Merge pull request #94 from ProgrammingLife3/fix/resizeofzoombar

Fix/resizeofzoombar

Author: kwendel

src/main/java/tudelft/ti2806/pl3/Application.java

@@ -313,6 +313,7 @@ public void componentResized(ComponentEvent e) {
 				size.setHeight((int) bounds.getHeight());
 				size.calculate();
 
+				// resize all the views.
 				getSideBarController().getPanel().setBounds(0, size.getMenubarHeight(),
 						size.getSideBarWidth(), size.getHeight());
 				getGraphController().getPanel().setBounds(0, 0, size.getWidth(),
@@ -322,6 +323,10 @@ public void componentResized(ComponentEvent e) {
 						size.getWidth(), size.getZoomBarHeight());
 				getPhyloController().getView().updateSize();
 
+				// recalculate the zoombar interestingness.
+				getGraphController().calculateCollectInterest();
+				getZoomBarController().graphLoaded();
+
 				main.repaint();
 			}
 		};

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

@@ -52,6 +52,8 @@ public class FilteredGraphModel extends Observable implements LoadingObservable,
 	private CollectInterest collectInterest;
 	private List<Genome> genomes;
 
+	private WrappedGraphData wrappedGraphData;
+
 	private Map<List<Filter<DataNode>>, Integer> filtersToGenomesCountMap;
 
 	/**
@@ -90,19 +92,26 @@ public void produceWrappedGraphData() {
 		filter(resultNodes);
 		List<Edge> resultEdges = originalGraphData.getEdgeListClone();
 		EdgeUtil.removeAllDeadEdges(resultEdges, resultNodes);
-		WrappedGraphData wrappedGraphData = new WrappedGraphData(resultNodes, resultEdges);
+		wrappedGraphData = new WrappedGraphData(resultNodes, resultEdges);
 		EdgeUtil.removeAllEmptyEdges(wrappedGraphData);
 		collapsedNode = WrapUtil.collapseGraph(wrappedGraphData).getPositionedNodes().get(0);
 		positionNodeYOnGenomeSpace.calculate(collapsedNode, null);
 
-		collectInterest = new CollectInterest(ScreenSize.getInstance().getWidth());
-		collectInterest.calculate(wrappedGraphData.getPositionedNodes());
 		calculateCollapse.calculate(collapsedNode, null);
+		calculateCollectInterest();
 		setChanged();
 		notifyObservers();
 		notifyLoadingObservers(false);
 	}
 
+	/**
+	 * Calculate the CollectInterest based on the current screensize width.
+	 */
+	public void calculateCollectInterest(){
+		collectInterest = new CollectInterest(ScreenSize.getInstance().getWidth());
+		collectInterest.calculate(wrappedGraphData.getPositionedNodes());
+	}
+
 	/**
 	 * Removes all edges of which one or both of their nodes is not on the originalWrappedGraphData.
 	 *

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

@@ -203,6 +203,10 @@ public void centerOnNode(DataNode node, Gene selected) throws NodeNotFoundExcept
 		graphMoved();
 	}
 
+	public void calculateCollectInterest(){
+		filteredGraphModel.calculateCollectInterest();
+	}
+
 	private double getCurrentZoomLevel() {
 		return zoomedGraphModel.getZoomLevel();
 	}