Author: kono
Date: 2010-12-06 19:39:35 -0800 (Mon, 06 Dec 2010)
New Revision: 23104
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
core3/vizmap-gui-api/trunk/pom.xml
core3/vizmap-gui-api/trunk/src/main/java/org/cytoscape/view/vizmap/gui/DefaultViewPanel.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewMouseListener.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
Log:
Default view editor is fixed and displays default view. Need to fix image
generator in DING.
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2010-12-07 00:32:48 UTC (rev 23103)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2010-12-07 03:39:35 UTC (rev 23104)
@@ -2840,9 +2840,8 @@
}
- public Image createImage(int width, int height) {
- // TODO Auto-generated method stub
- return null;
+ @Override public Image createImage(int width, int height) {
+ return createImage(width, height, 1, true);
}
public VisualLexicon getVisualLexicon() {
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2010-12-07 00:32:48 UTC (rev 23103)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2010-12-07 03:39:35 UTC (rev 23104)
@@ -1,6 +1,7 @@
package org.cytoscape.ding.impl;
+import java.awt.BorderLayout;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -8,6 +9,7 @@
import javax.swing.JComponent;
import javax.swing.JDesktopPane;
import javax.swing.JInternalFrame;
+import javax.swing.JLayeredPane;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetwork;
@@ -93,9 +95,14 @@
* Render given view model by Ding rendering engine.
*
*/
- @Override public RenderingEngine<CyNetwork> getInstance(Object
presentationContainer,
+ @Override public RenderingEngine<CyNetwork> getInstance(final Object
presentationContainer,
View<CyNetwork> view) {
+ // Validate arguments
+ if (presentationContainer == null)
+ throw new IllegalArgumentException(
+ "Container is null.");
+
if (view == null)
throw new IllegalArgumentException(
"Cannot create presentation for null
view model.");
@@ -105,22 +112,25 @@
"Ding accepts CyNetworkView only.");
final CyNetworkView targetView = (CyNetworkView) view;
+
DGraphView dgv = null;
if (presentationContainer instanceof JComponent) {
logger.debug("Start rendering presentation by Ding: "
+ targetView.getSUID());
+
dgv = new DGraphView(targetView, dataTableFactory,
rootNetworkFactory, undo,
spacialFactory, dingLexicon,
nodeViewTFs, edgeViewTFs,
emptySpaceTFs, dropNodeViewTFs,
dropEmptySpaceTFs, tm, eventHelper,
tableMgr);
+
logger.info("DGraphView created as a presentation for
view model: "
+ targetView.getSUID());
viewMap.put(targetView, dgv);
if (presentationContainer instanceof JInternalFrame) {
- JInternalFrame inFrame = (JInternalFrame)
presentationContainer;
+ final JInternalFrame inFrame = (JInternalFrame)
presentationContainer;
JDesktopPane desktopPane =
inFrame.getDesktopPane();
// TODO - not sure this layered pane bit is
optimal
@@ -128,7 +138,8 @@
// dgv.addTransferComponent(desktopPane);
} else {
JComponent component = (JComponent)
presentationContainer;
- component.add(dgv.getComponent());
+ component.setLayout(new BorderLayout());
+ component.add(dgv.getComponent(),
BorderLayout.CENTER);
}
} else {
Modified: core3/vizmap-gui-api/trunk/pom.xml
===================================================================
--- core3/vizmap-gui-api/trunk/pom.xml 2010-12-07 00:32:48 UTC (rev 23103)
+++ core3/vizmap-gui-api/trunk/pom.xml 2010-12-07 03:39:35 UTC (rev 23104)
@@ -79,6 +79,11 @@
<artifactId>vizmap-api</artifactId>
<version>3.0.0-alpha2-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>presentation-api</artifactId>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified:
core3/vizmap-gui-api/trunk/src/main/java/org/cytoscape/view/vizmap/gui/DefaultViewPanel.java
===================================================================
---
core3/vizmap-gui-api/trunk/src/main/java/org/cytoscape/view/vizmap/gui/DefaultViewPanel.java
2010-12-07 00:32:48 UTC (rev 23103)
+++
core3/vizmap-gui-api/trunk/src/main/java/org/cytoscape/view/vizmap/gui/DefaultViewPanel.java
2010-12-07 03:39:35 UTC (rev 23104)
@@ -1,6 +1,7 @@
package org.cytoscape.view.vizmap.gui;
-import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.view.presentation.RenderingEngine;
public interface DefaultViewPanel {
@@ -11,6 +12,6 @@
*
* @return DOCUMENT ME!
*/
- public CyNetworkView getView();
+ public RenderingEngine<CyNetwork> getRenderingEngine();
}
\ No newline at end of file
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2010-12-07 00:32:48 UTC (rev 23103)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2010-12-07 03:39:35 UTC (rev 23104)
@@ -93,17 +93,13 @@
* </ul>
* </p>
*
- * @version 0.5
- * @since Cytoscape 2.5
- * @author kono
*/
public class DefaultViewEditorImpl extends JDialog implements
DefaultViewEditor, SelectedVisualStyleSwitchedListener {
private final static long serialVersionUID = 1202339876675416L;
- private static final Logger logger = LoggerFactory
- .getLogger(DefaultViewEditorImpl.class);
+ private static final Logger logger =
LoggerFactory.getLogger(DefaultViewEditorImpl.class);
private static final int ICON_WIDTH = 48;
private static final int ICON_HEIGHT = 48;
@@ -113,12 +109,13 @@
private final CyApplicationManager cyApplicationManager;
- private EditorManager editorFactory;
+ private final EditorManager editorFactory;
+ private final VisualMappingManager vmm;
+ private final SelectedVisualStyleManager selectedManager;
- private VisualMappingManager vmm;
- final SelectedVisualStyleManager selectedManager;
-
private final VizMapperUtil util;
+
+ private final DefaultViewPanelImpl mainView;
/**
* Creates a new DefaultAppearenceBuilder object.
@@ -135,6 +132,10 @@
final SelectedVisualStyleManager selectedManager,
final VizMapperUtil util) {
super();
+
+ if(mainView == null)
+ throw new NullPointerException("DefaultViewPanel is
missing.");
+
this.vmm = vmm;
this.util = util;
this.selectedManager = selectedManager;
@@ -155,7 +156,6 @@
this.addComponentListener(new ComponentAdapter() {
public void componentResized(ComponentEvent e) {
defaultObjectTabbedPane.repaint();
- mainView.repaint();
mainView.updateView();
}
});
@@ -210,17 +210,12 @@
}
- /*
- * (non-Javadoc)
- *
- * @see
- *
org.cytoscape.vizmap.gui.internal.DefaultViewEditor#showDialog(java.awt
- * .Component)
- */
- public void showEditor(Component parent) {
+
+ @Override public void showEditor(Component parent) {
updateVisualPropertyLists();
buildList();
+ mainView.updateView();
setSize(900, 450);
setLocationRelativeTo(parent);
setVisible(true);
@@ -234,12 +229,12 @@
* .lang.String)
*/
public JPanel getDefaultView(String vsName) {
- // TODO: update background color
- // mainView.updateBackgroungColor(vmm.getVisualStyle()
- //
.getGlobalAppearanceCalculator().getDefaultBackgroundColor());
+// // TODO: update background color
+// mainView.updateBackgroungColor(vmm.getVisualStyle()
+// .getGlobalAppearanceCalculator().getDefaultBackgroundColor());
+//
+// mainView.updateView();
- // mainView.updateView();
-
return mainView;
}
@@ -293,16 +288,7 @@
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
- mainView.setBorder(new javax.swing.border.LineBorder(
- java.awt.Color.darkGray, 1, true));
- GroupLayout jXPanel2Layout = new GroupLayout(mainView);
- mainView.setLayout(jXPanel2Layout);
-
jXPanel2Layout.setHorizontalGroup(jXPanel2Layout.createParallelGroup(
- GroupLayout.Alignment.LEADING).addGap(0, 300,
Short.MAX_VALUE));
-
jXPanel2Layout.setVerticalGroup(jXPanel2Layout.createParallelGroup(
- GroupLayout.Alignment.LEADING).addGap(0, 237,
Short.MAX_VALUE));
-
jXTitledPanel1.setTitle("Default Visual Properties");
// TODO: fix gradient
// jXTitledPanel1.setTitlePainter(new BasicGradientPainter(
@@ -462,6 +448,8 @@
private <V> void listActionPerformed(MouseEvent e) {
final Object source = e.getSource();
final JList list;
+
+
if (source instanceof JList)
list = (JList) source;
else
@@ -469,8 +457,8 @@
V newValue = null;
- final VisualProperty<V> vp = (VisualProperty<V>) list
- .getSelectedValue();
+ @SuppressWarnings("unchecked")
+ final VisualProperty<V> vp = (VisualProperty<V>)
list.getSelectedValue();
if (SwingUtilities.isLeftMouseButton(e) && e.getClickCount() ==
2) {
final VisualStyle selectedStyle = selectedManager
@@ -488,22 +476,21 @@
}
if (newValue != null) {
+ // Got new value. Apply to the dummy view.
selectedStyle.setDefaultValue(vp, newValue);
- selectedStyle.apply(cyApplicationManager
- .getCurrentNetworkView());
+ mainView.updateView();
+ mainView.repaint();
+ //selectedStyle.apply(mainView.updateView());
}
repaint();
- this.mainView.getView().updateView();
}
}
- private void applyNewStyle(CyNetworkView view) {
- final VisualStyle selectedStyle = selectedManager
- .getCurrentVisualStyle();
-
+ private void applyNewStyle(final CyNetworkView view) {
+ final VisualStyle selectedStyle =
selectedManager.getCurrentVisualStyle();
+
vmm.setVisualStyle(selectedStyle, view);
-
selectedStyle.apply(view);
view.updateView();
}
@@ -524,7 +511,7 @@
private org.jdesktop.swingx.JXTitledPanel jXTitledPanel1;
// End of variables declaration
- protected DefaultViewPanelImpl mainView;
+
/**
* DOCUMENT ME!
@@ -663,8 +650,7 @@
// }
public Component getDefaultView(VisualStyle vs) {
- // mainView.updateView();
-
+ mainView.updateView(vs);
return mainView;
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewMouseListener.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewMouseListener.java
2010-12-07 00:32:48 UTC (rev 23103)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewMouseListener.java
2010-12-07 03:39:35 UTC (rev 23104)
@@ -41,6 +41,8 @@
import javax.swing.SwingUtilities;
import org.cytoscape.view.vizmap.gui.DefaultViewEditor;
+import org.cytoscape.view.vizmap.gui.DefaultViewPanel;
+import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
/**
* Moulse Listener for the default view panel.
@@ -48,12 +50,19 @@
public class DefaultViewMouseListener extends MouseAdapter {
// Singleton managed by DI container.
- private DefaultViewEditor defViewEditor;
+ private final DefaultViewEditor defViewEditor;
+ private final VizMapperMainPanel vizMapperMainPanel;
+ private final SelectedVisualStyleManager manager;
- public DefaultViewMouseListener(DefaultViewEditor defViewEditor) {
+
+ public DefaultViewMouseListener(final DefaultViewEditor defViewEditor,
+ final VizMapperMainPanel vizMapperMainPanel,
SelectedVisualStyleManager manager) {
this.defViewEditor = defViewEditor;
+ this.vizMapperMainPanel = vizMapperMainPanel;
+ this.manager = manager;
}
+
/**
* Creates a new DefaultViewMouseListener object. / public
* DefaultViewMouseListener(DefaultViewEditor defViewEditor) {
@@ -68,13 +77,12 @@
if (SwingUtilities.isLeftMouseButton(e)) {
defViewEditor.showEditor(null);
-
// TODO Should be handled by listener.
- // vizMapperMainPanel.updateDefaultImage(targetStyle,
- // panel.getView(),
- // vizMapperMainPanel.getDefaultViewPanel().getSize());
- //
vizMapperMainPanel.setDefaultViewImagePanel(vizMapperMainPanel
- // .getDefaultImageManager().get(targetStyle));
+
vizMapperMainPanel.updateDefaultImage(manager.getCurrentVisualStyle(),
+
((DefaultViewPanel)defViewEditor.getDefaultView(manager.getCurrentVisualStyle())).getRenderingEngine(),
+ vizMapperMainPanel.getDefaultViewPanel().getSize());
+
vizMapperMainPanel.setDefaultViewImagePanel(vizMapperMainPanel
+
.getDefaultImageManager().get(manager.getCurrentVisualStyle()));
}
}
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
2010-12-07 00:32:48 UTC (rev 23103)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
2010-12-07 03:39:35 UTC (rev 23104)
@@ -37,68 +37,47 @@
import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.NODE_X_LOCATION;
import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.NODE_Y_LOCATION;
+import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
-import java.awt.Paint;
import javax.swing.JPanel;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.LineBorder;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNode;
+import org.cytoscape.model.CyTableEntry;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewFactory;
+import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.gui.DefaultViewPanel;
-import org.cytoscape.view.vizmap.gui.event.SelectedVisualStyleSwitchedEvent;
-import org.cytoscape.view.vizmap.gui.event.SelectedVisualStyleSwitchedListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
/**
- * Panel to show the default properties visually (as graphics).
+ * Container to embed the default presentation.
*
- * @version 0.6
- * @since Cytoscape 2.5
*/
-public class DefaultViewPanelImpl extends JPanel implements DefaultViewPanel,
- SelectedVisualStyleSwitchedListener {
+public class DefaultViewPanelImpl extends JPanel implements DefaultViewPanel {
+
private final static long serialVersionUID = 1202339876691085L;
- private static final Logger logger = LoggerFactory
- .getLogger(DefaultViewPanelImpl.class);
-
- // Padding around canvas
+ private static final Dimension MIN_SIZE = new Dimension(300, 200);
+
+ // Space around view.
private static final int PADDING = 20;
- // Dummy network view
- private CyNetworkView dummyview;
+ // Dummy network and its view
+ private final RenderingEngine<CyNetwork> renderingEngine;
+ private final SelectedVisualStyleManager selectedManager;
- // Dummy network displayed in the canvas
- private CyNetwork dummyNet;
+ // For padding.
+ private final JPanel innerPanel;
- // Background color of canvas
- private Paint background = Color.white;
-
- /*
- * Dummy graph components
- */
- private CyNode source;
- private CyNode target;
- private CyEdge edge;
-
- // Target visual style to be edited
- private VisualStyle vs;
-
- // Used to create dummy network
- private CyNetworkFactory cyNetworkFactory;
- private CyNetworkViewFactory cyNetworkViewFactory;
-
- // For setting presentation (rendered canvas) to this panel
- private RenderingEngineFactory<CyNetwork> presentationFactory;
-
/**
* Creates a new DefaultViewPanel object.
*
@@ -109,93 +88,84 @@
*/
public DefaultViewPanelImpl(final CyNetworkFactory cyNetworkFactory,
final CyNetworkViewFactory cyNetworkViewFactory,
- final RenderingEngineFactory<CyNetwork>
presentationFactory) {
-
- this.cyNetworkViewFactory = cyNetworkViewFactory;
- this.cyNetworkFactory = cyNetworkFactory;
- this.presentationFactory = presentationFactory;
+ final RenderingEngineFactory<CyNetwork>
presentationFactory,
+ final SelectedVisualStyleManager selectedManager) {
- // Create dummy network view
- createDummyNet();
+ this.innerPanel = new JPanel();
+ this.innerPanel.setBorder(new EmptyBorder(PADDING, PADDING,
PADDING, PADDING));
- this.setBackground((Color) background);
-
- logger.debug("Dummy view panel created");
- }
+ this.setPreferredSize(MIN_SIZE);
+ this.setSize(MIN_SIZE);
+ this.setMinimumSize(MIN_SIZE);
+ this.setBorder(new LineBorder(Color.DARK_GRAY, 2));
+ this.setLayout(new BorderLayout());
+ this.add(innerPanel, BorderLayout.CENTER);
- private void createDummyNet() {
- dummyNet = cyNetworkFactory.getInstance();
+ // Validate
+ if (cyNetworkFactory == null)
+ throw new NullPointerException("CyNetworkFactory is
null.");
- source = dummyNet.addNode();
- source.getCyRow().set("name", "Source");
+ if (cyNetworkViewFactory == null)
+ throw new NullPointerException("CyNetworkViewFactory is
null.");
- target = dummyNet.addNode();
- target.getCyRow().set("name", "Target");
+ if (presentationFactory == null)
+ throw new NullPointerException("RenderingEngineFactory
is null.");
- edge = dummyNet.addEdge(source, target, true);
- edge.getCyRow().set("name", "Source (interaction) Target");
+ if (selectedManager == null)
+ throw new NullPointerException(
+ "SelectedVisualStyleManager is null.");
- dummyNet.getCyRow().set("name", "Default Appearance");
- dummyview = cyNetworkViewFactory.getNetworkView(dummyNet);
+ this.selectedManager = selectedManager;
+ // Create dummy view.
+ final CyNetwork dummyNet = cyNetworkFactory.getInstance();
+
+ final CyNode source = dummyNet.addNode();
+ final CyNode target = dummyNet.addNode();
+
+ source.getCyRow().set(CyTableEntry.NAME, "Source");
+ target.getCyRow().set(CyTableEntry.NAME, "Target");
+
+ final CyEdge edge = dummyNet.addEdge(source, target, true);
+ edge.getCyRow().set(CyTableEntry.NAME, "Source (interaction)
Target");
+
+ dummyNet.getCyRow().set(CyTableEntry.NAME, "Default
Appearance");
+ final CyNetworkView dummyview = cyNetworkViewFactory
+ .getNetworkView(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, 10d);
+
dummyview.getNodeView(target).setVisualProperty(NODE_Y_LOCATION, 20d);
- // Set background color
- // background = vs.getDefaultValue(NETWORK_BACKGROUND_COLOR);
- // view.setVisualProperty(NETWORK_BACKGROUND_COLOR, background);
+ final VisualStyle currentStyle = selectedManager
+ .getCurrentVisualStyle();
+ currentStyle.apply(dummyview);
// Render it in this panel
- presentationFactory.getInstance(this, dummyview);
+ renderingEngine = presentationFactory
+ .getInstance(innerPanel, dummyview);
+ dummyview.fitContent();
}
- /**
- * DOCUMENT ME!
- */
- protected void updateView() {
+
+ void updateView(final VisualStyle vs) {
+ final CyNetworkView viewModel = (CyNetworkView) renderingEngine
+ .getViewModel();
+ vs.apply(viewModel);
- if (dummyview == null || presentationFactory == null)
- return;
-
- final Dimension panelSize = this.getSize();
- // view.setSize(new Dimension((int) panelSize.getWidth() -
PADDING,
- // (int) panelSize.getHeight() - PADDING));
-
// This is necessary to adjust the size of default image.
- dummyview.fitContent();
-
- // TODO: is this correct???
- this.removeAll();
-
- presentationFactory.getInstance(this, dummyview);
-
- // canvas.setLocation(PADDING / 2, PADDING / 2);
- // vs.apply(dummyview);
-
+ viewModel.fitContent();
}
-
- /*
- * (non-Javadoc)
- *
- * @see
org.cytoscape.application.swing.vizmap.gui.internal.DefaultViewPanel#getView()
- */
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public CyNetworkView getView() {
- return dummyview;
+
+ void updateView() {
+ updateView(selectedManager.getCurrentVisualStyle());
+
}
- public void handleEvent(SelectedVisualStyleSwitchedEvent e) {
-
- this.vs = e.getNewVisualStyle();
-
- // Apply the given visual style to the dummy net
- this.vs.apply(dummyview);
-
+ @Override
+ public RenderingEngine<CyNetwork> getRenderingEngine() {
+ return renderingEngine;
}
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2010-12-07 00:32:48 UTC (rev 23103)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2010-12-07 03:39:35 UTC (rev 23104)
@@ -52,6 +52,7 @@
import org.cytoscape.application.swing.CytoPanelComponent;
import org.cytoscape.application.swing.CytoPanelName;
import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.events.NetworkAddedEvent;
import org.cytoscape.model.events.NetworkAddedListener;
import org.cytoscape.session.CyApplicationManager;
@@ -59,6 +60,7 @@
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.model.events.NetworkViewAddedEvent;
import org.cytoscape.view.model.events.NetworkViewAddedListener;
+import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.VisualStyleFactory;
@@ -138,12 +140,12 @@
applicationManager, eventHelper, manager);
// Initialize all components
- initPanel();
+ initPanel(manager);
}
- private void initPanel() {
+ private void initPanel(final SelectedVisualStyleManager manager) {
- defaultViewMouseListener = new
DefaultViewMouseListener(defViewEditor);
+ defaultViewMouseListener = new
DefaultViewMouseListener(defViewEditor, this, manager);
addVisualStyleChangeAction();
@@ -247,10 +249,8 @@
if (defImg == null) {
// Default image is not available in the buffer. Create
a new one.
- // updateDefaultImage(style,
- // defViewEditor.
- // .getDefaultView(style).getView(),
- // defaultViewImagePanel.getSize());
+ updateDefaultImage(style,
((DefaultViewPanel)defViewEditor.getDefaultView(style)).getRenderingEngine(),
+ defaultViewImagePanel.getSize());
defImg = defaultImageManager.get(style);
}
@@ -293,9 +293,9 @@
logger.info("Adding VS: " + vs.getTitle());
vsComboBoxModel.addElement(vs);
defPanel = defViewEditor.getDefaultView(vs);
- view = ((DefaultViewPanel) defPanel).getView();
+ RenderingEngine<CyNetwork> engine = ((DefaultViewPanel)
defPanel).getRenderingEngine();
- updateDefaultImage(vs, view, panelSize);
+ updateDefaultImage(vs, engine, panelSize);
}
// Switch back to the original style.
@@ -319,8 +319,8 @@
* @param size
*/
// TODO: this should be called by listeners.
- public void updateDefaultImage(VisualStyle vs, CyNetworkView view,
- Dimension size) {
+ public void updateDefaultImage(VisualStyle vs,
RenderingEngine<CyNetwork> engine, Dimension size) {
+
Image image = defaultImageManager.remove(vs);
if (image != null) {
@@ -328,9 +328,7 @@
image = null;
}
- // TODO: Add image nenerator method in presentation
- // defaultImageManager.put(vs, view.createImage((int)
size.getWidth(),
- // (int) size.getHeight(), 0.9));
+ defaultImageManager.put(vs, engine.createImage((int)
size.getWidth(), (int) size.getHeight()));
}
public void updateAttributeList() {
@@ -383,8 +381,7 @@
*/
public void setDefaultViewImagePanel(final Image defImage) {
if (defImage == null) {
-
- // return;
+ logger.debug("****************** image is null.");
}
defaultViewImagePanel.removeAll();
@@ -396,9 +393,10 @@
if(defImage != null)
defaultImageButton.setIcon(new ImageIcon(defImage));
- if(vsComboBoxModel.getSelectedItem() != null)
- defaultImageButton
-
.setText(vsComboBoxModel.getSelectedItem().toString());
+
+// if(vsComboBoxModel.getSelectedItem() != null)
+// defaultImageButton
+//
.setText(vsComboBoxModel.getSelectedItem().toString());
defaultViewImagePanel.add(defaultImageButton,
BorderLayout.CENTER);
defaultImageButton.addMouseListener(defaultViewMouseListener);
this.repaint();
@@ -689,13 +687,13 @@
// Update default panel
final Component defPanel =
defViewEditor.getDefaultView(newStyle);
- final CyNetworkView view = (CyNetworkView)
((DefaultViewPanelImpl) defPanel).getView();
+ final RenderingEngine<CyNetwork> engine =
((DefaultViewPanelImpl) defPanel).getRenderingEngine();
final Dimension panelSize = getDefaultPanel().getSize();
- if (view != null) {
+ if (engine != null) {
logger.debug("Creating Default Image for new visual
style "
+ newStyle.getTitle());
- updateDefaultImage(newStyle, view, panelSize);
+ updateDefaultImage(newStyle, engine, panelSize);
setDefaultViewImagePanel(getDefaultImageManager().get(newStyle));
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
2010-12-07 00:32:48 UTC (rev 23103)
+++
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
2010-12-07 03:39:35 UTC (rev 23104)
@@ -172,6 +172,7 @@
<constructor-arg ref="cyNetworkFactoryServiceRef" />
<constructor-arg ref="graphViewFactoryServiceRef" />
<constructor-arg ref="presentationFactoryServiceRef" />
+ <constructor-arg ref="selectedVisualStyleManager" />
</bean>
<bean name="defViewEditor"
--
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.
