Author: Christian Lopes
Date: 2011-03-23 15:33:37 -0700 (Wed, 23 Mar 2011)
New Revision: 24566
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/TwoDVisualLexicon.java
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/ThreeDVisualLexiconTest.java
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/TwoDVisualLexiconTest.java
Log:
Removed the TwoDVisualLexicon.NETWORK_TITLE visual property.
Increased the default network size from 100x100 to 400x400.
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/TwoDVisualLexicon.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/TwoDVisualLexicon.java
2011-03-23 22:30:27 UTC (rev 24565)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/TwoDVisualLexicon.java
2011-03-23 22:33:37 UTC (rev 24566)
@@ -151,15 +151,12 @@
0.0, ARBITRARY_DOUBLE_RANGE,
"NETWORK_CENTER_Y_LOCATION", "Network Center Y Location", true,
CyNetwork.class);
public static final VisualProperty<Double> NETWORK_SIZE = new
DoubleVisualProperty(
- 100.0, NONE_ZERO_POSITIVE_DOUBLE_RANGE, "NETWORK_SIZE",
"Network Size", true, CyNetwork.class);
+ 400.0, NONE_ZERO_POSITIVE_DOUBLE_RANGE, "NETWORK_SIZE",
"Network Size", true, CyNetwork.class);
public static final VisualProperty<Double> NETWORK_WIDTH = new
DoubleVisualProperty(
- 100.0, NONE_ZERO_POSITIVE_DOUBLE_RANGE,
"NETWORK_WIDTH", "Network Width", true, CyNetwork.class);
+ 400.0, NONE_ZERO_POSITIVE_DOUBLE_RANGE,
"NETWORK_WIDTH", "Network Width", true, CyNetwork.class);
public static final VisualProperty<Double> NETWORK_HEIGHT = new
DoubleVisualProperty(
- 100.0, NONE_ZERO_POSITIVE_DOUBLE_RANGE,
"NETWORK_HEIGHT", "Network Height", true, CyNetwork.class);
+ 400.0, NONE_ZERO_POSITIVE_DOUBLE_RANGE,
"NETWORK_HEIGHT", "Network Height", true, CyNetwork.class);
- public static final VisualProperty<String> NETWORK_TITLE = new
StringVisualProperty(
- "", ARBITRARY_STRING_RANGE, "NETWORK_TITLE", "Network
Title", CyNetwork.class);
-
public static final VisualProperty<Paint> NETWORK_BACKGROUND_PAINT =
new PaintVisualProperty(
Color.WHITE, PAINT_RANGE, "NETWORK_BACKGROUND_PAINT",
"Network Background Paint", CyNetwork.class);
@@ -203,7 +200,6 @@
addVisualProperty(EDGE_VISIBLE, EDGE);
addVisualProperty(EDGE_SELECTED, EDGE);
- addVisualProperty(NETWORK_TITLE, NETWORK);
addVisualProperty(NETWORK_BACKGROUND_PAINT, NETWORK);
addVisualProperty(NETWORK_WIDTH, NETWORK_SIZE);
addVisualProperty(NETWORK_HEIGHT, NETWORK_SIZE);
@@ -231,7 +227,6 @@
addIdentifierMapping(CyNetwork.class,"GRAPH_VIEW_CENTER_X",NETWORK_CENTER_X_LOCATION);
addIdentifierMapping(CyNetwork.class,"GRAPH_VIEW_CENTER_Y",NETWORK_CENTER_Y_LOCATION);
addIdentifierMapping(CyNetwork.class,"GRAPH_VIEW_ZOOM",NETWORK_SCALE_FACTOR);
- addIdentifierMapping(CyNetwork.class,"label",NETWORK_TITLE);
addIdentifierMapping(CyNode.class,"fill",NODE_COLOR);
addIdentifierMapping(CyNode.class,"x",NODE_X_LOCATION);
Modified:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/ThreeDVisualLexiconTest.java
===================================================================
---
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/ThreeDVisualLexiconTest.java
2011-03-23 22:30:27 UTC (rev 24565)
+++
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/ThreeDVisualLexiconTest.java
2011-03-23 22:33:37 UTC (rev 24566)
@@ -21,8 +21,7 @@
public void setUp() throws Exception {
// Create root node.
- threeDRoot = new NullVisualProperty("THREE_D_ROOT",
- "3D Root Visual Property");
+ threeDRoot = new NullVisualProperty("THREE_D_ROOT", "3D Root
Visual Property");
threeDLex = new ThreeDVisualLexicon(threeDRoot);
}
@@ -34,7 +33,7 @@
@Test
public void test2DLexicon() throws Exception {
- assertEquals(39, threeDLex.getAllVisualProperties().size());
+ assertEquals(38, threeDLex.getAllVisualProperties().size());
}
@Test
Modified:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/TwoDVisualLexiconTest.java
===================================================================
---
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/TwoDVisualLexiconTest.java
2011-03-23 22:30:27 UTC (rev 24565)
+++
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/TwoDVisualLexiconTest.java
2011-03-23 22:33:37 UTC (rev 24566)
@@ -24,9 +24,7 @@
public void setUp() throws Exception {
// Create root node.
- twoDRoot = new NullVisualProperty("TWO_D_ROOT",
- "2D Root Visual Property");
-
+ twoDRoot = new NullVisualProperty("TWO_D_ROOT", "2D Root Visual
Property");
twoDLex = new TwoDVisualLexicon(twoDRoot);
}
@@ -37,7 +35,7 @@
@Test
public void test2DLexicon() throws Exception {
- assertEquals(35, twoDLex.getAllVisualProperties().size());
+ assertEquals(34, twoDLex.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.
