Author: pwang
Date: 2013-03-01 14:17:06 -0800 (Fri, 01 Mar 2013)
New Revision: 31147

Modified:
   
csplugins/trunk/ucsd/kono/bingo-impl/src/main/java/bingo/internal/DisplayBiNGOWindow.java
   
csplugins/trunk/ucsd/kono/bingo-impl/src/main/java/bingo/internal/SettingsPanelActionListener.java
Log:
Updated

Modified: 
csplugins/trunk/ucsd/kono/bingo-impl/src/main/java/bingo/internal/DisplayBiNGOWindow.java
===================================================================
--- 
csplugins/trunk/ucsd/kono/bingo-impl/src/main/java/bingo/internal/DisplayBiNGOWindow.java
   2013-03-01 21:57:21 UTC (rev 31146)
+++ 
csplugins/trunk/ucsd/kono/bingo-impl/src/main/java/bingo/internal/DisplayBiNGOWindow.java
   2013-03-01 22:17:06 UTC (rev 31147)
@@ -78,7 +78,7 @@
 
 public class DisplayBiNGOWindow {
 
-       private static final String[] NODE_COL_NAMES = { "pValue", 
"adjustedPValue", "x", "X", "n", "N", "description",
+       private static final String[] NODE_COL_NAMES = { "pValue", 
"adjustedPValue", "xx", "X", "nn", "N", "description",
                        "nodeFillColor", "nodeSize", "nodeType", "nodeFontSize" 
};
 
        /**
@@ -272,7 +272,7 @@
                        
                        taskMonitor.setProgress(1.0);
                        taskMonitor.setStatusMessage("Network view successfully 
create for:  "
-                                       + 
network.getDefaultNetworkTable().getRow(network));
+                                       + 
network.getDefaultNetworkTable().getRow(network.getSUID()));
                }
        }
 
@@ -508,12 +508,12 @@
                        //node.getCyRow().set("nodeType_" + clusterName, shape);
                        //node.getCyRow().set("nodeFontSize_" + clusterName, 
14);
                        
-                       CyRow row = network.getDefaultNodeTable().getRow(node); 
                        
+                       CyRow row = 
network.getDefaultNodeTable().getRow(node.getSUID());                       
                        row.set("pValue_" + clusterName, pValue);
                        row.set("adjustedPValue_" + clusterName, adj_pValue);
-                       row.set("x_" + clusterName, smallX);
+                       row.set("xx_" + clusterName, smallX);
                        row.set("X_" + clusterName, bigX);
-                       row.set("n_" + clusterName, smallN);
+                       row.set("nn_" + clusterName, smallN);
                        row.set("N_" + clusterName, bigN);
                        row.set("description_" + clusterName, description);
                        row.set("nodeFillColor_" + clusterName, color);
@@ -549,7 +549,7 @@
                final List<CyEdge> edgeList = network.getEdgeList();
                for (final CyEdge edge : edgeList) {
                        //edge.getCyRow().set("edgeType_" + clusterName, 
"black");
-                       
network.getDefaultEdgeTable().getRow(edge).set("edgeType_" + clusterName, 
"black");
+                       
network.getDefaultEdgeTable().getRow(edge.getSUID()).set("edgeType_" + 
clusterName, "black");
                }
        }
 }

Modified: 
csplugins/trunk/ucsd/kono/bingo-impl/src/main/java/bingo/internal/SettingsPanelActionListener.java
===================================================================
--- 
csplugins/trunk/ucsd/kono/bingo-impl/src/main/java/bingo/internal/SettingsPanelActionListener.java
  2013-03-01 21:57:21 UTC (rev 31146)
+++ 
csplugins/trunk/ucsd/kono/bingo-impl/src/main/java/bingo/internal/SettingsPanelActionListener.java
  2013-03-01 22:17:06 UTC (rev 31147)
@@ -596,7 +596,7 @@
                if (params.getStatus() == false) {
                        AnnotationParser annParser = 
params.initializeAnnotationParser();
 //                     TaskManager taskManager = adapter.getTaskManager();
-                       System.out.println("\nCalling annotation parser...");
+//                     System.out.println("\nCalling annotation parser...");
 //                     taskManager.execute(new 
GenericTaskFactory(annParser).createTaskIterator());
                        try {
                                annParser.calculate();
@@ -607,7 +607,7 @@
                                // TODO Auto-generated catch block
                                e.printStackTrace();
                        }
-                       System.out.println("Calling annotation 
parser...DONE!!");
+//                     System.out.println("Calling annotation 
parser...DONE!!");
                        if (annParser.getStatus()) {
                                params.setAnnotation(annParser.getAnnotation());
                                params.setOntology(annParser.getOntology());

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/cytoscape-cvs?hl=en.
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to