浏览代码

slider kinda works, need to update slider position better

tsdedhar 6 年之前
父节点
当前提交
3ba7f866ef

二进制
assignments/a2/.gradle/4.7/fileHashes/fileHashes.bin


二进制
assignments/a2/.gradle/4.7/fileHashes/fileHashes.lock


二进制
assignments/a2/.gradle/4.7/taskHistory/taskHistory.bin


二进制
assignments/a2/.gradle/4.7/taskHistory/taskHistory.lock


二进制
assignments/a2/.gradle/buildOutputCleanup/buildOutputCleanup.lock


二进制
assignments/a2/build/classes/java/main/Controls$1.class


二进制
assignments/a2/build/classes/java/main/Controls.class


二进制
assignments/a2/build/classes/java/main/Model.class


二进制
assignments/a2/build/classes/java/main/Thingy.class


二进制
assignments/a2/build/classes/java/main/View.class


二进制
assignments/a2/build/libs/a2-1.0-SNAPSHOT.jar


+ 2 - 2
assignments/a2/src/main/java/Controls.java

@@ -36,13 +36,13 @@ public class Controls extends JPanel implements Observer
 
   public void update(Object observable)
   {
-    int len = model.getThingies().size();
+    int len = model.getTotalLen();
     if (len > 0)
     {
       playback.toggleSettingLen();
       playback.setMaximum(len);
       playback.toggleSettingLen();
-      playback.setValue(len);
+      //playback.setValue(len);
     }
     this.setBackground(model.controlColour);
     revalidate();

+ 1 - 1
assignments/a2/src/main/java/Model.java

@@ -58,7 +58,7 @@ public class Model extends Observable
   public void changeThingy(int x) // int x is the position in the slider we are at
   {
     int tempLen = 0;
-    int index;
+    int index = 0;
     
     for (int i = 0; i < thingies.size() && tempLen <= x; i++)
     {

+ 1 - 1
assignments/a2/src/main/java/View.java

@@ -39,7 +39,7 @@ public class View extends JPanel implements Observer
       gtemp.setColor(t.getColour());
       gtemp.setStroke(new BasicStroke(t.getThiccness(), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
       
-      if (t.getVisisbleLen() ==  1))
+      if (t.getVisisbleLen() ==  1)
       {
         gtemp.drawLine(points.get(0).x, points.get(0).y, points.get(0).x, points.get(0).y);
       }