Author: pwang
Date: 2011-02-28 15:23:43 -0800 (Mon, 28 Feb 2011)
New Revision: 24264
Added:
csplugins/trunk/ucsd/pwang/cy3samples/sample10/src/main/java/org/cytoscape/sample/internal/Sample10TaskFactory.java
Removed:
csplugins/trunk/ucsd/pwang/cy3samples/sample10/src/main/java/org/cytoscape/sample/internal/Sample10Action.java
csplugins/trunk/ucsd/pwang/cy3samples/sample10/src/main/java/org/cytoscape/sample/internal/ZoomTaskFactory.java
Modified:
csplugins/trunk/ucsd/pwang/cy3samples/sample10/src/main/java/org/cytoscape/sample/internal/ZoomTask.java
Log:
Use TaskFactory
Deleted:
csplugins/trunk/ucsd/pwang/cy3samples/sample10/src/main/java/org/cytoscape/sample/internal/Sample10Action.java
===================================================================
---
csplugins/trunk/ucsd/pwang/cy3samples/sample10/src/main/java/org/cytoscape/sample/internal/Sample10Action.java
2011-02-28 23:23:07 UTC (rev 24263)
+++
csplugins/trunk/ucsd/pwang/cy3samples/sample10/src/main/java/org/cytoscape/sample/internal/Sample10Action.java
2011-02-28 23:23:43 UTC (rev 24264)
@@ -1,35 +0,0 @@
-package org.cytoscape.sample.internal;
-
-import java.awt.event.ActionEvent;
-import org.cytoscape.application.swing.AbstractCyAction;
-import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.session.CyApplicationManager;
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.work.swing.GUITaskManager;
-
-public class Sample10Action extends AbstractCyAction {
-
- private GUITaskManager taskMgr;
- private CyApplicationManager appMgr;
-
- public Sample10Action(CyApplicationManager appMgr, CySwingApplication
desktopApp,
- GUITaskManager taskMgr){
- super("sample10", appMgr);
- setPreferredMenu("Plugins");
-
- this.taskMgr = taskMgr;
- this.appMgr = appMgr;
- }
-
- public void actionPerformed(ActionEvent e) {
- CyNetworkView view = this.appMgr.getCurrentNetworkView();
- if (view == null){
- return;
- }
-
- double scale = 2.0;
-
- ZoomTaskFactory factory = new ZoomTaskFactory(view, scale);
- this.taskMgr.execute(factory);
- }
-}
Copied:
csplugins/trunk/ucsd/pwang/cy3samples/sample10/src/main/java/org/cytoscape/sample/internal/Sample10TaskFactory.java
(from rev 24175,
csplugins/trunk/ucsd/pwang/cy3samples/sample10/src/main/java/org/cytoscape/sample/internal/ZoomTaskFactory.java)
===================================================================
---
csplugins/trunk/ucsd/pwang/cy3samples/sample10/src/main/java/org/cytoscape/sample/internal/Sample10TaskFactory.java
(rev 0)
+++
csplugins/trunk/ucsd/pwang/cy3samples/sample10/src/main/java/org/cytoscape/sample/internal/Sample10TaskFactory.java
2011-02-28 23:23:43 UTC (rev 24264)
@@ -0,0 +1,24 @@
+package org.cytoscape.sample.internal;
+
+import org.cytoscape.application.swing.CySwingApplication;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.task.AbstractNetworkViewTaskFactory;
+import org.cytoscape.work.TaskIterator;
+import org.cytoscape.work.Tunable;
+import org.cytoscape.work.swing.GUITaskManager;
+import org.cytoscape.view.model.CyNetworkView;
+
+public class Sample10TaskFactory extends AbstractNetworkViewTaskFactory {
+
+ private CyApplicationManager appMgr;
+
+ public Sample10TaskFactory(CyApplicationManager appMgr) {
+ this.appMgr = appMgr;
+ }
+
+ public TaskIterator getTaskIterator() {
+ this.view = this.appMgr.getCurrentNetworkView();
+
+ return new TaskIterator(new ZoomTask(this.view));
+ }
+}
Modified:
csplugins/trunk/ucsd/pwang/cy3samples/sample10/src/main/java/org/cytoscape/sample/internal/ZoomTask.java
===================================================================
---
csplugins/trunk/ucsd/pwang/cy3samples/sample10/src/main/java/org/cytoscape/sample/internal/ZoomTask.java
2011-02-28 23:23:07 UTC (rev 24263)
+++
csplugins/trunk/ucsd/pwang/cy3samples/sample10/src/main/java/org/cytoscape/sample/internal/ZoomTask.java
2011-02-28 23:23:43 UTC (rev 24264)
@@ -4,21 +4,27 @@
import org.cytoscape.task.AbstractNetworkViewTask;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.work.Tunable;
-class ZoomTask extends AbstractNetworkViewTask {
+public class ZoomTask extends AbstractNetworkViewTask {
- protected double factor;
+ @Tunable(description="Scale")
+ public double scale = 0.2; // Default value
- ZoomTask(CyNetworkView v, double factor) {
+ ZoomTask(CyNetworkView v) {
super(v);
- this.factor = factor;
}
public void run(TaskMonitor tm) {
- view.setVisualProperty(NETWORK_SCALE_FACTOR,
- view.getVisualProperty(NETWORK_SCALE_FACTOR).doubleValue() *
factor);
+ if(this.view == null){
+ return;
+ }
+
+ double newScale =
view.getVisualProperty(NETWORK_SCALE_FACTOR).doubleValue() * scale;
+ view.setVisualProperty(NETWORK_SCALE_FACTOR, newScale);
+
view.updateView();
}
}
Deleted:
csplugins/trunk/ucsd/pwang/cy3samples/sample10/src/main/java/org/cytoscape/sample/internal/ZoomTaskFactory.java
===================================================================
---
csplugins/trunk/ucsd/pwang/cy3samples/sample10/src/main/java/org/cytoscape/sample/internal/ZoomTaskFactory.java
2011-02-28 23:23:07 UTC (rev 24263)
+++
csplugins/trunk/ucsd/pwang/cy3samples/sample10/src/main/java/org/cytoscape/sample/internal/ZoomTaskFactory.java
2011-02-28 23:23:43 UTC (rev 24264)
@@ -1,20 +0,0 @@
-package org.cytoscape.sample.internal;
-
-import org.cytoscape.task.AbstractNetworkViewTaskFactory;
-import org.cytoscape.work.TaskIterator;
-import org.cytoscape.view.model.CyNetworkView;
-
-public class ZoomTaskFactory extends AbstractNetworkViewTaskFactory {
-
- private CyNetworkView view;
- private double scale;
-
- public ZoomTaskFactory(CyNetworkView view, double scale){
- this.view = view;
- this.scale = scale;
- }
-
- public TaskIterator getTaskIterator() {
- return new TaskIterator(new ZoomTask(view, scale));
- }
-}
--
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.
