Selaa lähdekoodia

slider still wont work

tsdedhar 6 vuotta sitten
vanhempi
commit
51a31552f6

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$1.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/libs/a2-1.0-SNAPSHOT.jar


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

@@ -18,15 +18,15 @@ public class Controls extends JPanel implements Observer
     this.setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
     this.setPreferredSize(new Dimension(1280,75));
     this.setMinimumSize(new Dimension(320, 75));
-    this.playback = new JSlider(new DefaultBoundedRangeModel(0, 0, 0, 0));
-    this.playback.addChangeListener(new ChangeListener()
+    this.playback = new JSlider(0, 0, 0);
+    playback.addChangeListener(new ChangeListener()
     {
       public void stateChanged(ChangeEvent e)
       {
-        if (playback.getValue() != model.getThingies().size())
-	{
-          model.changeThingy(playback.getValue() - 1);
-	}
+        if (!playback.getValueIsAdjusting() && playback.getValue() != model.getThingies().size())
+        {
+          //if (playback.getValue() >= 1) model.changeThingy(playback.getValue() - 1);
+        }
       }
     });
     this.playback.setPreferredSize(new Dimension(280, 75));
@@ -39,8 +39,8 @@ public class Controls extends JPanel implements Observer
     int len = model.getThingies().size();
     if (len > 0)
     {
-      //playback.setMaximum(len);
-      //playback.setValue(len);
+      playback.setMaximum(len);
+      playback.setValue(len);
     }
     this.setBackground(model.controlColour);
     revalidate();

+ 5 - 2
assignments/a2/src/main/java/Model.java

@@ -49,9 +49,12 @@ public class Model extends Observable
   public void changeThingy(int x)
   {
     curThingy = thingies.get(x);
-    for (int i = (x + 1); i < thingies.size(); i++)
+    if (thingies.size() >= 2)
     {
-      thingies.remove(i);
+      for (int i = (x + 1); i < thingies.size(); i++)
+      {
+        thingies.remove(i);
+      }
     }
     setChanged();
     notifyObservers();