Author: kono
Date: 2011-07-19 15:16:18 -0700 (Tue, 19 Jul 2011)
New Revision: 26219
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/AddEdgeStateMonitor.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
Log:
refs #326 View model will be updated when ding modifies zoom level by mouse
wheel.
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/AddEdgeStateMonitor.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/AddEdgeStateMonitor.java
2011-07-19 21:52:19 UTC (rev 26218)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/AddEdgeStateMonitor.java
2011-07-19 22:16:18 UTC (rev 26219)
@@ -29,60 +29,16 @@
import java.awt.Color;
-import java.awt.FontMetrics;
import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.Point;
-import java.awt.Rectangle;
import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.dnd.DnDConstants;
-import java.awt.dnd.DropTarget;
-import java.awt.dnd.DropTargetListener;
-import java.awt.dnd.DropTargetDropEvent;
-import java.awt.dnd.DropTargetDragEvent;
-import java.awt.dnd.DropTargetEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
-import java.awt.event.MouseWheelEvent;
-import java.awt.event.MouseWheelListener;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Line2D;
import java.awt.geom.Point2D;
-import java.awt.image.BufferedImage;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
+import java.util.HashMap;
+import java.util.Map;
-import javax.swing.JComponent;
-import javax.swing.TransferHandler;
-
-import org.cytoscape.ding.EdgeView;
-import org.cytoscape.ding.GraphViewChangeListener;
-import org.cytoscape.ding.NodeView;
-import org.cytoscape.ding.ViewChangeEdit;
-import org.cytoscape.graph.render.export.ImageImposter;
-import org.cytoscape.graph.render.immed.EdgeAnchors;
-import org.cytoscape.graph.render.immed.GraphGraphics;
-import org.cytoscape.graph.render.stateful.GraphLOD;
-import org.cytoscape.graph.render.stateful.GraphRenderer;
-import org.cytoscape.model.CyEdge;
-import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.util.intr.IntEnumerator;
-import org.cytoscape.util.intr.IntHash;
-import org.cytoscape.util.intr.IntStack;
-import org.cytoscape.work.undo.UndoSupport;
-import java.util.Map;
-import java.util.HashMap;
-
/**
* This class is designed to keep track of the state of AddEdgeTasks
throughout ding.
* An instance of this class is used by InnerCanvas to keep track of the state
of adding
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
2011-07-19 21:52:19 UTC (rev 26218)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
2011-07-19 22:16:18 UTC (rev 26219)
@@ -296,12 +296,11 @@
return isPrinting;
}
- //
- // MouseWheelListener
- //
-
+ /**
+ *
+ */
public void mouseWheelMoved(MouseWheelEvent e) {
- adjustZoom( e.getWheelRotation() );
+ adjustZoom(e.getWheelRotation());
}
//
@@ -883,31 +882,26 @@
}
private void adjustZoom(int notches) {
- double factor;
+
+ final double factor;
+
+ if (notches < 0)
+ factor = 1.1; // scroll up, zoom in
+ else
+ factor = 0.9; // scroll down, zoom out
- // scroll up, zoom in
- if (notches < 0) {
- factor = 1.1;
-
- // scroll down, zoom out
- } else {
- factor = 0.9;
- }
-
synchronized (m_lock) {
m_scaleFactor = m_scaleFactor * factor;
}
m_view.m_viewportChanged = true;
+
+ // Update view model.
+
m_view.cyNetworkView.setVisualProperty(MinimalVisualLexicon.NETWORK_SCALE_FACTOR,
m_scaleFactor);
repaint();
}
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
public int getLastRenderDetail() {
return m_lastRenderDetail;
}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
