Author: kono
Date: 2011-04-06 22:54:16 -0700 (Wed, 06 Apr 2011)
New Revision: 24700
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/RichVisualLexicon.java
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/RichVisualLexiconTest.java
Log:
Some more vps are moved to rich lexicon.
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
2011-04-07 03:39:03 UTC (rev 24699)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
2011-04-07 05:54:16 UTC (rev 24700)
@@ -281,20 +281,7 @@
private static final DLineType SEPARATE_ARROW = new DLineType(
"Separate Arrow", "SEPARATE_ARROW", new
SeparateArrowStroke(1.0f));
- public static final VisualProperty<Paint> EDGE_SELECTED_PAINT = new
PaintVisualProperty(
- Color.RED, MinimalVisualLexicon.PAINT_RANGE,
"EDGE_SELECTED_PAINT",
- "Edge Selected Paint", CyEdge.class);
- public static final VisualProperty<Paint> EDGE_UNSELECTED_PAINT = new
PaintVisualProperty(
- Color.DARK_GRAY, MinimalVisualLexicon.PAINT_RANGE,
- "EDGE_UNSELECTED_PAINT", "Edge Unselected Paint",
CyEdge.class);
- public static final VisualProperty<Paint> EDGE_STROKE_SELECTED_PAINT =
new PaintVisualProperty(
- Color.RED, MinimalVisualLexicon.PAINT_RANGE,
- "EDGE_STROKE_SELECTED_PAINT", "Edge Stroke Selected
Paint",
- CyEdge.class);
- public static final VisualProperty<Paint> EDGE_STROKE_UNSELECTED_PAINT
= new PaintVisualProperty(
- Color.DARK_GRAY, MinimalVisualLexicon.PAINT_RANGE,
- "EDGE_STROKE_UNSELECTED_PAINT", "Edge Stroke Unselected
Paint",
- CyEdge.class);
+
static {
CG_POSITIONS.add(NODE_CUSTOMGRAPHICS_POSITION_1);
@@ -413,11 +400,6 @@
addVisualProperty(NODE_CUSTOMGRAPHICS_POSITION_8,
NODE_CUSTOMPAINT_8);
addVisualProperty(NODE_CUSTOMGRAPHICS_POSITION_9,
NODE_CUSTOMPAINT_9);
-
- addVisualProperty(EDGE_SELECTED_PAINT, EDGE_PAINT);
- addVisualProperty(EDGE_UNSELECTED_PAINT, EDGE_PAINT);
- addVisualProperty(EDGE_STROKE_SELECTED_PAINT,
EDGE_SELECTED_PAINT);
- addVisualProperty(EDGE_STROKE_UNSELECTED_PAINT,
EDGE_UNSELECTED_PAINT);
addVisualProperty(EDGE_SOURCE_ARROW_SELECTED_PAINT,
EDGE_SELECTED_PAINT);
addVisualProperty(EDGE_TARGET_ARROW_SELECTED_PAINT,
EDGE_SELECTED_PAINT);
addVisualProperty(EDGE_SOURCE_ARROW_UNSELECTED_PAINT,
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/RichVisualLexicon.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/RichVisualLexicon.java
2011-04-07 03:39:03 UTC (rev 24699)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/RichVisualLexicon.java
2011-04-07 05:54:16 UTC (rev 24700)
@@ -82,6 +82,21 @@
10, "EDGE_LABEL_FONT_SIZE", "Edge Label Font Size",
CyEdge.class);
+ public static final VisualProperty<Paint> EDGE_SELECTED_PAINT = new
PaintVisualProperty(
+ Color.RED, MinimalVisualLexicon.PAINT_RANGE,
"EDGE_SELECTED_PAINT",
+ "Edge Selected Paint", CyEdge.class);
+ public static final VisualProperty<Paint> EDGE_UNSELECTED_PAINT = new
PaintVisualProperty(
+ Color.DARK_GRAY, MinimalVisualLexicon.PAINT_RANGE,
+ "EDGE_UNSELECTED_PAINT", "Edge Unselected Paint",
CyEdge.class);
+ public static final VisualProperty<Paint> EDGE_STROKE_SELECTED_PAINT =
new PaintVisualProperty(
+ Color.RED, MinimalVisualLexicon.PAINT_RANGE,
+ "EDGE_STROKE_SELECTED_PAINT", "Edge Stroke Selected
Paint",
+ CyEdge.class);
+ public static final VisualProperty<Paint> EDGE_STROKE_UNSELECTED_PAINT
= new PaintVisualProperty(
+ Color.DARK_GRAY, MinimalVisualLexicon.PAINT_RANGE,
+ "EDGE_STROKE_UNSELECTED_PAINT", "Edge Stroke Unselected
Paint",
+ CyEdge.class);
+
/**
* Construct a {@linkplain VisalLexicon} for 3D rendering engine.
@@ -117,5 +132,10 @@
addVisualProperty(EDGE_LABEL_FONT_FACE, EDGE);
addVisualProperty(EDGE_LABEL_FONT_SIZE, EDGE);
+
+ addVisualProperty(EDGE_SELECTED_PAINT, EDGE_PAINT);
+ addVisualProperty(EDGE_UNSELECTED_PAINT, EDGE_PAINT);
+ addVisualProperty(EDGE_STROKE_SELECTED_PAINT,
EDGE_SELECTED_PAINT);
+ addVisualProperty(EDGE_STROKE_UNSELECTED_PAINT,
EDGE_UNSELECTED_PAINT);
}
}
Modified:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/RichVisualLexiconTest.java
===================================================================
---
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/RichVisualLexiconTest.java
2011-04-07 03:39:03 UTC (rev 24699)
+++
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/RichVisualLexiconTest.java
2011-04-07 05:54:16 UTC (rev 24700)
@@ -31,7 +31,7 @@
@Test
public void test2DLexicon() throws Exception {
- assertEquals(46, richLex.getAllVisualProperties().size());
+ assertEquals(50, richLex.getAllVisualProperties().size());
}
@Test
--
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.
