Author: kono
Date: 2010-01-27 17:27:03 -0800 (Wed, 27 Jan 2010)
New Revision: 19056
Modified:
cytoscape/trunk/src/cytoscape/Cytoscape.java
cytoscape/trunk/src/cytoscape/util/NestedNetworkViewUpdater.java
cytoscape/trunk/src/cytoscape/view/NetworkPanel.java
cytoscape/trunk/src/cytoscape/visual/ui/VizMapperMainPanel.java
Log:
Confused visual style problem fixed.
Modified: cytoscape/trunk/src/cytoscape/Cytoscape.java
===================================================================
--- cytoscape/trunk/src/cytoscape/Cytoscape.java 2010-01-28 00:43:18 UTC
(rev 19055)
+++ cytoscape/trunk/src/cytoscape/Cytoscape.java 2010-01-28 01:27:03 UTC
(rev 19056)
@@ -852,7 +852,7 @@
*/
@SuppressWarnings("unchecked")
public static List<CyNetworkView> getSelectedNetworkViews() {
- CyNetworkView view = getCurrentNetworkView();
+ final CyNetworkView view = getCurrentNetworkView();
if (!selectedNetworkViews.contains(view))
selectedNetworkViews.add(view);
@@ -1113,16 +1113,16 @@
}
/**
- * destroys the networkview, including any layout information
+ * Destroys the network view.
*/
public static void destroyNetworkView(CyNetworkView view) {
if ((view == null) || (view == nullNetworkView))
return;
getSelectedNetworkViews().remove(view);
+
final String viewID = view.getIdentifier();
-
if (viewID.equals(currentNetworkViewID)) {
if (getNetworkViewMap().size() <= 0)
currentNetworkViewID = null;
@@ -1153,15 +1153,15 @@
/**
* destroys the networkview, including any layout information
*/
- public static void destroyNetworkView(String network_view_id) {
- destroyNetworkView((CyNetworkView)
getNetworkViewMap().get(network_view_id));
+ public static void destroyNetworkView(final String networkViewID) {
+ destroyNetworkView(getNetworkViewMap().get(networkViewID));
}
/**
* destroys the networkview, including any layout information
*/
- public static void destroyNetworkView(CyNetwork network) {
+ public static void destroyNetworkView(final CyNetwork network) {
destroyNetworkView(getNetworkViewMap().get(network.getIdentifier()));
}
Modified: cytoscape/trunk/src/cytoscape/util/NestedNetworkViewUpdater.java
===================================================================
--- cytoscape/trunk/src/cytoscape/util/NestedNetworkViewUpdater.java
2010-01-28 00:43:18 UTC (rev 19055)
+++ cytoscape/trunk/src/cytoscape/util/NestedNetworkViewUpdater.java
2010-01-28 01:27:03 UTC (rev 19056)
@@ -13,6 +13,8 @@
import cytoscape.Cytoscape;
import cytoscape.view.CyNetworkView;
import cytoscape.view.CytoscapeDesktop;
+import cytoscape.visual.VisualMappingManager;
+import cytoscape.visual.VisualStyle;
import ding.view.DGraphView;
import ding.view.DNodeView;
@@ -29,6 +31,8 @@
private static final String NESTED_NETWORK_VS_NAME = "Nested Network
Style";
+ private final VisualMappingManager vmm =
Cytoscape.getVisualMappingManager();
+
private boolean ignoreNextEvent = false;
public NestedNetworkViewUpdater() {
@@ -100,8 +104,17 @@
}
// Apply visual style if necessary
- if (applyStyle)
- networkView.redrawGraph(/* do layout = */
false, /* apply visual style = */ true);
+ if (applyStyle) {
+ final VisualStyle currentStyle =
vmm.getVisualStyle();
+
if(!currentStyle.equals(networkView.getVisualStyle())) {
+
vmm.setVisualStyle(networkView.getVisualStyle());
+ networkView.redrawGraph(/* do layout =
*/ false, /* apply visual style = */ true);
+ vmm.setVisualStyle(currentStyle);
+ } else {
+ networkView.redrawGraph(/* do layout =
*/ false, /* apply visual style = */ true);
+ }
+
+ }
}
}
Modified: cytoscape/trunk/src/cytoscape/view/NetworkPanel.java
===================================================================
--- cytoscape/trunk/src/cytoscape/view/NetworkPanel.java 2010-01-28
00:43:18 UTC (rev 19055)
+++ cytoscape/trunk/src/cytoscape/view/NetworkPanel.java 2010-01-28
01:27:03 UTC (rev 19056)
@@ -254,6 +254,8 @@
*/
public void removeNetwork(final String network_id) {
final NetworkTreeNode node = getNetworkNode(network_id);
+ if (node == null) return;
+
final Enumeration children = node.children();
NetworkTreeNode child = null;
final List removed_children = new ArrayList();
Modified: cytoscape/trunk/src/cytoscape/visual/ui/VizMapperMainPanel.java
===================================================================
--- cytoscape/trunk/src/cytoscape/visual/ui/VizMapperMainPanel.java
2010-01-28 00:43:18 UTC (rev 19055)
+++ cytoscape/trunk/src/cytoscape/visual/ui/VizMapperMainPanel.java
2010-01-28 01:27:03 UTC (rev 19056)
@@ -789,9 +789,6 @@
CyLogger.getLogger().debug("VS Switched --> " + vsName + ",
Last = " + lastVSName);
vmm.setNetworkView(Cytoscape.getCurrentNetworkView());
-
- // MLC 03/31/08:
- // NOTE: Will cause stateChanged() to be called:
vmm.setVisualStyle(vsName);
if (propertyMap.containsKey(vsName)) {
@@ -828,9 +825,6 @@
} else
setPropertyTable();
- // MLC 03/31/08:
- //lastVSName = vsName;
-
Cytoscape.getCurrentNetworkView().setVisualStyle(vsName);
if (redraw)
@@ -903,7 +897,7 @@
if (view != null) {
CyLogger.getLogger().debug("Creating Default
Image for " + name);
- updateDefaultImage(name, view, panelSize);
+ updateDefaultImage(name, view, panelSize);
}
}
--
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.
