Author: mes
Date: 2012-06-04 16:24:01 -0700 (Mon, 04 Jun 2012)
New Revision: 29448
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
Log:
fixes #1064 changed setZoom method so that it no longer calls updateView, which
was triggering a deadlock
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-06-04 22:29:21 UTC (rev 29447)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-06-04 23:24:01 UTC (rev 29448)
@@ -1072,30 +1072,16 @@
}
/**
- * DOCUMENT ME!
- *
- * @param zoom
- * DOCUMENT ME!
+ * Set the zoom level and redraw the view.
*/
- public void setZoom(final double zoom, final boolean updateView) {
+ @Override
+ public void setZoom(final double zoom) {
synchronized (m_lock) {
m_networkCanvas.m_scaleFactor =
checkZoom(zoom,m_networkCanvas.m_scaleFactor);
m_viewportChanged = true;
}
-
- if (updateView) {
- this.updateView();
- }
}
- /**
- * Set the zoom level and redraw the view.
- */
- @Override
- public void setZoom(final double zoom) {
- setZoom(zoom, /* updateView = */ true);
- }
-
private void fitContent(final boolean updateView) {
cyEventHelper.flushPayloadEvents();
@@ -2069,7 +2055,7 @@
originalSize = m_networkCanvas.getSize();
m_networkCanvas.setSize(width, height);
fitContent(/* updateView = */ false);
- setZoom(getZoom() * shrink, /* updateView = */ false);
+ setZoom(getZoom() * shrink);
m_networkCanvas.paint(g);
// Restore network to original size
m_networkCanvas.setSize(originalSize);
--
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.
