Author: clopes
Date: 2012-05-29 13:36:22 -0700 (Tue, 29 May 2012)
New Revision: 29381
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/CustomGraphicsSizeDependencyFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/EdgeColorDependencyFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/NodeSizeDependencyFactory.java
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/VisualStyleSerializer.java
Log:
Fixes #1040 : Visual Property Dependencies are not loaded from 2.x sessions
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/CustomGraphicsSizeDependencyFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/CustomGraphicsSizeDependencyFactory.java
2012-05-29 19:38:22 UTC (rev 29380)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/CustomGraphicsSizeDependencyFactory.java
2012-05-29 20:36:22 UTC (rev 29381)
@@ -31,7 +31,7 @@
customGraphicsSizeDependency.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_8);
customGraphicsSizeDependency.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_9);
- return new
VisualPropertyDependency<Double>("CustomGraphicsSizeToNodeSize", "Fit Custom
Graphics to node", customGraphicsSizeDependency, lexicon);
+ return new
VisualPropertyDependency<Double>("nodeCustomGraphicsSizeSync", "Fit Custom
Graphics to node", customGraphicsSizeDependency, lexicon);
}
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/EdgeColorDependencyFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/EdgeColorDependencyFactory.java
2012-05-29 19:38:22 UTC (rev 29380)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/EdgeColorDependencyFactory.java
2012-05-29 20:36:22 UTC (rev 29381)
@@ -28,7 +28,7 @@
edgeColorDependency.add(DVisualLexicon.EDGE_SOURCE_ARROW_UNSELECTED_PAINT);
edgeColorDependency.add(DVisualLexicon.EDGE_TARGET_ARROW_UNSELECTED_PAINT);
- return new
VisualPropertyDependency<Paint>("EdgeColorToArrowColor", "Edge color to
arrows", edgeColorDependency, lexicon);
+ return new
VisualPropertyDependency<Paint>("arrowColorMatchesEdge", "Edge color to
arrows", edgeColorDependency, lexicon);
}
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/NodeSizeDependencyFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/NodeSizeDependencyFactory.java
2012-05-29 19:38:22 UTC (rev 29380)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/NodeSizeDependencyFactory.java
2012-05-29 20:36:22 UTC (rev 29381)
@@ -24,7 +24,7 @@
nodeSizeVisualProperties.add(BasicVisualLexicon.NODE_WIDTH);
nodeSizeVisualProperties.add(BasicVisualLexicon.NODE_HEIGHT);
- return new
VisualPropertyDependency<Double>("NodeSizeToNodeWidthAndHeight", "Lock node
width and height", nodeSizeVisualProperties, lexicon);
+ return new VisualPropertyDependency<Double>("nodeSizeLocked",
"Lock node width and height", nodeSizeVisualProperties, lexicon);
}
}
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/VisualStyleSerializer.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/VisualStyleSerializer.java
2012-05-29 19:38:22 UTC (rev 29380)
+++
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/VisualStyleSerializer.java
2012-05-29 20:36:22 UTC (rev 29381)
@@ -499,6 +499,7 @@
newDependency.setValue(vpDep.isDependencyEnabled());
final VisualProperty<?> parent =
vpDep.getParentVisualProperty();
+
if (nodeVisualProperties.contains(parent))
nodeDep.add(newDependency);
else if (edgeVisualProperties.contains(parent))
@@ -509,44 +510,29 @@
}
private void restoreDependency(final VisualStyle visualStyle,
org.cytoscape.io.internal.util.vizmap.model.VisualStyle vsModel) {
-
final Node nodeSection = vsModel.getNode();
final Edge edgeSection = vsModel.getEdge();
final Network networkSection = vsModel.getNetwork();
-
+
final Set<Dependency> dependencyStates = new
HashSet<Dependency>();
-
- if(nodeSection != null)
+
+ if (nodeSection != null)
dependencyStates.addAll(nodeSection.getDependency());
- if(edgeSection != null)
+ if (edgeSection != null)
dependencyStates.addAll(edgeSection.getDependency());
- if(networkSection != null)
+ if (networkSection != null)
dependencyStates.addAll(networkSection.getDependency());
-
+
final Set<VisualPropertyDependency<?>> availableDependencies =
visualStyle.getAllVisualPropertyDependencies();
- for(final Dependency dep: dependencyStates) {
- final String newDependencyName = dep.getName();
- final Boolean depEnabled = dep.isValue();
-
- for(final VisualPropertyDependency<?> vsDependency:
availableDependencies) {
-
if(vsDependency.getIdString().equals(newDependencyName))
- vsDependency.setDependency(depEnabled);
- }
- }
- }
+
+ for (final Dependency dep : dependencyStates) {
+ final String depName = dep.getName();
+ final Boolean enabled = dep.isValue();
-
- /**
- * For 2.x compatibility?
- * @param vs
- * @param key
- * @param value
- */
- private void setDependency(final VisualStyle vs, final String key,
final String value) {
- if (key.contains("nodeSizeLocked")) {
- boolean isDependencyEnabled =
Boolean.parseBoolean(value);
-//
lexicon.getVisualLexiconNode(BasicVisualLexicon.NODE_WIDTH).setDependency(b);
-//
lexicon.getVisualLexiconNode(BasicVisualLexicon.NODE_HEIGHT).setDependency(b);
+ for (final VisualPropertyDependency<?> vsDependency :
availableDependencies) {
+ if
(vsDependency.getIdString().equalsIgnoreCase(depName))
+ vsDependency.setDependency(enabled);
+ }
}
}
--
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.
