Author: paperwing
Date: 2012-02-23 13:42:02 -0800 (Thu, 23 Feb 2012)
New Revision: 28353
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindVisualLexicon.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/view/DefaultValueVault.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/view/WindNetworkView.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/input/NetworkChangeInputHandler.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderArcEdgesProcedure.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderNodeLabelsProcedure.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderNodesProcedure.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/ResetSceneProcedure.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/tools/NetworkToolkit.java
Log:
Updated references to recently removed RichVisualLexicon and MinimalLexicon
classes to new BasicVisualLexicon
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
2012-02-23 21:33:19 UTC (rev 28352)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
2012-02-23 21:42:02 UTC (rev 28353)
@@ -106,6 +106,7 @@
// TODO: check whether to use GLCanvas or
GLJPanel
panel = new GLJPanel(capabilities);
+
// TODO: check if negative effects produced by
this
panel.setIgnoreRepaint(true);
// panel.setDoubleBuffered(true);
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindVisualLexicon.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindVisualLexicon.java
2012-02-23 21:33:19 UTC (rev 28352)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindVisualLexicon.java
2012-02-23 21:42:02 UTC (rev 28353)
@@ -5,10 +5,10 @@
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.presentation.property.DoubleVisualProperty;
import org.cytoscape.view.presentation.property.NullVisualProperty;
-import org.cytoscape.view.presentation.property.RichVisualLexicon;
+import org.cytoscape.view.presentation.property.BasicVisualLexicon;
/** The visual lexicon for the Wind rendering engines */
-public class WindVisualLexicon extends RichVisualLexicon {
+public class WindVisualLexicon extends BasicVisualLexicon {
/** The root visual property */
public static final VisualProperty<NullDataType> WIND_ROOT = new
NullVisualProperty(
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/view/DefaultValueVault.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/view/DefaultValueVault.java
2012-02-23 21:33:19 UTC (rev 28352)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/view/DefaultValueVault.java
2012-02-23 21:42:02 UTC (rev 28353)
@@ -12,7 +12,7 @@
import org.cytoscape.model.CyTableEntry;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.presentation.property.RichVisualLexicon;
+import org.cytoscape.view.presentation.property.BasicVisualLexicon;
public class DefaultValueVault {
@@ -38,7 +38,7 @@
defaultValueSets.put(CyEdge.class, edgeDefaultValues);
defaultValueSets.put(CyNetwork.class, networkDefaultValues);
- // Populate with default values from the relevant VisualLexicon
(eg. RichVisualLexicon, MinimalVisualLexicon)
+ // Populate with default values from the relevant VisualLexicon
(eg. BasicVisualLexicon, MinimalVisualLexicon)
populateDefaultValues();
// Override VisualLexicon default values with custom
@@ -63,7 +63,7 @@
// // Override selected values from VisualProperties
// private void updateDefaultValues() {
-// modifyDefaultValue(RichVisualLexicon.NODE_FILL_COLOR, new
Color(120, 120, 120));
+// modifyDefaultValue(BasicVisualLexicon.NODE_FILL_COLOR, new
Color(120, 120, 120));
// }
// @Override
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/view/WindNetworkView.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/view/WindNetworkView.java
2012-02-23 21:33:19 UTC (rev 28352)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/view/WindNetworkView.java
2012-02-23 21:42:02 UTC (rev 28353)
@@ -26,7 +26,7 @@
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.presentation.property.RichVisualLexicon;
+import org.cytoscape.view.presentation.property.BasicVisualLexicon;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
@@ -124,12 +124,12 @@
// Shift the nodes to place the center of the network at the
origin
for (View<CyNode> nodeView : getNodeViews()) {
-
nodeView.setVisualProperty(RichVisualLexicon.NODE_X_LOCATION,
-
nodeView.getVisualProperty(RichVisualLexicon.NODE_X_LOCATION) -
networkCenter.x());
-
nodeView.setVisualProperty(RichVisualLexicon.NODE_Y_LOCATION,
-
nodeView.getVisualProperty(RichVisualLexicon.NODE_Y_LOCATION) -
networkCenter.y());
-
nodeView.setVisualProperty(RichVisualLexicon.NODE_Z_LOCATION,
-
nodeView.getVisualProperty(RichVisualLexicon.NODE_Z_LOCATION) -
networkCenter.z());
+
nodeView.setVisualProperty(BasicVisualLexicon.NODE_X_LOCATION,
+
nodeView.getVisualProperty(BasicVisualLexicon.NODE_X_LOCATION) -
networkCenter.x());
+
nodeView.setVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION,
+
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION) -
networkCenter.y());
+
nodeView.setVisualProperty(BasicVisualLexicon.NODE_Z_LOCATION,
+
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Z_LOCATION) -
networkCenter.z());
}
}
@@ -139,7 +139,7 @@
Set<Integer> selectedNodeIndices = new HashSet<Integer>();
for (View<CyNode> nodeView : getNodeViews()) {
- if
(nodeView.getVisualProperty(RichVisualLexicon.NODE_SELECTED)) {
+ if
(nodeView.getVisualProperty(BasicVisualLexicon.NODE_SELECTED)) {
selectedNodeIndices.add(nodeView.getModel().getIndex());
}
}
@@ -148,12 +148,12 @@
// Shift the nodes to place the center of the network at the
center of the selected group of nodes
for (View<CyNode> nodeView : getNodeViews()) {
-
nodeView.setVisualProperty(RichVisualLexicon.NODE_X_LOCATION,
-
nodeView.getVisualProperty(RichVisualLexicon.NODE_X_LOCATION) -
selectionCenter.x());
-
nodeView.setVisualProperty(RichVisualLexicon.NODE_Y_LOCATION,
-
nodeView.getVisualProperty(RichVisualLexicon.NODE_Y_LOCATION) -
selectionCenter.y());
-
nodeView.setVisualProperty(RichVisualLexicon.NODE_Z_LOCATION,
-
nodeView.getVisualProperty(RichVisualLexicon.NODE_Z_LOCATION) -
selectionCenter.z());
+
nodeView.setVisualProperty(BasicVisualLexicon.NODE_X_LOCATION,
+
nodeView.getVisualProperty(BasicVisualLexicon.NODE_X_LOCATION) -
selectionCenter.x());
+
nodeView.setVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION,
+
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION) -
selectionCenter.y());
+
nodeView.setVisualProperty(BasicVisualLexicon.NODE_Z_LOCATION,
+
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Z_LOCATION) -
selectionCenter.z());
}
}
@@ -271,9 +271,9 @@
// These visual properties are object-specific such as x, y, z
coordinates
// and do not need to be updated according to the visual style
Set<VisualProperty<?>> exemptProperties = new
HashSet<VisualProperty<?>>();
- exemptProperties.add(RichVisualLexicon.NODE_X_LOCATION);
- exemptProperties.add(RichVisualLexicon.NODE_Y_LOCATION);
- exemptProperties.add(RichVisualLexicon.NODE_Z_LOCATION);
+ exemptProperties.add(BasicVisualLexicon.NODE_X_LOCATION);
+ exemptProperties.add(BasicVisualLexicon.NODE_Y_LOCATION);
+ exemptProperties.add(BasicVisualLexicon.NODE_Z_LOCATION);
// Update visual properties according to the current visual
style
VisualStyle visualStyle =
visualMappingManager.getVisualStyle(this);
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/input/NetworkChangeInputHandler.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/input/NetworkChangeInputHandler.java
2012-02-23 21:33:19 UTC (rev 28352)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/input/NetworkChangeInputHandler.java
2012-02-23 21:42:02 UTC (rev 28353)
@@ -14,7 +14,7 @@
import org.cytoscape.paperwing.internal.tools.SimpleCamera;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
-import org.cytoscape.view.presentation.property.RichVisualLexicon;
+import org.cytoscape.view.presentation.property.BasicVisualLexicon;
public class NetworkChangeInputHandler implements InputHandler {
@@ -57,13 +57,13 @@
// TODO: Maybe throw an exception if viewAdded is null
if (viewAdded != null) {
viewAdded.setVisualProperty(
-
RichVisualLexicon.NODE_X_LOCATION, projection.x()
+
BasicVisualLexicon.NODE_X_LOCATION, projection.x()
*
distanceScale);
viewAdded.setVisualProperty(
-
RichVisualLexicon.NODE_Y_LOCATION, projection.y()
+
BasicVisualLexicon.NODE_Y_LOCATION, projection.y()
*
distanceScale);
viewAdded.setVisualProperty(
-
RichVisualLexicon.NODE_Z_LOCATION, projection.z()
+
BasicVisualLexicon.NODE_Z_LOCATION, projection.z()
*
distanceScale);
// Set the node to be hovered
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderArcEdgesProcedure.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderArcEdgesProcedure.java
2012-02-23 21:33:19 UTC (rev 28352)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderArcEdgesProcedure.java
2012-02-23 21:42:02 UTC (rev 28353)
@@ -25,8 +25,8 @@
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
import org.cytoscape.view.presentation.property.LineTypeVisualProperty;
-import org.cytoscape.view.presentation.property.MinimalVisualLexicon;
-import org.cytoscape.view.presentation.property.RichVisualLexicon;
+import org.cytoscape.view.presentation.property.BasicVisualLexicon;
+import org.cytoscape.view.presentation.property.BasicVisualLexicon;
public class RenderArcEdgesProcedure implements ReadOnlyGraphicsProcedure {
@@ -195,7 +195,7 @@
if (container.start != null && container.end != null &&
(container.end.distance(container.start) >= MIN_LENGTH || container.selfEdge)) {
- edgeWidth =
container.edgeView.getVisualProperty(RichVisualLexicon.EDGE_WIDTH);
+ edgeWidth =
container.edgeView.getVisualProperty(BasicVisualLexicon.EDGE_WIDTH);
if (edgeWidth != null) {
edgeRadiusFactor =
edgeWidth.floatValue() / 2;
@@ -215,13 +215,13 @@
if (container.straightEdge) {
// Draw the correct type of edge
depending on the visual property
- if
(edgeView.getVisualProperty(RichVisualLexicon.EDGE_LINE_TYPE)
+ if
(edgeView.getVisualProperty(BasicVisualLexicon.EDGE_LINE_TYPE)
==
LineTypeVisualProperty.EQUAL_DASH) {
points =
EdgeCoordinateCalculator.generateStraightEdgeSparseCoordinates(
container.start, container.end, DASHED_EDGE_SPACING);
drawDashedArc(gl, points);
- } else if
(edgeView.getVisualProperty(RichVisualLexicon.EDGE_LINE_TYPE)
+ } else if
(edgeView.getVisualProperty(BasicVisualLexicon.EDGE_LINE_TYPE)
==
LineTypeVisualProperty.DOT) {
points =
EdgeCoordinateCalculator.generateStraightEdgeSparseCoordinates(
container.start, container.end, DOTTED_EDGE_SPACING);
@@ -241,13 +241,13 @@
circleCenter =
findCircleCenter(container);
// Draw the correct type of edge
depending on the visual property
- if
(edgeView.getVisualProperty(RichVisualLexicon.EDGE_LINE_TYPE)
+ if
(edgeView.getVisualProperty(BasicVisualLexicon.EDGE_LINE_TYPE)
==
LineTypeVisualProperty.EQUAL_DASH) {
points =
EdgeCoordinateCalculator.generateArcEdgeSparseCoordinates(
container.start, container.end, circleCenter, DASHED_EDGE_SPACING,
container.selfEdge);
drawDashedArc(gl, points);
- } else if
(edgeView.getVisualProperty(RichVisualLexicon.EDGE_LINE_TYPE)
+ } else if
(edgeView.getVisualProperty(BasicVisualLexicon.EDGE_LINE_TYPE)
==
LineTypeVisualProperty.DOT) {
points =
EdgeCoordinateCalculator.generateArcEdgeSparseCoordinates(
container.start, container.end, circleCenter, DOTTED_EDGE_SPACING,
container.selfEdge);
@@ -269,7 +269,7 @@
// Picks a color according to the edgeView and passes it to OpenGL
private void chooseColor(GL2 gl, View<CyEdge> edgeView, GraphicsData
graphicsData) {
Color visualPropertyColor = null;
- visualPropertyColor = (Color)
edgeView.getVisualProperty(RichVisualLexicon.EDGE_STROKE_UNSELECTED_PAINT);
+ visualPropertyColor = (Color)
edgeView.getVisualProperty(BasicVisualLexicon.EDGE_STROKE_UNSELECTED_PAINT);
RenderColor color = new RenderColor(DEFAULT_COLOR);
@@ -279,7 +279,7 @@
(double) visualPropertyColor.getBlue()
/ 255);
}
- if
(edgeView.getVisualProperty(MinimalVisualLexicon.EDGE_SELECTED)) {
+ if
(edgeView.getVisualProperty(BasicVisualLexicon.EDGE_SELECTED)) {
// Make selected edges appear greener
color.multiplyRed(0.7, 0, 0.7);
@@ -304,9 +304,9 @@
View<CyNode> nodeView = networkView.getNodeView(node);
if (nodeView != null) {
- double x =
nodeView.getVisualProperty(RichVisualLexicon.NODE_X_LOCATION) / distanceScale;
- double y =
nodeView.getVisualProperty(RichVisualLexicon.NODE_Y_LOCATION) / distanceScale;
- double z =
nodeView.getVisualProperty(RichVisualLexicon.NODE_Z_LOCATION) / distanceScale;
+ double x =
nodeView.getVisualProperty(BasicVisualLexicon.NODE_X_LOCATION) / distanceScale;
+ double y =
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION) / distanceScale;
+ double z =
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Z_LOCATION) / distanceScale;
// TODO: Perform a check to ensure none of x, y, z are
null?
coordinates = new Vector3(x, y, z);
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderNodeLabelsProcedure.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderNodeLabelsProcedure.java
2012-02-23 21:33:19 UTC (rev 28352)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderNodeLabelsProcedure.java
2012-02-23 21:42:02 UTC (rev 28353)
@@ -11,8 +11,8 @@
import org.cytoscape.paperwing.internal.tools.RenderToolkit;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
-import org.cytoscape.view.presentation.property.MinimalVisualLexicon;
-import org.cytoscape.view.presentation.property.RichVisualLexicon;
+import org.cytoscape.view.presentation.property.BasicVisualLexicon;
+import org.cytoscape.view.presentation.property.BasicVisualLexicon;
import com.jogamp.opengl.util.awt.TextRenderer;
@@ -77,17 +77,17 @@
// textRenderer.beginRendering(graphicsData.getScreenWidth(),
graphicsData.getScreenHeight(), true);
// textRenderer.createString(gl, null, 0, "test").
for (View<CyNode> nodeView : networkView.getNodeViews()) {
- x =
nodeView.getVisualProperty(RichVisualLexicon.NODE_X_LOCATION)
+ x =
nodeView.getVisualProperty(BasicVisualLexicon.NODE_X_LOCATION)
.floatValue() / distanceScale;
- y =
nodeView.getVisualProperty(RichVisualLexicon.NODE_Y_LOCATION)
+ y =
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION)
.floatValue() / distanceScale;
- z =
nodeView.getVisualProperty(RichVisualLexicon.NODE_Z_LOCATION)
+ z =
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Z_LOCATION)
.floatValue() / distanceScale;
// Draw it only if the visual property says it is
visible
- if
(nodeView.getVisualProperty(MinimalVisualLexicon.NODE_VISIBLE)) {
+ if
(nodeView.getVisualProperty(BasicVisualLexicon.NODE_VISIBLE)) {
- text =
nodeView.getVisualProperty(MinimalVisualLexicon.NODE_LABEL);
+ text =
nodeView.getVisualProperty(BasicVisualLexicon.NODE_LABEL);
if (text != null) {
@@ -101,7 +101,7 @@
&&
graphicsData.getCamera().getDirection().angle(offsetFromCamera) <= Math.PI / 2)
{
// TODO: Check if there is a
way around this cast
- textColor = (Color)
nodeView.getVisualProperty(MinimalVisualLexicon.NODE_LABEL_COLOR);
+ textColor = (Color)
nodeView.getVisualProperty(BasicVisualLexicon.NODE_LABEL_COLOR);
if (textColor == null) {
// Use black as default
if no node label color was found
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderNodesProcedure.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderNodesProcedure.java
2012-02-23 21:33:19 UTC (rev 28352)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderNodesProcedure.java
2012-02-23 21:42:02 UTC (rev 28353)
@@ -20,9 +20,9 @@
import org.cytoscape.paperwing.internal.tools.RenderColor;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
-import org.cytoscape.view.presentation.property.MinimalVisualLexicon;
+import org.cytoscape.view.presentation.property.BasicVisualLexicon;
import org.cytoscape.view.presentation.property.NodeShapeVisualProperty;
-import org.cytoscape.view.presentation.property.RichVisualLexicon;
+import org.cytoscape.view.presentation.property.BasicVisualLexicon;
import org.cytoscape.view.presentation.property.values.NodeShape;
public class RenderNodesProcedure implements ReadOnlyGraphicsProcedure {
@@ -78,23 +78,23 @@
// networkView.updateView();
for (View<CyNode> nodeView : networkView.getNodeViews()) {
- x =
nodeView.getVisualProperty(RichVisualLexicon.NODE_X_LOCATION)
+ x =
nodeView.getVisualProperty(BasicVisualLexicon.NODE_X_LOCATION)
.floatValue() / distanceScale;
- y =
nodeView.getVisualProperty(RichVisualLexicon.NODE_Y_LOCATION)
+ y =
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION)
.floatValue() / distanceScale;
- z =
nodeView.getVisualProperty(RichVisualLexicon.NODE_Z_LOCATION)
+ z =
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Z_LOCATION)
.floatValue() / distanceScale;
- width =
nodeView.getVisualProperty(MinimalVisualLexicon.NODE_WIDTH);
- height =
nodeView.getVisualProperty(MinimalVisualLexicon.NODE_HEIGHT);
- depth =
nodeView.getVisualProperty(RichVisualLexicon.NODE_DEPTH);
+ width =
nodeView.getVisualProperty(BasicVisualLexicon.NODE_WIDTH);
+ height =
nodeView.getVisualProperty(BasicVisualLexicon.NODE_HEIGHT);
+ depth =
nodeView.getVisualProperty(BasicVisualLexicon.NODE_DEPTH);
index = nodeView.getModel().getIndex();
// gl.glLoadName(33);
// Draw it only if the visual property says it is
visible
- if
(nodeView.getVisualProperty(MinimalVisualLexicon.NODE_VISIBLE)) {
+ if
(nodeView.getVisualProperty(BasicVisualLexicon.NODE_VISIBLE)) {
gl.glPushMatrix();
gl.glTranslatef(x, y, z);
gl.glLoadName(index);
@@ -112,7 +112,7 @@
depth.floatValue() /
distanceScale);
}
- shapeType =
cytoscapeShapeMap.get(nodeView.getVisualProperty(RichVisualLexicon.NODE_SHAPE));
+ shapeType =
cytoscapeShapeMap.get(nodeView.getVisualProperty(BasicVisualLexicon.NODE_SHAPE));
if (shapeType != null) {
shapeDrawer.drawShape(gl, shapeType);
@@ -127,7 +127,7 @@
private void chooseColor(GL2 gl, View<CyNode> nodeView, GraphicsData
graphicsData) {
Color visualPropertyColor = null;
- visualPropertyColor = (Color)
nodeView.getVisualProperty(RichVisualLexicon.NODE_FILL_COLOR);
+ visualPropertyColor = (Color)
nodeView.getVisualProperty(BasicVisualLexicon.NODE_FILL_COLOR);
RenderColor color = new RenderColor(DEFAULT_COLOR);
@@ -137,7 +137,7 @@
(double) visualPropertyColor.getBlue()
/ 255);
}
- if
(nodeView.getVisualProperty(MinimalVisualLexicon.NODE_SELECTED)) {
+ if
(nodeView.getVisualProperty(BasicVisualLexicon.NODE_SELECTED)) {
// Make selected nodes appear greener
color.multiplyRed(0.7, 0, 0.7);
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/ResetSceneProcedure.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/ResetSceneProcedure.java
2012-02-23 21:33:19 UTC (rev 28352)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/ResetSceneProcedure.java
2012-02-23 21:42:02 UTC (rev 28353)
@@ -10,7 +10,7 @@
import org.cytoscape.paperwing.internal.data.GraphicsData;
import org.cytoscape.paperwing.internal.geometric.Vector3;
import org.cytoscape.paperwing.internal.tools.SimpleCamera;
-import org.cytoscape.view.presentation.property.RichVisualLexicon;
+import org.cytoscape.view.presentation.property.BasicVisualLexicon;
public class ResetSceneProcedure implements ReadOnlyGraphicsProcedure {
@@ -26,7 +26,7 @@
// Obtain the desired network background color
Color backgroundColor = (Color)
graphicsData.getNetworkView().getVisualProperty(
-
RichVisualLexicon.NETWORK_BACKGROUND_PAINT);
+
BasicVisualLexicon.NETWORK_BACKGROUND_PAINT);
if (backgroundColor != null) {
gl.glClearColor(backgroundColor.getRed() / 255f,
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/tools/NetworkToolkit.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/tools/NetworkToolkit.java
2012-02-23 21:33:19 UTC (rev 28352)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/tools/NetworkToolkit.java
2012-02-23 21:42:02 UTC (rev 28353)
@@ -11,7 +11,7 @@
import org.cytoscape.paperwing.internal.geometric.Vector3;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
-import org.cytoscape.view.presentation.property.RichVisualLexicon;
+import org.cytoscape.view.presentation.property.BasicVisualLexicon;
public class NetworkToolkit {
@@ -31,9 +31,9 @@
nodeView =
networkView.getNodeView(networkView.getModel().getNode(index));
if (nodeView != null) {
- x +=
nodeView.getVisualProperty(RichVisualLexicon.NODE_X_LOCATION);
- y +=
nodeView.getVisualProperty(RichVisualLexicon.NODE_Y_LOCATION);
- z +=
nodeView.getVisualProperty(RichVisualLexicon.NODE_Z_LOCATION);
+ x +=
nodeView.getVisualProperty(BasicVisualLexicon.NODE_X_LOCATION);
+ y +=
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION);
+ z +=
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Z_LOCATION);
visitedCount++;
}
}
@@ -54,9 +54,9 @@
nodeView = networkView.getNodeView(node);
if (nodeView != null) {
- x +=
nodeView.getVisualProperty(RichVisualLexicon.NODE_X_LOCATION);
- y +=
nodeView.getVisualProperty(RichVisualLexicon.NODE_Y_LOCATION);
- z +=
nodeView.getVisualProperty(RichVisualLexicon.NODE_Z_LOCATION);
+ x +=
nodeView.getVisualProperty(BasicVisualLexicon.NODE_X_LOCATION);
+ y +=
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION);
+ z +=
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Z_LOCATION);
visitedCount++;
}
}
@@ -84,9 +84,9 @@
if (nodeView != null) {
-
currentPosition.set(nodeView.getVisualProperty(RichVisualLexicon.NODE_X_LOCATION),
-
nodeView.getVisualProperty(RichVisualLexicon.NODE_Y_LOCATION),
-
nodeView.getVisualProperty(RichVisualLexicon.NODE_Z_LOCATION));
+
currentPosition.set(nodeView.getVisualProperty(BasicVisualLexicon.NODE_X_LOCATION),
+
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION),
+
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Z_LOCATION));
currentPosition.divideLocal(distanceScale);
currentDistanceSquared =
networkCenter.distanceSquared(currentPosition);
@@ -112,16 +112,16 @@
nodeView =
networkView.getNodeView(networkView.getModel().getNode(index));
if (nodeView != null) {
-
nodeView.setVisualProperty(RichVisualLexicon.NODE_X_LOCATION,
-
nodeView.getVisualProperty(RichVisualLexicon.NODE_X_LOCATION)
+
nodeView.setVisualProperty(BasicVisualLexicon.NODE_X_LOCATION,
+
nodeView.getVisualProperty(BasicVisualLexicon.NODE_X_LOCATION)
+
displacement.x() * distanceScale);
-
nodeView.setVisualProperty(RichVisualLexicon.NODE_Y_LOCATION,
-
nodeView.getVisualProperty(RichVisualLexicon.NODE_Y_LOCATION)
+
nodeView.setVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION,
+
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION)
+
displacement.y() * distanceScale);
-
nodeView.setVisualProperty(RichVisualLexicon.NODE_Z_LOCATION,
-
nodeView.getVisualProperty(RichVisualLexicon.NODE_Z_LOCATION)
+
nodeView.setVisualProperty(BasicVisualLexicon.NODE_Z_LOCATION,
+
nodeView.getVisualProperty(BasicVisualLexicon.NODE_Z_LOCATION)
+
displacement.z() * distanceScale);
}
}
@@ -146,7 +146,7 @@
row.set(SELECTED_COLUMN_NAME, false);
}
-
networkView.getNodeView(node).setVisualProperty(RichVisualLexicon.NODE_SELECTED,
false);
+
networkView.getNodeView(node).setVisualProperty(BasicVisualLexicon.NODE_SELECTED,
false);
}
}
}
@@ -160,7 +160,7 @@
row.set(SELECTED_COLUMN_NAME, selected);
networkView.getNodeView(network.getNode(index)).setVisualProperty(
- RichVisualLexicon.NODE_SELECTED, selected);
+ BasicVisualLexicon.NODE_SELECTED, selected);
}
public static boolean checkNodeSelected(int index, CyNetworkView
networkView) {
@@ -190,7 +190,7 @@
row.set(SELECTED_COLUMN_NAME, false);
}
-
networkView.getEdgeView(edge).setVisualProperty(RichVisualLexicon.EDGE_SELECTED,
false);
+
networkView.getEdgeView(edge).setVisualProperty(BasicVisualLexicon.EDGE_SELECTED,
false);
}
}
}
@@ -204,7 +204,7 @@
row.set(SELECTED_COLUMN_NAME, selected);
networkView.getEdgeView(network.getEdge(index)).setVisualProperty(
- RichVisualLexicon.EDGE_SELECTED, selected);
+ BasicVisualLexicon.EDGE_SELECTED, selected);
}
public static boolean checkEdgeSelected(int index, CyNetworkView
networkView) {
--
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.
