Generic Model Organism Database Project

Revision: 23072
          http://gmod.svn.sourceforge.net/gmod/?rev=23072&view=rev
Author:   montys9
Date:     2010-04-20 20:01:12 +0000 (Tue, 20 Apr 2010)

Log Message:
-----------
put coloring of background into regular version - no more test code.

Modified Paths:
--------------
    nbrowse/trunk/src/org/nbrowse/views/Jnet.java

Modified: nbrowse/trunk/src/org/nbrowse/views/Jnet.java
===================================================================
--- nbrowse/trunk/src/org/nbrowse/views/Jnet.java	2010-04-20 19:51:28 UTC (rev 23071)
+++ nbrowse/trunk/src/org/nbrowse/views/Jnet.java	2010-04-20 20:01:12 UTC (rev 23072)
@@ -242,9 +242,13 @@
         JButton bgButton = createButton(createIcon("images/bg.png"));        
         bgButton.addActionListener(new javax.swing.AbstractAction() {
             public void actionPerformed(java.awt.event.ActionEvent e) {
+            	// removed use of testcode only for color background swatch
+            	/*
             	if (CommandLine.inst().useTestCode())
             	{
-            	colorBackground();            	
+            	*/
+            	colorBackground();
+            	/*
             	}
             	else
             	{
@@ -260,6 +264,7 @@
                     toggle = 1;
                 }
             	}
+            	*/
             }
         });
         //bgButton.setToolTipText("toggle white/black background");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 23984
          http://gmod.svn.sourceforge.net/gmod/?rev=23984&view=rev
Author:   montys9
Date:     2010-10-15 19:51:49 +0000 (Fri, 15 Oct 2010)

Log Message:
-----------
default switch for adding toolbar icons for anchor and unanchor (weigh anchor) is turned off for now until better icons are found, etc.

Modified Paths:
--------------
    nbrowse/trunk/src/org/nbrowse/views/Jnet.java

Modified: nbrowse/trunk/src/org/nbrowse/views/Jnet.java
===================================================================
--- nbrowse/trunk/src/org/nbrowse/views/Jnet.java	2010-10-15 19:26:56 UTC (rev 23983)
+++ nbrowse/trunk/src/org/nbrowse/views/Jnet.java	2010-10-15 19:51:49 UTC (rev 23984)
@@ -35,6 +35,7 @@
 import org.jnet.viewer.Viewer;
 import org.jnet.viewer.ZoomObserver;
 import org.nbrowse.io.UrlManager;
+import org.nbrowse.layouts.spring.vrmlgraph.GraphData;
 
 /**
  *Jnet is an AbstractView that is loaded as default property in
@@ -48,6 +49,8 @@
 public class Jnet extends AbstractView{
 	static final long serialVersionUID = 7790502517175718870L;
 
+	private static boolean ALLOW_ANCHOR = false; // make true if anchor icons look okay,etc for toolbar 
+	// in future, we can have nicer icons for them
     final Dimension currentSize = new Dimension();
     final Rectangle rectClip = new Rectangle();
     // making displayPanel non-static enables view to have reloadable step buttons when loading via applet version
@@ -413,7 +416,50 @@
        });
       stopSpringButton.setToolTipText("Stop layout calculation (spring by default)");
       toolbar.add(stopSpringButton);
+      if (ALLOW_ANCHOR)
+      {
+        JButton anchorButton = createButton(createIcon("images/anchor.gif"));
+        anchorButton.addActionListener(new javax.swing.AbstractAction() {
+          public void actionPerformed(java.awt.event.ActionEvent e) {
+          // anchor here
+        	  List<NodeViewI> nbNodes = NBSelectionManager.inst().getSelectedNodeViews();
+        	  if (nbNodes.isEmpty())
+        	    return;
+        	  //if (areNodesSelected())
+        	  //	  System.out.println("selected nodes found");
+        		  
+        	  //Node node = viewer.getModelSet().getNodeAt(nearestNodeIndex);  
+        	  //String name = node.getNodeName(); // get primary node name
+        	  GraphViewI graphData = GraphViewManager.current(); 
+        	  if (graphData instanceof GraphData)
+        	    //((GraphData) graphData).anchorNode(name);  
+        	    ((GraphData) graphData).anchorNodes(nbNodes);            	
+          }
+
+         });
+        anchorButton.setToolTipText("Anchor selected nodes");
+        toolbar.add(anchorButton);
       
+        JButton unanchorButton = createButton(createIcon("images/wanchor.gif"));
+        unanchorButton.addActionListener(new javax.swing.AbstractAction() {
+          public void actionPerformed(java.awt.event.ActionEvent e) {
+          	  List<NodeViewI> nbNodes = NBSelectionManager.inst().getSelectedNodeViews();
+        	    if (nbNodes.isEmpty())
+        	      return;
+        	  
+        	    //Node node = viewer.getModelSet().getNodeAt(nearestNodeIndex);  	    
+        	    //String name = node.getNodeName(); // get primary node name
+        	    GraphViewI graphData = GraphViewManager.current(); 
+        	    if (graphData instanceof GraphData)
+        	      //((GraphData) graphData).unanchorNode(name);
+        	      ((GraphData) graphData).unanchorNodes(nbNodes); 
+          }
+
+         });
+        unanchorButton.setToolTipText("Unanchor selected nodes (Weigh Anchor!)");
+        toolbar.add(unanchorButton);      
+      }
+      
       JButton scaleButton = createButton(createIcon("images/scale.png"));        
         scaleButton.addActionListener(new javax.swing.AbstractAction() {
             public void actionPerformed(java.awt.event.ActionEvent e) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24028
          http://gmod.svn.sourceforge.net/gmod/?rev=24028&view=rev
Author:   montys9
Date:     2010-10-25 13:46:35 +0000 (Mon, 25 Oct 2010)

Log Message:
-----------
fixed code and cached icons when allocated for hover and interact.

Modified Paths:
--------------
    nbrowse/trunk/src/org/nbrowse/views/Jnet.java

Modified: nbrowse/trunk/src/org/nbrowse/views/Jnet.java
===================================================================
--- nbrowse/trunk/src/org/nbrowse/views/Jnet.java	2010-10-22 21:40:51 UTC (rev 24027)
+++ nbrowse/trunk/src/org/nbrowse/views/Jnet.java	2010-10-25 13:46:35 UTC (rev 24028)
@@ -633,7 +633,8 @@
   }
   private Icon getHoverIcon() {
    // return viewer().hoverIsEnabled() ? normalHover() : smallHover();
-	  return viewer().hoverIsEnabled() ? createIcon("images/hoveron.png") : createIcon("images/hoveroff.png");
+	  //return viewer().hoverIsEnabled() ? createIcon("images/hoveron.png") : createIcon("images/hoveroff.png");
+   return viewer().hoverIsEnabled() ? onHover() : offHover();
   }
 
   private class InteractBut implements ActionListener {
@@ -653,7 +654,8 @@
 	  }
 	  private Icon getInteractIcon() {
 	    //return viewer().interactModeIsEnabled() ? normalInteract() : smallInteract();
-	    return viewer().interactModeIsEnabled() ? createIcon("images/interacton.png") : createIcon("images/interactoff.png");
+	    //return viewer().interactModeIsEnabled() ? createIcon("images/interacton.png") : createIcon("images/interactoff.png");
+		return viewer().interactModeIsEnabled() ? onInteract() : offInteract();
 	  }  
         
     private Icon createIcon(String icon) {
@@ -671,39 +673,59 @@
     return new ImageIcon(half);
   }
 
-  private boolean reducedInitialized = false;
-  private void initReducedIcons() {
-    if (reducedInitialized) return;
-    reducedInitialized = true;
-    smallHoverIcon = null;
-    makeSmallHover();
-    smallInteractIcon = null;
-    makeSmallInteract();
+  // don't need to initDefaultIcons -already allocated
+  private boolean defaultInitialized = false;
+  private void initDefaultIcons() {
+    if (defaultInitialized) return;
+    defaultInitialized = true;
+    offHoverIcon = null;
+    makeHoverOff();
+    offInteractIcon = null;
+    makeInteractOff();
   }
-  private Icon smallHoverIcon;
-  private Icon normalHoverIcon;
-  private Icon smallHover() {
-    if (smallHoverIcon==null) makeSmallHover();
-    return smallHoverIcon;
+  private Icon offHoverIcon;
+  private Icon onHoverIcon;
+  
+  private Icon offHover() {
+    if (offHoverIcon==null) makeHoverOff();
+    return offHoverIcon;
   }
-  private void makeSmallHover() { // --> url manager handle half sizing!
-    smallHoverIcon = createReducedIcon("images/hover.png");
+  private void makeHoverOff() { // --> url manager handle half sizing!
+    //smallHoverIcon = createReducedIcon("images/hover.png");
+	offHoverIcon = createIcon("images/hoveroff.png");
   }
-  private Icon normalHover() {
-    return UrlManager.inst().getHoverIcon(); // caches
+  
+  private void makeHoverOn() { // --> url manager handle half sizing!
+	    //smallHoverIcon = createReducedIcon("images/hover.png");
+		onHoverIcon = createIcon("images/hoveron.png");
+	  }  
+  private Icon onHover() {
+    //return UrlManager.inst().getHoverIcon(); // caches
+	if (onHoverIcon == null) makeHoverOn();
+	return onHoverIcon;
   }
   
-  private Icon smallInteractIcon;
-  private Icon normalInteractIcon;
-  private Icon smallInteract() {
-    if (smallInteractIcon==null) makeSmallInteract();
-    return smallInteractIcon;
+  private Icon offInteractIcon=null;
+  private Icon onInteractIcon=null;
+  private Icon offInteract() {
+    if (offInteractIcon==null) makeInteractOff();
+    return offInteractIcon;
   }
-  private void makeSmallInteract() { // --> url manager handle half sizing!
-    smallInteractIcon = createReducedIcon("images/interact.png");
+  private void makeInteractOff() { // --> url manager handle half sizing!
+    //smallInteractIcon = createReducedIcon("images/interact.png");
+	offInteractIcon = createIcon("images/interactoff.png");
   }
-  private Icon normalInteract() {
-    return UrlManager.inst().getInteractIcon(); // caches
+  
+  private void makeInteractOn() { // --> url manager handle half sizing!
+	    //smallInteractIcon = createReducedIcon("images/interact.png");
+		onInteractIcon = createIcon("images/interacton.png");
+	  }  
+  
+  private Icon onInteract() {
+    //return UrlManager.inst().getInteractIcon(); // caches
+	if (onInteractIcon==null) makeInteractOn();
+	return onInteractIcon;
+	
   }  
 
   
@@ -729,6 +751,6 @@
         displayPanel.setPreferredSize(new Dimension(currentSize.width,currentSize.height-5));
         displayPanel.revalidate();
         displayPanel.repaint();
-        initReducedIcons();
+        //initDefaultIcons();
     }
   }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.