Merge pull request #92 from ProgrammingLife3/feature/square

Change shape of unwrappable node to a square.

Author: mathieupost

resources/stylesheet.css

@@ -24,19 +24,10 @@ node:selected {
     size: 25;
 }
 
-node.HorizontalWrapper {
+node.BOX {
     shape: box;
 }
 
-node.SpaceWrapper {
-    shape: diamond;
-    size: 20;
-}
-
-node.VerticalWrapper {
-    shape: cross;
-}
-
 node.FixWrapper {
     visibility-mode: hidden;
 }

src/main/java/tudelft/ti2806/pl3/data/wrapper/CombineWrapper.java

@@ -82,7 +82,8 @@ public void calculateX() {
 		}
 		this.x /= this.getNodeList().size();
 	}
-	
+
+	@Override
 	public boolean canUnwrap() {
 		return true;
 	}

src/main/java/tudelft/ti2806/pl3/data/wrapper/DataNodeWrapper.java

@@ -76,6 +76,11 @@ public String getIdString() {
 		return node.getId();
 	}
 
+	@Override
+	public boolean canUnwrap() {
+		return false;
+	}
+
 	@Override
 	public Set<Genome> getGenome() {
 		return node.getCurrentGenomeSet();

src/main/java/tudelft/ti2806/pl3/data/wrapper/FixWrapper.java

@@ -31,6 +31,11 @@ public int getId() {
 		return id;
 	}
 
+	@Override
+	public boolean canUnwrap() {
+		return false;
+	}
+
 	@Override
 	public Set<Genome> getGenome() {
 		return genome;

src/main/java/tudelft/ti2806/pl3/data/wrapper/SingleWrapper.java

@@ -45,7 +45,12 @@ public String getIdString() {
 	public int getId() {
 		return this.target.getId();
 	}
-	
+
+	@Override
+	public boolean canUnwrap() {
+		return false;
+	}
+
 	@Override
 	public Set<Genome> getGenome() {
 		return this.target.getGenome();

src/main/java/tudelft/ti2806/pl3/data/wrapper/Wrapper.java

@@ -88,7 +88,9 @@ public void setOutgoingWeight(List<Integer> outgoingWeight) {
 	public abstract String getIdString();
 
 	public abstract int getId();
-	
+
+	public abstract boolean canUnwrap();
+
 	public abstract Set<Genome> getGenome();
 
 	public abstract void calculate(WrapperOperation wrapperSequencer, Wrapper container);

src/main/java/tudelft/ti2806/pl3/data/wrapper/WrapperClone.java

@@ -50,6 +50,11 @@ public String getIdString() {
 		return originalNode.getId();
 	}
 
+	@Override
+	public boolean canUnwrap() {
+		return originalNode.canUnwrap();
+	}
+
 	@Override
 	public Set<Genome> getGenome() {
 		return originalNode.getGenome();

src/main/java/tudelft/ti2806/pl3/data/wrapper/WrapperPlaceholder.java

@@ -29,6 +29,11 @@ public int getId() {
 		return ID;
 	}
 
+	@Override
+	public boolean canUnwrap() {
+		return true;
+	}
+
 	@Override
 	public Set<Genome> getGenome() {
 		return null;

src/main/java/tudelft/ti2806/pl3/visualization/GraphView.java

@@ -130,15 +130,18 @@ public void generateGraph() {
 			/ (panel.getBounds().width * zoomLevel / zoomedGraphModel.getWrappedCollapsedNode().getWidth())
 			/ zoomedGraphModel.getWrappedCollapsedNode().getGenome().size();
 		graphData.forEach(node -> {
-			Node graphNode = graph.addNode(Integer.toString(node.getId()));
-			double y = node.getY() * someSize;
-			graphNode.setAttribute("xy", node.getX(), y);
-			graphNode.addAttribute("ui.class", node.getOriginalNode().getClass().getSimpleName());
-			graphNode.addAttribute("ui.label",
-					NumberFormat.getNumberInstance(Locale.US)
-							.format(node.getOriginalNode().getBasePairCount()));
-			graphNode.setAttribute("node", node);
-		});
+				Node graphNode = graph.addNode(Integer.toString(node.getId()));
+				double y = node.getY() * someSize;
+				graphNode.setAttribute("xy", node.getX(), y);
+				if (node.canUnwrap()) {
+					graphNode.addAttribute("ui.class", "BOX");
+				}
+				graphNode.addAttribute("ui.label",
+						NumberFormat.getNumberInstance(Locale.US)
+								.format(node.getOriginalNode().getBasePairCount()));
+				graphNode.setAttribute("node", node);
+			}
+		);
 
 		for (WrapperClone node : graphData) {
 			int i = 0;

src/test/java/tudelft/ti2806/pl3/data/wrapper/TestWrapper.java

@@ -56,6 +56,11 @@ public String getIdString() {
 		return id;
 	}
 
+	@Override
+	public boolean canUnwrap() {
+		return false;
+	}
+
 	@Override
 	public Set<Genome> getGenome() {
 		return genomeSet;

src/test/java/tudelft/ti2806/pl3/util/OrderedListUtilTest.java

@@ -119,6 +119,11 @@ public int getId() {
 			return 0;
 		}
 
+		@Override
+		public boolean canUnwrap() {
+			return false;
+		}
+
 		@Override
 		public Set<Genome> getGenome() {
 			return new HashSet<>();