Author: kono
Date: 2012-04-06 15:01:05 -0700 (Fri, 06 Apr 2012)
New Revision: 28763
Added:
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
Removed:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/CustomGraphicsSizeDependency.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/EdgePaintToArrowHeadPaintDependency.java
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
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/DNodeView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/EdgeViewDefaultSupport.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/legend/ContinuousMappingLegendPanel.java
Log:
fixes #259 Visual Property Dependency is now part of vizmap-api.
Deleted:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/CustomGraphicsSizeDependency.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/CustomGraphicsSizeDependency.java
2012-04-06 22:00:17 UTC (rev 28762)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/CustomGraphicsSizeDependency.java
2012-04-06 22:01:05 UTC (rev 28763)
@@ -1,24 +0,0 @@
-package org.cytoscape.ding.dependency;
-
-import org.cytoscape.ding.DVisualLexicon;
-import org.cytoscape.view.vizmap.gui.AbstractVisualPropertyDependency;
-
-public class CustomGraphicsSizeDependency extends
- AbstractVisualPropertyDependency {
-
- private static final String NAME = "Synchronize Custom Graphics Size to
Node Size";
-
- public CustomGraphicsSizeDependency() {
- super(NAME);
-
- this.group.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_1);
- this.group.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_2);
- this.group.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_3);
- this.group.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_4);
- this.group.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_5);
- this.group.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_6);
- this.group.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_7);
- this.group.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_8);
- this.group.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_9);
- }
-}
Added:
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
(rev 0)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/CustomGraphicsSizeDependencyFactory.java
2012-04-06 22:01:05 UTC (rev 28763)
@@ -0,0 +1,37 @@
+package org.cytoscape.ding.dependency;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.cytoscape.ding.DVisualLexicon;
+import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.vizmap.VisualPropertyDependency;
+import org.cytoscape.view.vizmap.VisualPropertyDependencyFactory;
+
+public class CustomGraphicsSizeDependencyFactory implements
VisualPropertyDependencyFactory<Double> {
+
+ private final VisualLexicon lexicon;
+
+ public CustomGraphicsSizeDependencyFactory(final VisualLexicon lexicon)
{
+ this.lexicon = lexicon;
+ }
+
+ @Override
+ public VisualPropertyDependency<Double>
createVisualPropertyDependency() {
+
+ final Set<VisualProperty<Double>> customGraphicsSizeDependency
= new HashSet<VisualProperty<Double>>();
+
customGraphicsSizeDependency.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_1);
+
customGraphicsSizeDependency.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_2);
+
customGraphicsSizeDependency.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_3);
+
customGraphicsSizeDependency.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_4);
+
customGraphicsSizeDependency.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_5);
+
customGraphicsSizeDependency.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_6);
+
customGraphicsSizeDependency.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_7);
+
customGraphicsSizeDependency.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_8);
+
customGraphicsSizeDependency.add(DVisualLexicon.NODE_CUSTOMGRAPHICS_SIZE_9);
+
+ return new VisualPropertyDependency<Double>("Fit Custom
Graphics to node", customGraphicsSizeDependency, lexicon);
+ }
+
+}
Added:
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
(rev 0)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/EdgeColorDependencyFactory.java
2012-04-06 22:01:05 UTC (rev 28763)
@@ -0,0 +1,34 @@
+package org.cytoscape.ding.dependency;
+
+import java.awt.Paint;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.cytoscape.ding.DVisualLexicon;
+import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.vizmap.VisualPropertyDependency;
+import org.cytoscape.view.vizmap.VisualPropertyDependencyFactory;
+
+public class EdgeColorDependencyFactory implements
VisualPropertyDependencyFactory<Paint> {
+
+private final VisualLexicon lexicon;
+
+ public EdgeColorDependencyFactory(final VisualLexicon lexicon) {
+ this.lexicon = lexicon;
+ }
+
+ @Override
+ public VisualPropertyDependency<Paint> createVisualPropertyDependency()
{
+
+ // Create Visual Property Dependencies
+ final Set<VisualProperty<Paint>> edgeColorDependency = new
HashSet<VisualProperty<Paint>>();
+
+
edgeColorDependency.add(DVisualLexicon.EDGE_STROKE_UNSELECTED_PAINT);
+
edgeColorDependency.add(DVisualLexicon.EDGE_SOURCE_ARROW_UNSELECTED_PAINT);
+
edgeColorDependency.add(DVisualLexicon.EDGE_TARGET_ARROW_UNSELECTED_PAINT);
+
+ return new VisualPropertyDependency<Paint>("Edge color to
arrows", edgeColorDependency, lexicon);
+ }
+
+}
Deleted:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/EdgePaintToArrowHeadPaintDependency.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/EdgePaintToArrowHeadPaintDependency.java
2012-04-06 22:00:17 UTC (rev 28762)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/EdgePaintToArrowHeadPaintDependency.java
2012-04-06 22:01:05 UTC (rev 28763)
@@ -1,22 +0,0 @@
-package org.cytoscape.ding.dependency;
-
-import org.cytoscape.ding.DVisualLexicon;
-import org.cytoscape.view.vizmap.gui.AbstractVisualPropertyDependency;
-
-public class EdgePaintToArrowHeadPaintDependency extends
- AbstractVisualPropertyDependency {
-
- private static final String NAME = "Make arrow color matches to edge
color";
-
- public EdgePaintToArrowHeadPaintDependency() {
- super(NAME);
-
- group.add(DVisualLexicon.EDGE_SOURCE_ARROW_SELECTED_PAINT);
- group.add(DVisualLexicon.EDGE_TARGET_ARROW_SELECTED_PAINT);
- group.add(DVisualLexicon.EDGE_SOURCE_ARROW_UNSELECTED_PAINT);
- group.add(DVisualLexicon.EDGE_TARGET_ARROW_UNSELECTED_PAINT);
-
- group.add(DVisualLexicon.EDGE_STROKE_SELECTED_PAINT);
- group.add(DVisualLexicon.EDGE_STROKE_UNSELECTED_PAINT);
- }
-}
\ No newline at end of file
Added:
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
(rev 0)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/NodeSizeDependencyFactory.java
2012-04-06 22:01:05 UTC (rev 28763)
@@ -0,0 +1,30 @@
+package org.cytoscape.ding.dependency;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.presentation.property.BasicVisualLexicon;
+import org.cytoscape.view.vizmap.VisualPropertyDependency;
+import org.cytoscape.view.vizmap.VisualPropertyDependencyFactory;
+
+public class NodeSizeDependencyFactory implements
VisualPropertyDependencyFactory<Double> {
+
+private final VisualLexicon lexicon;
+
+ public NodeSizeDependencyFactory(final VisualLexicon lexicon) {
+ this.lexicon = lexicon;
+ }
+
+ @Override
+ public VisualPropertyDependency<Double>
createVisualPropertyDependency() {
+ // Node Size Dependency
+ final Set<VisualProperty<Double>> nodeSizeVisualProperties =
new HashSet<VisualProperty<Double>>();
+ nodeSizeVisualProperties.add(BasicVisualLexicon.NODE_WIDTH);
+ nodeSizeVisualProperties.add(BasicVisualLexicon.NODE_HEIGHT);
+
+ return new VisualPropertyDependency<Double>("Lock node width
and height", nodeSizeVisualProperties, lexicon);
+ }
+
+}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2012-04-06 22:00:17 UTC (rev 28762)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2012-04-06 22:01:05 UTC (rev 28763)
@@ -797,35 +797,35 @@
@Override
public <T, V extends T> void setVisualProperty(VisualProperty<? extends
T> vpOriginal, V value) {
- final VisualProperty<?> vp;
- final VisualLexiconNode treeNode =
lexicon.getVisualLexiconNode(vpOriginal);
-
- // TODO: This should not happen. Maybe this should throw an
exception?
- if(treeNode == null)
- return;
-
- if(treeNode.getChildren().size() != 0) {
- // This is not leaf.
- final Collection<VisualLexiconNode> children =
treeNode.getChildren();
- boolean shouldApply = false;
- for(VisualLexiconNode node: children) {
- if(node.isDepend()) {
- shouldApply = true;
- break;
- }
- }
-
- if(shouldApply == false)
- return;
- }
-
- if(treeNode.isDepend()) {
- // Do not use this. Parent will be applied.
- return;
- } else {
- vp = vpOriginal;
- }
-
+ final VisualProperty<?> vp = vpOriginal;
+// final VisualLexiconNode treeNode =
lexicon.getVisualLexiconNode(vpOriginal);
+//
+// // TODO: This should not happen. Maybe this should throw an
exception?
+// if(treeNode == null)
+// return;
+//
+// if(treeNode.getChildren().size() != 0) {
+// // This is not leaf.
+// final Collection<VisualLexiconNode> children =
treeNode.getChildren();
+// boolean shouldApply = false;
+// for(VisualLexiconNode node: children) {
+// if(node.isDepend()) {
+// shouldApply = true;
+// break;
+// }
+// }
+//
+// if(shouldApply == false)
+// return;
+// }
+//
+// if(treeNode.isDepend()) {
+// // Do not use this. Parent will be applied.
+// return;
+// } else {
+// vp = vpOriginal;
+// }
+//
if(value == null)
value = (V) vp.getDefault();
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
2012-04-06 22:00:17 UTC (rev 28762)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-04-06 22:01:05 UTC (rev 28763)
@@ -2517,31 +2517,31 @@
if (value == null)
return;
- final VisualProperty<?> vp;
- final VisualLexiconNode treeNode =
dingLexicon.getVisualLexiconNode(vpOriginal);
- if (treeNode == null)
- return;
-
- if (treeNode.getChildren().size() != 0) {
- // This is not leaf.
- final Collection<VisualLexiconNode> children =
treeNode.getChildren();
- boolean shouldApply = false;
- for (VisualLexiconNode node : children) {
- if (node.isDepend()) {
- shouldApply = true;
- break;
- }
- }
-
- if (shouldApply == false)
- return;
- }
-
- if (treeNode.isDepend()) {
- // Do not use this. Parent will be applied.
- return;
- } else
- vp = vpOriginal;
+ final VisualProperty<?> vp = vpOriginal;
+// final VisualLexiconNode treeNode =
dingLexicon.getVisualLexiconNode(vpOriginal);
+// if (treeNode == null)
+// return;
+//
+// if (treeNode.getChildren().size() != 0) {
+// // This is not leaf.
+// final Collection<VisualLexiconNode> children =
treeNode.getChildren();
+// boolean shouldApply = false;
+// for (VisualLexiconNode node : children) {
+// if (node.isDepend()) {
+// shouldApply = true;
+// break;
+// }
+// }
+//
+// if (shouldApply == false)
+// return;
+// }
+//
+// if (treeNode.isDepend()) {
+// // Do not use this. Parent will be applied.
+// return;
+// } else
+// vp = vpOriginal;
if (vp == DVisualLexicon.NETWORK_NODE_SELECTION) {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2012-04-06 22:00:17 UTC (rev 28762)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2012-04-06 22:01:05 UTC (rev 28763)
@@ -1139,32 +1139,7 @@
@Override
public <T, V extends T> void setVisualProperty(final VisualProperty<?
extends T> vpOriginal, V value) {
- final VisualProperty<?> vp;
- final VisualLexiconNode treeNode =
lexicon.getVisualLexiconNode(vpOriginal);
- if (treeNode == null)
- return;
-
- if (treeNode.getChildren().size() != 0) {
- // This is not leaf.
- final Collection<VisualLexiconNode> children =
treeNode.getChildren();
- boolean shouldApply = false;
- for (VisualLexiconNode node : children) {
- if (node.isDepend()) {
- shouldApply = true;
- break;
- }
- }
-
- if (shouldApply == false)
- return;
- }
-
- if (treeNode.isDepend()) {
- // Do not use this. Parent will be applied.
- return;
- } else
- vp = vpOriginal;
-
+ VisualProperty<?> vp = vpOriginal;
// Null means set value to VP's default.
if(value == null)
value = (V) vp.getDefault();
@@ -1270,7 +1245,7 @@
// Check dependency. Sync size or not.
final VisualProperty<?> cgSizeVP =
DVisualLexicon.getAssociatedCustomGraphicsSizeVP(vp);
final VisualLexiconNode sizeTreeNode =
lexicon.getVisualLexiconNode(cgSizeVP);
- boolean sync = sizeTreeNode.isDepend();
+ //boolean sync = sizeTreeNode.isDepend();
final VisualProperty<ObjectPosition> cgPositionVP =
DVisualLexicon.getAssociatedCustomGraphicsPositionVP(vp);
final ObjectPosition positionValue =
getVisualProperty(cgPositionVP);
@@ -1279,11 +1254,13 @@
// Assume it's a Ding layer
CustomGraphic newCG = layer.getLayerObject();
CustomGraphic finalCG = newCG;
- if (sync) {
- // Size is locked to node size.
- finalCG = syncSize(customGraphics, newCG,
lexicon.getVisualLexiconNode(BasicVisualLexicon.NODE_WIDTH)
- .isDepend());
- }
+
+ //FIXME
+// if (sync) {
+// // Size is locked to node size.
+// finalCG = syncSize(customGraphics, newCG,
lexicon.getVisualLexiconNode(BasicVisualLexicon.NODE_WIDTH)
+// .isDepend());
+// }
finalCG = moveCustomGraphicsToNewPosition(finalCG,
positionValue);
addCustomGraphic(finalCG);
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/EdgeViewDefaultSupport.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/EdgeViewDefaultSupport.java
2012-04-06 22:00:17 UTC (rev 28762)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/EdgeViewDefaultSupport.java
2012-04-06 22:01:05 UTC (rev 28763)
@@ -75,30 +75,30 @@
<T, V extends T> void setEdgeViewDefault(VisualProperty<? extends T>
vpOriginal, V value) {
- final VisualProperty<?> vp;
- final VisualLexiconNode treeNode =
lexicon.getVisualLexiconNode(vpOriginal);
-
- if(treeNode == null)
- return;
-
- if(treeNode.getChildren().size() != 0) {
- final Collection<VisualLexiconNode> children =
treeNode.getChildren();
- boolean shouldApply = false;
- for(VisualLexiconNode node: children) {
- if(node.isDepend()) {
- shouldApply = true;
- break;
- }
- }
- if(shouldApply == false)
- return;
- }
-
- if(treeNode.isDepend())
- return;
- else
- vp = vpOriginal;
-
+ final VisualProperty<?> vp = vpOriginal;
+// final VisualLexiconNode treeNode =
lexicon.getVisualLexiconNode(vpOriginal);
+//
+// if(treeNode == null)
+// return;
+//
+// if(treeNode.getChildren().size() != 0) {
+// final Collection<VisualLexiconNode> children =
treeNode.getChildren();
+// boolean shouldApply = false;
+// for(VisualLexiconNode node: children) {
+// if(node.isDepend()) {
+// shouldApply = true;
+// break;
+// }
+// }
+// if(shouldApply == false)
+// return;
+// }
+//
+// if(treeNode.isDepend())
+// return;
+// else
+// vp = vpOriginal;
+//
if(value == null)
value = (V) vp.getDefault();
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/legend/ContinuousMappingLegendPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/legend/ContinuousMappingLegendPanel.java
2012-04-06 22:00:17 UTC (rev 28762)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/legend/ContinuousMappingLegendPanel.java
2012-04-06 22:01:05 UTC (rev 28763)
@@ -122,7 +122,6 @@
}
}
- System.out.println(vp.getDisplayName() + " Got Legend: " +
legend.toString());
legend.setBorder(new EmptyBorder(10, 10, 10, 10));
add(legend, BorderLayout.CENTER);
repaint();
--
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.
