Merge pull request #90 from ProgrammingLife3/feat/changeZoomSteps

feat/changeZoomSteps

Author: Delfil

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

@@ -1,15 +1,15 @@
 package tudelft.ti2806.pl3.visualization;
 
 import tudelft.ti2806.pl3.Controller;
-import tudelft.ti2806.pl3.data.gene.Gene;
-import tudelft.ti2806.pl3.util.observers.LoadingObserver;
 import tudelft.ti2806.pl3.ScreenSize;
 import tudelft.ti2806.pl3.data.filter.Filter;
+import tudelft.ti2806.pl3.data.gene.Gene;
 import tudelft.ti2806.pl3.data.gene.GeneData;
 import tudelft.ti2806.pl3.data.graph.DataNode;
 import tudelft.ti2806.pl3.data.graph.GraphDataRepository;
 import tudelft.ti2806.pl3.exception.NodeNotFoundException;
 import tudelft.ti2806.pl3.ui.util.DialogUtil;
+import tudelft.ti2806.pl3.util.observers.LoadingObserver;
 
 import java.awt.Component;
 import java.io.File;
@@ -35,6 +35,7 @@ public class GraphController implements Controller {
 	 * Percentage of the screen that is moved.
 	 */
 	private static final double MOVE_FACTOR = 10.0;
+	private static final float ZOOM_STEP_SIZE = 1.5f;
 
 	/**
 	 * Initialise an instance of GraphControler.<br>
@@ -149,7 +150,7 @@ public void moveView(float zoomCenter) {
 	 * Zoom the graph one level up.
 	 */
 	public void zoomLevelUp() {
-		zoomedGraphModel.setZoomLevel(zoomedGraphModel.getZoomLevel() * 2);
+		zoomedGraphModel.setZoomLevel(zoomedGraphModel.getZoomLevel() * ZOOM_STEP_SIZE);
 		zoomedGraphModel.produceDataNodeWrapperList();
 		graphMoved();
 	}
@@ -158,7 +159,7 @@ public void zoomLevelUp() {
 	 * Zoom the graph one level down.
 	 */
 	public void zoomLevelDown() {
-		zoomedGraphModel.setZoomLevel(zoomedGraphModel.getZoomLevel() / 2);
+		zoomedGraphModel.setZoomLevel(zoomedGraphModel.getZoomLevel() / ZOOM_STEP_SIZE);
 		zoomedGraphModel.produceDataNodeWrapperList();
 		graphMoved();
 	}

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

@@ -46,7 +46,7 @@ public class GraphView implements Observer, tudelft.ti2806.pl3.View, ViewInterfa
 	 * A zoom level of 1.0 shows the graph 1:1, so that every base pair should be readable, each with pixels to draw its
 	 * value as text. A zoom level of 2.0 shows the graph with each base pair using the half this size.
 	 */
-	private double zoomLevel = 1.0;
+	private float zoomLevel = 1.0f;
 
 	/**
 	 * The css style sheet used drawing the graph.<br>

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

@@ -43,7 +43,7 @@ public class ZoomedGraphModel extends Observable implements Observer, LoadingObs
 	private List<WrapperClone> dataNodeWrapperList;
 	private final ArrayList<LoadingObserver> loadingObservers = new ArrayList<>();
 
-	private int zoomLevel = 1;
+	private float zoomLevel = 1;
 	private int graphWidth;
 
 	/**
@@ -66,13 +66,13 @@ public List<WrapperClone> getDataNodeWrapperList() {
 	 * @param zoomLevel
 	 *            the new zoom level
 	 */
-	public void setZoomLevel(int zoomLevel) {
-		if (zoomLevel > 0) {
+	public void setZoomLevel(float zoomLevel) {
+		if (zoomLevel >= 1) {
 			this.zoomLevel = zoomLevel;
 		}
 	}
 
-	public int getZoomLevel() {
+	public float getZoomLevel() {
 		return this.zoomLevel;
 	}
 
@@ -87,6 +87,7 @@ public int getZoomLevel() {
 	 */
 	public void produceDataNodeWrapperList() {
 		notifyLoadingObservers(true);
+
 		float condition = Math.min((this.graphWidth * MIN_NODE_DISTANCE)
 				/ (ScreenSize.getInstance().getWidth() * this.zoomLevel),
 				new GetFirstCombineWrapper().compute(this.collapsedNode).getCollapse());

src/test/java/tudelft/ti2806/pl3/visualisation/ZoomedGraphModelTest.java

@@ -1,15 +1,16 @@
 package tudelft.ti2806.pl3.visualisation;
 
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
+
 import tudelft.ti2806.pl3.visualization.FilteredGraphModel;
 import tudelft.ti2806.pl3.visualization.ZoomedGraphModel;
 
-import static org.junit.Assert.assertEquals;
-
 /**
  * Test for ZoomedGraphModel
  * Created by Kasper on 17-6-2015.
@@ -29,10 +30,10 @@ public void setUp() {
 
 	@Test
 	public void testZoom() {
-		assertEquals(1, zoomedGraphModel.getZoomLevel());
+		assertEquals(1, zoomedGraphModel.getZoomLevel(), 0);
 		zoomedGraphModel.setZoomLevel(5);
-		assertEquals(5, zoomedGraphModel.getZoomLevel());
+		assertEquals(5, zoomedGraphModel.getZoomLevel(), 0);
 		zoomedGraphModel.setZoomLevel(-1);
-		assertEquals(5, zoomedGraphModel.getZoomLevel());
+		assertEquals(5, zoomedGraphModel.getZoomLevel(), 0);
 	}
 }