Author: paperwing
Date: 2012-02-08 11:51:33 -0800 (Wed, 08 Feb 2012)
New Revision: 28213
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/RenderNodesProcedure.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/tools/RenderToolkit.java
Log:
Updated color tinting for selected/hovered nodes and edges, added method to
convert screen to 3D coordinates via glUnProject(), in progress of
investigating vizmap-gui-impl to determine cause of visual style editor crash
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-08 00:24:34 UTC (rev 28212)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderArcEdgesProcedure.java
2012-02-08 19:51:33 UTC (rev 28213)
@@ -282,14 +282,14 @@
if
(edgeView.getVisualProperty(MinimalVisualLexicon.EDGE_SELECTED)) {
// Make selected edges appear greener
- color.multiplyRed(0.7, 0, 1);
+ color.multiplyRed(0.7, 0, 0.7);
color.multiplyGreen(1.5, 0.5, 1);
- color.multiplyBlue(0.7, 0, 1);
+ color.multiplyBlue(0.7, 0, 0.7);
} else if (edgeView.getModel().getIndex() ==
graphicsData.getSelectionData().getHoverEdgeIndex()) {
// Make hovered edges appear bluer
- color.multiplyRed(0.7, 0, 1);
- color.multiplyGreen(0.7, 0, 1);
+ color.multiplyRed(0.7, 0, 0.7);
+ color.multiplyGreen(0.7, 0, 0.7);
color.multiplyBlue(1.5, 0.5, 1);
}
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-08 00:24:34 UTC (rev 28212)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderNodesProcedure.java
2012-02-08 19:51:33 UTC (rev 28213)
@@ -140,13 +140,13 @@
if
(nodeView.getVisualProperty(MinimalVisualLexicon.NODE_SELECTED)) {
// Make selected nodes appear greener
- color.multiplyRed(0.7, 0, 1);
+ color.multiplyRed(0.7, 0, 0.7);
color.multiplyGreen(1.5, 0.5, 1);
- color.multiplyBlue(0.7, 0, 1);
+ color.multiplyBlue(0.7, 0, 0.7);
} else if (nodeView.getModel().getIndex() ==
graphicsData.getSelectionData().getHoverNodeIndex()) {
// Make hovered nodes appear bluer
- color.multiplyRed(0.7, 0, 1);
- color.multiplyGreen(0.7, 0, 1);
+ color.multiplyRed(0.7, 0, 0.7);
+ color.multiplyGreen(0.7, 0, 0.7);
color.multiplyBlue(1.5, 0.5, 1);
}
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/tools/RenderToolkit.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/tools/RenderToolkit.java
2012-02-08 00:24:34 UTC (rev 28212)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/tools/RenderToolkit.java
2012-02-08 19:51:33 UTC (rev 28213)
@@ -63,9 +63,7 @@
glu.gluProject(position.x(), position.y(), position.z(),
modelView, 0, projection, 0, viewPort, 0,
result, 0);
- return new Vector3(result[0],
- result[1],
- result[2]);
+ return new Vector3(result[0], result[1], result[2]);
}
public static Vector3 convert3dToScreen(GL2 gl, Vector3 position,
double[] modelView, double[] projection, int[] viewPort) {
@@ -80,4 +78,23 @@
result[1],
result[2]);
}
+
+ public static Vector3 convertScreenTo3d(GL2 gl, int x, int y) {
+ GLU glu = GLU.createGLU(gl);
+
+ double modelView[] = new double[16];
+ double projection[] = new double[16];
+ int viewPort[] = new int[4];
+
+ gl.glGetDoublev(GL2.GL_MODELVIEW_MATRIX, modelView, 0);
+ gl.glGetDoublev(GL2.GL_PROJECTION_MATRIX, projection, 0);
+ gl.glGetIntegerv(GL2.GL_VIEWPORT, viewPort, 0);
+
+ double result[] = new double[4];
+
+ glu.gluUnProject(x, y, 0, modelView, 0, projection, 0,
viewPort, 0, result, 0);
+
+ return new Vector3(result[0], result[1], result[2]);
+ }
}
+
--
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.
