Author: mes
Date: 2010-01-19 13:55:18 -0800 (Tue, 19 Jan 2010)
New Revision: 18964
Modified:
cytoscape/trunk/src/cytoscape/visual/ui/DefaultAppearenceBuilder.java
cytoscape/trunk/src/cytoscape/visual/ui/VizMapperMainPanel.java
Log:
updated panels so that dependencies are propertly synced between the two
Modified: cytoscape/trunk/src/cytoscape/visual/ui/DefaultAppearenceBuilder.java
===================================================================
--- cytoscape/trunk/src/cytoscape/visual/ui/DefaultAppearenceBuilder.java
2010-01-19 20:22:55 UTC (rev 18963)
+++ cytoscape/trunk/src/cytoscape/visual/ui/DefaultAppearenceBuilder.java
2010-01-19 21:55:18 UTC (rev 18964)
@@ -139,8 +139,9 @@
dab.setLocationRelativeTo(parent);
dab.setSize(900, 400);
- dab.applyDependenciesToCheckboxes();
+ dab.buildList();
+
dab.mainView.updateView();
dab.setLocationRelativeTo(Cytoscape.getDesktop());
dab.setVisible(true);
@@ -161,7 +162,7 @@
dab.mainView.updateBackgroungColor(Cytoscape.getVisualMappingManager().getVisualStyle()
.getGlobalAppearanceCalculator()
.getDefaultBackgroundColor());
- dab.mainView.updateView();
+ dab.buildList();
return dab.getPanel();
}
@@ -350,8 +351,6 @@
buildList();
Cytoscape.getCurrentNetworkView().redrawGraph(false,
true);
- mainView.updateView();
- mainView.repaint();
}
}
@@ -412,7 +411,7 @@
*/
private void buildList() {
- syncPropertiesWithDependencies();
+ syncDependencies();
List<Icon> nodeIcons = new ArrayList<Icon>();
List<Icon> edgeIcons = new ArrayList<Icon>();
@@ -467,9 +466,10 @@
mainView.repaint();
}
- private void syncPropertiesWithDependencies() {
+ private void syncDependencies() {
final VisualPropertyDependency dep =
Cytoscape.getVisualMappingManager().getVisualStyle().getDependency();
+ // sync properties with dependencies
for ( VisualPropertyType type : VisualPropertyType.values() ) {
if ( !type.isAllowed() )
continue;
@@ -486,14 +486,10 @@
EDGE_PROPS.add(type);
}
}
- }
- private void applyDependenciesToCheckboxes() {
- final VisualPropertyDependency dep =
Cytoscape.getVisualMappingManager().getVisualStyle()
- .getDependency();
+ // apply dependencies to checkboxes
for ( Definition def : dependencyCheckBoxMap.keySet() )
dependencyCheckBoxMap.get(def).setSelected( dep.check(
def ) );
-
}
private void initDependencyPanel() {
Modified: cytoscape/trunk/src/cytoscape/visual/ui/VizMapperMainPanel.java
===================================================================
--- cytoscape/trunk/src/cytoscape/visual/ui/VizMapperMainPanel.java
2010-01-19 20:22:55 UTC (rev 18963)
+++ cytoscape/trunk/src/cytoscape/visual/ui/VizMapperMainPanel.java
2010-01-19 21:55:18 UTC (rev 18964)
@@ -321,9 +321,9 @@
visualPropertySheetPanel.repaint();
- final String targetName = vmm.getVisualStyle().getName();
- updateDefaultImage(targetName, (DGraphView) ((DefaultViewPanel)
DefaultAppearenceBuilder.getDefaultView(targetName)).getView(),
defaultAppearencePanel.getSize());
- setDefaultPanel(defaultImageManager.get(targetName));
+ final String vsName = vmm.getVisualStyle().getName();
+ updateDefaultImage(vsName, (DGraphView) ((DefaultViewPanel)
DefaultAppearenceBuilder.getDefaultView(vsName)).getView(),
defaultAppearencePanel.getSize());
+ setDefaultPanel(defaultImageManager.get(vsName),true);
}
@@ -847,7 +847,7 @@
defImg = defaultImageManager.get(vsName);
}
// Set the default view to the panel.
- setDefaultPanel(defImg);
+ setDefaultPanel(defImg,false);
// Sync. locks
VisualPropertyDependency dep =
vmm.getVisualStyle().getDependency();
@@ -1783,7 +1783,7 @@
return mappedKeys;
}
- private void setDefaultPanel(final Image defImage) {
+ private void setDefaultPanel(final Image defImage, boolean repaint) {
if (defImage == null)
return;
@@ -1796,6 +1796,8 @@
defaultImageButton.setIcon(new ImageIcon(defImage));
defaultAppearencePanel.add(defaultImageButton,
BorderLayout.CENTER);
defaultImageButton.addMouseListener(new DefaultMouseListener());
+ if ( repaint )
+ Cytoscape.getDesktop().repaint();
}
class DefaultMouseListener extends MouseAdapter {
@@ -1807,7 +1809,7 @@
final DefaultViewPanel panel =
(DefaultViewPanel) DefaultAppearenceBuilder .showDialog(Cytoscape
.getDesktop());
updateDefaultImage(targetName, (DGraphView)
panel.getView(),
defaultAppearencePanel.getSize());
-
setDefaultPanel(defaultImageManager.get(targetName));
+
setDefaultPanel(defaultImageManager.get(targetName), false);
vmm.setNetworkView(Cytoscape.getCurrentNetworkView());
vmm.setVisualStyle(targetName);
@@ -1940,7 +1942,7 @@
if
(e.getPropertyName().equals(Cytoscape.CYTOSCAPE_INITIALIZED)) {
String vmName = vmm.getVisualStyle().getName();
- setDefaultPanel(defaultImageManager.get(vmName));
+ setDefaultPanel(defaultImageManager.get(vmName),false);
vsNameComboBox.setSelectedItem(vmName);
vmm.setVisualStyle(vmName);
setPropertyTable();
@@ -1973,7 +1975,7 @@
} else {
switchVS(vs.getName(), false);
vsNameComboBox.setSelectedItem(vs.getName());
-
setDefaultPanel(this.defaultImageManager.get(vs.getName()));
+
setDefaultPanel(this.defaultImageManager.get(vs.getName()),false);
}
}
@@ -2537,7 +2539,7 @@
if (view != null) {
CyLogger.getLogger().debug("Creating Default
Image for new visual style " + name);
updateDefaultImage(name, view, panelSize);
- setDefaultPanel(defaultImageManager.get(name));
+
setDefaultPanel(defaultImageManager.get(name),false);
}
vmm.setNetworkView(Cytoscape.getCurrentNetworkView());
@@ -2706,7 +2708,7 @@
if (view != null) {
CyLogger.getLogger().debug("Creating Default
Image for new visual style " + newName);
updateDefaultImage(newName, view, panelSize);
-
setDefaultPanel(defaultImageManager.get(newName));
+
setDefaultPanel(defaultImageManager.get(newName),false);
}
vmm.setNetworkView(Cytoscape.getCurrentNetworkView());
--
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.
