Bladeren bron

made buttons hopefully work for jumping to start or end

tsdedhar 6 jaren geleden
bovenliggende
commit
1d76cbaf43

BIN
assignments/a2/.gradle/4.7/fileHashes/fileHashes.bin


BIN
assignments/a2/.gradle/4.7/fileHashes/fileHashes.lock


BIN
assignments/a2/.gradle/4.7/taskHistory/taskHistory.bin


BIN
assignments/a2/.gradle/4.7/taskHistory/taskHistory.lock


BIN
assignments/a2/.gradle/buildOutputCleanup/buildOutputCleanup.lock


BIN
assignments/a2/build/classes/java/main/Controls$4.class


BIN
assignments/a2/build/classes/java/main/Controls$5.class


BIN
assignments/a2/build/classes/java/main/Controls.class


BIN
assignments/a2/build/classes/java/main/Model.class


BIN
assignments/a2/build/classes/java/main/Thingy.class


BIN
assignments/a2/build/classes/java/main/playSlider.class


BIN
assignments/a2/build/libs/a2-1.0-SNAPSHOT.jar


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

@@ -56,7 +56,8 @@ public class Controls extends JPanel implements Observer
     {
       public void actionPerformed(ActionEvent e)
       {
-        playback.setValue(playback.getMaximum());
+        model.ffwd();
+        //playback.setValue(playback.getMaximum());
       }
     });
     this.clear = new JButton("Start");
@@ -64,7 +65,8 @@ public class Controls extends JPanel implements Observer
     {
       public void actionPerformed(ActionEvent e)
       {
-        playback.setValue(playback.getMinimum());
+        model.rewind();
+        //playback.setValue(playback.getMinimum());
       }
     });
     this.add(play);

+ 37 - 0
assignments/a2/src/main/java/Model.java

@@ -116,7 +116,39 @@ public class Model extends Observable
     setChanged();
     notifyObservers();
   }
+
+  public void ffwd()
+  {
+    for (Thingy t: thingies)
+    {
+      t.setVisibleLen(t.getPoints().size());
+    }
+
+    if (thingies.size() >= 1)
+    {
+      curThingy = thingies.get(thingies.size() - 1);
+    }
+
+    setChanged();
+    notifyObservers();
+  }
   
+  public void rewind()
+  {
+    for (Thingy t: thingies)
+    {
+      t.setVisibleLen(0);
+    }
+
+    if (thingies.size() >= 1)
+    {
+      curThingy = thingies.get(0);
+    }
+
+    setChanged();
+    notifyObservers();
+  }
+
   public void setSideColour(Color c)
   {
     sideColour = c;
@@ -232,4 +264,9 @@ class Thingy
   {
     visibleLen++;
   }
+
+  public void setVisibleLen(int x)
+  {
+    visibleLen = x;
+  }
 }