Author: kono
Date: 2012-05-15 18:41:34 -0700 (Tue, 15 May 2012)
New Revision: 29273
Added:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ClearBendTask.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ClearBendTaskFactory.java
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypassMenuListener.java
Log:
fixes #983 Clear bend context menu had been added.
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2012-05-15 23:40:19 UTC (rev 29272)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2012-05-16 01:41:34 UTC (rev 29273)
@@ -19,10 +19,11 @@
import org.cytoscape.model.CyTableManager;
import org.cytoscape.service.util.AbstractCyActivator;
import org.cytoscape.service.util.CyServiceRegistrar;
+import org.cytoscape.task.EdgeViewTaskFactory;
import org.cytoscape.view.model.CyNetworkViewFactory;
-import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.presentation.RenderingEngineManager;
+import org.cytoscape.view.presentation.property.values.BendFactory;
import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyleFactory;
@@ -42,6 +43,7 @@
import
org.cytoscape.view.vizmap.gui.internal.editor.valueeditor.NumericValueEditor;
import
org.cytoscape.view.vizmap.gui.internal.editor.valueeditor.StringValueEditor;
import
org.cytoscape.view.vizmap.gui.internal.event.VizMapEventHandlerManagerImpl;
+import org.cytoscape.view.vizmap.gui.internal.task.ClearBendTaskFactory;
import org.cytoscape.view.vizmap.gui.internal.task.CopyVisualStyleTaskFactory;
import org.cytoscape.view.vizmap.gui.internal.task.CreateLegendTaskFactory;
import
org.cytoscape.view.vizmap.gui.internal.task.CreateNewVisualStyleTaskFactory;
@@ -51,7 +53,6 @@
import
org.cytoscape.view.vizmap.gui.internal.task.RenameVisualStyleTaskFactory;
import org.cytoscape.view.vizmap.gui.internal.theme.ColorManager;
import org.cytoscape.view.vizmap.gui.internal.theme.IconManager;
-import org.cytoscape.view.vizmap.gui.internal.util.DefaultVisualStyleBuilder;
import org.cytoscape.view.vizmap.gui.internal.util.VizMapperUtil;
import
org.cytoscape.view.vizmap.gui.internal.util.mapgenerator.NumberSeriesMappingGenerator;
import
org.cytoscape.view.vizmap.gui.internal.util.mapgenerator.RainbowColorMappingGenerator;
@@ -59,6 +60,7 @@
import
org.cytoscape.view.vizmap.gui.internal.util.mapgenerator.RandomColorMappingGenerator;
import
org.cytoscape.view.vizmap.gui.internal.util.mapgenerator.RandomNumberMappingGenerator;
import org.cytoscape.view.vizmap.gui.util.DiscreteMappingGenerator;
+import org.cytoscape.work.ServiceProperties;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.swing.DialogTaskManager;
import org.osgi.framework.BundleContext;
@@ -146,7 +148,14 @@
VizMapEventHandlerManagerImpl vizMapEventHandlerManager = new
VizMapEventHandlerManagerImpl(selectedVisualStyleManager,editorManager,vizMapPropertySheetBuilder,propertySheetPanel,vizMapperMainPanel,cyNetworkTableManagerServiceRef,cyApplicationManagerServiceRef,attributeSetManager,vizMapperUtil);
BypassManager bypassManager = new
BypassManager(cyServiceRegistrarServiceRef,editorManager,selectedVisualStyleManager);
+ // Context menu for edge bend
+ BendFactory bf = getService(bc, BendFactory.class);
+ final Properties clearBendProp = new Properties();
+ clearBendProp.put(ServiceProperties.PREFERRED_MENU, "Clear
Bend");
+ final ClearBendTaskFactory clearBendTaskFactory = new
ClearBendTaskFactory(selectedVisualStyleManager, bf);
+ registerService(bc, clearBendTaskFactory,
EdgeViewTaskFactory.class, clearBendProp);
+
registerAllServices(bc,viewModeAction, new Properties());
registerAllServices(bc,selectedVisualStyleManager, new
Properties());
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypassMenuListener.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypassMenuListener.java
2012-05-15 23:40:19 UTC (rev 29272)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypassMenuListener.java
2012-05-16 01:41:34 UTC (rev 29273)
@@ -54,34 +54,4 @@
NodeBypassMenuListener(EditorManager ef) {
this.ef = ef;
}
-
- /**
- * @param nodeView
- * The clicked NodeView
- * @param menu
- * popup menu to add the Bypass menu
- */
-// public void addNodeContextMenuItems(NodeView nodeView, JPopupMenu menu)
{
-// NodeBypass nb = new NodeBypass(ef);
-//
-// if (menu == null)
-// menu = new JPopupMenu();
-//
-// /*
-// * Add Node ID as label.
-// */
-// final String nodeID = nodeView.getNode().attrs().get("name",
-// String.class);
-// final JLabel nodeLabel = new JLabel(nodeID);
-//
-// if (menu == null)
-// menu = new JPopupMenu();
-//
-// nodeLabel.setForeground(new Color(10, 50, 250, 150));
-// nodeLabel.setFont(new Font("SansSerif", Font.BOLD, 18));
-// nodeLabel.setBorder(new EmptyBorder(5, 10, 5, 5));
-// menu.add(nodeLabel);
-//
-// menu.add(nb.addMenu(nodeView.getNode()));
-// }
}
Added:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ClearBendTask.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ClearBendTask.java
(rev 0)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ClearBendTask.java
2012-05-16 01:41:34 UTC (rev 29273)
@@ -0,0 +1,53 @@
+package org.cytoscape.view.vizmap.gui.internal.task;
+
+import javax.swing.SwingUtilities;
+
+import org.cytoscape.model.CyEdge;
+import org.cytoscape.model.CyRow;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.presentation.property.BasicVisualLexicon;
+import org.cytoscape.view.presentation.property.values.Bend;
+import org.cytoscape.view.presentation.property.values.BendFactory;
+import org.cytoscape.view.vizmap.VisualMappingFunction;
+import org.cytoscape.view.vizmap.VisualStyle;
+import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
+import org.cytoscape.work.AbstractTask;
+import org.cytoscape.work.TaskMonitor;
+
+public class ClearBendTask extends AbstractTask {
+
+ private final View<CyEdge> edgeView;
+ private final CyNetworkView netView;
+ private final BendFactory bendFactory;
+
+ private final SelectedVisualStyleManager selectedManager;
+
+ ClearBendTask(View<CyEdge> edgeView, CyNetworkView netView, final
SelectedVisualStyleManager selectedManager,
+ final BendFactory bendFactory) {
+ this.edgeView = edgeView;
+ this.netView = netView;
+ this.selectedManager = selectedManager;
+ this.bendFactory = bendFactory;
+ }
+
+ @Override
+ public void run(TaskMonitor taskMonitor) throws Exception {
+ SwingUtilities.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ final VisualStyle style =
selectedManager.getCurrentVisualStyle();
+ final VisualMappingFunction<?, Bend> mapping =
style
+
.getVisualMappingFunction(BasicVisualLexicon.EDGE_BEND);
+ if (mapping != null) {
+
edgeView.setVisualProperty(BasicVisualLexicon.EDGE_BEND,
bendFactory.createBend());
+ } else {
+
style.setDefaultValue(BasicVisualLexicon.EDGE_BEND, bendFactory.createBend());
+
selectedManager.getCurrentVisualStyle().apply(netView);
+ }
+ netView.updateView();
+ }
+ });
+ }
+}
Added:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ClearBendTaskFactory.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ClearBendTaskFactory.java
(rev 0)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ClearBendTaskFactory.java
2012-05-16 01:41:34 UTC (rev 29273)
@@ -0,0 +1,25 @@
+package org.cytoscape.view.vizmap.gui.internal.task;
+
+import org.cytoscape.model.CyEdge;
+import org.cytoscape.task.AbstractEdgeViewTaskFactory;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.presentation.property.values.BendFactory;
+import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
+import org.cytoscape.work.TaskIterator;
+
+public class ClearBendTaskFactory extends AbstractEdgeViewTaskFactory {
+
+ private final SelectedVisualStyleManager selectedManager;
+ private final BendFactory bendFactory;
+
+ public ClearBendTaskFactory(final SelectedVisualStyleManager
selectedManager, final BendFactory bendFactory) {
+ this.selectedManager = selectedManager;
+ this.bendFactory = bendFactory;
+ }
+
+ @Override
+ public TaskIterator createTaskIterator(View<CyEdge> edgeView,
CyNetworkView netView) {
+ return new TaskIterator(new ClearBendTask(edgeView, netView,
selectedManager, bendFactory));
+ }
+}
--
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.
