Author: clopes
Date: 2012-05-02 12:29:33 -0700 (Wed, 02 May 2012)
New Revision: 29081
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
Log:
The selected element of the "Current visual style" combo-box is now updated
after a VisualStyleSetEvent is fired.
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
2012-05-02 19:24:47 UTC (rev 29080)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2012-05-02 19:29:33 UTC (rev 29081)
@@ -69,6 +69,8 @@
import org.cytoscape.view.vizmap.events.VisualStyleAboutToBeRemovedListener;
import org.cytoscape.view.vizmap.events.VisualStyleAddedEvent;
import org.cytoscape.view.vizmap.events.VisualStyleAddedListener;
+import org.cytoscape.view.vizmap.events.VisualStyleSetEvent;
+import org.cytoscape.view.vizmap.events.VisualStyleSetListener;
import org.cytoscape.view.vizmap.gui.DefaultViewEditor;
import org.cytoscape.view.vizmap.gui.DefaultViewPanel;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
@@ -101,8 +103,9 @@
*
*/
public class VizMapperMainPanel extends AbstractVizMapperPanel implements
VisualStyleAddedListener,
- VisualStyleAboutToBeRemovedListener, PopupMenuListener,
NetworkViewAddedListener, CytoPanelComponent,
- SelectedVisualStyleSwitchedListener,
SetCurrentRenderingEngineListener, PropertyChangeListener,
LexiconStateChangedListener {
+ VisualStyleSetListener, VisualStyleAboutToBeRemovedListener,
PopupMenuListener, NetworkViewAddedListener,
+ CytoPanelComponent, SelectedVisualStyleSwitchedListener,
SetCurrentRenderingEngineListener,
+ PropertyChangeListener, LexiconStateChangedListener {
private final static long serialVersionUID = 1202339867854959L;
@@ -424,6 +427,22 @@
}
@Override
+ public void handleEvent(VisualStyleSetEvent e) {
+ final CyNetworkView view = e.getNetworkView();
+
+ if(view.equals(applicationManager.getCurrentNetworkView())) {
+ // Only switch the selected style if the network view
is the current one
+ final VisualStyle style = e.getVisualStyle();
+ final VisualStyle lastStyle = (VisualStyle)
visualStyleComboBox.getSelectedItem();
+
+ // Also check if the style is not already selected
+ if(style.equals(lastStyle) == false) {
+ eventHelper.fireEvent(new
SelectedVisualStyleSwitchedEvent(this, lastStyle, style));
+ }
+ }
+ }
+
+ @Override
public String getTitle() {
return TAB_TITLE;
}
@@ -451,7 +470,6 @@
if(newStyle.equals(currentSelected) == false)
this.visualStyleComboBox.setSelectedItem(newStyle);
}
-
@Override
public void handleEvent(SetCurrentRenderingEngineEvent e) {
@@ -465,7 +483,6 @@
this.visualStyleComboBox.setSelectedItem(newStyle);
}
-
/**
* Handles local property change event.
* This will be used to switch view mode: show all VPs or basic VPs
only.
--
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.
