meh

dan-jfisher · Jun 21, 2018 · 2b0793e · 2b0793e
1 parent 11dd6e6
commit 2b0793e
Show file tree

Hide file tree

Showing 28 changed files with 319 additions and 326 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/out/production/HW6/cs3500/animator/controller/ControllerGUI$1.class b/out/production/HW6/cs3500/animator/controller/ControllerGUI$1.class
diff --git a/out/production/HW6/cs3500/animator/controller/ControllerGUI.class b/out/production/HW6/cs3500/animator/controller/ControllerGUI.class
diff --git a/out/production/HW6/cs3500/animator/controller/HybridController.class b/out/production/HW6/cs3500/animator/controller/HybridController.class
diff --git a/out/production/HW6/cs3500/animator/controller/InteractiveController.class b/out/production/HW6/cs3500/animator/controller/InteractiveController.class
diff --git a/out/production/HW6/cs3500/animator/model/animation/AnimatedShapeImpl.class b/out/production/HW6/cs3500/animator/model/animation/AnimatedShapeImpl.class
diff --git a/out/production/HW6/cs3500/animator/model/animation/AnimationModelImpl.class b/out/production/HW6/cs3500/animator/model/animation/AnimationModelImpl.class
diff --git a/out/production/HW6/cs3500/animator/view/IGuiInteractiveView.class b/out/production/HW6/cs3500/animator/view/IGuiInteractiveView.class
diff --git a/out/production/HW6/cs3500/animator/view/IGuiView.class b/out/production/HW6/cs3500/animator/view/IGuiView.class
diff --git a/out/production/HW6/cs3500/animator/view/IView$ViewType.class b/out/production/HW6/cs3500/animator/view/IView$ViewType.class
diff --git a/out/production/HW6/cs3500/animator/view/InteractiveViewGUI.class b/out/production/HW6/cs3500/animator/view/InteractiveViewGUI.class
diff --git a/out/production/HW6/cs3500/animator/view/ViewGUI.class b/out/production/HW6/cs3500/animator/view/ViewGUI.class
diff --git a/out/production/HW6/cs3500/animator/view/ViewSVG.class b/out/production/HW6/cs3500/animator/view/ViewSVG.class
diff --git a/out/production/HW6/cs3500/animator/view/ViewText.class b/out/production/HW6/cs3500/animator/view/ViewText.class
diff --git a/out/production/HW6/hw7 README b/out/production/HW6/hw7 README
@@ -1,3 +1,12 @@
 The following changes were made to our code from the previous assignment:
     - Added functions of all views to IView and make unsupported functions throw
-    UnsupportedOperationException's.
+    UnsupportedOperationException's.
+    - Changed model to store shapes in LinkedHashMap rather than HashMap since draw order
+    wasn't conserved in HashMap.
+
+
+The following classes were added:
+    -IGuiBasedView
+    -InteractiveViewGUI
+    -HybridController
+    -InteractiveController
diff --git a/src/cs3500/animator/controller/ControllerGUI.java b/src/cs3500/animator/controller/ControllerGUI.java
@@ -5,11 +5,13 @@
 import java.util.ArrayList;
 
 import javax.swing.Timer;
+import javax.swing.text.View;
 
 import cs3500.animator.model.animation.IAnimatedShape;
 import cs3500.animator.model.animation.IAnimationModel;
 import cs3500.animator.util.AnimatedShapeToDrawableConverter;
 import cs3500.animator.util.DrawableGUIShape;
+import cs3500.animator.view.IGuiView;
 import cs3500.animator.view.ViewGUI;
 
 /**

diff --git a/src/cs3500/animator/controller/HybridController.java b/src/cs3500/animator/controller/HybridController.java
@@ -3,10 +3,14 @@
 import java.awt.event.ActionEvent;
 
 import cs3500.animator.model.animation.IAnimationModel;
+import cs3500.animator.view.IGuiInteractiveView;
 import cs3500.animator.view.InteractiveViewGUI;
 import cs3500.animator.view.TextBasedView;
 import cs3500.animator.view.ViewSVG;
 
+/**
+ *
+ */
 public class HybridController extends InteractiveController {
   private ControllerText fileOutputController;
 

diff --git a/src/cs3500/animator/controller/InteractiveController.java b/src/cs3500/animator/controller/InteractiveController.java
@@ -8,10 +8,12 @@
 import javax.swing.event.ChangeListener;
 
 import cs3500.animator.model.animation.IAnimationModel;
+import cs3500.animator.view.IGuiInteractiveView;
+import cs3500.animator.view.IGuiView;
 import cs3500.animator.view.InteractiveViewGUI;
 
 public class InteractiveController extends ControllerGUI implements ActionListener, ChangeListener {
-  InteractiveViewGUI interactiveView;
+  IGuiInteractiveView interactiveView;
 
   /**
    * Constructor for the GUI controller. Reads data from model and tells the view what to print.

diff --git a/src/cs3500/animator/view/IGuiInteractiveView.java b/src/cs3500/animator/view/IGuiInteractiveView.java
@@ -0,0 +1,22 @@
+package cs3500.animator.view;
+
+import java.awt.event.ActionListener;
+import javax.swing.event.ChangeListener;
+
+/**
+ *
+ */
+public interface IGuiInteractiveView extends IView {
+
+  /**
+   *
+   * @param listener
+   */
+  void setActionListener(ActionListener listener);
+
+  /**
+   *
+   * @param listener
+   */
+  void setChangeListener(ChangeListener listener);
+}
diff --git a/src/cs3500/animator/view/IGuiView.java b/src/cs3500/animator/view/IGuiView.java
@@ -0,0 +1,17 @@
+package cs3500.animator.view;
+
+import java.util.ArrayList;
+
+import cs3500.animator.util.DrawableGUIShape;
+
+/**
+ *
+ */
+public interface IGuiView extends IView {
+
+  /**
+   *
+   * @param newShapes
+   */
+  void setShapes(ArrayList<DrawableGUIShape> newShapes);
+}
diff --git a/src/cs3500/animator/view/IView.java b/src/cs3500/animator/view/IView.java
@@ -52,13 +52,6 @@ public interface IView {
    */
   void setFilename(String filename);
 
-  /**
-   *
-   * @param s
-   * @return
-   */
-  String printStartEndTimeSVGAnimations(IDrawableShape s);
-
   /**
    *
    * @return

diff --git a/src/cs3500/animator/view/InteractiveViewGUI.java b/src/cs3500/animator/view/InteractiveViewGUI.java
@@ -5,7 +5,10 @@
 import javax.swing.*;
 import javax.swing.event.ChangeListener;
 
-public class InteractiveViewGUI extends ViewGUI {
+/**
+ *
+ */
+public class InteractiveViewGUI extends ViewGUI implements IGuiInteractiveView {
   private JSlider slider;
   private JButton stopStartButton;
   private JButton restartButton;
@@ -18,6 +21,10 @@ public class InteractiveViewGUI extends ViewGUI {
   private final int FPS_MAX = 60;
   private final int FPS_INIT = 30;
 
+  /**
+   * Creates a new InteractiveViewGUI object. This type of view can display animations whose
+   * settings can be adjusted by the client.
+   */
   public InteractiveViewGUI() {
     super();
 
@@ -40,6 +47,7 @@ public InteractiveViewGUI() {
     this.add(panel);
   }
 
+  @Override
   public void setActionListener(ActionListener listener) {
     if (listener == null) {
       throw new IllegalArgumentException("Invalid action listener");
@@ -51,6 +59,7 @@ public void setActionListener(ActionListener listener) {
     exportButton.addActionListener(listener);
   }
 
+  @Override
   public void setChangeListener(ChangeListener listener) {
     if (listener == null) {
       throw new IllegalArgumentException("Invalid action listener");

diff --git a/src/cs3500/animator/view/TextBasedView.java b/src/cs3500/animator/view/TextBasedView.java
@@ -58,6 +58,4 @@ public void setShapes(ArrayList<DrawableTextShape> shapes) {
   public ViewType getViewType() {
     return viewType;
   }
-
-  public abstract String printStartEndTimeSVGAnimations(DrawableTextShape s);
 }
diff --git a/src/cs3500/animator/view/ViewFactory.java b/src/cs3500/animator/view/ViewFactory.java
@@ -6,7 +6,7 @@
 public class ViewFactory {
 
   /**
-   * THis method constructs a view based on the type provied. It accepts svg, text, or gui.
+   * This method constructs a view based on the type provided. It accepts svg, text, or gui.
    * @param type the view type.
    * @return the new {@link IView} object.
    */

diff --git a/src/cs3500/animator/view/ViewGUI.java b/src/cs3500/animator/view/ViewGUI.java
@@ -15,13 +15,13 @@
 /**
  * This class serves as both an IView object and a JFrame for cs3500.animator.model.animation.
  */
-public class ViewGUI extends JFrame implements IView {
+public class ViewGUI extends JFrame implements IGuiView {
   private ShapePanel panel;
   private JScrollPane scrollPane;
   private ViewType viewType;
 
   /**
-   * This is the defualt constructor.
+   * This is the default constructor.
    */
   public ViewGUI() {
     super();
@@ -36,23 +36,26 @@ public ViewGUI() {
     this.pack();
   }
 
-  /**
-   * This method sets the cs3500.animator.model.shapes to be animated on the next tic.
-   * @param newShapes The cs3500.animator.model.shapes to be painted.
-   */
-  public void setShapes(ArrayList<DrawableGUIShape> newShapes) {
-    panel.setShapes(newShapes);
-  }
-
   /**
    * This method is called by the constructor and adds a panel with scroll bars to this object.
    */
-  public void addPanelWithScrollPane() {
+  private void addPanelWithScrollPane() {
     this.panel = new ShapePanel();
     this.add(panel);
     this.add(new JScrollPane(panel));
   }
 
+
+
+  /**
+   * This method sets the cs3500.animator.model.shapes to be animated on the next tic.
+   * @param newShapes The cs3500.animator.model.shapes to be painted.
+   */
+  @Override
+  public void setShapes(ArrayList<DrawableGUIShape> newShapes) {
+    panel.setShapes(newShapes);
+  }
+
   @Override
   public void display() {
     this.setVisible(true);
@@ -78,11 +81,6 @@ public void setFilename(String filename) {
     throw new UnsupportedOperationException("ViewGUI object does not support this function");
   }
 
-  @Override
-  public String printStartEndTimeSVGAnimations(IDrawableShape s) {
-    throw new UnsupportedOperationException("ViewGUI object does not support this function");
-  }
-
   @Override
   public String printSVGFromShapeList() {
     throw new UnsupportedOperationException("ViewGUI object does not support this function");

diff --git a/src/cs3500/animator/view/ViewSVG.java b/src/cs3500/animator/view/ViewSVG.java
@@ -23,6 +23,40 @@ public ViewSVG() {
     viewType = ViewType.SVG;
   }
 
+  @Override
+  public void display() {
+    try {
+      ap.append("<svg xmlns=\"http://www.w3.org/2000/svg\" " +
+              "xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n\n");
+
+      ap.append(printSVGFromShapeList());
+
+      ap.append("\n</svg>");
+
+      ap.close();
+    } catch (IOException e) {
+      throw new IllegalArgumentException("Could not open file");
+    }
+  }
+
+   /**
+   * This method adds transformations for animating the appearance and disappearance of a shape.
+   * This must be done for every shape.
+   * @param s The shape being animated
+   * @return the svg description of the appearance/disappearance cs3500.animator.model.animation.
+   */
+  public String printStartEndTimeSVGAnimations(DrawableTextShape s) {
+    StringBuilder stringBuilder = new StringBuilder();
+
+    stringBuilder.append("<set attributeName=\"fill-opacity\" attributeType=\"XML\"\n");
+    stringBuilder.append("to=\"1\"\nbegin=\"" + s.getStartTime() + "s\"/>\n");
+
+    stringBuilder.append("<set attributeName=\"fill-opacity\" attributeType=\"XML\"\n");
+    stringBuilder.append("to=\"0\"\nbegin=\"" + s.getEndTime() + "s\"/>");
+
+    return stringBuilder.toString();
+  }
+
   /**
    * This method writes an SVG style for a rectangle.
    * @param x the x coordinate of the corner.
@@ -64,26 +98,6 @@ public String getEllipseDescription(double x, double y, double xRadius, double y
     return strBuilder.toString();
   }
 
-
-  /**
-   * This method adds transformations for animating the appearance and disappearance of a shape.
-   * This must be done for every shape.
-   * @param s The shape being animated
-   * @return the svg description of the appearance/disappearance cs3500.animator.model.animation.
-   */
-  @Override
-  public String printStartEndTimeSVGAnimations(DrawableTextShape s) {
-    StringBuilder stringBuilder = new StringBuilder();
-
-    stringBuilder.append("<set attributeName=\"fill-opacity\" attributeType=\"XML\"\n");
-    stringBuilder.append("to=\"1\"\nbegin=\"" + s.getStartTime() + "s\"/>\n");
-
-    stringBuilder.append("<set attributeName=\"fill-opacity\" attributeType=\"XML\"\n");
-    stringBuilder.append("to=\"0\"\nbegin=\"" + s.getEndTime() + "s\"/>");
-
-    return stringBuilder.toString();
-  }
-
   /**
    * This function loops through the cs3500.animator.model.shapes and converts them to SVG.
    * It only accepts cs3500.animator.model.shapes of type ellipse and rectangle.
@@ -188,19 +202,5 @@ public String printSVGFromShapeList() {
     return strBuilder.toString();
   }
 
-  @Override
-  public void display() {
-    try {
-      ap.append("<svg xmlns=\"http://www.w3.org/2000/svg\" " +
-              "xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n\n");
-
-      ap.append(printSVGFromShapeList());
-
-      ap.append("\n</svg>");
 
-      ap.close();
-    } catch (IOException e) {
-      throw new IllegalArgumentException("Could not open file");
-    }
-  }
 }
diff --git a/src/cs3500/animator/view/ViewText.java b/src/cs3500/animator/view/ViewText.java
@@ -110,12 +110,8 @@ public void setFilename(String filename) {
     throw new UnsupportedOperationException("ViewText object does not support this function");
   }
 
-  @Override
-  public String printStartEndTimeSVGAnimations(IDrawableShape s) {
-    throw new UnsupportedOperationException("ViewText object does not support this function");
-  }
-
   @Override
   public String printSVGFromShapeList() {
     throw new UnsupportedOperationException("ViewText object does not support this function");
+  }
 }
diff --git a/src/hw7 README b/src/hw7 README
@@ -1,3 +1,12 @@
 The following changes were made to our code from the previous assignment:
     - Added functions of all views to IView and make unsupported functions throw
-    UnsupportedOperationException's.
+    UnsupportedOperationException's.
+    - Changed model to store shapes in LinkedHashMap rather than HashMap since draw order
+    wasn't conserved in HashMap.
+
+
+The following classes were added:
+    -IGuiBasedView
+    -InteractiveViewGUI
+    -HybridController
+    -InteractiveController