Thread: [graphl-cvs] graphl/src/org/mediavirus/graphl/painter ImageNodePainter.java StraightLineEdgePainter.

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12051/src/org/mediavirus/graphl/painter

Modified Files:
	ImageNodePainter.java StraightLineEdgePainter.java 
	LineEdgePainter.java BoxNodePainter.java 
	StraightLineEdgePainterBeanInfo.java 
Log Message:
- FEATURE: added z-index support for painting nodes & edges
- FEATURE: BoxNodePainter draws rounded rectangles
- FEATURE: Font for boxnodepainter is configurable
- FEATURE: labelcolor of edgepainter is configurable
- FEATURE: added utility functions for namespace compression/expansion
- REFACTOR: moved layouter to graphpane
- BUG: removed value property from graphelements
- BUG: stopping layouter when displaying contextmenus etc.
- BUG: fixed panning after startup
- removed obsolete commented-out code

Index: LineEdgePainter.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/LineEdgePainter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LineEdgePainter.java	5 Oct 2004 07:54:20 -0000	1.5
--- LineEdgePainter.java	14 Oct 2004 13:03:03 -0000	1.6
***************
*** 35,39 ****
  	Font font;
  	Color color;
! 	Color textColor = Color.BLACK;
  	
      LabelGenerator labelGenerator;
--- 35,39 ----
  	Font font;
  	Color color;
! 	Color labelColor = Color.BLACK;
  	
      LabelGenerator labelGenerator;
***************
*** 122,135 ****
  
      /**
!      * @return Returns the textColor.
       */
!     public Color getTextColor() {
!         return textColor;
      }
      /**
!      * @param textColor The textColor to set.
       */
!     public void setTextColor(Color textColor) {
!         this.textColor = textColor;
      }
      /**
--- 122,135 ----
  
      /**
!      * @return Returns the labelColor.
       */
!     public Color getLabelColor() {
!         return labelColor;
      }
      /**
!      * @param labelColor The labelColor to set.
       */
!     public void setLabelColor(Color textColor) {
!         this.labelColor = textColor;
      }
      /**
***************
*** 230,233 ****
--- 230,236 ----
  		if (col != null) setColor(col);
  		
+     	col = ParseUtils.parseColor(node.getProperty("http://www.mediavirus.org/graphl#labelColor"));
+ 		if (col != null) setLabelColor(col);
+ 		
  		Stroke stroke = ParseUtils.parseStroke(node.getProperty("http://www.mediavirus.org/graphl#stroke"));
  		if (stroke != null) setStroke(stroke);

Index: BoxNodePainter.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/BoxNodePainter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BoxNodePainter.java	4 Oct 2004 10:21:03 -0000	1.4
--- BoxNodePainter.java	14 Oct 2004 13:03:03 -0000	1.5
***************
*** 108,112 ****
  		Point point) {
  
! 		return node.getValue();
  	}
  
--- 108,112 ----
  		Point point) {
  
! 		return node.getId();
  	}
  
***************
*** 208,212 ****
          Color oldColor=g.getColor();
          g.setColor(getBackgroundColor(highlighted, selected, false));
!         g.fillRect(nodePoint.x-width/2,nodePoint.y-height/2,width,height);
          if (label!=null) {
              Font oldFont=g.getFont();
--- 208,214 ----
          Color oldColor=g.getColor();
          g.setColor(getBackgroundColor(highlighted, selected, false));
!         //TODO (1,0.5h) property for rounded rect
!         //g.fillRect(nodePoint.x-width/2,nodePoint.y-height/2,width,height);
!         g.fillRoundRect(nodePoint.x-width/2,nodePoint.y-height/2,width,height,8,8);
          if (label!=null) {
              Font oldFont=g.getFont();
***************
*** 217,221 ****
          }
          g.setColor(getBorderColor(highlighted, selected, false));
!         g.drawRect(nodePoint.x-width/2,nodePoint.y-height/2,width,height);
          g.setColor(oldColor);
      }
--- 219,224 ----
          }
          g.setColor(getBorderColor(highlighted, selected, false));
!         //g.drawRect(nodePoint.x-width/2,nodePoint.y-height/2,width,height);
!         g.drawRoundRect(nodePoint.x-width/2,nodePoint.y-height/2,width,height,8,8);
          g.setColor(oldColor);
      }
***************
*** 306,309 ****
--- 309,315 ----
  		if (col != null) textColor = col;
  		
+ 		Font font = ParseUtils.parseFont(node.getProperty("http://www.mediavirus.org/graphl#font"));
+ 		if (font != null) setFont(font);
+ 		
  		try {
  			Node labelGeneratorNode = (Node)node.getNeighbours("http://www.mediavirus.org/graphl#labelGenerator", true).get(0);

Index: ImageNodePainter.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/ImageNodePainter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ImageNodePainter.java	4 Oct 2004 10:21:03 -0000	1.4
--- ImageNodePainter.java	14 Oct 2004 13:03:03 -0000	1.5
***************
*** 88,92 ****
          	        if (href == null) {
          	            Node propertyNode = node.getFirstNeighbour(property, true);
!         	            if (propertyNode != null) href = propertyNode.getValue();
          	        }
      				img = loadImage(baseURL, href);
--- 88,92 ----
          	        if (href == null) {
          	            Node propertyNode = node.getFirstNeighbour(property, true);
!         	            if (propertyNode != null) href = propertyNode.getId();
          	        }
      				img = loadImage(baseURL, href);
***************
*** 165,169 ****
  
      public String getToolTipText(GraphlPane graphPane, Node node, Point point) {
!         return node.getValue();
      }
  
--- 165,169 ----
  
      public String getToolTipText(GraphlPane graphPane, Node node, Point point) {
!         return node.getId();
      }
  

Index: StraightLineEdgePainterBeanInfo.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/StraightLineEdgePainterBeanInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StraightLineEdgePainterBeanInfo.java	4 Oct 2004 10:21:03 -0000	1.1
--- StraightLineEdgePainterBeanInfo.java	14 Oct 2004 13:03:03 -0000	1.2
***************
*** 27,31 ****
              PropertyDescriptor rv[] = {
                      new PropertyDescriptor("color", beanClass),
!                     new PropertyDescriptor("textColor", beanClass),
                      new PropertyDescriptor("font", beanClass),
                      new PropertyDescriptor("stroke", beanClass),
--- 27,31 ----
              PropertyDescriptor rv[] = {
                      new PropertyDescriptor("color", beanClass),
!                     new PropertyDescriptor("labelColor", beanClass),
                      new PropertyDescriptor("font", beanClass),
                      new PropertyDescriptor("stroke", beanClass),

Index: StraightLineEdgePainter.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/StraightLineEdgePainter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StraightLineEdgePainter.java	4 Oct 2004 10:21:03 -0000	1.3
--- StraightLineEdgePainter.java	14 Oct 2004 13:03:03 -0000	1.4
***************
*** 140,144 ****
  					}
  					if (isPaintLabel()){
! 					    g.setColor(getTextColor());
  						String label = labelGenerator.getLabel(edge);
  						if (label != null){
--- 140,144 ----
  					}
  					if (isPaintLabel()){
! 					    g.setColor(getLabelColor());
  						String label = labelGenerator.getLabel(edge);
  						if (label != null){
***************
*** 254,258 ****
      public boolean isPointInLabel(GraphlPane graphPane, RDFEdge edge, Point point) {
          if (isPaintLabel()) {
! 			String label = edge.getValue();
  			if (label != null){
  				Point from = graphPane.getScreenPointForNode(edge.getFrom());
--- 254,259 ----
      public boolean isPointInLabel(GraphlPane graphPane, RDFEdge edge, Point point) {
          if (isPaintLabel()) {
!             // TODO how to get the label string
! 			String label = edge.getLabel();
  			if (label != null){
  				Point from = graphPane.getScreenPointForNode(edge.getFrom());