Author: scooter
Date: 2011-08-24 10:18:52 -0700 (Wed, 24 Aug 2011)
New Revision: 26630
Modified:
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/menus/ChemVizMenu.java
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/AbstractCompoundTask.java
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/CreateNodeGraphicsTask.java
Log:
Added node graphics menus back to main menu
Modified:
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/menus/ChemVizMenu.java
===================================================================
--- csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/menus/ChemVizMenu.java
2011-08-24 16:11:54 UTC (rev 26629)
+++ csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/menus/ChemVizMenu.java
2011-08-24 17:18:52 UTC (rev 26630)
@@ -94,6 +94,7 @@
Component[] subMenus = m.getMenuComponents();
for (int i = 0; i < subMenus.length; i++) {
m.remove(subMenus[i]); }
new DepictionMenus(m, systemProps, settingsDialog, null);
+ new NodeGraphicsMenus(m, systemProps, settingsDialog, null);
new SimilarityMenu(m, systemProps, settingsDialog);
new AttributesMenu(m, systemProps, settingsDialog, null);
new SettingsMenu(m, systemProps, settingsDialog);
Modified:
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/AbstractCompoundTask.java
===================================================================
---
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/AbstractCompoundTask.java
2011-08-24 16:11:54 UTC (rev 26629)
+++
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/AbstractCompoundTask.java
2011-08-24 17:18:52 UTC (rev 26630)
@@ -84,7 +84,7 @@
public JTaskConfig getDefaultTaskConfig() {
JTaskConfig result = new JTaskConfig();
- result.displayCancelButton(false);
+ result.displayCancelButton(true);
result.displayCloseButton(false);
result.displayStatus(true);
result.displayTimeElapsed(false);
Modified:
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/CreateNodeGraphicsTask.java
===================================================================
---
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/CreateNodeGraphicsTask.java
2011-08-24 16:11:54 UTC (rev 26629)
+++
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/CreateNodeGraphicsTask.java
2011-08-24 17:18:52 UTC (rev 26630)
@@ -199,10 +199,14 @@
CyAttributes networkAttributes =
Cytoscape.getNetworkAttributes();
CyAttributes nodeAttributes = Cytoscape.getNodeAttributes();
CyNetworkView view = Cytoscape.getCurrentNetworkView();
+ monitor.setPercentCompleted(0);
if (removeCustomGraphics) {
ArrayList<NodeView> removeList = new
ArrayList<NodeView>(graphMap.keySet());
+ totalObjects = removeList.size();
+ objectCount = 0;
for (NodeView nv: removeList) {
+ updateMonitor();
if (nodeSelection == null ||
nodeSelection.contains(nv.getNode())) {
// System.out.println("Removing cg for
"+nv.getNode().getIdentifier());
CustomGraphic cg = graphMap.get(nv);
@@ -223,6 +227,8 @@
return;
}
+ totalObjects = nodeSelection.size();
+ objectCount = 0;
List<Compound>cList = getCompounds(nodeSelection,
nodeAttributes,
settingsDialog.getCompoundAttributes("node",AttriType.smiles),
settingsDialog.getCompoundAttributes("node",AttriType.inchi));
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
