Author: kono
Date: 2009-12-01 18:43:08 -0800 (Tue, 01 Dec 2009)
New Revision: 18642
Modified:
cytoscape/trunk/resources/props/vizmap.props
cytoscape/trunk/src/cytoscape/Cytoscape.java
cytoscape/trunk/src/cytoscape/util/NestedNetworkViewUpdater.java
Log:
Need to debug session loading. It throws exception when we load session with
nested networks.
Modified: cytoscape/trunk/resources/props/vizmap.props
===================================================================
--- cytoscape/trunk/resources/props/vizmap.props 2009-12-02 01:37:44 UTC
(rev 18641)
+++ cytoscape/trunk/resources/props/vizmap.props 2009-12-02 02:43:08 UTC
(rev 18642)
@@ -3,8 +3,8 @@
# Any changes may make these visual mappings unreadable.
# Please make sure you know what you are doing before modifying this file by
hand.
#
-#Tue Nov 24 16:17:31 PST 2009
-edgeAppearanceCalculator.Nested\ Network\ Style.defaultEdgeColor=0,0,0
+#Tue Dec 01 17:43:17 PST 2009
+edgeAppearanceCalculator.Nested\ Network\ Style.defaultEdgeColor=51,51,51
edgeAppearanceCalculator.Nested\ Network\
Style.defaultEdgeFont=SanSerif,plain,10
edgeAppearanceCalculator.Nested\ Network\ Style.defaultEdgeFontSize=10.0
edgeAppearanceCalculator.Nested\ Network\ Style.defaultEdgeLabel=
@@ -13,7 +13,7 @@
edgeAppearanceCalculator.Nested\ Network\
Style.defaultEdgeLabelPosition=C,C,c,0,0
edgeAppearanceCalculator.Nested\ Network\ Style.defaultEdgeLabelWidth=100.0
edgeAppearanceCalculator.Nested\ Network\ Style.defaultEdgeLineStyle=SOLID
-edgeAppearanceCalculator.Nested\ Network\ Style.defaultEdgeLineWidth=3.0
+edgeAppearanceCalculator.Nested\ Network\ Style.defaultEdgeLineWidth=2.0
edgeAppearanceCalculator.Nested\ Network\ Style.defaultEdgeOpacity=255
edgeAppearanceCalculator.Nested\ Network\
Style.defaultEdgeSourceArrowColor=0,0,0
edgeAppearanceCalculator.Nested\ Network\
Style.defaultEdgeSourceArrowOpacity=255
@@ -259,8 +259,8 @@
nodeAppearanceCalculator.Nested\ Network\
Style.defaultEdgeTargetArrowOpacity=255
nodeAppearanceCalculator.Nested\ Network\
Style.defaultEdgeTargetArrowShape=NONE
nodeAppearanceCalculator.Nested\ Network\ Style.defaultEdgeToolTip=
-nodeAppearanceCalculator.Nested\ Network\ Style.defaultNodeBorderColor=0,0,0
-nodeAppearanceCalculator.Nested\ Network\ Style.defaultNodeBorderOpacity=255
+nodeAppearanceCalculator.Nested\ Network\ Style.defaultNodeBorderColor=0,153,0
+nodeAppearanceCalculator.Nested\ Network\ Style.defaultNodeBorderOpacity=190.0
nodeAppearanceCalculator.Nested\ Network\
Style.defaultNodeFillColor=153,255,153
nodeAppearanceCalculator.Nested\ Network\
Style.defaultNodeFont=SansSerif,plain,12
nodeAppearanceCalculator.Nested\ Network\ Style.defaultNodeFontSize=13.0
@@ -271,16 +271,18 @@
nodeAppearanceCalculator.Nested\ Network\
Style.defaultNodeLabelPosition=C,C,c,0,0
nodeAppearanceCalculator.Nested\ Network\ Style.defaultNodeLabelWidth=100.0
nodeAppearanceCalculator.Nested\ Network\ Style.defaultNodeLineStyle=SOLID
-nodeAppearanceCalculator.Nested\ Network\ Style.defaultNodeLineWidth=3.0
-nodeAppearanceCalculator.Nested\ Network\ Style.defaultNodeOpacity=255
+nodeAppearanceCalculator.Nested\ Network\ Style.defaultNodeLineWidth=2.0
+nodeAppearanceCalculator.Nested\ Network\ Style.defaultNodeOpacity=150.0
nodeAppearanceCalculator.Nested\ Network\ Style.defaultNodeShape=ellipse
nodeAppearanceCalculator.Nested\ Network\ Style.defaultNodeSize=40.0
nodeAppearanceCalculator.Nested\ Network\ Style.defaultNodeToolTip=
nodeAppearanceCalculator.Nested\ Network\ Style.defaultNodeWidth=70.0
+nodeAppearanceCalculator.Nested\ Network\
Style.nodeBorderColorCalculator=Nested Network Style-Node Border Color-Discrete
Mapper
nodeAppearanceCalculator.Nested\ Network\ Style.nodeFillColorCalculator=Nested
Network Style-Node Color-Discrete Mapper
nodeAppearanceCalculator.Nested\ Network\ Style.nodeLabelCalculator=Nested
Network Style-Node Label-Passthrough Mapper
nodeAppearanceCalculator.Nested\ Network\ Style.nodeLabelColor=Nested Network
Style-Node Label Color-Discrete Mapper
nodeAppearanceCalculator.Nested\ Network\
Style.nodeLabelPositionCalculator=Nested Network Style-Node Label
Position-Discrete Mapper
+nodeAppearanceCalculator.Nested\ Network\ Style.nodeLineWidthCalculator=Nested
Network Style-Node Line Width-Discrete Mapper
nodeAppearanceCalculator.Nested\ Network\ Style.nodeShapeCalculator=Nested
Network Style-Node Shape-Discrete Mapper
nodeAppearanceCalculator.Nested\ Network\ Style.nodeSizeLocked=true
nodeAppearanceCalculator.Nested\ Network\
Style.nodeUniformSizeCalculator=Nested Network Style-Node Size-Discrete Mapper
@@ -436,6 +438,11 @@
nodeAppearanceCalculator.default.defaultNodeWidth=70.0
nodeAppearanceCalculator.default.nodeLabelCalculator=NodeLabel
nodeAppearanceCalculator.default.nodeSizeLocked=true
+nodeBorderColorCalculator.Nested\ Network\ Style-Node\ Border\ Color-Discrete\
Mapper.mapping.controller=has_nested_network
+nodeBorderColorCalculator.Nested\ Network\ Style-Node\ Border\ Color-Discrete\
Mapper.mapping.controllerType=4
+nodeBorderColorCalculator.Nested\ Network\ Style-Node\ Border\ Color-Discrete\
Mapper.mapping.map.yes=0,102,204
+nodeBorderColorCalculator.Nested\ Network\ Style-Node\ Border\ Color-Discrete\
Mapper.mapping.type=DiscreteMapping
+nodeBorderColorCalculator.Nested\ Network\ Style-Node\ Border\ Color-Discrete\
Mapper.visualPropertyType=NODE_BORDER_COLOR
nodeFillColorCalculator.Nested\ Network\ Style-Node\ Color-Discrete\
Mapper.mapping.controller=has_nested_network
nodeFillColorCalculator.Nested\ Network\ Style-Node\ Color-Discrete\
Mapper.mapping.controllerType=4
nodeFillColorCalculator.Nested\ Network\ Style-Node\ Color-Discrete\
Mapper.mapping.map.yes=255,255,255
@@ -461,7 +468,7 @@
nodeLabelCalculator.id\ as\ node\ labels.visualPropertyType=NODE_LABEL
nodeLabelColor.Nested\ Network\ Style-Node\ Label\ Color-Discrete\
Mapper.mapping.controller=has_nested_network
nodeLabelColor.Nested\ Network\ Style-Node\ Label\ Color-Discrete\
Mapper.mapping.controllerType=4
-nodeLabelColor.Nested\ Network\ Style-Node\ Label\ Color-Discrete\
Mapper.mapping.map.yes=0,0,255
+nodeLabelColor.Nested\ Network\ Style-Node\ Label\ Color-Discrete\
Mapper.mapping.map.yes=0,102,204
nodeLabelColor.Nested\ Network\ Style-Node\ Label\ Color-Discrete\
Mapper.mapping.type=DiscreteMapping
nodeLabelColor.Nested\ Network\ Style-Node\ Label\ Color-Discrete\
Mapper.visualPropertyType=NODE_LABEL_COLOR
nodeLabelPositionCalculator.Nested\ Network\ Style-Node\ Label\
Position-Discrete\ Mapper.mapping.controller=has_nested_network
@@ -469,14 +476,19 @@
nodeLabelPositionCalculator.Nested\ Network\ Style-Node\ Label\
Position-Discrete\ Mapper.mapping.map.yes=SE,NW,c,0,0
nodeLabelPositionCalculator.Nested\ Network\ Style-Node\ Label\
Position-Discrete\ Mapper.mapping.type=DiscreteMapping
nodeLabelPositionCalculator.Nested\ Network\ Style-Node\ Label\
Position-Discrete\ Mapper.visualPropertyType=NODE_LABEL_POSITION
+nodeLineWidthCalculator.Nested\ Network\ Style-Node\ Line\ Width-Discrete\
Mapper.mapping.controller=has_nested_network
+nodeLineWidthCalculator.Nested\ Network\ Style-Node\ Line\ Width-Discrete\
Mapper.mapping.controllerType=4
+nodeLineWidthCalculator.Nested\ Network\ Style-Node\ Line\ Width-Discrete\
Mapper.mapping.map.yes=5.0
+nodeLineWidthCalculator.Nested\ Network\ Style-Node\ Line\ Width-Discrete\
Mapper.mapping.type=DiscreteMapping
+nodeLineWidthCalculator.Nested\ Network\ Style-Node\ Line\ Width-Discrete\
Mapper.visualPropertyType=NODE_LINE_WIDTH
nodeShapeCalculator.Nested\ Network\ Style-Node\ Shape-Discrete\
Mapper.mapping.controller=has_nested_network
nodeShapeCalculator.Nested\ Network\ Style-Node\ Shape-Discrete\
Mapper.mapping.controllerType=4
-nodeShapeCalculator.Nested\ Network\ Style-Node\ Shape-Discrete\
Mapper.mapping.map.yes=roundrect
+nodeShapeCalculator.Nested\ Network\ Style-Node\ Shape-Discrete\
Mapper.mapping.map.yes=rect
nodeShapeCalculator.Nested\ Network\ Style-Node\ Shape-Discrete\
Mapper.mapping.type=DiscreteMapping
nodeShapeCalculator.Nested\ Network\ Style-Node\ Shape-Discrete\
Mapper.visualPropertyType=NODE_SHAPE
nodeUniformSizeCalculator.Nested\ Network\ Style-Node\ Size-Discrete\
Mapper.mapping.controller=has_nested_network
nodeUniformSizeCalculator.Nested\ Network\ Style-Node\ Size-Discrete\
Mapper.mapping.controllerType=4
-nodeUniformSizeCalculator.Nested\ Network\ Style-Node\ Size-Discrete\
Mapper.mapping.map.yes=125.0
+nodeUniformSizeCalculator.Nested\ Network\ Style-Node\ Size-Discrete\
Mapper.mapping.map.yes=60.0
nodeUniformSizeCalculator.Nested\ Network\ Style-Node\ Size-Discrete\
Mapper.mapping.type=DiscreteMapping
nodeUniformSizeCalculator.Nested\ Network\ Style-Node\ Size-Discrete\
Mapper.visualPropertyType=NODE_SIZE
nodeUniformSizeCalculator.Node\ Size-Continuous\
Mapper.mapping.boundaryvalues=2
Modified: cytoscape/trunk/src/cytoscape/Cytoscape.java
===================================================================
--- cytoscape/trunk/src/cytoscape/Cytoscape.java 2009-12-02 01:37:44 UTC
(rev 18641)
+++ cytoscape/trunk/src/cytoscape/Cytoscape.java 2009-12-02 02:43:08 UTC
(rev 18642)
@@ -1728,7 +1728,6 @@
if (layout == null) {
layout = CyLayouts.getDefaultLayout();
}
-
layout.doLayout(view);
Cytoscape.firePropertyChange(cytoscape.view.CytoscapeDesktop.NETWORK_VIEW_CREATED,
null, view);
Modified: cytoscape/trunk/src/cytoscape/util/NestedNetworkViewUpdater.java
===================================================================
--- cytoscape/trunk/src/cytoscape/util/NestedNetworkViewUpdater.java
2009-12-02 01:37:44 UTC (rev 18641)
+++ cytoscape/trunk/src/cytoscape/util/NestedNetworkViewUpdater.java
2009-12-02 02:43:08 UTC (rev 18642)
@@ -16,10 +16,17 @@
import ding.view.DNodeView;
-/** This class manages images that represent nested networks. This
"management" includes creation, updating and destruction of such images as well
- * as updating network views when any of their nodes nested networks have
changed.
+/**
+ * This class manages images that represent nested networks. This
"management" includes creation,
+ * updating and destruction of such images as well as updating network views
when any of their
+ * nodes nested networks have changed.
+ *
+ * @since Cytoscape 2.7.0
+ * @author kono, ruschein
*/
public class NestedNetworkViewUpdater implements PropertyChangeListener {
+
+ private static final String NESTED_NETWORK_VS_NAME = "Nested Network
Style";
public NestedNetworkViewUpdater() {
//Cytoscape.getPropertyChangeSupport().addPropertyChangeListener(this);
@@ -27,11 +34,12 @@
}
public void propertyChange(final PropertyChangeEvent evt) {
- //System.out.println("------- Got Signal --------> " +
evt.getPropertyName() + ", " + evt.getSource());
+ System.out.println("------- Got Signal --------> " +
evt.getPropertyName() + ", " + evt.getSource());
if
(evt.getPropertyName().equals(CytoscapeDesktop.NETWORK_VIEW_CREATED) ||
evt.getPropertyName().equals(CytoscapeDesktop.NETWORK_VIEW_DESTROYED)) {
final boolean created =
evt.getPropertyName().equals(CytoscapeDesktop.NETWORK_VIEW_CREATED);
+ // "New value" always contains newly created/destroyed
CyNetworkView.
final CyNetworkView view = (CyNetworkView)
evt.getNewValue();
final List<String> parents =
Cytoscape.getNetworkAttributes().getListAttribute(view.getNetwork().getIdentifier(),
CyNode.PARENT_NODES_ATTR);
if (parents == null || parents.isEmpty()) {
@@ -43,10 +51,14 @@
for (final CyNetworkView networkView: networkViews) {
for (final String parentNode: parents) {
// If this view contains a parentNode,
then update its nested network view.
- final NodeView nodeView =
networkView.getNodeView(Cytoscape.getCyNode(parentNode));
- if (nodeView != null) {
+ //TODO: When we load saved session with
nested network, the following can be null. WHY?
+ final CyNode node =
Cytoscape.getCyNode(parentNode);
+ final NodeView nodeView =
networkView.getNodeView(node);
+ if (nodeView != null && node != null &&
node.getNestedNetwork() != null) {
+ System.out.println("--------->
Nested = " + node.getNestedNetwork());
((DNodeView)nodeView).setNestedNetworkView(
- created ? (DGraphView)
Cytoscape.getNetworkView(((CyNetwork)nodeView.getNode().getNestedNetwork()).getIdentifier())
: null);
+ created ? (DGraphView)
Cytoscape.getNetworkView(((CyNetwork)nodeView.getNode().getNestedNetwork()).getIdentifier())
+ : null);
}
}
}
--
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.
