Author: kono
Date: 2011-07-01 18:34:41 -0700 (Fri, 01 Jul 2011)
New Revision: 26012
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
core3/vizmap-impl/trunk/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleFactoryImpl.java
core3/vizmap-impl/trunk/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
Log:
fixes #275 Unnecessary visual style switch method calls had been removed.
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
2011-07-02 00:31:52 UTC (rev 26011)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2011-07-02 01:34:41 UTC (rev 26012)
@@ -316,9 +316,9 @@
}
- void updateDefaultImage(final VisualStyle vs,
- final RenderingEngine<CyNetwork> engine, final
Dimension size) {
+ void updateDefaultImage(final VisualStyle vs, final
RenderingEngine<CyNetwork> engine, final Dimension size) {
+ logger.debug("Creating Default Image for new visual style " +
vs.getTitle());
Image image = defaultImageManager.remove(vs);
if (image != null) {
@@ -326,10 +326,7 @@
image = null;
}
- defaultImageManager.put(
- vs,
- engine.createImage((int) size.getWidth(),
- (int) size.getHeight()));
+ defaultImageManager.put(vs, engine.createImage((int)
size.getWidth(), (int) size.getHeight()));
}
public void updateAttributeList() {
@@ -673,31 +670,20 @@
return;
vsComboBoxModel.addElement(newStyle);
- visualStyleComboBox.setSelectedItem(newStyle);
+ final CyNetworkView currentView =
applicationManager.getCurrentNetworkView();
- final CyNetworkView currentView = applicationManager
- .getCurrentNetworkView();
-
if (currentView != null)
vmm.setVisualStyle(newStyle, currentView);
// Update default panel
final Component defPanel =
defViewEditor.getDefaultView(newStyle);
- final RenderingEngine<CyNetwork> engine =
((DefaultViewPanelImpl) defPanel)
- .getRenderingEngine();
+ final RenderingEngine<CyNetwork> engine =
((DefaultViewPanelImpl) defPanel).getRenderingEngine();
final Dimension panelSize = defaultViewImagePanel.getSize();
- if (engine != null) {
- logger.debug("Creating Default Image for new visual
style "
- + newStyle.getTitle());
+ if (engine != null)
updateDefaultImage(newStyle, engine, panelSize);
-
setDefaultViewImagePanel(getDefaultImageManager().get(newStyle));
- }
-
- switchVS(newStyle);
- eventHelper.fireEvent(new SelectedVisualStyleSwitchedEvent(
- this, currentStyle, newStyle));
- logger.debug("######## Event: Got new style: " + newStyle);
+
+ // TODO: switch only if it is necessary
}
@Override
Modified:
core3/vizmap-impl/trunk/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleFactoryImpl.java
===================================================================
---
core3/vizmap-impl/trunk/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleFactoryImpl.java
2011-07-02 00:31:52 UTC (rev 26011)
+++
core3/vizmap-impl/trunk/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleFactoryImpl.java
2011-07-02 01:34:41 UTC (rev 26012)
@@ -28,7 +28,7 @@
}
@Override
- public VisualStyle getInstance(String title) {
+ public VisualStyle getInstance(final String title) {
return new VisualStyleImpl(title, lexManager);
}
Modified:
core3/vizmap-impl/trunk/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
===================================================================
---
core3/vizmap-impl/trunk/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
2011-07-02 00:31:52 UTC (rev 26011)
+++
core3/vizmap-impl/trunk/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
2011-07-02 01:34:41 UTC (rev 26012)
@@ -38,7 +38,6 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
@@ -46,8 +45,6 @@
import org.cytoscape.model.CyTableEntry;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
-import org.cytoscape.view.model.VisualLexicon;
-import org.cytoscape.view.model.VisualLexiconNode;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.model.Visualizable;
import org.cytoscape.view.vizmap.VisualMappingFunction;
@@ -71,12 +68,9 @@
private String title;
/**
- * Creates a new VisualStyleImpl object.
*
- * @param eventHelper
- * DOCUMENT ME!
- * @param rootLexicon
- * DOCUMENT ME!
+ * @param title Title of the new Visual Style
+ * @param lexManager
*/
public VisualStyleImpl(final String title, final VisualLexiconManager
lexManager) {
@@ -96,12 +90,7 @@
logger.info("New Visual Style Created: Style Name = " +
this.title);
}
- /**
- * DOCUMENT ME!
- *
- * @param c
- * DOCUMENT ME!
- */
+
@Override
public void addVisualMappingFunction(final VisualMappingFunction<?, ?>
mapping) {
mappings.put(mapping.getVisualProperty(), mapping);
--
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.
