You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/08/21 23:00:14 UTC

svn commit: r1375789 - in /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph: PortGUI.java system/IfNodeGUI.java

Author: samindaw
Date: Tue Aug 21 21:00:13 2012
New Revision: 1375789

URL: http://svn.apache.org/viewvc?rev=1375789&view=rev
Log:
showing true/false in control ports

Modified:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/PortGUI.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/IfNodeGUI.java

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/PortGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/PortGUI.java?rev=1375789&r1=1375788&r2=1375789&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/PortGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/PortGUI.java Tue Aug 21 21:00:13 2012
@@ -22,12 +22,14 @@
 package org.apache.airavata.xbaya.ui.graph;
 
 import java.awt.Color;
+import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Polygon;
 import java.awt.Shape;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Ellipse2D;
+import java.awt.geom.Rectangle2D;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -69,6 +71,8 @@ public class PortGUI implements GraphPie
     private List<String> tokens = new LinkedList<String>();
 
     private Port port;
+    
+    private String portText=null;
 
     /**
      * The position of this port relative to the node this port belongs to.
@@ -163,9 +167,16 @@ public class PortGUI implements GraphPie
                     CONTROL_PORT_SIZE, CONTROL_PORT_SIZE);
             break;
         }
-//        g.setColor(color);
-//        g.fill(shape);
         DrawUtils.gradientFillShape(g, color.brighter().brighter().brighter().brighter(), color.darker(), shape);
+        if (getPortText()!=null){
+        	g.setColor(Color.WHITE);
+            Font oldFont = g.getFont();
+    		g.setFont(new Font(oldFont.getFontName(),Font.BOLD,7));
+            Rectangle2D bounds = g.getFontMetrics().getStringBounds(getPortText(), g);
+            g.drawString(getPortText(), (int)(shape.getBounds().getX() + (shape.getBounds().getWidth()-bounds.getWidth())*2/4), 
+    		(int)(shape.getBounds().getY() + (shape.getBounds().getHeight()+bounds.getHeight())*4/8));
+            g.setFont(oldFont);
+        }
     }
 
     /**
@@ -252,4 +263,12 @@ public class PortGUI implements GraphPie
         this.tokens.clear();
 
     }
+
+	public String getPortText() {
+		return portText;
+	}
+
+	public void setPortText(String portText) {
+		this.portText = portText;
+	}
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/IfNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/IfNodeGUI.java?rev=1375789&r1=1375788&r2=1375789&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/IfNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/IfNodeGUI.java Tue Aug 21 21:00:13 2012
@@ -153,12 +153,16 @@ public class IfNodeGUI extends Configura
         List<? extends Port> controlOutPorts = this.node.getControlOutPorts();
         Port controlOutPort1 = controlOutPorts.get(0);
         Point offset = new Point(getBounds().width, +this.headHeight / 2);
-        NodeController.getGUI(controlOutPort1).setOffset(offset);
+        PortGUI truePortGUI = NodeController.getGUI(controlOutPort1);
+        truePortGUI.setOffset(offset);
+        truePortGUI.setPortText("T");
 
         Port controlOutPort2 = controlOutPorts.get(1);
         offset = new Point(this.getBounds().width, getBounds().height - this.headHeight / 2);
-        NodeController.getGUI(controlOutPort2).setOffset(offset);
-
+        PortGUI falsePortGUI = NodeController.getGUI(controlOutPort2);
+		falsePortGUI.setOffset(offset);
+		falsePortGUI.setPortText("F");
+		
         // No outputs
     }