Browse Source

added thiccness, need to fix preview

tsdedhar 6 years ago
parent
commit
b8d8234703

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/Colours$1.class


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


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


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


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


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


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


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


BIN
assignments/a2/build/classes/java/main/previewPanel$1.class


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


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


+ 9 - 3
assignments/a2/src/main/java/Sidepane.java

@@ -3,12 +3,14 @@ import java.util.*;
 import java.awt.*;
 import javax.swing.*;
 import java.awt.event.*;
+import javax.swing.event.*;
 
 public class Sidepane extends JPanel implements Observer
 {
   private Model model;
   private Colours colours;
   private JPanel thiccness;
+  private previewPanel preview;
 
   // Bob the Builder this shit
   public Sidepane(Model model, Handler handler)
@@ -19,7 +21,9 @@ public class Sidepane extends JPanel implements Observer
     this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
     this.setPreferredSize(new Dimension(280, 720));
     colours = new Colours(model);
+    preview = new previewPanel(model);
     this.add(colours);
+    this.add(preview);
     model.addObserver(this);
   }
 
@@ -100,14 +104,16 @@ class previewPanel extends JPanel
       {
         public void stateChanged(ChangeEvent e)
         {
-          this.model.changeThiccness(slider.getValue());
+          model.changeThiccness(slider.getValue());
         }
       });
     this.preview = new previewLine(m);
+    this.add(preview);
+    this.add(slider);
   }
 }
 
-class previewLine
+class previewLine extends JComponent implements Observer
 {
   private int xpos;
   private int ypos;
@@ -133,4 +139,4 @@ class previewLine
     gtemp.setStroke(new BasicStroke(model.getThiccness(), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
     gtemp.drawLine(xpos, ypos, xpos, ypos);
   }
-}
+}