Author: kono
Date: 2011-10-11 15:54:52 -0700 (Tue, 11 Oct 2011)
New Revision: 27135
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
Log:
fixes #424 Default Network Visual Properties will be applied correctly.
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
2011-10-11 22:24:04 UTC (rev 27134)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2011-10-11 22:54:52 UTC (rev 27135)
@@ -2980,6 +2980,9 @@
} else if(targetType == CyEdge.class) {
m_edgeDetails.clear();
m_edgeViewDefaultSupport.setEdgeViewDefault(vp,defaultValue);
+ } else if(targetType == CyNetwork.class) {
+ if(vp.shouldIgnoreDefault() == false)
+ this.setVisualProperty(vp, defaultValue);
}
}
Modified:
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
2011-10-11 22:24:04 UTC (rev 27134)
+++
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
2011-10-11 22:54:52 UTC (rev 27135)
@@ -169,7 +169,8 @@
applyViewDefaults(networkView,
lexManager.getNodeVisualProperties());
applyViewDefaults(networkView,
lexManager.getEdgeVisualProperties());
-
+ applyViewDefaults(networkView,
lexManager.getNetworkVisualProperties());
+
// Current visual prop tree.
applyImpl(nodeViews, lexManager.getNodeVisualProperties());
applyImpl(edgeViews, lexManager.getEdgeVisualProperties());
@@ -177,7 +178,8 @@
logger.info(title + ": Visual Style applied in " +
(System.currentTimeMillis() - start) + " msec.");
}
-
+
+
/**
* DOCUMENT ME!
*
--
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.
