Author: paperwing
Date: 2012-01-09 15:52:38 -0800 (Mon, 09 Jan 2012)
New Revision: 27957
Added:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/processing/
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/processing/CytoscapeDataProcessor.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/processing/MainCytoscapeDataProcessor.java
Removed:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/CytoscapeDataProcessor.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/MainCytoscapeDataProcessor.java
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/BirdsEyeGraphicsHandler.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/GraphicsHandler.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/MainGraphicsHandler.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/input/NetworkChangeInputHandler.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/RenderSelectionBoxProcedure.java
Log:
moved CytoscapeDataProcessor classes to subpackage to make room for incoming
CyNetworkView implementations, other minor adjustments
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/BirdsEyeGraphicsHandler.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/BirdsEyeGraphicsHandler.java
2012-01-09 23:50:08 UTC (rev 27956)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/BirdsEyeGraphicsHandler.java
2012-01-09 23:52:38 UTC (rev 27957)
@@ -7,8 +7,8 @@
import org.cytoscape.paperwing.internal.coordinator.CoordinatorProcessor;
import org.cytoscape.paperwing.internal.coordinator.MainCoordinatorProcessor;
import org.cytoscape.paperwing.internal.coordinator.ViewingCoordinator;
-import org.cytoscape.paperwing.internal.cytoscape.CytoscapeDataProcessor;
-import org.cytoscape.paperwing.internal.cytoscape.MainCytoscapeDataProcessor;
+import
org.cytoscape.paperwing.internal.cytoscape.processing.CytoscapeDataProcessor;
+import
org.cytoscape.paperwing.internal.cytoscape.processing.MainCytoscapeDataProcessor;
import org.cytoscape.paperwing.internal.data.GraphicsData;
import org.cytoscape.paperwing.internal.input.BirdsEyeInputProcessor;
import org.cytoscape.paperwing.internal.input.InputProcessor;
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
2012-01-09 23:50:08 UTC (rev 27956)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
2012-01-09 23:52:38 UTC (rev 27957)
@@ -19,7 +19,7 @@
import org.cytoscape.paperwing.internal.coordinator.CoordinatorProcessor;
import org.cytoscape.paperwing.internal.coordinator.ViewingCoordinator;
-import org.cytoscape.paperwing.internal.cytoscape.CytoscapeDataProcessor;
+import
org.cytoscape.paperwing.internal.cytoscape.processing.CytoscapeDataProcessor;
import org.cytoscape.paperwing.internal.data.GraphicsData;
import org.cytoscape.paperwing.internal.geometric.Vector3;
import org.cytoscape.paperwing.internal.input.InputProcessor;
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/GraphicsHandler.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/GraphicsHandler.java
2012-01-09 23:50:08 UTC (rev 27956)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/GraphicsHandler.java
2012-01-09 23:52:38 UTC (rev 27957)
@@ -4,7 +4,7 @@
import org.cytoscape.paperwing.internal.coordinator.CoordinatorProcessor;
import org.cytoscape.paperwing.internal.coordinator.ViewingCoordinator;
-import org.cytoscape.paperwing.internal.cytoscape.CytoscapeDataProcessor;
+import
org.cytoscape.paperwing.internal.cytoscape.processing.CytoscapeDataProcessor;
import org.cytoscape.paperwing.internal.data.GraphicsData;
import org.cytoscape.paperwing.internal.input.InputProcessor;
import org.cytoscape.paperwing.internal.picking.ShapePickingProcessor;
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/MainGraphicsHandler.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/MainGraphicsHandler.java
2012-01-09 23:50:08 UTC (rev 27956)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/MainGraphicsHandler.java
2012-01-09 23:52:38 UTC (rev 27957)
@@ -6,8 +6,8 @@
import org.cytoscape.paperwing.internal.coordinator.CoordinatorProcessor;
import org.cytoscape.paperwing.internal.coordinator.MainCoordinatorProcessor;
import org.cytoscape.paperwing.internal.coordinator.ViewingCoordinator;
-import org.cytoscape.paperwing.internal.cytoscape.CytoscapeDataProcessor;
-import org.cytoscape.paperwing.internal.cytoscape.MainCytoscapeDataProcessor;
+import
org.cytoscape.paperwing.internal.cytoscape.processing.CytoscapeDataProcessor;
+import
org.cytoscape.paperwing.internal.cytoscape.processing.MainCytoscapeDataProcessor;
import org.cytoscape.paperwing.internal.data.GraphicsData;
import org.cytoscape.paperwing.internal.input.InputProcessor;
import org.cytoscape.paperwing.internal.input.MainInputProcessor;
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-01-09 23:50:08 UTC (rev 27956)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindVisualLexicon.java
2012-01-09 23:52:38 UTC (rev 27957)
@@ -1,7 +1,9 @@
package org.cytoscape.paperwing.internal;
+import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.NullDataType;
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;
@@ -13,9 +15,19 @@
"WIND_ROOT_VISUAL_PROPERTY",
"Wind Rendering Engine Root Visual Property");
+ public static final VisualProperty<Double> TEST_PROPERTY = new
DoubleVisualProperty(
+ 1.0, ARBITRARY_DOUBLE_RANGE, "TEST_PROPERTY", "Wind
Test Property", CyNode.class);
+
/** Create a new WindVisualLexicon object */
public WindVisualLexicon() {
super(WIND_ROOT);
+
+ addVisualProperty(TEST_PROPERTY, NODE);
+
+ addIdentifierMapping(CyNode.class, "testProperty",
TEST_PROPERTY);
+
+ VisualProperty visualProperty = this.lookup(Double.class,
"test");
+
}
}
Deleted:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/CytoscapeDataProcessor.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/CytoscapeDataProcessor.java
2012-01-09 23:50:08 UTC (rev 27956)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/CytoscapeDataProcessor.java
2012-01-09 23:52:38 UTC (rev 27957)
@@ -1,11 +0,0 @@
-package org.cytoscape.paperwing.internal.cytoscape;
-
-import org.cytoscape.paperwing.internal.data.GraphicsData;
-
-// Responsible for interacting with Cytoscape through Cytoscape API,
-// such as transferring data to Cytoscape's CyTables
-public interface CytoscapeDataProcessor {
-
- public void processCytoscapeData(GraphicsData graphicsData);
-
-}
Deleted:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/MainCytoscapeDataProcessor.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/MainCytoscapeDataProcessor.java
2012-01-09 23:50:08 UTC (rev 27956)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/MainCytoscapeDataProcessor.java
2012-01-09 23:52:38 UTC (rev 27957)
@@ -1,70 +0,0 @@
-package org.cytoscape.paperwing.internal.cytoscape;
-
-import java.util.Set;
-
-import org.cytoscape.model.CyEdge;
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyNode;
-import org.cytoscape.paperwing.internal.data.GraphicsData;
-import org.cytoscape.paperwing.internal.data.GraphicsSelectionData;
-import org.cytoscape.paperwing.internal.tools.NetworkToolkit;
-import org.cytoscape.view.model.CyNetworkView;
-
-public class MainCytoscapeDataProcessor implements CytoscapeDataProcessor {
-
- @Override
- public void processCytoscapeData(GraphicsData graphicsData) {
-
- // Perform on second frame, first frame performs initial drawing
- // TODO: Check if necessary, the ding renderer doesn't do this
-// if (graphicsData.getFramesElapsed() == 1) {
-// initializeTableSelectionState(graphicsData);
-// }
-
- processDeselectedData(graphicsData);
- }
-
- // Performs deselection in Cytoscape data objects, such as CyTable
- private void processDeselectedData(GraphicsData graphicsData) {
-
- CyNetworkView networkView = graphicsData.getNetworkView();
- GraphicsSelectionData selectionData =
graphicsData.getSelectionData();
-
- Set<Integer> toBeDeselectedNodeIndices =
selectionData.getToBeDeselectedNodeIndices();
- Set<Integer> toBeDeselectedEdgeIndices =
selectionData.getToBeDeselectedEdgeIndices();
-
- NetworkToolkit.deselectNodes(toBeDeselectedNodeIndices,
networkView);
- NetworkToolkit.deselectEdges(toBeDeselectedEdgeIndices,
networkView);
- toBeDeselectedNodeIndices.clear();
- toBeDeselectedEdgeIndices.clear();
-
- // Select nodes
- for (int index : selectionData.getSelectedNodeIndices()) {
- if (!NetworkToolkit.checkNodeSelected(index,
networkView)) {
- NetworkToolkit.setNodeSelected(index,
networkView, true);
- }
- }
-
- // Select edges
- for (int index : selectionData.getSelectedEdgeIndices()) {
- if (!NetworkToolkit.checkEdgeSelected(index,
networkView)) {
- NetworkToolkit.setEdgeSelected(index,
networkView, true);
- }
- }
- }
-
- // Fills in the missing "selected" boolean values in CyTable
- private void initializeTableSelectionState(GraphicsData graphicsData) {
- CyNetworkView networkView = graphicsData.getNetworkView();
- CyNetwork network = graphicsData.getNetworkView().getModel();
-
- for (CyNode node : network.getNodeList()) {
- NetworkToolkit.setNodeSelected(node.getIndex(),
networkView, false);
- }
-
- for (CyEdge edge : network.getEdgeList()) {
- NetworkToolkit.setEdgeSelected(edge.getIndex(),
networkView, false);
- }
- }
-
-}
Added:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/processing/CytoscapeDataProcessor.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/processing/CytoscapeDataProcessor.java
(rev 0)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/processing/CytoscapeDataProcessor.java
2012-01-09 23:52:38 UTC (rev 27957)
@@ -0,0 +1,11 @@
+package org.cytoscape.paperwing.internal.cytoscape.processing;
+
+import org.cytoscape.paperwing.internal.data.GraphicsData;
+
+// Responsible for interacting with Cytoscape through Cytoscape API,
+// such as transferring data to Cytoscape's CyTables
+public interface CytoscapeDataProcessor {
+
+ public void processCytoscapeData(GraphicsData graphicsData);
+
+}
Added:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/processing/MainCytoscapeDataProcessor.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/processing/MainCytoscapeDataProcessor.java
(rev 0)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/processing/MainCytoscapeDataProcessor.java
2012-01-09 23:52:38 UTC (rev 27957)
@@ -0,0 +1,70 @@
+package org.cytoscape.paperwing.internal.cytoscape.processing;
+
+import java.util.Set;
+
+import org.cytoscape.model.CyEdge;
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyNode;
+import org.cytoscape.paperwing.internal.data.GraphicsData;
+import org.cytoscape.paperwing.internal.data.GraphicsSelectionData;
+import org.cytoscape.paperwing.internal.tools.NetworkToolkit;
+import org.cytoscape.view.model.CyNetworkView;
+
+public class MainCytoscapeDataProcessor implements CytoscapeDataProcessor {
+
+ @Override
+ public void processCytoscapeData(GraphicsData graphicsData) {
+
+ // Perform on second frame, first frame performs initial drawing
+ // TODO: Check if necessary, the ding renderer doesn't do this
+// if (graphicsData.getFramesElapsed() == 1) {
+// initializeTableSelectionState(graphicsData);
+// }
+
+ processDeselectedData(graphicsData);
+ }
+
+ // Performs deselection in Cytoscape data objects, such as CyTable
+ private void processDeselectedData(GraphicsData graphicsData) {
+
+ CyNetworkView networkView = graphicsData.getNetworkView();
+ GraphicsSelectionData selectionData =
graphicsData.getSelectionData();
+
+ Set<Integer> toBeDeselectedNodeIndices =
selectionData.getToBeDeselectedNodeIndices();
+ Set<Integer> toBeDeselectedEdgeIndices =
selectionData.getToBeDeselectedEdgeIndices();
+
+ NetworkToolkit.deselectNodes(toBeDeselectedNodeIndices,
networkView);
+ NetworkToolkit.deselectEdges(toBeDeselectedEdgeIndices,
networkView);
+ toBeDeselectedNodeIndices.clear();
+ toBeDeselectedEdgeIndices.clear();
+
+ // Select nodes
+ for (int index : selectionData.getSelectedNodeIndices()) {
+ if (!NetworkToolkit.checkNodeSelected(index,
networkView)) {
+ NetworkToolkit.setNodeSelected(index,
networkView, true);
+ }
+ }
+
+ // Select edges
+ for (int index : selectionData.getSelectedEdgeIndices()) {
+ if (!NetworkToolkit.checkEdgeSelected(index,
networkView)) {
+ NetworkToolkit.setEdgeSelected(index,
networkView, true);
+ }
+ }
+ }
+
+ // Fills in the missing "selected" boolean values in CyTable
+ private void initializeTableSelectionState(GraphicsData graphicsData) {
+ CyNetworkView networkView = graphicsData.getNetworkView();
+ CyNetwork network = graphicsData.getNetworkView().getModel();
+
+ for (CyNode node : network.getNodeList()) {
+ NetworkToolkit.setNodeSelected(node.getIndex(),
networkView, false);
+ }
+
+ for (CyEdge edge : network.getEdgeList()) {
+ NetworkToolkit.setEdgeSelected(edge.getIndex(),
networkView, false);
+ }
+ }
+
+}
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-01-09 23:50:08 UTC (rev 27956)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/input/NetworkChangeInputHandler.java
2012-01-09 23:52:38 UTC (rev 27957)
@@ -139,6 +139,9 @@
networkView.getModel().removeNodes(nodesToBeRemoved);
networkView.getModel().removeEdges(edgesToBeRemoved);
+ selectedNodeIndices.clear();
+ selectedEdgeIndices.clear();
+
// TODO: Not sure if this call is needed
networkView.updateView();
}
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-01-09 23:50:08 UTC (rev 27956)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderNodesProcedure.java
2012-01-09 23:52:38 UTC (rev 27957)
@@ -33,10 +33,10 @@
/** The slices detail level to use for drawing spherical nodes */
// 10, 10, 4 // 24, 24, 12 used to be default values for
// slices/stacks/slices
- private static int NODE_SLICES_DETAIL = 10;
+ private static int NODE_SLICES_DETAIL = 12;
/** The stacks detail level to use for drawing spherical nodes */
- private static int NODE_STACKS_DETAIL = 10;
+ private static int NODE_STACKS_DETAIL = 12;
private int nodeListIndex;
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderSelectionBoxProcedure.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderSelectionBoxProcedure.java
2012-01-09 23:50:08 UTC (rev 27956)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderSelectionBoxProcedure.java
2012-01-09 23:52:38 UTC (rev 27957)
@@ -8,10 +8,14 @@
import org.cytoscape.paperwing.internal.data.GraphicsData;
import org.cytoscape.paperwing.internal.geometric.Vector3;
import org.cytoscape.paperwing.internal.tools.GeometryToolkit;
+import org.cytoscape.paperwing.internal.tools.RenderColor;
import org.cytoscape.paperwing.internal.tools.SimpleCamera;
public class RenderSelectionBoxProcedure implements ReadOnlyGraphicsProcedure {
+ private static final RenderColor DEFAULT_COLOR =
+ new RenderColor(0.4, 0.6, 0.75);
+
@Override
public void initialize(GraphicsData graphicsData) {
// TODO Auto-generated method stub
@@ -72,8 +76,8 @@
gl.glDisable(GL2.GL_LIGHTING);
gl.glDisable(GL.GL_DEPTH_TEST);
- gl.glColor3f(0.0f, 0.4f, 0.6f);
-
+ RenderColor.setNonAlphaColors(gl, DEFAULT_COLOR);
+
// Below uses converted 3D coordinates
gl.glBegin(GL2.GL_LINE_LOOP);
gl.glVertex3d(topLeft.x(), topLeft.y(), topLeft.z());
--
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.
