Author: kono
Date: 2010-12-07 10:53:52 -0800 (Tue, 07 Dec 2010)
New Revision: 23108
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-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
Log:
Default View's background color problem is fixed.
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 17:54:30 UTC (rev 23107)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2010-12-07 18:53:52 UTC (rev 23108)
@@ -2442,7 +2442,7 @@
m_foregroundCanvas.paint(g);
// Restore foreground to original size
m_foregroundCanvas.setSize(originalSize);
-
+
return image;
}
@@ -2840,6 +2840,10 @@
}
+
+ /**
+ * Common API for all rendering engines.
+ */
@Override public Image createImage(int width, int height) {
return createImage(width, height, 1, true);
}
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 17:54:30 UTC (rev 23107)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2010-12-07 18:53:52 UTC (rev 23108)
@@ -137,7 +137,7 @@
inFrame.setContentPane(dgv.getContainer(inFrame.getLayeredPane()));
// dgv.addTransferComponent(desktopPane);
} else {
- JComponent component = (JComponent)
presentationContainer;
+ final JComponent component = (JComponent)
presentationContainer;
component.setLayout(new BorderLayout());
component.add(dgv.getComponent(),
BorderLayout.CENTER);
}
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 17:54:30 UTC (rev 23107)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewMouseListener.java
2010-12-07 18:53:52 UTC (rev 23108)
@@ -53,16 +53,15 @@
private final DefaultViewEditor defViewEditor;
private final VizMapperMainPanel vizMapperMainPanel;
private final SelectedVisualStyleManager manager;
-
public DefaultViewMouseListener(final DefaultViewEditor defViewEditor,
- final VizMapperMainPanel vizMapperMainPanel,
SelectedVisualStyleManager manager) {
+ final VizMapperMainPanel vizMapperMainPanel,
+ SelectedVisualStyleManager manager) {
this.defViewEditor = defViewEditor;
this.vizMapperMainPanel = vizMapperMainPanel;
this.manager = manager;
}
-
/**
* Creates a new DefaultViewMouseListener object. / public
* DefaultViewMouseListener(DefaultViewEditor defViewEditor) {
@@ -75,14 +74,17 @@
*/
public void mouseClicked(MouseEvent e) {
if (SwingUtilities.isLeftMouseButton(e)) {
-
- defViewEditor.showEditor(null);
- // TODO Should be handled by listener.
-
vizMapperMainPanel.updateDefaultImage(manager.getCurrentVisualStyle(),
-
((DefaultViewPanel)defViewEditor.getDefaultView(manager.getCurrentVisualStyle())).getRenderingEngine(),
- vizMapperMainPanel.getDefaultViewPanel().getSize());
-
vizMapperMainPanel.setDefaultViewImagePanel(vizMapperMainPanel
-
.getDefaultImageManager().get(manager.getCurrentVisualStyle()));
+
+ defViewEditor.showEditor(vizMapperMainPanel);
+
+ 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 17:54:30 UTC (rev 23107)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
2010-12-07 18:53:52 UTC (rev 23108)
@@ -54,6 +54,7 @@
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.RenderingEngineFactory;
+import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.gui.DefaultViewPanel;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
@@ -143,6 +144,7 @@
.getCurrentVisualStyle();
currentStyle.apply(dummyview);
+ this.innerPanel.setBackground((Color)
currentStyle.getDefaultValue(TwoDVisualLexicon.NETWORK_BACKGROUND_PAINT));
// Render it in this panel
renderingEngine = presentationFactory
.getInstance(innerPanel, dummyview);
@@ -154,7 +156,7 @@
final CyNetworkView viewModel = (CyNetworkView) renderingEngine
.getViewModel();
vs.apply(viewModel);
-
+ this.innerPanel.setBackground((Color)
vs.getDefaultValue(TwoDVisualLexicon.NETWORK_BACKGROUND_PAINT));
// This is necessary to adjust the size of default image.
viewModel.fitContent();
}
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 17:54:30 UTC (rev 23107)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2010-12-07 18:53:52 UTC (rev 23108)
@@ -29,6 +29,7 @@
import java.awt.BorderLayout;
+import java.awt.Color;
import java.awt.Component;
import java.awt.Cursor;
import java.awt.Dimension;
@@ -61,6 +62,7 @@
import org.cytoscape.view.model.events.NetworkViewAddedEvent;
import org.cytoscape.view.model.events.NetworkViewAddedListener;
import org.cytoscape.view.presentation.RenderingEngine;
+import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.VisualStyleFactory;
@@ -381,7 +383,8 @@
*/
public void setDefaultViewImagePanel(final Image defImage) {
if (defImage == null) {
- logger.debug("****************** image is null.");
+ logger.debug("Default image is null!");
+ return;
}
defaultViewImagePanel.removeAll();
@@ -390,13 +393,11 @@
defaultImageButton.setUI(new BlueishButtonUI());
defaultImageButton.setCursor(Cursor
.getPredefinedCursor(Cursor.HAND_CURSOR));
+
+ defaultImageButton.setIcon(new ImageIcon(defImage));
+ final VisualStyle currentStyle =
manager.getCurrentVisualStyle();
+ defaultImageButton.setBackground((Color)
currentStyle.getDefaultValue(TwoDVisualLexicon.NETWORK_BACKGROUND_PAINT));
- if(defImage != null)
- defaultImageButton.setIcon(new ImageIcon(defImage));
-
-// if(vsComboBoxModel.getSelectedItem() != null)
-// defaultImageButton
-//
.setText(vsComboBoxModel.getSelectedItem().toString());
defaultViewImagePanel.add(defaultImageButton,
BorderLayout.CENTER);
defaultImageButton.addMouseListener(defaultViewMouseListener);
this.repaint();
--
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.
