Author: pwang
Date: 2011-09-27 12:37:54 -0700 (Tue, 27 Sep 2011)
New Revision: 26987
Modified:
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTask.java
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTaskFactoryImpl.java
Log:
Set default name for new node, e.g. Node_1, Node_2, ...
Modified:
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
2011-09-27 19:20:51 UTC (rev 26986)
+++
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
2011-09-27 19:37:54 UTC (rev 26987)
@@ -20,6 +20,7 @@
import org.cytoscape.dnd.DropNetworkViewTaskFactory;
import
org.cytoscape.application.swing.events.CytoPanelComponentSelectedListener;
import org.cytoscape.task.NetworkViewTaskFactory;
+import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.application.events.SetCurrentNetworkViewListener;
import org.cytoscape.dnd.DropNodeViewTaskFactory;
@@ -45,8 +46,9 @@
NewEmptyNetworkViewFactory newEmptyNetworkViewFactoryServiceRef
= getService(bc,NewEmptyNetworkViewFactory.class);
CyEventHelper cyEventHelperServiceRef =
getService(bc,CyEventHelper.class);
+ VisualMappingManager vmm =
getService(bc,VisualMappingManager.class);
SIFInterpreterTaskFactory sifInterpreterTaskFactory = new
SIFInterpreterTaskFactory();
- DropNetworkViewTaskFactoryImpl dropNetworkViewTaskFactory = new
DropNetworkViewTaskFactoryImpl(cyEventHelperServiceRef);
+ DropNetworkViewTaskFactoryImpl dropNetworkViewTaskFactory = new
DropNetworkViewTaskFactoryImpl(cyEventHelperServiceRef, vmm);
DropNodeViewTaskFactoryImpl dropNodeViewTaskFactory = new
DropNodeViewTaskFactoryImpl(cyNetworkManagerServiceRef);
EditorCytoPanelComponent editorCytoPanelComponent = new
EditorCytoPanelComponent(cySwingApplicationServiceRef);
CurrentNetworkViewListener currentNetworkViewListener = new
CurrentNetworkViewListener(cySwingApplicationServiceRef,editorCytoPanelComponent);
Modified:
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTask.java
===================================================================
---
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTask.java
2011-09-27 19:20:51 UTC (rev 26986)
+++
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTask.java
2011-09-27 19:37:54 UTC (rev 26987)
@@ -19,20 +19,26 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.view.vizmap.VisualStyle;
+
public class DropNetworkViewTask extends AbstractNetworkViewTask {
private final Transferable t;
private final Point2D xformPt;
private final CyEventHelper eh;
+ private static int new_node_index =1;
+ private VisualMappingManager vmm;
private static final Logger logger =
LoggerFactory.getLogger(DropNetworkViewTask.class);
- public DropNetworkViewTask(CyNetworkView view, Transferable t, Point2D
xformPt, CyEventHelper eh) {
+ public DropNetworkViewTask(VisualMappingManager vmm, CyNetworkView
view, Transferable t, Point2D xformPt, CyEventHelper eh) {
super(view);
this.t = t;
this.xformPt = xformPt;
this.eh = eh;
+ this.vmm = vmm;
}
@Override
@@ -44,10 +50,22 @@
CyNetwork net = view.getModel();
CyNode n = net.addNode();
+
+ // set the name attribute for the new node
+ String nodeName = "Node_"+ new_node_index;
+ new_node_index++;
+ n.getCyRow().set("name", nodeName);
+
eh.flushPayloadEvents();
View<CyNode> nv = view.getNodeView(n);
nv.setVisualProperty(MinimalVisualLexicon.NODE_X_LOCATION,xformPt.getX());
nv.setVisualProperty(MinimalVisualLexicon.NODE_Y_LOCATION,xformPt.getY());
view.updateView();
+
+
+ // Apply visual style
+ VisualStyle vs = vmm.getVisualStyle(view);
+ vs.apply(view);
+
}
}
Modified:
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTaskFactoryImpl.java
2011-09-27 19:20:51 UTC (rev 26986)
+++
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTaskFactoryImpl.java
2011-09-27 19:37:54 UTC (rev 26987)
@@ -7,6 +7,7 @@
import org.cytoscape.dnd.DropNetworkViewTaskFactory;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.work.TaskIterator;
@@ -16,9 +17,11 @@
private Point2D javaPt;
private Point2D xformPt;
private final CyEventHelper eh;
+ private final VisualMappingManager vmm;
- public DropNetworkViewTaskFactoryImpl(CyEventHelper eh) {
+ public DropNetworkViewTaskFactoryImpl(CyEventHelper eh,
VisualMappingManager vmm) {
this.eh = eh;
+ this.vmm = vmm;
}
public void setNetworkView(CyNetworkView view) {
@@ -32,6 +35,6 @@
}
public TaskIterator getTaskIterator() {
- return new TaskIterator(new DropNetworkViewTask(view, t,
xformPt, eh));
+ return new TaskIterator(new DropNetworkViewTask(vmm, view, t,
xformPt, eh));
}
}
--
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.
