Author: scooter
Date: 2013-01-17 14:36:24 -0800 (Thu, 17 Jan 2013)
New Revision: 31051
Modified:
csplugins/trunk/ucsf/scooter/chemViz2/pom.xml
csplugins/trunk/ucsf/scooter/chemViz2/src/main/java/edu/ucsf/rbvi/internal/model/ChemInfoSettings.java
csplugins/trunk/ucsf/scooter/chemViz2/src/main/java/edu/ucsf/rbvi/internal/view/ChemVizCustomGraphics.java
Log:
Changes to support new custom graphics API
Modified: csplugins/trunk/ucsf/scooter/chemViz2/pom.xml
===================================================================
--- csplugins/trunk/ucsf/scooter/chemViz2/pom.xml 2013-01-17 22:35:31 UTC
(rev 31050)
+++ csplugins/trunk/ucsf/scooter/chemViz2/pom.xml 2013-01-17 22:36:24 UTC
(rev 31051)
@@ -15,7 +15,7 @@
<packaging>bundle</packaging>
<name>${bundle.symbolicName}</name>
- <version>0.0.1</version>
+ <version>0.9.0</version>
<build>
<plugins>
Modified:
csplugins/trunk/ucsf/scooter/chemViz2/src/main/java/edu/ucsf/rbvi/internal/model/ChemInfoSettings.java
===================================================================
---
csplugins/trunk/ucsf/scooter/chemViz2/src/main/java/edu/ucsf/rbvi/internal/model/ChemInfoSettings.java
2013-01-17 22:35:31 UTC (rev 31050)
+++
csplugins/trunk/ucsf/scooter/chemViz2/src/main/java/edu/ucsf/rbvi/internal/model/ChemInfoSettings.java
2013-01-17 22:36:24 UTC (rev 31051)
@@ -89,16 +89,16 @@
getListSingleSelection(Arrays.asList(fingerprintList),
Fingerprinter.PUBCHEM);
@Tunable(description="Maximum number of threads to use", groups=" ")
- int maxThreads = 0;
+ public int maxThreads = 0;
- @Tunable(description="Attributes that contain SMILES strings",
groups={"Attribute Settings", "SMILES Attributes"})
+ @Tunable(groups={"Attribute Settings", "SMILES Attributes"})
public ListMultipleSelection<String> smilesAttributes = null;
@Tunable(description="Attributes that contain InCHI strings",
groups={"Attribute Settings", "InCHI Attributes"})
public ListMultipleSelection<String> inChiAttributes = null;
@Tunable(description="Size of 2D node depiction as a % of node size",
groups="Depiction options")
- int nodeStructureSize = 100;
+ public int nodeStructureSize = 100;
@Tunable(description="Attribute to use for image labels",
groups="Depiction options")
public ListSingleSelection<String> labelAttribute = null;
Modified:
csplugins/trunk/ucsf/scooter/chemViz2/src/main/java/edu/ucsf/rbvi/internal/view/ChemVizCustomGraphics.java
===================================================================
---
csplugins/trunk/ucsf/scooter/chemViz2/src/main/java/edu/ucsf/rbvi/internal/view/ChemVizCustomGraphics.java
2013-01-17 22:35:31 UTC (rev 31050)
+++
csplugins/trunk/ucsf/scooter/chemViz2/src/main/java/edu/ucsf/rbvi/internal/view/ChemVizCustomGraphics.java
2013-01-17 22:36:24 UTC (rev 31051)
@@ -32,6 +32,8 @@
import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.view.presentation.customgraphics.CustomGraphicLayer;
import org.cytoscape.view.presentation.customgraphics.PaintedShape;
@@ -94,8 +96,8 @@
public float getFitRatio() {return fitRatio;}
public int getHeight() { return height; }
public Long getIdentifier() {return id;}
- public List<PaintedShape> getLayers(CyNetwork network, CyIdentifiable
grObject) {
- if (!(grObject instanceof CyNode))
+ public List<PaintedShape> getLayers(CyNetworkView networkView, View
grView) {
+ if (!(grView.getModel() instanceof CyNode))
return null;
// Set offsets
// System.out.println("Molecule = "+compound.getMolecule());
--
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.
