[graphl-cvs] graphl/src/org/mediavirus/graphl/interaction GraphlManipulator.java

[Flo L. <fl...@us...>]

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

Modified Files:
	GraphlManipulator.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: GraphlManipulator.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/interaction/GraphlManipulator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GraphlManipulator.java	5 Oct 2004 07:54:21 -0000	1.4
--- GraphlManipulator.java	14 Oct 2004 13:03:06 -0000	1.5
***************
*** 42,46 ****
  	private Point mousePos;
  	
! 	private Node edgeNode;
  	private Edge dragEdge = null;
  	private Node dragNode = null;
--- 42,46 ----
  	private Point mousePos;
  	
! 	private Node edgeNode = null;
  	private Edge dragEdge = null;
  	private Node dragNode = null;
***************
*** 56,60 ****
      private Point2D oldTranslation;
      
!     boolean doDragNode = true;
  
  	public GraphlManipulator(){
--- 56,60 ----
      private Point2D oldTranslation;
      
!     boolean doDragNode = false;
  
  	public GraphlManipulator(){
***************
*** 102,109 ****
      	else if (e.getModifiers() == MouseEvent.BUTTON3_MASK) {
      	    if (overNode != null) {
      	        nodeMenu.show(e.getX(), e.getY(), overNode);
      	    }
      	    else if(overEdge != null) {
!     	        // TODO (2): stop layout and resume later. (move layouter to graphlpane) (0.5h)
       	        edgeMenu.show(e.getX(), e.getY(), overEdge);
      	    }
--- 102,110 ----
      	else if (e.getModifiers() == MouseEvent.BUTTON3_MASK) {
      	    if (overNode != null) {
+     	        graphPane.pauseLayouter();
      	        nodeMenu.show(e.getX(), e.getY(), overNode);
      	    }
      	    else if(overEdge != null) {
!     	        graphPane.pauseLayouter();
       	        edgeMenu.show(e.getX(), e.getY(), overEdge);
      	    }
***************
*** 201,208 ****
  		}
  
! 		dragEdge = null;
  		dragNode = null;
  		edgeNode = null;
  		doDragNode = false;
  	}
  
--- 202,211 ----
  		}
  
!         dragEdge = null;
  		dragNode = null;
  		edgeNode = null;
  		doDragNode = false;
+ 		
+ 		oldTranslation = null;
  	}
  
***************
*** 234,240 ****
  		}
  		else if (!doDragNode && oldTranslation != null){
! 		    GraphlPane pane = (GraphlPane)graphPane;
! 		    Point2D diff = new Point2D.Double(mousePos.getX() - dragStart.getX(),mousePos.getY() - dragStart.getY()); 
! 		    pane.setTranslation(diff.getX()+oldTranslation.getX(), diff.getY()+oldTranslation.getY());
  		}
  	}
--- 237,243 ----
  		}
  		else if (!doDragNode && oldTranslation != null){
! 		    double dx = mousePos.getX() - dragStart.getX();
! 		    double dy = mousePos.getY() - dragStart.getY(); 
! 		    graphPane.setTranslation(dx + oldTranslation.getX(), dy + oldTranslation.getY());
  		}
  	}
***************
*** 276,285 ****
  
  	public Object editingStarted(Node node) {
! 		return ((RDFNode)node).getValue();
  	}
  
  	public boolean editingFinished(Node node, Object value) {
  		if (!((String)value).equals("")) {
! 			((RDFNode)node).setValue((String)value);
  		} 
  		return true;
--- 279,288 ----
  
  	public Object editingStarted(Node node) {
! 		return ((RDFNode)node).getLabel();
  	}
  
  	public boolean editingFinished(Node node, Object value) {
  		if (!((String)value).equals("")) {
! 			((RDFNode)node).setProperty("http://www.mediavirus.org/graphl#label",(String)value);
  		} 
  		return true;