Author: kono
Date: 2011-06-20 18:59:28 -0700 (Mon, 20 Jun 2011)
New Revision: 25827
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/BirdsEyeViewHandler.java
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
Log:
Missing Bird's Eye View problem fixed.
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/BirdsEyeViewHandler.java
===================================================================
---
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/BirdsEyeViewHandler.java
2011-06-21 00:53:04 UTC (rev 25826)
+++
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/BirdsEyeViewHandler.java
2011-06-21 01:59:28 UTC (rev 25827)
@@ -52,6 +52,9 @@
import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.events.SetCurrentRenderingEngineEvent;
import org.cytoscape.session.events.SetCurrentRenderingEngineListener;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.events.NetworkViewAddedEvent;
+import org.cytoscape.view.model.events.NetworkViewAddedListener;
import org.cytoscape.view.model.events.NetworkViewDestroyedEvent;
import org.cytoscape.view.model.events.NetworkViewDestroyedListener;
import org.cytoscape.view.presentation.RenderingEngine;
@@ -66,8 +69,7 @@
public class BirdsEyeViewHandler implements SetCurrentRenderingEngineListener,
NetworkViewDestroyedListener {
- private static final Logger logger = LoggerFactory
- .getLogger(BirdsEyeViewHandler.class);
+ private static final Logger logger =
LoggerFactory.getLogger(BirdsEyeViewHandler.class);
private static final Dimension DEF_PANEL_SIZE = new Dimension(280, 280);
private static final Color DEF_BACKGROUND_COLOR = Color.WHITE;
@@ -165,7 +167,6 @@
bevFactory.getInstance(bevPanel, engine.getViewModel());
setFocus();
bevPanel.repaint();
-
}
@Override
@@ -177,4 +178,19 @@
bevPanel.repaint();
}
}
+
+
+ public void addView(final RenderingEngine<CyNetwork> newEngine) {
+ logger.debug("======== Got new view. Creating new BEV
=============");
+
+
+ engine = newEngine;
+ logger.debug("Got BEV New Network view = " +
engine.getViewModel());
+ bevPanel.removeAll();
+ bevFactory.getInstance(bevPanel, engine.getViewModel());
+ setFocus();
+ bevPanel.repaint();
+
+ logger.debug("======== BEV update done. =============");
+ }
}
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
===================================================================
---
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
2011-06-21 00:53:04 UTC (rev 25826)
+++
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
2011-06-21 01:59:28 UTC (rev 25827)
@@ -137,6 +137,8 @@
private final CyEventHelper eventHelper;
private final Map<CyNetwork, RowSetMicroListener> nameListeners;
private final CyTableRowUpdateService tableRowUpdateService;
+
+ private final BirdsEyeViewHandler bird;
/**
* Constructor for the Network Panel.
@@ -149,6 +151,7 @@
final CyTableRowUpdateService tableRowUpdateService) {
super();
+ this.bird = bird;
this.appManager = applicationManager;
this.netmgr = netmgr;
this.networkViewManager = networkViewManager;
@@ -291,9 +294,6 @@
return treeTable;
}
- public JPanel getNavigatorPanel() {
- return navigatorPanel;
- }
/**
* Remove a network from the panel.
@@ -402,11 +402,13 @@
}
public void handleEvent(NetworkViewAddedEvent nde) {
- logger.debug("Network view added to NetworkPanel: " +
nde.getNetworkView().getModel().getSUID());
+ logger.debug("********** Network view added to NetworkPanel.
View ID: " + nde.getNetworkView().getSUID());
// Set current network view to the new one.
appManager.setCurrentNetworkView(nde.getNetworkView().getModel().getSUID());
-
+
+ // Update BEV
+ bird.addView(appManager.getCurrentRenderingEngine());
treeTable.getTree().updateUI();
}
--
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.
