Просмотр исходного кода

idk what i just broke,but it's something

tsdedhar 6 лет назад
Родитель
Сommit
851b7dbf49

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/Model.class


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


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


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


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

@@ -71,14 +71,14 @@ public class Model extends Observable
     
     for (int i = 0; i < thingies.size() && tempLen <= x; i++)
     {
-      tempLen += thingies.get(i).getVisisbleLen();
+      tempLen += thingies.get(i).getVisibleLen();
       index = i;
     }
     
     Thingy tempThingy = thingies.get(index);
     // off by one adjustments if we're at the end of a thingy
-    if (tempThingy.getVisisbleLen() == 0 && tempLen > x) tempThingy = thingies.get(index - 1);
-    if (tempThingy.getVisisbleLen() == tempThingy.getPoints().size() && tempLen < x) tempThingy = thingies.get(index + 1);
+    if (tempThingy.getVisibleLen() == 0 && tempLen > x) tempThingy = thingies.get(index - 1);
+    if (tempThingy.getVisibleLen() == tempThingy.getPoints().size() && tempLen < x) tempThingy = thingies.get(index + 1);
     
     // now modify tempThingy
     // if we want to go back in time
@@ -192,7 +192,7 @@ class Thingy
     return thiccness;
   }
   
-  public int getVisisbleLen()
+  public int getVisibleLen()
   {
     return visibleLen;
   }

+ 3 - 2
assignments/a2/src/main/java/View.java

@@ -39,13 +39,14 @@ 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.getVisibleLen() == 0) {}
+      else if (t.getVisibleLen() ==  1)
       {
         gtemp.drawLine(points.get(0).x, points.get(0).y, points.get(0).x, points.get(0).y);
       }
       else
       {
-        for (int i = 1; i < t.getVisisbleLen(); i++)
+        for (int i = 1; i < t.getVisibleLen(); i++)
         {
           gtemp.drawLine(points.get(i - 1).x, points.get(i - 1).y, points.get(i).x, points.get(i).y);
         }