Author: kono
Date: 2009-04-29 11:28:56 -0700 (Wed, 29 Apr 2009)
New Revision: 16705
Added:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/DefaultIconFactory.java
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DNodeView.java
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/PresentationFactoryImpl.java
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Fixed to support refactored Presentation API.
Added:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/DefaultIconFactory.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/DefaultIconFactory.java
2009-04-29 18:27:06 UTC (rev 16704)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/DefaultIconFactory.java
2009-04-29 18:28:56 UTC (rev 16705)
@@ -0,0 +1,9 @@
+package org.cytoscape.ding.icon;
+
+public class DefaultIconFactory {
+
+ public DefaultIconFactory() {
+
+ }
+
+}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2009-04-29 18:27:06 UTC (rev 16704)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2009-04-29 18:28:56 UTC (rev 16705)
@@ -45,7 +45,7 @@
import org.cytoscape.ding.GraphViewChangeListener;
import org.cytoscape.ding.Label;
-import org.cytoscape.view.presentation.twod.TwoDVisualProperties;
+import org.cytoscape.view.presentation.twod.TwoDVisualLexicon;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.model.ViewChangeListener;
@@ -1434,7 +1434,7 @@
if (vp == DVisualLexicon.EDGE_SELECTED_PAINT) {
setSelectedPaint((Paint)o);
}
- else if (vp == TwoDVisualProperties.EDGE_COLOR) {
+ else if (vp == TwoDVisualLexicon.EDGE_COLOR) {
setUnselectedPaint((Paint)o);
}
else if (vp == DVisualLexicon.EDGE_WIDTH) {
@@ -1455,7 +1455,7 @@
else if (vp ==
DVisualLexicon.EDGE_TARGET_ARROW_UNSELECTED_PAINT) {
setTargetEdgeEndPaint((Paint)o);
}
- else if (vp == TwoDVisualProperties.EDGE_SELECTED) {
+ else if (vp == TwoDVisualLexicon.EDGE_SELECTED) {
setSelected((Boolean)o);
}
else if (vp == DVisualLexicon.EDGE_TARGET_ARROW_SHAPE) {
@@ -1464,7 +1464,7 @@
else if (vp == DVisualLexicon.EDGE_SOURCE_ARROW_SHAPE) {
//System.out.println(vp.getDisplayName() + " not yet
implemented " + o);
}
- else if (vp == TwoDVisualProperties.EDGE_LABEL) {
+ else if (vp == TwoDVisualLexicon.EDGE_LABEL) {
setText((String)o);
}
else if (vp == DVisualLexicon.EDGE_TOOLTIP) {
@@ -1491,7 +1491,7 @@
else if (vp == DVisualLexicon.EDGE_LABEL_FONT_SIZE) {
//System.out.println(vp.getDisplayName() + " not yet
implemented " + o);
}
- else if (vp == TwoDVisualProperties.EDGE_LABEL_COLOR) {
+ else if (vp == TwoDVisualLexicon.EDGE_LABEL_COLOR) {
setTextPaint((Paint)o);
}
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2009-04-29 18:27:06 UTC (rev 16704)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2009-04-29 18:28:56 UTC (rev 16705)
@@ -61,6 +61,7 @@
import java.util.List;
import java.util.Properties;
+import javax.swing.Icon;
import javax.swing.JComponent;
import javax.swing.JLayeredPane;
@@ -90,12 +91,13 @@
import org.cytoscape.util.intr.IntHash;
import org.cytoscape.util.intr.IntStack;
import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.RootVisualLexicon;
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.ViewChangeListener;
+import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.model.VisualPropertyCatalog;
-import org.cytoscape.view.presentation.Presentation;
-import org.cytoscape.view.presentation.twod.TwoDVisualProperties;
+import org.cytoscape.view.presentation.NetworkRenderer;
+import org.cytoscape.view.presentation.twod.TwoDVisualLexicon;
import org.cytoscape.work.UndoSupport;
import phoebe.PhoebeCanvasDropListener;
@@ -114,7 +116,7 @@
*
* @author Nerius Landys
*/
-public class DGraphView implements Presentation, GraphView, Printable,
PhoebeCanvasDroppable, ViewChangeListener {
+public class DGraphView implements NetworkRenderer, GraphView, Printable,
PhoebeCanvasDroppable, ViewChangeListener {
private static enum ZOrder {
BACKGROUND_PANE,
@@ -333,16 +335,21 @@
Paint m_lastTexturePaint = null;
CyNetworkView cyNetworkView;
- VisualPropertyCatalog vizPropCatalog;
+
+ RootVisualLexicon rootLexicon;
+
+ // Will be injected.
+ private VisualLexicon dingLexicon;
/**
* Creates a new DGraphView object.
*
* @param perspective The graph model that we'll be creating a view for.
*/
- public DGraphView(CyNetworkView view, CyDataTableFactory dataFactory,
CyRootNetworkFactory cyRoot, UndoSupport undo, SpacialIndex2DFactory
spacialFactory, VisualPropertyCatalog vpc) {
+ public DGraphView(CyNetworkView view, CyDataTableFactory dataFactory,
CyRootNetworkFactory cyRoot, UndoSupport undo, SpacialIndex2DFactory
spacialFactory, RootVisualLexicon vpc, VisualLexicon dingLexicon) {
m_perspective = view.getSource();
cyNetworkView = view;
- vizPropCatalog = vpc;
+ rootLexicon = vpc;
+ this.dingLexicon = dingLexicon;
CyDataTable nodeCAM = dataFactory.createTable("node
view",false);
@@ -391,7 +398,7 @@
addEdgeView( ee );
// read in visual properties from view obj
- Collection<VisualProperty<?>> netVPs =
vizPropCatalog.collectionOfVisualProperties(NETWORK);
+ Collection<VisualProperty<?>> netVPs =
rootLexicon.getVisualProperties(NETWORK);
for ( VisualProperty<?> vp : netVPs )
visualPropertySet(vp,
cyNetworkView.getVisualProperty(vp));
@@ -704,7 +711,7 @@
m_defaultNodeYMax);
// read in visual properties from view obj
- Collection<VisualProperty<?>> nodeVPs =
vizPropCatalog.collectionOfVisualProperties(NODE);
+ Collection<VisualProperty<?>> nodeVPs =
rootLexicon.getVisualProperties(NODE);
View<CyNode> nv = cyNetworkView.getNodeView(node);
for ( VisualProperty<?> vp : nodeVPs )
newView.visualPropertySet(vp, nv.getVisualProperty(vp));
@@ -748,7 +755,7 @@
m_contentChanged = true;
// read in visual properties from view obj
- Collection<VisualProperty<?>> edgeVPs =
vizPropCatalog.collectionOfVisualProperties(EDGE);
+ Collection<VisualProperty<?>> edgeVPs =
rootLexicon.getVisualProperties(EDGE);
View<CyEdge> ev = cyNetworkView.getEdgeView(edge);
for ( VisualProperty<?> vp : edgeVPs )
edgeView.visualPropertySet(vp,
ev.getVisualProperty(vp));
@@ -2604,13 +2611,13 @@
enableEdgeSelection();
else
disableEdgeSelection();
- } else if ( vp == TwoDVisualProperties.NETWORK_BACKGROUND_COLOR
) {
+ } else if ( vp == TwoDVisualLexicon.NETWORK_BACKGROUND_COLOR ) {
setBackgroundPaint((Paint)o);
- } else if ( vp ==
TwoDVisualProperties.NETWORK_CENTER_X_LOCATION ) {
+ } else if ( vp == TwoDVisualLexicon.NETWORK_CENTER_X_LOCATION )
{
setCenter(((Double)o).doubleValue(),m_networkCanvas.m_yCenter);
- } else if ( vp ==
TwoDVisualProperties.NETWORK_CENTER_Y_LOCATION ) {
+ } else if ( vp == TwoDVisualLexicon.NETWORK_CENTER_Y_LOCATION )
{
setCenter(m_networkCanvas.m_xCenter,((Double)o).doubleValue());
- } else if ( vp == TwoDVisualProperties.NETWORK_SCALE_FACTOR ) {
+ } else if ( vp == TwoDVisualLexicon.NETWORK_SCALE_FACTOR ) {
setZoom(((Double)o).doubleValue());
}
}
@@ -2634,4 +2641,23 @@
// TODO Auto-generated method stub
}
+
+ public Icon getDefaultIcon(VisualProperty<?> vp) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Image getImage(int width, int height) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getName() {
+ // TODO What kind of string should I return?
+ return "ding";
+ }
+
+ public VisualLexicon getVisualLexicon() {
+ return this.dingLexicon;
+ }
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DNodeView.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2009-04-29 18:27:06 UTC (rev 16704)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2009-04-29 18:28:56 UTC (rev 16705)
@@ -1389,10 +1389,10 @@
else if ( vp == DVisualLexicon.NODE_SELECTED_PAINT ) {
setSelectedPaint((Paint)o);
}
- else if ( vp == TwoDVisualProperties.NODE_SELECTED ) {
+ else if ( vp == TwoDVisualLexicon.NODE_SELECTED ) {
setSelected(((Boolean)o).booleanValue());
}
- else if ( vp == TwoDVisualProperties.NODE_COLOR ) { //
unselected paint
+ else if ( vp == TwoDVisualLexicon.NODE_COLOR ) { // unselected
paint
setUnselectedPaint((Paint)o);
}
else if ( vp == DVisualLexicon.NODE_BORDER_PAINT ) {
@@ -1413,19 +1413,19 @@
else if ( vp == DVisualLexicon.NODE_HEIGHT ) {
setHeight(((Double)o).doubleValue());
}
- else if ( vp == TwoDVisualProperties.NODE_LABEL ) {
+ else if ( vp == TwoDVisualLexicon.NODE_LABEL ) {
setText((String)o);
}
- else if ( vp == TwoDVisualProperties.NODE_X_LOCATION ) {
+ else if ( vp == TwoDVisualLexicon.NODE_X_LOCATION ) {
setXPosition(((Double)o).doubleValue());
}
- else if ( vp == TwoDVisualProperties.NODE_Y_LOCATION ) {
+ else if ( vp == TwoDVisualLexicon.NODE_Y_LOCATION ) {
setYPosition(((Double)o).doubleValue());
}
else if ( vp == DVisualLexicon.NODE_TOOLTIP ) {
setToolTip((String)o);
}
- else if ( vp == TwoDVisualProperties.NODE_LABEL_COLOR ) {
+ else if ( vp == TwoDVisualLexicon.NODE_LABEL_COLOR ) {
setTextPaint((Paint)o);
}
else if ( vp == DVisualLexicon.NODE_LABEL_FONT_FACE ) {
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
2009-04-29 18:27:06 UTC (rev 16704)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
2009-04-29 18:28:56 UTC (rev 16705)
@@ -1,4 +1,3 @@
-
/*
Copyright (c) 2006, 2007, The Cytoscape Consortium (www.cytoscape.org)
@@ -35,111 +34,132 @@
*/
package org.cytoscape.ding.impl;
-import org.cytoscape.ding.NodeShape;
-import org.cytoscape.ding.ArrowShape;
+import static org.cytoscape.model.GraphObject.EDGE;
+import static org.cytoscape.model.GraphObject.NETWORK;
+import static org.cytoscape.model.GraphObject.NODE;
-import org.cytoscape.view.model.VisualProperty;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Font;
import java.awt.Paint;
-import java.awt.Color;
import java.awt.Stroke;
-import java.awt.Font;
-import java.awt.BasicStroke;
-import org.cytoscape.view.presentation.twod.*;
-import static org.cytoscape.model.GraphObject.*;
+import org.cytoscape.ding.ArrowShape;
+import org.cytoscape.ding.NodeShape;
+import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.presentation.twod.BooleanTwoDVisualProperty;
+import org.cytoscape.view.presentation.twod.ColorTwoDVisualProperty;
+import org.cytoscape.view.presentation.twod.DoubleTwoDVisualProperty;
+import org.cytoscape.view.presentation.twod.StringTwoDVisualProperty;
+import org.cytoscape.view.presentation.twod.TwoDVisualLexicon;
-public class DVisualLexicon extends TwoDVisualProperties {
+public class DVisualLexicon extends TwoDVisualLexicon {
- public static final VisualProperty<Boolean> NETWORK_NODE_SELECTION
- = new
BooleanTwoDVisualProperty(NETWORK,Boolean.TRUE,"NETWORK_NODE_SELECTION","Network
Node Selection");
- public static final VisualProperty<Boolean> NETWORK_EDGE_SELECTION
- = new
BooleanTwoDVisualProperty(NETWORK,Boolean.TRUE,"NETWORK_EDGE_SELECTION","Network
Edge Selection");
+ public static final VisualProperty<Boolean> NETWORK_NODE_SELECTION =
new BooleanTwoDVisualProperty(
+ NETWORK, Boolean.TRUE, "NETWORK_NODE_SELECTION",
+ "Network Node Selection");
+ public static final VisualProperty<Boolean> NETWORK_EDGE_SELECTION =
new BooleanTwoDVisualProperty(
+ NETWORK, Boolean.TRUE, "NETWORK_EDGE_SELECTION",
+ "Network Edge Selection");
- public static final VisualProperty<NodeShape> NODE_SHAPE
- = new
NodeShapeTwoDVisualProperty(NODE,NodeShape.ELLIPSE,"NODE_SHAPE","Node Shape");
+ public static final VisualProperty<NodeShape> NODE_SHAPE = new
NodeShapeTwoDVisualProperty(
+ NODE, NodeShape.ELLIPSE, "NODE_SHAPE", "Node Shape");
- public static final VisualProperty<? extends Paint> NODE_SELECTED_PAINT
- = new
ColorTwoDVisualProperty(NODE,Color.YELLOW,"NODE_SELECTED_PAINT","Node Selected
Paint");
+ public static final VisualProperty<? extends Paint> NODE_SELECTED_PAINT
= new ColorTwoDVisualProperty(
+ NODE, Color.YELLOW, "NODE_SELECTED_PAINT", "Node
Selected Paint");
- public static final VisualProperty<? extends Paint> NODE_BORDER_PAINT
- = new
ColorTwoDVisualProperty(NODE,Color.BLACK,"NODE_BORDER_PAINT","Node Border
Paint");
+ public static final VisualProperty<? extends Paint> NODE_BORDER_PAINT =
new ColorTwoDVisualProperty(
+ NODE, Color.BLACK, "NODE_BORDER_PAINT", "Node Border
Paint");
- public static final VisualProperty<Double> NODE_BORDER_WIDTH
- = new DoubleTwoDVisualProperty(NODE,2.0,"NODE_BORDER_WIDTH","Node
Border Width");
+ public static final VisualProperty<Double> NODE_BORDER_WIDTH = new
DoubleTwoDVisualProperty(
+ NODE, 2.0, "NODE_BORDER_WIDTH", "Node Border Width");
- public static final VisualProperty<? extends Stroke> NODE_BORDER_STROKE
- = new StrokeTwoDVisualProperty(NODE,new
BasicStroke(),"NODE_BORDER_STROKE","Node Border Stroke");
+ public static final VisualProperty<? extends Stroke> NODE_BORDER_STROKE
= new StrokeTwoDVisualProperty(
+ NODE, new BasicStroke(), "NODE_BORDER_STROKE", "Node
Border Stroke");
- public static final VisualProperty<Double> NODE_WIDTH
- = new DoubleTwoDVisualProperty(NODE,40.0,"NODE_WIDTH","Node Width");
- public static final VisualProperty<Double> NODE_HEIGHT
- = new DoubleTwoDVisualProperty(NODE,40.0,"NODE_HEIGHT","Node Height");
- public static final VisualProperty<String> NODE_TOOLTIP
- = new StringTwoDVisualProperty(NODE,"","NODE_TOOLTIP","Node Tooltip");
- public static final VisualProperty<Font> NODE_LABEL_FONT_FACE
- = new FontTwoDVisualProperty(NODE,new
Font("SansSerif",Font.PLAIN,10),"NODE_LABEL_FONT_FACE","Node Label Font Face");
- public static final VisualProperty<Integer> NODE_LABEL_FONT_SIZE
- = new IntegerTwoDVisualProperty(NODE,10,"NODE_LABEL_FONT_SIZE","Node
Label Font Size");
+ public static final VisualProperty<Double> NODE_WIDTH = new
DoubleTwoDVisualProperty(
+ NODE, 40.0, "NODE_WIDTH", "Node Width");
+ public static final VisualProperty<Double> NODE_HEIGHT = new
DoubleTwoDVisualProperty(
+ NODE, 40.0, "NODE_HEIGHT", "Node Height");
+ public static final VisualProperty<String> NODE_TOOLTIP = new
StringTwoDVisualProperty(
+ NODE, "", "NODE_TOOLTIP", "Node Tooltip");
+ public static final VisualProperty<Font> NODE_LABEL_FONT_FACE = new
FontTwoDVisualProperty(
+ NODE, new Font("SansSerif", Font.PLAIN, 10),
+ "NODE_LABEL_FONT_FACE", "Node Label Font Face");
+ public static final VisualProperty<Integer> NODE_LABEL_FONT_SIZE = new
IntegerTwoDVisualProperty(
+ NODE, 10, "NODE_LABEL_FONT_SIZE", "Node Label Font
Size");
- public static final VisualProperty<Anchor> NODE_LABEL_TEXT_ANCHOR
- = new
AnchorTwoDVisualProperty(NODE,Anchor.CENTER,"NODE_LABEL_TEXT_ANCHOR","Node
Label Text Anchor");
- public static final VisualProperty<Anchor> NODE_LABEL_NODE_ANCHOR
- = new
AnchorTwoDVisualProperty(NODE,Anchor.CENTER,"NODE_LABEL_NODE_ANCHOR","Node
Label Node Anchor");
-
- public static final VisualProperty<Double> NODE_LABEL_ANCHOR_X_OFFSET
- = new
DoubleTwoDVisualProperty(NODE,0.0,"NODE_LABEL_ANCHOR_X_OFFSET","Node Label
Anchor X Offset");
- public static final VisualProperty<Double> NODE_LABEL_ANCHOR_Y_OFFSET
- = new
DoubleTwoDVisualProperty(NODE,0.0,"NODE_LABEL_ANCHOR_Y_OFFSET","Node Label
Anchor Y Offset");
+ public static final VisualProperty<Anchor> NODE_LABEL_TEXT_ANCHOR = new
AnchorTwoDVisualProperty(
+ NODE, Anchor.CENTER, "NODE_LABEL_TEXT_ANCHOR",
+ "Node Label Text Anchor");
+ public static final VisualProperty<Anchor> NODE_LABEL_NODE_ANCHOR = new
AnchorTwoDVisualProperty(
+ NODE, Anchor.CENTER, "NODE_LABEL_NODE_ANCHOR",
+ "Node Label Node Anchor");
- public static final VisualProperty<Justify> NODE_LABEL_JUSTIFY
- = new
JustifyTwoDVisualProperty(NODE,Justify.LEFT,"NODE_LABEL_JUSTIFY","Node Label
Justify");
- public static final VisualProperty<Integer> NODE_TRANSPARENCY
- = new IntegerTwoDVisualProperty(NODE,255,"NODE_TRANSPARENCY","Node
Transparency");
+ public static final VisualProperty<Double> NODE_LABEL_ANCHOR_X_OFFSET =
new DoubleTwoDVisualProperty(
+ NODE, 0.0, "NODE_LABEL_ANCHOR_X_OFFSET",
+ "Node Label Anchor X Offset");
+ public static final VisualProperty<Double> NODE_LABEL_ANCHOR_Y_OFFSET =
new DoubleTwoDVisualProperty(
+ NODE, 0.0, "NODE_LABEL_ANCHOR_Y_OFFSET",
+ "Node Label Anchor Y Offset");
-
- public static final VisualProperty<? extends Paint> EDGE_SELECTED_PAINT
- = new
ColorTwoDVisualProperty(EDGE,Color.RED,"EDGE_SELECTED_PAINT","Edge Selected
Paint");
- public static final VisualProperty<? extends Stroke> EDGE_STROKE
- = new StrokeTwoDVisualProperty(EDGE,new
BasicStroke(),"EDGE_STROKE","Edge Stroke");
+ public static final VisualProperty<Justify> NODE_LABEL_JUSTIFY = new
JustifyTwoDVisualProperty(
+ NODE, Justify.LEFT, "NODE_LABEL_JUSTIFY", "Node Label
Justify");
+ public static final VisualProperty<Integer> NODE_TRANSPARENCY = new
IntegerTwoDVisualProperty(
+ NODE, 255, "NODE_TRANSPARENCY", "Node Transparency");
- public static final VisualProperty<Double> EDGE_WIDTH
- = new DoubleTwoDVisualProperty(EDGE,2.0,"EDGE_WIDTH","Edge Width");
+ public static final VisualProperty<? extends Paint> EDGE_SELECTED_PAINT
= new ColorTwoDVisualProperty(
+ EDGE, Color.RED, "EDGE_SELECTED_PAINT", "Edge Selected
Paint");
+ public static final VisualProperty<? extends Stroke> EDGE_STROKE = new
StrokeTwoDVisualProperty(
+ EDGE, new BasicStroke(), "EDGE_STROKE", "Edge Stroke");
- public static final VisualProperty<? extends Paint>
EDGE_SOURCE_ARROW_SELECTED_PAINT
- = new
ColorTwoDVisualProperty(EDGE,Color.YELLOW,"EDGE_SOURCE_ARROW_SELECTED_PAINT","Edge
Source Arrow Selected Paint");
- public static final VisualProperty<? extends Paint>
EDGE_TARGET_ARROW_SELECTED_PAINT
- = new
ColorTwoDVisualProperty(EDGE,Color.YELLOW,"EDGE_TARGET_ARROW_SELECTED_PAINT","Edge
Target Arrow Selected Paint");
- public static final VisualProperty<? extends Paint>
EDGE_SOURCE_ARROW_UNSELECTED_PAINT
- = new
ColorTwoDVisualProperty(EDGE,Color.BLACK,"EDGE_SOURCE_ARROW_UNSELECTED_PAINT","Edge
Source Arrow Unselected Paint");
- public static final VisualProperty<? extends Paint>
EDGE_TARGET_ARROW_UNSELECTED_PAINT
- = new
ColorTwoDVisualProperty(EDGE,Color.BLACK,"EDGE_TARGET_ARROW_UNSELECTED_PAINT","Edge
Target Arrow Unselected Paint");
+ public static final VisualProperty<Double> EDGE_WIDTH = new
DoubleTwoDVisualProperty(
+ EDGE, 2.0, "EDGE_WIDTH", "Edge Width");
- public static final VisualProperty<ArrowShape> EDGE_SOURCE_ARROW_SHAPE
- = new
ArrowShapeTwoDVisualProperty(EDGE,ArrowShape.NONE,"EDGE_SOURCE_ARROW_SHAPE","Edge
Source Arrow Shape");
- public static final VisualProperty<ArrowShape> EDGE_TARGET_ARROW_SHAPE
- = new
ArrowShapeTwoDVisualProperty(EDGE,ArrowShape.NONE,"EDGE_TARGET_ARROW_SHAPE","Edge
Target Arrow Shape");
+ public static final VisualProperty<? extends Paint>
EDGE_SOURCE_ARROW_SELECTED_PAINT = new ColorTwoDVisualProperty(
+ EDGE, Color.YELLOW, "EDGE_SOURCE_ARROW_SELECTED_PAINT",
+ "Edge Source Arrow Selected Paint");
+ public static final VisualProperty<? extends Paint>
EDGE_TARGET_ARROW_SELECTED_PAINT = new ColorTwoDVisualProperty(
+ EDGE, Color.YELLOW, "EDGE_TARGET_ARROW_SELECTED_PAINT",
+ "Edge Target Arrow Selected Paint");
+ public static final VisualProperty<? extends Paint>
EDGE_SOURCE_ARROW_UNSELECTED_PAINT = new ColorTwoDVisualProperty(
+ EDGE, Color.BLACK, "EDGE_SOURCE_ARROW_UNSELECTED_PAINT",
+ "Edge Source Arrow Unselected Paint");
+ public static final VisualProperty<? extends Paint>
EDGE_TARGET_ARROW_UNSELECTED_PAINT = new ColorTwoDVisualProperty(
+ EDGE, Color.BLACK, "EDGE_TARGET_ARROW_UNSELECTED_PAINT",
+ "Edge Target Arrow Unselected Paint");
- public static final VisualProperty<String> EDGE_TOOLTIP
- = new StringTwoDVisualProperty(EDGE,"","EDGE_TOOLTIP","Edge Tooltip");
+ public static final VisualProperty<ArrowShape> EDGE_SOURCE_ARROW_SHAPE
= new ArrowShapeTwoDVisualProperty(
+ EDGE, ArrowShape.NONE, "EDGE_SOURCE_ARROW_SHAPE",
+ "Edge Source Arrow Shape");
+ public static final VisualProperty<ArrowShape> EDGE_TARGET_ARROW_SHAPE
= new ArrowShapeTwoDVisualProperty(
+ EDGE, ArrowShape.NONE, "EDGE_TARGET_ARROW_SHAPE",
+ "Edge Target Arrow Shape");
- public static final VisualProperty<Anchor> EDGE_LABEL_TEXT_ANCHOR
- = new
AnchorTwoDVisualProperty(EDGE,Anchor.CENTER,"EDGE_LABEL_TEXT_ANCHOR","Edge
Label Text Anchor");
- public static final VisualProperty<Anchor> EDGE_LABEL_EDGE_ANCHOR
- = new
AnchorTwoDVisualProperty(EDGE,Anchor.CENTER,"EDGE_LABEL_EDGE_ANCHOR","Edge
Label Edge Anchor");
-
- public static final VisualProperty<Double> EDGE_LABEL_ANCHOR_X_OFFSET
- = new
DoubleTwoDVisualProperty(EDGE,0.0,"EDGE_LABEL_ANCHOR_X_OFFSET","Edge Label
Anchor X Offset");
- public static final VisualProperty<Double> EDGE_LABEL_ANCHOR_Y_OFFSET
- = new
DoubleTwoDVisualProperty(EDGE,0.0,"EDGE_LABEL_ANCHOR_Y_OFFSET","Edge Label
Anchor Y Offset");
+ public static final VisualProperty<String> EDGE_TOOLTIP = new
StringTwoDVisualProperty(
+ EDGE, "", "EDGE_TOOLTIP", "Edge Tooltip");
- public static final VisualProperty<Font> EDGE_LABEL_FONT_FACE
- = new FontTwoDVisualProperty(EDGE,new
Font("SansSerif",Font.PLAIN,10),"EDGE_LABEL_FONT_FACE","Edge Label Font Face");
- public static final VisualProperty<Integer> EDGE_LABEL_FONT_SIZE
- = new IntegerTwoDVisualProperty(EDGE,10,"EDGE_LABEL_FONT_SIZE","Edge
Label Font Size");
- public static final VisualProperty<Justify> EDGE_LABEL_JUSTIFY
- = new
JustifyTwoDVisualProperty(EDGE,Justify.LEFT,"EDGE_LABEL_JUSTIFY","Edge Label
Justify");
+ public static final VisualProperty<Anchor> EDGE_LABEL_TEXT_ANCHOR = new
AnchorTwoDVisualProperty(
+ EDGE, Anchor.CENTER, "EDGE_LABEL_TEXT_ANCHOR",
+ "Edge Label Text Anchor");
+ public static final VisualProperty<Anchor> EDGE_LABEL_EDGE_ANCHOR = new
AnchorTwoDVisualProperty(
+ EDGE, Anchor.CENTER, "EDGE_LABEL_EDGE_ANCHOR",
+ "Edge Label Edge Anchor");
+ public static final VisualProperty<Double> EDGE_LABEL_ANCHOR_X_OFFSET =
new DoubleTwoDVisualProperty(
+ EDGE, 0.0, "EDGE_LABEL_ANCHOR_X_OFFSET",
+ "Edge Label Anchor X Offset");
+ public static final VisualProperty<Double> EDGE_LABEL_ANCHOR_Y_OFFSET =
new DoubleTwoDVisualProperty(
+ EDGE, 0.0, "EDGE_LABEL_ANCHOR_Y_OFFSET",
+ "Edge Label Anchor Y Offset");
+ public static final VisualProperty<Font> EDGE_LABEL_FONT_FACE = new
FontTwoDVisualProperty(
+ EDGE, new Font("SansSerif", Font.PLAIN, 10),
+ "EDGE_LABEL_FONT_FACE", "Edge Label Font Face");
+ public static final VisualProperty<Integer> EDGE_LABEL_FONT_SIZE = new
IntegerTwoDVisualProperty(
+ EDGE, 10, "EDGE_LABEL_FONT_SIZE", "Edge Label Font
Size");
+ public static final VisualProperty<Justify> EDGE_LABEL_JUSTIFY = new
JustifyTwoDVisualProperty(
+ EDGE, Justify.LEFT, "EDGE_LABEL_JUSTIFY", "Edge Label
Justify");
public DVisualLexicon() {
super();
@@ -160,26 +180,25 @@
visualPropertySet.add(NODE_BORDER_WIDTH);
visualPropertySet.add(NODE_BORDER_STROKE);
visualPropertySet.add(NODE_WIDTH);
- visualPropertySet.add(NODE_HEIGHT);
+ visualPropertySet.add(NODE_HEIGHT);
visualPropertySet.add(NODE_TRANSPARENCY);
- visualPropertySet.add(EDGE_SELECTED_PAINT);
- visualPropertySet.add(EDGE_STROKE);
- visualPropertySet.add(EDGE_WIDTH);
- visualPropertySet.add(EDGE_SOURCE_ARROW_SELECTED_PAINT);
- visualPropertySet.add(EDGE_TARGET_ARROW_SELECTED_PAINT);
- visualPropertySet.add(EDGE_SOURCE_ARROW_UNSELECTED_PAINT);
- visualPropertySet.add(EDGE_TARGET_ARROW_UNSELECTED_PAINT);
- visualPropertySet.add(EDGE_SOURCE_ARROW_SHAPE);
- visualPropertySet.add(EDGE_TARGET_ARROW_SHAPE);
- visualPropertySet.add(EDGE_TOOLTIP);
- visualPropertySet.add(EDGE_LABEL_TEXT_ANCHOR);
- visualPropertySet.add(EDGE_LABEL_EDGE_ANCHOR);
- visualPropertySet.add(EDGE_LABEL_ANCHOR_X_OFFSET);
- visualPropertySet.add(EDGE_LABEL_ANCHOR_Y_OFFSET);
- visualPropertySet.add(EDGE_LABEL_FONT_FACE);
- visualPropertySet.add(EDGE_LABEL_FONT_SIZE);
- visualPropertySet.add(EDGE_LABEL_JUSTIFY);
+ visualPropertySet.add(EDGE_SELECTED_PAINT);
+ visualPropertySet.add(EDGE_STROKE);
+ visualPropertySet.add(EDGE_WIDTH);
+ visualPropertySet.add(EDGE_SOURCE_ARROW_SELECTED_PAINT);
+ visualPropertySet.add(EDGE_TARGET_ARROW_SELECTED_PAINT);
+ visualPropertySet.add(EDGE_SOURCE_ARROW_UNSELECTED_PAINT);
+ visualPropertySet.add(EDGE_TARGET_ARROW_UNSELECTED_PAINT);
+ visualPropertySet.add(EDGE_SOURCE_ARROW_SHAPE);
+ visualPropertySet.add(EDGE_TARGET_ARROW_SHAPE);
+ visualPropertySet.add(EDGE_TOOLTIP);
+ visualPropertySet.add(EDGE_LABEL_TEXT_ANCHOR);
+ visualPropertySet.add(EDGE_LABEL_EDGE_ANCHOR);
+ visualPropertySet.add(EDGE_LABEL_ANCHOR_X_OFFSET);
+ visualPropertySet.add(EDGE_LABEL_ANCHOR_Y_OFFSET);
+ visualPropertySet.add(EDGE_LABEL_FONT_FACE);
+ visualPropertySet.add(EDGE_LABEL_FONT_SIZE);
+ visualPropertySet.add(EDGE_LABEL_JUSTIFY);
}
-
+
}
-
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PresentationFactoryImpl.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PresentationFactoryImpl.java
2009-04-29 18:27:06 UTC (rev 16704)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PresentationFactoryImpl.java
2009-04-29 18:28:56 UTC (rev 16705)
@@ -1,27 +1,27 @@
package org.cytoscape.ding.impl;
-import org.cytoscape.model.CyNetwork;
+import java.awt.Component;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.swing.JDesktopPane;
+import javax.swing.JInternalFrame;
+import javax.swing.JPanel;
+
+import org.cytoscape.ding.BirdsEyeView;
+import org.cytoscape.ding.GraphView;
import org.cytoscape.model.CyDataTableFactory;
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
+import org.cytoscape.spacial.SpacialIndex2DFactory;
import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.model.VisualPropertyCatalog;
+import org.cytoscape.view.model.RootVisualLexicon;
+import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.model.events.NetworkViewChangedEvent;
import org.cytoscape.view.model.events.NetworkViewChangedListener;
-import org.cytoscape.view.model.events.NetworkViewChangedEvent;
+import org.cytoscape.view.presentation.NavigationPresentation;
import org.cytoscape.view.presentation.PresentationFactory;
-import org.cytoscape.view.presentation.NavigationPresentation;
-import org.cytoscape.ding.impl.DGraphView;
-import org.cytoscape.ding.GraphViewFactory;
-import org.cytoscape.ding.GraphView;
-import org.cytoscape.ding.BirdsEyeView;
-import org.cytoscape.spacial.SpacialIndex2DFactory;
import org.cytoscape.work.UndoSupport;
-import javax.swing.JInternalFrame;
-import javax.swing.JDesktopPane;
-import javax.swing.JPanel;
-import java.awt.Component;
-import java.util.Map;
-import java.util.HashMap;
public class PresentationFactoryImpl implements PresentationFactory,
NetworkViewChangedListener {
@@ -29,30 +29,35 @@
private CyRootNetworkFactory rootNetworkFactory;
private SpacialIndex2DFactory spacialFactory;
private UndoSupport undo;
- private VisualPropertyCatalog vpc;
+ private RootVisualLexicon rootLexicon;
+ private VisualLexicon dingLexicon;
private Map<CyNetworkView, GraphView> viewMap;
public PresentationFactoryImpl(CyDataTableFactory dataTableFactory,
CyRootNetworkFactory rootNetworkFactory,
UndoSupport
undo, SpacialIndex2DFactory spacialFactory,
-
VisualPropertyCatalog vpc) {
+
RootVisualLexicon vpc, VisualLexicon dingLexicon) {
this.dataTableFactory = dataTableFactory;
this.rootNetworkFactory = rootNetworkFactory;
this.spacialFactory = spacialFactory;
this.undo = undo;
- this.vpc = vpc;
+ this.rootLexicon = vpc;
+ this.dingLexicon = dingLexicon;
viewMap = new HashMap<CyNetworkView, GraphView>();
}
public void addPresentation(Object frame, CyNetworkView view) {
+
+ System.out.println("########################### add
Presentation: " + view.getSUID());
+
if ( view == null )
throw new NullPointerException("CyNetworkView is null");
if ( frame instanceof JInternalFrame ) {
JInternalFrame inFrame = (JInternalFrame)frame;
JDesktopPane desktopPane = inFrame.getDesktopPane();
- DGraphView dgv = new
DGraphView(view,dataTableFactory,rootNetworkFactory,undo,spacialFactory,vpc);
+ DGraphView dgv = new
DGraphView(view,dataTableFactory,rootNetworkFactory,undo,spacialFactory,rootLexicon,
dingLexicon);
viewMap.put(view, dgv);
// TODO - not sure this layered pane bit is optimal
Modified:
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-04-29 18:27:06 UTC (rev 16704)
+++
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-04-29 18:28:56 UTC (rev 16705)
@@ -21,8 +21,8 @@
interface="org.cytoscape.spacial.SpacialIndex2DFactory">
</osgi:reference>
- <osgi:reference id="visualPropertyCatalogServiceRef"
-
interface="org.cytoscape.view.model.VisualPropertyCatalog">
+ <osgi:reference id="rootVisualLexiconServiceRef"
+ interface="org.cytoscape.view.model.RootVisualLexicon">
</osgi:reference>
@@ -35,7 +35,7 @@
</osgi:service>
<osgi:service id="dVisualLexiconService"
- ref="dVisualLexicon"
interface="org.cytoscape.view.model.Renderer">
+ ref="dVisualLexicon"
interface="org.cytoscape.view.model.VisualLexicon">
</osgi:service>
</beans>
Modified:
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2009-04-29 18:27:06 UTC (rev 16704)
+++
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2009-04-29 18:28:56 UTC (rev 16705)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:aop="http://www.springframework.org/schema/aop";
- xmlns:context="http://www.springframework.org/schema/context";
- xmlns:lang="http://www.springframework.org/schema/lang";
xmlns:osgi="http://www.springframework.org/schema/osgi";
- xsi:schemaLocation="
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:aop="http://www.springframework.org/schema/aop";
+ xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:lang="http://www.springframework.org/schema/lang";
xmlns:osgi="http://www.springframework.org/schema/osgi";
+ xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/aop
@@ -12,19 +12,19 @@
http://www.springframework.org/schema/context/spring-context-2.5.xsd
http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
- default-lazy-init="false">
+ default-lazy-init="false">
- <context:annotation-config />
+ <context:annotation-config />
+ <bean id="dVisualLexicon"
class="org.cytoscape.ding.impl.DVisualLexicon" />
<bean id="presentationFactory"
class="org.cytoscape.ding.impl.PresentationFactoryImpl">
- <constructor-arg ref="cyDataTableFactoryServiceRef"/>
- <constructor-arg ref="cyRootNetworkFactoryServiceRef"/>
- <constructor-arg ref="undoSupportServiceRef"/>
- <constructor-arg ref="spacialIndex2DFactoryServiceRef"/>
- <constructor-arg ref="visualPropertyCatalogServiceRef"/>
+ <constructor-arg ref="cyDataTableFactoryServiceRef" />
+ <constructor-arg ref="cyRootNetworkFactoryServiceRef" />
+ <constructor-arg ref="undoSupportServiceRef" />
+ <constructor-arg ref="spacialIndex2DFactoryServiceRef" />
+ <constructor-arg ref="rootVisualLexiconServiceRef" />
+ <constructor-arg ref="dVisualLexicon" />
</bean>
- <bean id="dVisualLexicon"
class="org.cytoscape.ding.impl.DVisualLexicon"/>
-
</beans>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
