[graphl-cvs] graphl/src/org/mediavirus/graphl/painter ImageNodePainter.java StraightLineEdgePainter.
Status: Pre-Alpha
Brought to you by:
flo1
Menu
▾
▴
[graphl-cvs] graphl/src/org/mediavirus/graphl/painter ImageNodePainter.java StraightLineEdgePainter.java LineEdgePainter.java ManhattanEdgePainter.java AbstractEdgePainter.java BoxNodePainter.java LineEdgePainterController.java InvisibleEdgePainter.java ReificationNodePainter.java NodePainter.java InvisibleNodePainter.java EdgePainter.java ArrowEdgePainter.java
|
From: Flo L. <fl...@us...> - 2004-08-21 22:31:47
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32158/src/org/mediavirus/graphl/painter Modified Files: ImageNodePainter.java StraightLineEdgePainter.java LineEdgePainter.java ManhattanEdgePainter.java AbstractEdgePainter.java BoxNodePainter.java LineEdgePainterController.java InvisibleEdgePainter.java ReificationNodePainter.java NodePainter.java InvisibleNodePainter.java EdgePainter.java ArrowEdgePainter.java Log Message: * added martin klinke's contributions (File>New and mousewheel zooming) * implemented facet configuration from rdf config file * added configuration data to config.rdf * removed historic JGraphPane, merged with GraphlPane * factored out vocabulary registry mechanism from GraphlPane Index: LineEdgePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/LineEdgePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LineEdgePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- LineEdgePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 14,19 **** import javax.swing.JComponent; import org.mediavirus.graphl.graph.Edge; ! import org.mediavirus.graphl.view.JGraphPane; import org.mediavirus.graphl.view.LabelGenerator; --- 14,21 ---- import javax.swing.JComponent; + import org.mediavirus.graphl.GraphlPane; import org.mediavirus.graphl.graph.Edge; ! import org.mediavirus.graphl.graph.Node; ! import org.mediavirus.graphl.graph.rdf.RDFEdge; import org.mediavirus.graphl.view.LabelGenerator; *************** *** 30,35 **** protected float segmentLength = 1.0f; ! protected boolean paintingArrow = true; ! protected boolean paintingLabel = true; Stroke stroke; --- 32,37 ---- protected float segmentLength = 1.0f; ! protected boolean paintArrow = true; ! protected boolean paintLabel = true; Stroke stroke; *************** *** 49,54 **** this.lineWidth = lineWidth; this.lineStyle = lineStyle; ! this.paintingArrow = paintingArrow; ! this.paintingLabel = paintingLabel; labelGenerator = new LabelGenerator(LabelGenerator.TYPE,"",true); --- 51,56 ---- this.lineWidth = lineWidth; this.lineStyle = lineStyle; ! this.paintArrow = paintingArrow; ! this.paintLabel = paintingLabel; labelGenerator = new LabelGenerator(LabelGenerator.TYPE,"",true); *************** *** 81,85 **** * @see de.fzi.wim.guibase.graphview.view.EdgePainter#paintEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Edge) */ ! public void paintEdge(JGraphPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { //DraggingManipulator draggingManipulator = (DraggingManipulator)graphPane.getManipulator(DraggingManipulator.NAME); //boolean isDragging = draggingManipulator!=null && draggingManipulator.getDraggedEdge()==edge; --- 83,87 ---- * @see de.fzi.wim.guibase.graphview.view.EdgePainter#paintEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Edge) */ ! public void paintEdge(GraphlPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { //DraggingManipulator draggingManipulator = (DraggingManipulator)graphPane.getManipulator(DraggingManipulator.NAME); //boolean isDragging = draggingManipulator!=null && draggingManipulator.getDraggedEdge()==edge; *************** *** 96,100 **** * @param isDragging */ ! abstract void doPaintEdge(JGraphPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted); /** --- 98,102 ---- * @param isDragging */ ! abstract void doPaintEdge(GraphlPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted); /** *************** *** 102,106 **** */ public void getEdgeScreenBounds( ! JGraphPane graphPane, Edge edge, Rectangle edgeScreenRectangle) { --- 104,108 ---- */ public void getEdgeScreenBounds( ! GraphlPane graphPane, Edge edge, Rectangle edgeScreenRectangle) { *************** *** 145,150 **** * @return */ ! public boolean isPaintingArrow() { ! return paintingArrow; } --- 147,152 ---- * @return */ ! public boolean isPaintArrow() { ! return paintArrow; } *************** *** 152,157 **** * @param b */ ! public void setPaintingArrow(boolean b) { ! paintingArrow = b; } --- 154,159 ---- * @param b */ ! public void setPaintArrow(boolean b) { ! paintArrow = b; } *************** *** 176,181 **** * @return */ ! public boolean isPaintingLabel() { ! return paintingLabel; } --- 178,183 ---- * @return */ ! public boolean isPaintLabel() { ! return paintLabel; } *************** *** 183,188 **** * @param b */ ! public void setPaintingLabel(boolean b) { ! paintingLabel = b; } --- 185,190 ---- * @param b */ ! public void setPaintLabel(boolean b) { ! paintLabel = b; } *************** *** 219,223 **** * Overrides @see de.fzi.wim.guibase.graphview.view.EdgePainter#screenDistanceFromEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Edge, java.awt.Point) */ ! public abstract double screenDistanceFromEdge(JGraphPane graphPane, Edge edge, Point point); /** --- 221,225 ---- * Overrides @see de.fzi.wim.guibase.graphview.view.EdgePainter#screenDistanceFromEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Edge, java.awt.Point) */ ! public abstract double screenDistanceFromEdge(GraphlPane graphPane, Edge edge, Point point); /** *************** *** 242,244 **** --- 244,293 ---- return segmentLength; } + + + /* + * Overrides @see org.mediavirus.graphl.painter.EdgePainter#isPointInLabel(org.mediavirus.graphl.GraphlPane, org.mediavirus.graphl.graph.rdf.RDFEdge, java.awt.Point) + */ + public boolean isPointInLabel(GraphlPane graphPane, RDFEdge edge, + Point point) { + // TODO Auto-generated method stub + return false; + } + /* + * Overrides @see org.mediavirus.graphl.view.Facet#getName() + */ + public String getName() { + // TODO Auto-generated method stub + return null; + } + /* + * Overrides @see org.mediavirus.graphl.view.Facet#isSameClass(java.lang.Object) + */ + public boolean isSameClass(Object o) { + // TODO Auto-generated method stub + return false; + } + /* + * Overrides @see org.mediavirus.graphl.view.Facet#setConfigurationNode(org.mediavirus.graphl.graph.Node) + */ + public void setConfigurationNode(Node node) { + if (node.getProperty("http://www.mediavirus.org/graphl#paintArrow") != null) { + setPaintArrow(node.getProperty("http://www.mediavirus.org/graphl#paintArrow").equalsIgnoreCase("true")); + } + if (node.getProperty("http://www.mediavirus.org/graphl#paintLabel") != null) { + setPaintLabel(node.getProperty("http://www.mediavirus.org/graphl#paintLabel").equalsIgnoreCase("true")); + } + String styleStr = node.getProperty("http://www.mediavirus.org/graphl#lineStyle"); + if ( styleStr != null) { + if (styleStr.equalsIgnoreCase("dotted")) { + setLineStyle(DOTTED); + } + else if (styleStr.equalsIgnoreCase("dashed")) { + setLineStyle(DASHED); + } + else { + setLineStyle(SOLID); + } + } + } } Index: ArrowEdgePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/ArrowEdgePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ArrowEdgePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- ArrowEdgePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 11,15 **** import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.rdf.RDFEdge; - import org.mediavirus.graphl.view.JGraphPane; /** --- 11,14 ---- *************** *** 29,33 **** * @param edge the edge to paint */ ! public void paintEdge(JGraphPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { Point from=graphPane.getScreenPointForNode(edge.getFrom()); Point to=graphPane.getScreenPointForNode(edge.getTo()); --- 28,32 ---- * @param edge the edge to paint */ ! public void paintEdge(GraphlPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { Point from=graphPane.getScreenPointForNode(edge.getFrom()); Point to=graphPane.getScreenPointForNode(edge.getTo()); *************** *** 92,96 **** * @return the distance of the point from the edge */ ! public double screenDistanceFromEdge(JGraphPane graphPane,Graphics2D g,Edge edge,Point point) { double px=point.x; double py=point.y; --- 91,95 ---- * @return the distance of the point from the edge */ ! public double screenDistanceFromEdge(GraphlPane graphPane, Edge edge, Point point) { double px=point.x; double py=point.y; *************** *** 117,121 **** * @param edgeScreenRectangle the rectangle receiving the edge's coordinates */ ! public void getEdgeScreenBounds(JGraphPane graphPane,Edge edge,Rectangle edgeScreenRectangle) { Point from=graphPane.getScreenPointForNode(edge.getFrom()); Point to=graphPane.getScreenPointForNode(edge.getTo()); --- 116,120 ---- * @param edgeScreenRectangle the rectangle receiving the edge's coordinates */ ! public void getEdgeScreenBounds(GraphlPane graphPane, Edge edge, Rectangle edgeScreenRectangle) { Point from=graphPane.getScreenPointForNode(edge.getFrom()); Point to=graphPane.getScreenPointForNode(edge.getTo()); Index: ReificationNodePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/ReificationNodePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ReificationNodePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- ReificationNodePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 12,18 **** import javax.swing.JComponent; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; - import org.mediavirus.graphl.view.JGraphPane; /** --- 12,18 ---- import javax.swing.JComponent; + import org.mediavirus.graphl.GraphlPane; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; /** *************** *** 27,31 **** * @see de.fzi.wim.guibase.graphview.view.NodePainter#paintNode(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Node) */ ! public void paintNode(JGraphPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted) { Point nodePoint = graphPane.getScreenPointForNode(node); g.setColor(new Color(255,250,168)); --- 27,31 ---- * @see de.fzi.wim.guibase.graphview.view.NodePainter#paintNode(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Node) */ ! public void paintNode(GraphlPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted) { Point nodePoint = graphPane.getScreenPointForNode(node); g.setColor(new Color(255,250,168)); *************** *** 38,42 **** * @see de.fzi.wim.guibase.graphview.view.NodePainter#isInNode(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Point) */ ! public boolean isInNode(JGraphPane graphPane, Node node, Point point) { Point nodePoint = graphPane.getScreenPointForNode(node); return Math.sqrt((nodePoint.getX()-point.getX())*(nodePoint.getX()-point.getX())+(nodePoint.getY()-point.getY())*(nodePoint.getY()-point.getY())) < 5; --- 38,42 ---- * @see de.fzi.wim.guibase.graphview.view.NodePainter#isInNode(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Point) */ ! public boolean isInNode(GraphlPane graphPane, Node node, Point point) { Point nodePoint = graphPane.getScreenPointForNode(node); return Math.sqrt((nodePoint.getX()-point.getX())*(nodePoint.getX()-point.getX())+(nodePoint.getY()-point.getY())*(nodePoint.getY()-point.getY())) < 5; *************** *** 46,50 **** * @see de.fzi.wim.guibase.graphview.view.NodePainter#getNodeScreenBounds(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Rectangle) */ ! public void getNodeScreenBounds(JGraphPane graphPane, Node node, Rectangle nodeScreenRectangle) { Point nodePoint = graphPane.getScreenPointForNode(node); nodeScreenRectangle.setRect(nodePoint.x-4, nodePoint.y-4, 8, 8); --- 46,50 ---- * @see de.fzi.wim.guibase.graphview.view.NodePainter#getNodeScreenBounds(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Rectangle) */ ! public void getNodeScreenBounds(GraphlPane graphPane, Node node, Rectangle nodeScreenRectangle) { Point nodePoint = graphPane.getScreenPointForNode(node); nodeScreenRectangle.setRect(nodePoint.x-4, nodePoint.y-4, 8, 8); *************** *** 55,59 **** */ public String getToolTipText( ! JGraphPane graphPane, Node node, Point point) { --- 55,59 ---- */ public String getToolTipText( ! GraphlPane graphPane, Node node, Point point) { *************** *** 64,68 **** * Overrides @see org.mediavirus.graphl.view.NodePainter#isEdgeDragPoint(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Point) */ ! public boolean isEdgeDragPoint(JGraphPane graphPane, Node node, Point p) { return false; } --- 64,68 ---- * Overrides @see org.mediavirus.graphl.view.NodePainter#isEdgeDragPoint(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Point) */ ! public boolean isEdgeDragPoint(GraphlPane graphPane, Node node, Point p) { return false; } Index: StraightLineEdgePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/StraightLineEdgePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StraightLineEdgePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- StraightLineEdgePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 19,23 **** import org.mediavirus.graphl.graph.Node; import org.mediavirus.graphl.graph.rdf.RDFEdge; - import org.mediavirus.graphl.view.JGraphPane; /** --- 19,22 ---- *************** *** 43,47 **** */ public double screenDistanceFromEdge( ! JGraphPane graphPane, Edge edge, Point point) { --- 42,46 ---- */ public double screenDistanceFromEdge( ! GraphlPane graphPane, Edge edge, Point point) { *************** *** 67,71 **** * @see org.mediavirus.graphl.painter.LineEdgePainter#doPaintEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Edge, boolean, boolean) */ ! void doPaintEdge(JGraphPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { Point from = graphPane.getScreenPointForNode(edge.getFrom()); Point to = graphPane.getScreenPointForNode(edge.getTo()); --- 66,70 ---- * @see org.mediavirus.graphl.painter.LineEdgePainter#doPaintEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Edge, boolean, boolean) */ ! void doPaintEdge(GraphlPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { Point from = graphPane.getScreenPointForNode(edge.getFrom()); Point to = graphPane.getScreenPointForNode(edge.getTo()); *************** *** 83,87 **** sourceNodePainter.getNodeScreenBounds(graphPane, sourceNode, sourceNodeRectangle); ! if (isPaintingArrow()) { targetNodeRectangle.grow(2,2); //sourceNodeRectangle.grow(-3,-3); --- 82,86 ---- sourceNodePainter.getNodeScreenBounds(graphPane, sourceNode, sourceNodeRectangle); ! if (isPaintArrow()) { targetNodeRectangle.grow(2,2); //sourceNodeRectangle.grow(-3,-3); *************** *** 105,109 **** g.setColor(oldColor); ! if (isPaintingArrow() || isPaintingLabel()) { int x = (from.x+to.x)/2; --- 104,108 ---- g.setColor(oldColor); ! if (isPaintArrow() || isPaintLabel()) { int x = (from.x+to.x)/2; *************** *** 124,128 **** g.rotate(angle,x,y); ! if (isPaintingArrow()) { if (flipped) { paintArrow(g,x+5,y,x-5,y); --- 123,127 ---- g.rotate(angle,x,y); ! if (isPaintArrow()) { if (flipped) { paintArrow(g,x+5,y,x-5,y); *************** *** 132,136 **** } } ! if (isPaintingLabel()){ String label = labelGenerator.getLabel(edge); if (label != null){ --- 131,135 ---- } } ! if (isPaintLabel()){ String label = labelGenerator.getLabel(edge); if (label != null){ *************** *** 244,248 **** */ public boolean isPointInLabel(GraphlPane graphPane, RDFEdge edge, Point point) { ! if (isPaintingLabel()) { String label = edge.getValue(); if (label != null){ --- 243,247 ---- */ public boolean isPointInLabel(GraphlPane graphPane, RDFEdge edge, Point point) { ! if (isPaintLabel()) { String label = edge.getValue(); if (label != null){ *************** *** 282,286 **** public Object clone() { ! StraightLineEdgePainter p = new StraightLineEdgePainter(lineWidth, lineStyle, paintingArrow, paintingLabel, font.getSize()); return p; } --- 281,285 ---- public Object clone() { ! StraightLineEdgePainter p = new StraightLineEdgePainter(lineWidth, lineStyle, paintArrow, paintLabel, font.getSize()); return p; } *************** *** 293,297 **** * Overrides @see org.mediavirus.graphl.view.GraphlEdgePainter#getLength(org.mediavirus.graphl.RDFEdge) */ ! public double getLength(RDFEdge edge) { return edge.getLength(); } --- 292,296 ---- * Overrides @see org.mediavirus.graphl.view.GraphlEdgePainter#getLength(org.mediavirus.graphl.RDFEdge) */ ! public double getLength(Edge edge) { return edge.getLength(); } Index: ImageNodePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/ImageNodePainter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ImageNodePainter.java 20 Aug 2004 12:38:52 -0000 1.2 --- ImageNodePainter.java 21 Aug 2004 22:31:01 -0000 1.3 *************** *** 21,27 **** import javax.swing.JComponent; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; - import org.mediavirus.graphl.view.JGraphPane; --- 21,27 ---- import javax.swing.JComponent; + import org.mediavirus.graphl.GraphlPane; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; *************** *** 59,63 **** * Overrides @see org.mediavirus.graphl.view.NodePainter#paintNode(org.mediavirus.graphl.view.JGraphPane, java.awt.Graphics2D, org.mediavirus.graphl.graph.Node) */ ! public void paintNode(JGraphPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted) { Image img = getImage(node, graphPane.getGraph().getBaseURL()); if (img != null) { --- 59,63 ---- * Overrides @see org.mediavirus.graphl.view.NodePainter#paintNode(org.mediavirus.graphl.view.JGraphPane, java.awt.Graphics2D, org.mediavirus.graphl.graph.Node) */ ! public void paintNode(GraphlPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted) { Image img = getImage(node, graphPane.getGraph().getBaseURL()); if (img != null) { *************** *** 141,145 **** * Overrides @see org.mediavirus.graphl.view.NodePainter#isInNode(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Point) */ ! public boolean isInNode(JGraphPane graphPane, Node node, Point point) { Rectangle nodeScreenRectangle=new Rectangle(); getNodeScreenBounds(graphPane,node,nodeScreenRectangle); --- 141,145 ---- * Overrides @see org.mediavirus.graphl.view.NodePainter#isInNode(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Point) */ ! public boolean isInNode(GraphlPane graphPane, Node node, Point point) { Rectangle nodeScreenRectangle=new Rectangle(); getNodeScreenBounds(graphPane,node,nodeScreenRectangle); *************** *** 151,155 **** * Overrides @see org.mediavirus.graphl.view.NodePainter#getNodeScreenBounds(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Rectangle) */ ! public void getNodeScreenBounds(JGraphPane graphPane, Node node, Rectangle nodeScreenRectangle) { Point nodePoint=graphPane.getScreenPointForNode(node); int width=1; --- 151,155 ---- * Overrides @see org.mediavirus.graphl.view.NodePainter#getNodeScreenBounds(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Rectangle) */ ! public void getNodeScreenBounds(GraphlPane graphPane, Node node, Rectangle nodeScreenRectangle) { Point nodePoint=graphPane.getScreenPointForNode(node); int width=1; *************** *** 167,171 **** * Overrides @see org.mediavirus.graphl.view.NodePainter#getToolTipText(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Point) */ ! public String getToolTipText(JGraphPane graphPane, Node node, Point point) { return node.getValue(); } --- 167,171 ---- * Overrides @see org.mediavirus.graphl.view.NodePainter#getToolTipText(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Point) */ ! public String getToolTipText(GraphlPane graphPane, Node node, Point point) { return node.getValue(); } *************** *** 175,179 **** * Overrides @see org.mediavirus.graphl.view.NodePainter#isEdgeDragPoint(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Point) */ ! public boolean isEdgeDragPoint(JGraphPane graphPane, Node node, Point p) { // TODO (2) implement this --- 175,179 ---- * Overrides @see org.mediavirus.graphl.view.NodePainter#isEdgeDragPoint(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Point) */ ! public boolean isEdgeDragPoint(GraphlPane graphPane, Node node, Point p) { // TODO (2) implement this Index: InvisibleNodePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/InvisibleNodePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** InvisibleNodePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- InvisibleNodePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 11,17 **** import javax.swing.JComponent; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; - import org.mediavirus.graphl.view.JGraphPane; /** --- 11,17 ---- import javax.swing.JComponent; + import org.mediavirus.graphl.GraphlPane; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; /** *************** *** 26,30 **** * Overrides @see org.mediavirus.graphl.view.GraphlNodePainter#isEdgeDragPoint(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Point) */ ! public boolean isEdgeDragPoint(JGraphPane graphPane, Node node, Point p) { return false; } --- 26,30 ---- * Overrides @see org.mediavirus.graphl.view.GraphlNodePainter#isEdgeDragPoint(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Point) */ ! public boolean isEdgeDragPoint(GraphlPane graphPane, Node node, Point p) { return false; } *************** *** 50,54 **** * Overrides @see de.fzi.wim.guibase.graphview.view.NodePainter#paintNode(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Node) */ ! public void paintNode(JGraphPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted) { } --- 50,54 ---- * Overrides @see de.fzi.wim.guibase.graphview.view.NodePainter#paintNode(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Node) */ ! public void paintNode(GraphlPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted) { } *************** *** 57,61 **** * Overrides @see de.fzi.wim.guibase.graphview.view.NodePainter#isInNode(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Point) */ ! public boolean isInNode(JGraphPane graphPane, Node node, Point point) { Rectangle nodeScreenRectangle=new Rectangle(); Point nodePoint=graphPane.getScreenPointForNode(node); --- 57,61 ---- * Overrides @see de.fzi.wim.guibase.graphview.view.NodePainter#isInNode(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Point) */ ! public boolean isInNode(GraphlPane graphPane, Node node, Point point) { Rectangle nodeScreenRectangle=new Rectangle(); Point nodePoint=graphPane.getScreenPointForNode(node); *************** *** 68,72 **** * Overrides @see de.fzi.wim.guibase.graphview.view.NodePainter#getNodeScreenBounds(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Rectangle) */ ! public void getNodeScreenBounds(JGraphPane graphPane, Node node, Rectangle nodeScreenRectangle) { Point p=graphPane.getScreenPointForNode(node); nodeScreenRectangle.setFrame(p.x,p.y,1,1); --- 68,72 ---- * Overrides @see de.fzi.wim.guibase.graphview.view.NodePainter#getNodeScreenBounds(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Rectangle) */ ! public void getNodeScreenBounds(GraphlPane graphPane, Node node, Rectangle nodeScreenRectangle) { Point p=graphPane.getScreenPointForNode(node); nodeScreenRectangle.setFrame(p.x,p.y,1,1); *************** *** 77,81 **** * Overrides @see de.fzi.wim.guibase.graphview.view.NodePainter#getToolTipText(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Point) */ ! public String getToolTipText(JGraphPane graphPane, Node node, Point point) { return null; } --- 77,81 ---- * Overrides @see de.fzi.wim.guibase.graphview.view.NodePainter#getToolTipText(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Point) */ ! public String getToolTipText(GraphlPane graphPane, Node node, Point point) { return null; } Index: NodePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/NodePainter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NodePainter.java 20 Aug 2004 12:38:52 -0000 1.2 --- NodePainter.java 21 Aug 2004 22:31:01 -0000 1.3 *************** *** 5,12 **** import java.awt.Rectangle; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; import org.mediavirus.graphl.view.Facet; - import org.mediavirus.graphl.view.JGraphPane; /** --- 5,12 ---- import java.awt.Rectangle; + import org.mediavirus.graphl.GraphlPane; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; import org.mediavirus.graphl.view.Facet; /** *************** *** 21,25 **** * @param node the node to paint */ ! void paintNode(JGraphPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted); /** * Checks whether given point is inside the node. --- 21,25 ---- * @param node the node to paint */ ! void paintNode(GraphlPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted); /** * Checks whether given point is inside the node. *************** *** 30,34 **** * @return <code>true</code> if the point is in the node */ ! boolean isInNode(JGraphPane graphPane,Node node,Point point); /** * Returns the outer rectangle of the node on screen. --- 30,34 ---- * @return <code>true</code> if the point is in the node */ ! boolean isInNode(GraphlPane graphPane,Node node,Point point); /** * Returns the outer rectangle of the node on screen. *************** *** 38,42 **** * @param nodeScreenRectangle the rectangle receiving the node's coordinates */ ! void getNodeScreenBounds(JGraphPane graphPane,Node node,Rectangle nodeScreenRectangle); /** * Returns the tool-tip for given point. --- 38,42 ---- * @param nodeScreenRectangle the rectangle receiving the node's coordinates */ ! void getNodeScreenBounds(GraphlPane graphPane,Node node,Rectangle nodeScreenRectangle); /** * Returns the tool-tip for given point. *************** *** 47,53 **** * @return the tool-tip at given point (or <code>null</code>) */ ! String getToolTipText(JGraphPane graphPane,Node node,Point point); ! public boolean isEdgeDragPoint(JGraphPane graphPane,Node node,Point p); /** --- 47,53 ---- * @return the tool-tip at given point (or <code>null</code>) */ ! String getToolTipText(GraphlPane graphPane,Node node,Point point); ! public boolean isEdgeDragPoint(GraphlPane graphPane,Node node,Point p); /** Index: LineEdgePainterController.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/LineEdgePainterController.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LineEdgePainterController.java 2 Aug 2004 12:36:49 -0000 1.1 --- LineEdgePainterController.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 179,184 **** isUpdating = true; ! getPaintLabelCheckBox().setSelected(painter.isPaintingLabel()); ! boolean temp = painter.isPaintingArrow(); JCheckBox box = getPaintArrowCheckBox(); box.setSelected(temp); --- 179,184 ---- isUpdating = true; ! getPaintLabelCheckBox().setSelected(painter.isPaintLabel()); ! boolean temp = painter.isPaintArrow(); JCheckBox box = getPaintArrowCheckBox(); box.setSelected(temp); *************** *** 193,198 **** painter.setLineWidth(getWidthSlider().getValue()/10.0f); painter.setLineStyle(getLineTypeComboBox().getSelectedIndex()); ! painter.setPaintingArrow(getPaintArrowCheckBox().isSelected()); ! painter.setPaintingLabel(getPaintLabelCheckBox().isSelected()); } } --- 193,198 ---- painter.setLineWidth(getWidthSlider().getValue()/10.0f); painter.setLineStyle(getLineTypeComboBox().getSelectedIndex()); ! painter.setPaintArrow(getPaintArrowCheckBox().isSelected()); ! painter.setPaintLabel(getPaintLabelCheckBox().isSelected()); } } Index: ManhattanEdgePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/ManhattanEdgePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ManhattanEdgePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- ManhattanEdgePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 13,17 **** import org.mediavirus.graphl.graph.Node; import org.mediavirus.graphl.graph.rdf.RDFEdge; - import org.mediavirus.graphl.view.JGraphPane; /** --- 13,16 ---- *************** *** 24,28 **** * @see org.mediavirus.graphl.painter.LineEdgePainter#doPaintEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Edge, boolean, boolean) */ ! void doPaintEdge(JGraphPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { g.setStroke(getStroke(selected, highlighted)); --- 23,27 ---- * @see org.mediavirus.graphl.painter.LineEdgePainter#doPaintEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Edge, boolean, boolean) */ ! void doPaintEdge(GraphlPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { g.setStroke(getStroke(selected, highlighted)); *************** *** 42,46 **** */ public double screenDistanceFromEdge( ! JGraphPane graphPane, Edge edge, Point point) { --- 41,45 ---- */ public double screenDistanceFromEdge( ! GraphlPane graphPane, Edge edge, Point point) { *************** *** 82,86 **** } ! protected Point[] getVertices(JGraphPane graphPane, Edge edge){ //TODO (2): distribute incoming & outgoing connections across side of node (3h) Node src = edge.getFrom(); --- 81,85 ---- } ! protected Point[] getVertices(GraphlPane graphPane, Edge edge){ //TODO (2): distribute incoming & outgoing connections across side of node (3h) Node src = edge.getFrom(); Index: AbstractEdgePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/AbstractEdgePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AbstractEdgePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- AbstractEdgePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 4,10 **** import java.awt.Rectangle; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.view.AbstractFacet; - import org.mediavirus.graphl.view.JGraphPane; /** --- 4,10 ---- import java.awt.Rectangle; + import org.mediavirus.graphl.GraphlPane; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.view.AbstractFacet; /** *************** *** 20,24 **** * @return the distance of the point from the edge */ ! public double screenDistanceFromEdge(JGraphPane graphPane,Edge edge,Point point) { double px=point.x; double py=point.y; --- 20,24 ---- * @return the distance of the point from the edge */ ! public double screenDistanceFromEdge(GraphlPane graphPane, Edge edge, Point point) { double px=point.x; double py=point.y; *************** *** 45,49 **** * @param edgeScreenRectangle the rectangle receiving the edge's coordinates */ ! public void getEdgeScreenBounds(JGraphPane graphPane,Edge edge,Rectangle edgeScreenRectangle) { Point from=graphPane.getScreenPointForNode(edge.getFrom()); Point to=graphPane.getScreenPointForNode(edge.getTo()); --- 45,49 ---- * @param edgeScreenRectangle the rectangle receiving the edge's coordinates */ ! public void getEdgeScreenBounds(GraphlPane graphPane,Edge edge,Rectangle edgeScreenRectangle) { Point from=graphPane.getScreenPointForNode(edge.getFrom()); Point to=graphPane.getScreenPointForNode(edge.getTo()); Index: BoxNodePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/BoxNodePainter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BoxNodePainter.java 20 Aug 2004 12:38:52 -0000 1.2 --- BoxNodePainter.java 21 Aug 2004 22:31:01 -0000 1.3 *************** *** 13,23 **** import java.awt.Rectangle; import java.awt.Stroke; - import java.util.Iterator; import javax.swing.JComponent; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; - import org.mediavirus.graphl.view.JGraphPane; import org.mediavirus.graphl.view.LabelGenerator; --- 13,22 ---- import java.awt.Rectangle; import java.awt.Stroke; import javax.swing.JComponent; + import org.mediavirus.graphl.GraphlPane; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; import org.mediavirus.graphl.view.LabelGenerator; *************** *** 81,85 **** */ public String getToolTipText( ! JGraphPane graphPane, Node node, Point point) { --- 80,84 ---- */ public String getToolTipText( ! GraphlPane graphPane, Node node, Point point) { *************** *** 155,159 **** * @param node the node to paint */ ! public void paintNode(JGraphPane graphPane,Graphics2D g,Node node, boolean selected, boolean highlighted) { //DraggingManipulator draggingManipulator=(DraggingManipulator)graphPane.getManipulator(DraggingManipulator.NAME); boolean isDragging=false; //draggingManipulator!=null && draggingManipulator.getDraggedNode()==node; --- 154,158 ---- * @param node the node to paint */ ! public void paintNode(GraphlPane graphPane,Graphics2D g,Node node, boolean selected, boolean highlighted) { //DraggingManipulator draggingManipulator=(DraggingManipulator)graphPane.getManipulator(DraggingManipulator.NAME); boolean isDragging=false; //draggingManipulator!=null && draggingManipulator.getDraggedNode()==node; *************** *** 199,203 **** * @param nodeScreenRectangle the rectangle receiving the node's coordinates */ ! public void getNodeScreenBounds(JGraphPane graphPane,Node node,Rectangle nodeScreenRectangle) { Point nodePoint=graphPane.getScreenPointForNode(node); String label = labelGenerator.getLabel(node); --- 198,202 ---- * @param nodeScreenRectangle the rectangle receiving the node's coordinates */ ! public void getNodeScreenBounds(GraphlPane graphPane,Node node,Rectangle nodeScreenRectangle) { Point nodePoint=graphPane.getScreenPointForNode(node); String label = labelGenerator.getLabel(node); *************** *** 218,222 **** * Overrides @see org.mediavirus.graphl.view.GraphlNodePainter#isEdgeDragPoint(java.awt.Point) */ ! public boolean isEdgeDragPoint(JGraphPane graphPane,Node node,Point p) { Rectangle r = new Rectangle(); getNodeScreenBounds(graphPane, node, r); --- 217,221 ---- * Overrides @see org.mediavirus.graphl.view.GraphlNodePainter#isEdgeDragPoint(java.awt.Point) */ ! public boolean isEdgeDragPoint(GraphlPane graphPane,Node node,Point p) { Rectangle r = new Rectangle(); getNodeScreenBounds(graphPane, node, r); *************** *** 238,242 **** * @return <code>true</code> if the point is in the node */ ! public boolean isInNode(JGraphPane graphPane,Node node,Point point) { Rectangle nodeScreenRectangle=new Rectangle(); getNodeScreenBounds(graphPane,node,nodeScreenRectangle); --- 237,241 ---- * @return <code>true</code> if the point is in the node */ ! public boolean isInNode(GraphlPane graphPane,Node node,Point point) { Rectangle nodeScreenRectangle=new Rectangle(); getNodeScreenBounds(graphPane,node,nodeScreenRectangle); Index: InvisibleEdgePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/InvisibleEdgePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** InvisibleEdgePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- InvisibleEdgePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 14,18 **** import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.rdf.RDFEdge; - import org.mediavirus.graphl.view.JGraphPane; /** --- 14,17 ---- *************** *** 82,86 **** * Overrides @see de.fzi.wim.guibase.graphview.view.EdgePainter#paintEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Edge) */ ! public void paintEdge(JGraphPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { if (showPins) { Rectangle r = new Rectangle(); --- 81,85 ---- * Overrides @see de.fzi.wim.guibase.graphview.view.EdgePainter#paintEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Edge) */ ! public void paintEdge(GraphlPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { if (showPins) { Rectangle r = new Rectangle(); *************** *** 96,100 **** * Overrides @see de.fzi.wim.guibase.graphview.view.EdgePainter#screenDistanceFromEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Edge, java.awt.Point) */ ! public double screenDistanceFromEdge(JGraphPane graphPane, Edge edge, Point point) { if (showPins) { Rectangle r = new Rectangle(); --- 95,99 ---- * Overrides @see de.fzi.wim.guibase.graphview.view.EdgePainter#screenDistanceFromEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Edge, java.awt.Point) */ ! public double screenDistanceFromEdge(GraphlPane graphPane, Edge edge, Point point) { if (showPins) { Rectangle r = new Rectangle(); *************** *** 111,115 **** * Overrides @see de.fzi.wim.guibase.graphview.view.EdgePainter#getEdgeScreenBounds(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Edge, java.awt.Rectangle) */ ! public void getEdgeScreenBounds(JGraphPane graphPane, Edge edge, Rectangle edgeScreenRectangle) { if (showPins) { Point from=graphPane.getScreenPointForNode(edge.getFrom()); --- 110,114 ---- * Overrides @see de.fzi.wim.guibase.graphview.view.EdgePainter#getEdgeScreenBounds(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Edge, java.awt.Rectangle) */ ! public void getEdgeScreenBounds(GraphlPane graphPane, Edge edge, Rectangle edgeScreenRectangle) { if (showPins) { Point from=graphPane.getScreenPointForNode(edge.getFrom()); Index: EdgePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/EdgePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EdgePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- EdgePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 9,13 **** import org.mediavirus.graphl.graph.rdf.RDFEdge; import org.mediavirus.graphl.view.Facet; - import org.mediavirus.graphl.view.JGraphPane; /** --- 9,12 ---- *************** *** 22,26 **** * @param edge the edge to paint */ ! void paintEdge(JGraphPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted); /** * Returns the distance of the point to the edge. --- 21,25 ---- * @param edge the edge to paint */ ! void paintEdge(GraphlPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted); /** * Returns the distance of the point to the edge. *************** *** 31,35 **** * @return the distance of the point from the edge */ ! double screenDistanceFromEdge(JGraphPane graphPane, Edge edge, Point point); /** * Returns the outer rectangle of the edge on screen. --- 30,34 ---- * @return the distance of the point from the edge */ ! double screenDistanceFromEdge(GraphlPane graphPane, Edge edge, Point point); /** * Returns the outer rectangle of the edge on screen. *************** *** 39,43 **** * @param edgeScreenRectangle the rectangle receiving the edge's coordinates */ ! void getEdgeScreenBounds(JGraphPane graphPane, Edge edge, Rectangle edgeScreenRectangle); boolean isPointInLabel(GraphlPane graphPane, RDFEdge edge, Point point); --- 38,42 ---- * @param edgeScreenRectangle the rectangle receiving the edge's coordinates */ ! void getEdgeScreenBounds(GraphlPane graphPane, Edge edge, Rectangle edgeScreenRectangle); boolean isPointInLabel(GraphlPane graphPane, RDFEdge edge, Point point); |
