Author: kono
Date: 2011-09-27 15:01:02 -0700 (Tue, 27 Sep 2011)
New Revision: 26998
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
core3/impl/trunk/vizmap-gui-impl/src/main/resources/default_vizmap.xml
Log:
Default style had been modified.
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
2011-09-27 21:59:02 UTC (rev 26997)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
2011-09-27 22:01:02 UTC (rev 26998)
@@ -272,15 +272,16 @@
// TODO why do we have to do this?
mainSplitPane.setSize(new Dimension(100, 120));
- defaultViewImagePanel.setMinimumSize(new Dimension(100, 100));
- defaultViewImagePanel.setPreferredSize(new
Dimension(mainSplitPane
- .getWidth(),
mainSplitPane.getDividerLocation()));
-
defaultViewImagePanel.setSize(defaultViewImagePanel.getPreferredSize());
- defaultViewImagePanel.setLayout(new BorderLayout());
-
listSplitPane.setDividerLocation(400);
listSplitPane.setDividerSize(5);
listSplitPane.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
+
+ // Default View Panel
+ defaultViewImagePanel.setMinimumSize(new Dimension(200, 200));
+ defaultViewImagePanel.setPreferredSize(new
Dimension(mainSplitPane.getWidth(), mainSplitPane
+ .getDividerLocation()));
+
defaultViewImagePanel.setSize(defaultViewImagePanel.getPreferredSize());
+ defaultViewImagePanel.setLayout(new BorderLayout());
noMapListScrollPane = new javax.swing.JScrollPane();
noMapListScrollPane.setBorder(javax.swing.BorderFactory
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2011-09-27 21:59:02 UTC (rev 26997)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2011-09-27 22:01:02 UTC (rev 26998)
@@ -239,8 +239,7 @@
final CyNetworkView currentView =
applicationManager.getCurrentNetworkView();
if (currentView != null) {
- vmm.setVisualStyle((VisualStyle)
visualStyleComboBox.getModel()
- .getSelectedItem(), currentView);
+ vmm.setVisualStyle((VisualStyle)
visualStyleComboBox.getModel().getSelectedItem(), currentView);
style.apply(currentView);
// Update view
currentView.updateView();
@@ -253,9 +252,7 @@
if (defImg == null) {
// Default image is not available in the buffer. Create
a new one.
- updateDefaultImage(style,
- ((DefaultViewPanel)
defViewEditor.getDefaultView(style))
- .getRenderingEngine(),
+ updateDefaultImage(style, ((DefaultViewPanel)
defViewEditor.getDefaultView(style)).getRenderingEngine(),
defaultViewImagePanel.getSize());
defImg = defaultImageManager.get(style);
}
@@ -269,8 +266,6 @@
final List<VisualStyle> visualStyles = new
ArrayList<VisualStyle>(
vmm.getAllVisualStyles());
- // final VisualStyle selectedStyle = (VisualStyle)
- // vsComboBox.getModel().getSelectedItem();
// Disable action listeners
final ActionListener[] li =
visualStyleComboBox.getActionListeners();
@@ -363,12 +358,7 @@
}
- /**
- * DOCUMENT ME!
- *
- * @param arg0
- * DOCUMENT ME!
- */
+ @Override
public void popupMenuCanceled(PopupMenuEvent arg0) {
// TODO: replace this to firePropertyChange
// disableAllPopup();
Modified: core3/impl/trunk/vizmap-gui-impl/src/main/resources/default_vizmap.xml
===================================================================
--- core3/impl/trunk/vizmap-gui-impl/src/main/resources/default_vizmap.xml
2011-09-27 21:59:02 UTC (rev 26997)
+++ core3/impl/trunk/vizmap-gui-impl/src/main/resources/default_vizmap.xml
2011-09-27 22:01:02 UTC (rev 26998)
@@ -42,11 +42,11 @@
<visualProperty name="NODE_CUSTOMGRAPHICS_SIZE_7" default="50.0"/>
<visualProperty name="NODE_CUSTOMPAINT_7"
default="org.cytoscape.view.presentation.property.DefaultVisualizableVisualProperty$VisualizableImpl@210713c7"/>
<visualProperty name="NODE_CUSTOMPAINT_3"
default="org.cytoscape.view.presentation.property.DefaultVisualizableVisualProperty$VisualizableImpl@210713c7"/>
- <visualProperty name="NODE_FILL_COLOR" default="#ffffff"/>
- <visualProperty name="NODE_PAINT" default="#787878"/>
+ <visualProperty name="NODE_FILL_COLOR" default="#1E90FF"/>
+ <visualProperty name="NODE_PAINT" default="#1E90FF"/>
<visualProperty name="NODE_CUSTOMGRAPHICS_POSITION_4"
default="C,C,c,0.00,0.00"/>
<visualProperty name="NODE_DEPTH" default="0.0"/>
- <visualProperty name="NODE_WIDTH" default="70.0"/>
+ <visualProperty name="NODE_WIDTH" default="60.0"/>
<visualProperty name="NODE_BORDER_WIDTH" default="1.0"/>
<visualProperty name="NODE_CUSTOMGRAPHICS_3"/>
<visualProperty name="NODE_CUSTOMGRAPHICS_8"/>
@@ -68,7 +68,7 @@
<visualProperty name="NODE_LABEL" default="">
<passthroughMapping attributeType="string"
attributeName="name"/>
</visualProperty>
- <visualProperty name="NODE_HEIGHT" default="30.0"/>
+ <visualProperty name="NODE_HEIGHT" default="35.0"/>
<visualProperty name="NODE_VISIBLE" default="true"/>
<visualProperty name="NODE_CUSTOMGRAPHICS_4"/>
<visualProperty name="NODE_SELECTED" default="false"/>
--
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.
