Author: paperwing
Date: 2012-02-15 15:10:07 -0800 (Wed, 15 Feb 2012)
New Revision: 28289
Modified:
csplugins/trunk/toronto/yuedong/multi_renderer/impl/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
csplugins/trunk/toronto/yuedong/multi_renderer/impl/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
Log:
In process of updating vizmap-gui implementation to use new ExternalRenderer
interface
Modified:
csplugins/trunk/toronto/yuedong/multi_renderer/impl/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
===================================================================
---
csplugins/trunk/toronto/yuedong/multi_renderer/impl/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2012-02-15 22:57:18 UTC (rev 28288)
+++
csplugins/trunk/toronto/yuedong/multi_renderer/impl/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2012-02-15 23:10:07 UTC (rev 28289)
@@ -20,6 +20,7 @@
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.presentation.ExternalRendererManager;
import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
@@ -89,6 +90,8 @@
VizmapReaderManager vizmapReaderManagerServiceRef =
getService(bc,VizmapReaderManager.class);
CyNetworkTableManager cyNetworkTableManagerServiceRef =
getService(bc,CyNetworkTableManager.class);
+ ExternalRendererManager externalRendererManagerServiceRef =
getService(bc, ExternalRendererManager.class);
+
AttributeSetManager attributeSetManager = new
AttributeSetManager(cyNetworkTableManagerServiceRef);
SelectedVisualStyleManagerImpl selectedVisualStyleManager = new
SelectedVisualStyleManagerImpl(vmmServiceRef);
EditorManagerImpl editorManager = new
EditorManagerImpl(cyApplicationManagerServiceRef,attributeSetManager,vmmServiceRef,cyNetworkTableManagerServiceRef,selectedVisualStyleManager);
@@ -109,7 +112,7 @@
ColorManager colorMgr = new ColorManager();
IconManager iconManager = new IconManager();
VizMapperMenuManager menuManager = new
VizMapperMenuManager(dialogTaskManagerServiceRef,propertySheetPanel,selectedVisualStyleManager,cyApplicationManagerServiceRef);
- DefaultViewPanelImpl defaultViewPanel = new
DefaultViewPanelImpl(cyNetworkFactoryServiceRef,graphViewFactoryServiceRef,presentationFactoryServiceRef,selectedVisualStyleManager);
+ DefaultViewPanelImpl defaultViewPanel = new
DefaultViewPanelImpl(cyNetworkFactoryServiceRef,externalRendererManagerServiceRef,selectedVisualStyleManager);
NodeSizeDependency nodeSizeDep = new NodeSizeDependency();
VizMapperUtil vizMapperUtil = new VizMapperUtil(vmmServiceRef);
VisualPropertyDependencyManagerImpl vpDependencyManager = new
VisualPropertyDependencyManagerImpl();
Modified:
csplugins/trunk/toronto/yuedong/multi_renderer/impl/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
===================================================================
---
csplugins/trunk/toronto/yuedong/multi_renderer/impl/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
2012-02-15 22:57:18 UTC (rev 28288)
+++
csplugins/trunk/toronto/yuedong/multi_renderer/impl/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
2012-02-15 23:10:07 UTC (rev 28289)
@@ -54,12 +54,15 @@
import org.cytoscape.model.CyTableEntry;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewFactory;
+import org.cytoscape.view.presentation.ExternalRenderer;
+import org.cytoscape.view.presentation.ExternalRendererManager;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.presentation.property.MinimalVisualLexicon;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.gui.DefaultViewPanel;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
+import
org.cytoscape.view.vizmap.gui.presentation.VisualStylePreviewRenderingEngineFactory;
/**
* Container to embed the default presentation.
@@ -90,8 +93,7 @@
* DOCUMENT ME!
*/
public DefaultViewPanelImpl(final CyNetworkFactory cyNetworkFactory,
- final CyNetworkViewFactory cyNetworkViewFactory,
- final RenderingEngineFactory<CyNetwork>
presentationFactory,
+ final ExternalRendererManager externalRendererManager,
final SelectedVisualStyleManager selectedManager) {
this.innerPanel = new JPanel();
@@ -106,12 +108,6 @@
if (cyNetworkFactory == null)
throw new NullPointerException("CyNetworkFactory is
null.");
- if (cyNetworkViewFactory == null)
- throw new NullPointerException("CyNetworkViewFactory is
null.");
-
- if (presentationFactory == null)
- throw new NullPointerException("RenderingEngineFactory
is null.");
-
if (selectedManager == null)
throw new NullPointerException(
"SelectedVisualStyleManager is null.");
@@ -131,31 +127,42 @@
dummyNet.getRow(edge).set(CyTableEntry.NAME, "Source
(interaction) Target");
dummyNet.getRow(dummyNet).set(CyTableEntry.NAME, "Default
Appearance");
- final CyNetworkView dummyview = cyNetworkViewFactory
- .createNetworkView(dummyNet);
-
- // Set node locations
-
dummyview.getNodeView(source).setVisualProperty(NODE_X_LOCATION, 0d);
-
dummyview.getNodeView(source).setVisualProperty(NODE_Y_LOCATION, 0d);
-
dummyview.getNodeView(target).setVisualProperty(NODE_X_LOCATION, 150d);
-
dummyview.getNodeView(target).setVisualProperty(NODE_Y_LOCATION, 20d);
-
- final VisualStyle currentStyle =
selectedManager.getCurrentVisualStyle();
- currentStyle.apply(dummyview);
-
- this.innerPanel.setBackground((Color)
currentStyle.getDefaultValue(MinimalVisualLexicon.NETWORK_BACKGROUND_PAINT));
- // Render it in this panel
- renderingEngine = presentationFactory
- .createRenderingEngine(innerPanel, dummyview);
- dummyview.fitContent();
- // Remove unnecessary mouse listeners.
- final int compCount = innerPanel.getComponentCount();
- for(int i=0; i<compCount; i++) {
- final Component comp = innerPanel.getComponent(i);
- final MouseListener[] listeners =
comp.getMouseListeners();
- for(MouseListener ml: listeners)
- comp.removeMouseListener(ml);
+ ExternalRenderer renderer =
externalRendererManager.getCurrentRenderer();
+ if (renderer != null) {
+
+ CyNetworkViewFactory cyNetworkViewFactory =
renderer.getNetworkViewFactory();
+ RenderingEngineFactory<CyNetwork> presentationFactory =
renderer
+
.getRenderingEngineFactory(VisualStylePreviewRenderingEngineFactory.class);
+
+ final CyNetworkView dummyview = cyNetworkViewFactory
+ .createNetworkView(dummyNet);
+
+ // Set node locations
+
dummyview.getNodeView(source).setVisualProperty(NODE_X_LOCATION, 0d);
+
dummyview.getNodeView(source).setVisualProperty(NODE_Y_LOCATION, 0d);
+
dummyview.getNodeView(target).setVisualProperty(NODE_X_LOCATION, 150d);
+
dummyview.getNodeView(target).setVisualProperty(NODE_Y_LOCATION, 20d);
+
+ final VisualStyle currentStyle =
selectedManager.getCurrentVisualStyle();
+ currentStyle.apply(dummyview);
+
+ this.innerPanel.setBackground((Color)
currentStyle.getDefaultValue(MinimalVisualLexicon.NETWORK_BACKGROUND_PAINT));
+ // Render it in this panel
+ if (presentationFactory != null) {
+ renderingEngine = presentationFactory
+
.createRenderingEngine(innerPanel, dummyview);
+ }
+ dummyview.fitContent();
+
+ // Remove unnecessary mouse listeners.
+ final int compCount = innerPanel.getComponentCount();
+ for(int i=0; i<compCount; i++) {
+ final Component comp =
innerPanel.getComponent(i);
+ final MouseListener[] listeners =
comp.getMouseListeners();
+ for(MouseListener ml: listeners)
+ comp.removeMouseListener(ml);
+ }
}
}
--
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.
