Merge pull request #33 from UCSDOalads/MYCBranch

Add and remove functions for annotations

Author: UltimatePea

src/actions/AddAnnotationAction.java

@@ -0,0 +1,49 @@
+package actions;
+
+import java.util.ArrayList;
+
+import javax.swing.JOptionPane;
+
+import actions.menu.ActionsMenuBarTitles;
+import paintcomponents.PaintComponent;
+import paintcomponents.annotations.TextAnnotation;
+import paintcomponents.data.DataTextPaintComponent;
+import ui.PaintPanel;
+
+public class AddAnnotationAction extends PaintAction{
+
+	public AddAnnotationAction(PaintPanel panel) {
+		super(panel);
+	}
+
+	@Override
+	public boolean canPerformAction() {
+		//get selected components
+		ArrayList<PaintComponent> items = panel.getSelectTool().getSelectedComponents();
+		
+		if(items.size() != 1){
+			return false;
+		}
+		if(!(items.get(0) instanceof DataTextPaintComponent)){
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public void performAction() {
+		ArrayList<PaintComponent> items = panel.getSelectTool().getSelectedComponents();
+		String annotations = JOptionPane
+				.showInputDialog("Please specify the annotation of the component");
+		new TextAnnotation(items.get(0), annotations);
+		
+		panel.repaint();
+	}
+
+	@Override
+	public String locationString() {
+		return ActionsMenuBarTitles.Data().Annotations().Add().toString();
+	}
+
+
+}

src/actions/RemoveAnnotationAction.java

@@ -0,0 +1,40 @@
+package actions;
+
+import java.util.ArrayList;
+
+import actions.menu.ActionsMenuBarTitles;
+import paintcomponents.PaintComponent;
+import ui.PaintPanel;
+
+public class RemoveAnnotationAction extends PaintAction{
+
+	public RemoveAnnotationAction(PaintPanel panel) {
+		super(panel);
+	}
+
+	@Override
+	public boolean canPerformAction() {
+		ArrayList<PaintComponent> items = panel.getSelectTool().getSelectedComponents();
+		
+		if(items.size() != 1){
+			return false;
+		}
+		if(items.get(0).getOptionalAnnotation() == null){
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public void performAction() {
+		ArrayList<PaintComponent> items = panel.getSelectTool().getSelectedComponents();
+		items.get(0).setOptionalAnnotation(null);
+		panel.repaint();
+	}
+
+	@Override
+	public String locationString() {
+		return ActionsMenuBarTitles.Data().Annotations().Remove().toString();
+	}
+
+}

src/actions/menu/ActionsMenuBar.java

@@ -9,6 +9,7 @@
 
 import painttools.tools.SelectionToolListener;
 import ui.PaintPanel;
+import actions.AddAnnotationAction;
 import actions.AddDataDisplayBoxAction;
 import actions.AddDataInputBoxAction;
 import actions.AddHaskellComponent;
@@ -27,6 +28,7 @@
 import actions.GeneratePolygonSourceJava;
 import actions.InputDataForDataInputBoxAction;
 import actions.PaintAction;
+import actions.RemoveAnnotationAction;
 import actions.RemovePaintComponent;
 import actions.UpdateDataDisplayBoxAction;
 import actions.singleinstanceoperations.SetPointSizeOperation;
@@ -79,6 +81,9 @@ public ActionsMenuBar(PaintPanel panel){
 		addAction(new UpdateFontSizeOperation(panel));
 		addAction(new SetPointSizeOperation(panel));
 
+		// add data annotation
+		addAction(new AddAnnotationAction(panel));
+		addAction(new RemoveAnnotationAction(panel));
 	}
 
 	private void addAction(PaintAction action) {

src/actions/menu/ActionsMenuBarTitles.java

@@ -138,4 +138,9 @@ public ActionsMenuBarTitles Zoom_Out() {
 		return this;
 	}
 
+	public ActionsMenuBarTitles Annotations() {
+		append("Annotations");
+		return this;
+	}
+
 }

src/paintcomponents/PaintComponent.java

@@ -7,6 +7,7 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import paintcomponents.annotations.PaintComponentAnnotation;
 import painttools.tools.SelectTool;
 import ui.PaintPanel;
 
@@ -38,6 +39,7 @@ public abstract class PaintComponent {
 	static private long UNIQUE_ID = 0;
 	long uid = ++UNIQUE_ID;
 
+	private PaintComponentAnnotation optionalAnnotation;
 	/**
 	 * Get a Unique ID of this component. IDs resets to zero when JVM starts;
 	 * 
@@ -95,6 +97,10 @@ public void paint(Graphics g) {
 			paintNotSelected(g);
 		}
 
+		//paint annotation
+		if(optionalAnnotation != null){
+			optionalAnnotation.paint(g);
+		}
 	}
 
 	/**
@@ -166,7 +172,11 @@ public boolean isSelected() {
 	public void translate(int i, int j) {
 		this.x += i;
 		this.y += j;
-
+		
+		//if attached component is not null, translate it as well
+		if(optionalAnnotation != null){
+			optionalAnnotation.translate(i, j);
+		}
 	}
 
 	public abstract boolean contains(int x2, int y2);
@@ -220,4 +230,18 @@ public PaintComponent(Element rootElement, PaintPanel panel) {
 			this.x = Integer.parseInt(pos.getElementsByTagName("xcoordinate").item(0).getTextContent());
 			this.y = Integer.parseInt(pos.getElementsByTagName("ycoordinate").item(0).getTextContent());
 	  }
+
+	/**
+	 * @return the optionalAnnotation
+	 */
+	public PaintComponentAnnotation getOptionalAnnotation() {
+		return optionalAnnotation;
+	}
+
+	/**
+	 * @param optionalAnnotation the optionalAnnotation to set
+	 */
+	public void setOptionalAnnotation(PaintComponentAnnotation optionalAnnotation) {
+		this.optionalAnnotation = optionalAnnotation;
+	}
 }

src/paintcomponents/TextPaintComponent.java

@@ -103,6 +103,16 @@ protected void paintNotSelected(Graphics g) {
 		updateBoundsAndDrawString(g);
 	}
 	private void updateBoundsAndDrawString(Graphics g) {
+		updateBounds(g);
+		drawString(g);
+		
+	}
+
+	/**
+	 * Update bounds updates the width and row height of this text paint component
+	 * @param g Graphics Object
+	 */
+	public void updateBounds(Graphics g) {
 		//reset bounds to begin calculation
 		width = 0;
 		//derive row Height
@@ -120,6 +130,20 @@ private void updateBoundsAndDrawString(Graphics g) {
 			if( curStringWidth > width){
 				width = curStringWidth;
 			}
+		}
+	}
+	
+	/**
+	 * Draws the string, do not update bounds
+	 * @param g
+	 */
+	private void drawString(Graphics g){
+		
+		//get number of rows
+		String[] rows = this.displayingText.split("\n");
+		
+		for (int i = 0; i < rows.length; i++) {
+			String string = rows[i];
 
 			g.drawString(string, getX(), (int) (getY() + rowHeight * (i + 1)));
 		}

src/paintcomponents/annotations/PaintComponentAnnotation.java

@@ -18,6 +18,7 @@ public abstract class PaintComponentAnnotation extends PaintComponent{
 	public PaintComponentAnnotation(PaintComponent attachedComponent) {
 		super(attachedComponent.getX(), attachedComponent.getY());
 		this.setAttachedComponent(attachedComponent);
+		attachedComponent.setOptionalAnnotation(this);
 	}
 
 	/**

src/paintcomponents/annotations/TextAnnotation.java

@@ -3,29 +3,45 @@
 import java.awt.Graphics;
 
 import paintcomponents.PaintComponent;
+import paintcomponents.TextPaintComponent;
 
 public class TextAnnotation extends PaintComponentAnnotation {
 
-	public TextAnnotation(PaintComponent attachedComponent) {
+	private TextPaintComponent textPaintComponent;
+	
+	
+	public TextAnnotation(PaintComponent attachedComponent, String displayingText) {
 		super(attachedComponent);
+		this.textPaintComponent = new TextPaintComponent(displayingText, attachedComponent.getX(),
+				attachedComponent.getY());
+		
 	}
 
 	@Override
 	protected void paintNotSelected(Graphics g) {
 		// TODO Auto-generated method stub
-		
+		textPaintComponent.updateBounds(g);
+		textPaintComponent.setY(getAttachedComponent().getY() - textPaintComponent.getRowHeight());
+		textPaintComponent.paint(g);
 	}
 
 	@Override
 	protected void paintSelected(Graphics g) {
 		// TODO Auto-generated method stub
-		
+		textPaintComponent.updateBounds(g);
+		textPaintComponent.setY(getAttachedComponent().getY() - textPaintComponent.getRowHeight());
+		textPaintComponent.paint(g);
 	}
 
 	@Override
 	public boolean contains(int x2, int y2) {
 		// TODO Auto-generated method stub
-		return false;
+		return textPaintComponent.contains(x2, y2);
 	}
 
+	public void translate(int x, int y){
+		textPaintComponent.translate(x, y);
+	}
+	
+	
 }

src/ui/PaintPanel.java

@@ -176,7 +176,6 @@ public void showCursor() {
 
 	public void addPaintComponent(PaintComponent comp) {
 		components.add(comp);
-
 	}
 
 	public ArrayList<PaintComponent> getPaintComponents() {