Author: kono
Date: 2010-09-27 18:31:25 -0700 (Mon, 27 Sep 2010)
New Revision: 22081
Added:
core3/vizmap-gui-impl/branches/
core3/vizmap-gui-impl/branches/vp-tree/
Modified:
core3/vizmap-gui-impl/branches/vp-tree/pom.xml
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperProperty.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/EdgeBypass.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypass.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/VizMapBypass.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/EditorValueRangeTracer.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/DefaultVisualStyleBuilder.java
Log:
Refactored version of visual property tree. Tree structure is now managed in
wrapper object VisualLexiconNode.
Copied: core3/vizmap-gui-impl/branches/vp-tree (from rev 22011,
core3/vizmap-gui-impl/trunk)
Property changes on: core3/vizmap-gui-impl/branches/vp-tree
___________________________________________________________________
Name: svn:ignore
+ .settings
target
.classpath
.project
.springBeans
Modified: core3/vizmap-gui-impl/branches/vp-tree/pom.xml
===================================================================
--- core3/vizmap-gui-impl/trunk/pom.xml 2010-09-22 22:16:41 UTC (rev 22011)
+++ core3/vizmap-gui-impl/branches/vp-tree/pom.xml 2010-09-28 01:31:25 UTC
(rev 22081)
@@ -78,6 +78,12 @@
<artifactId>default-mappings</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>presentation-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>cytoscape</groupId>
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
2010-09-22 22:16:41 UTC (rev 22011)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
2010-09-28 01:31:25 UTC (rev 22081)
@@ -62,6 +62,7 @@
import org.cytoscape.session.CyNetworkManager;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
+import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.view.vizmap.gui.DefaultViewEditor;
import org.cytoscape.view.vizmap.gui.VizMapGUI;
import org.cytoscape.view.vizmap.gui.action.VizMapUIAction;
@@ -173,9 +174,14 @@
protected AttributeComboBoxPropertyEditor networkAttributeEditor;
protected SwingPropertyChangeSupport spcs;
+
+ protected final VisualStyleFactory vsFactory;
+
protected static final long serialVersionUID = -6839011300709287662L;
- public AbstractVizMapperPanel(CySwingApplication desktop,
+ public AbstractVizMapperPanel(
+ final VisualStyleFactory vsFactory,
+ CySwingApplication desktop,
DefaultViewEditor defViewEditor, IconManager iconMgr,
ColorManager colorMgr, VisualMappingManager vmm,
VizMapperMenuManager menuMgr, EditorManager
editorFactory,
@@ -185,7 +191,8 @@
EditorWindowManager editorWindowManager,
CyNetworkManager cyNetworkManager, CyEventHelper
eventHelper,
VisualStyle defStyle) {
-
+
+ this.vsFactory = vsFactory;
this.cytoscapeDesktop = desktop;
this.defViewEditor = defViewEditor;
this.iconMgr = iconMgr;
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2010-09-22 22:16:41 UTC (rev 22011)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2010-09-28 01:31:25 UTC (rev 22081)
@@ -76,6 +76,7 @@
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
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.gui.DefaultViewEditor;
@@ -173,14 +174,11 @@
private void updateVisualPropertyLists() {
vpSets.clear();
- VisualLexicon lexicon = selectedStyle.getVisualLexicon();
+ final VisualLexicon lexicon = selectedStyle.getVisualLexicon();
- vpSets.put(NODE, new HashSet<VisualProperty<?>>(lexicon
- .getVisualProperties(NODE)));
- vpSets.put(EDGE, new HashSet<VisualProperty<?>>(lexicon
- .getVisualProperties(EDGE)));
- vpSets.put(NETWORK, new HashSet<VisualProperty<?>>(lexicon
- .getVisualProperties(NETWORK)));
+ vpSets.put(NODE, new
HashSet<VisualProperty<?>>(lexicon.getAllDescendants(TwoDVisualLexicon.NODE)));
+ vpSets.put(EDGE, new
HashSet<VisualProperty<?>>(lexicon.getAllDescendants(TwoDVisualLexicon.EDGE)));
+ vpSets.put(NETWORK, new
HashSet<VisualProperty<?>>(lexicon.getAllDescendants(TwoDVisualLexicon.NETWORK)));
}
/*
@@ -466,35 +464,6 @@
cyNetworkManager.getCurrentNetworkView().updateView();
- } else if (SwingUtilities.isRightMouseButton(e)) {
- if (vp != null) {
-
- contextMenu.removeAll();
- final CyNetworkView networkView =
cyNetworkManager
- .getCurrentNetworkView();
-
- final JMenuItem lockItemMenu = new
JCheckBoxMenuItem(
- "Lock this Visual Property") {
-
- public void ActionPerformed(ActionEvent
e) {
- boolean lock = false;
- if
(vp.getObjectType().equals(CyTableEntry.NETWORK)) {
- lock =
((View<CyNetwork>)networkView).isValueLocked(vp);
- } else if
(vp.getObjectType().equals(CyTableEntry.NODE)) {
-
- }
-
- if (lock)
- this.setSelected(false);
- else
- this.setSelected(true);
- }
-
- };
- contextMenu.add(lockItemMenu);
- // Display Context menu here
- contextMenu.show(e.getComponent(), e.getX(),
e.getY());
- }
}
}
Modified:
core3/vizmap-gui-impl/branches/vp-tree/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-09-22 22:16:41 UTC (rev 22011)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
2010-09-28 01:31:25 UTC (rev 22081)
@@ -34,8 +34,6 @@
*/
package org.cytoscape.view.vizmap.gui.internal;
-import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.NODE_X_LOCATION;
-import static org.cytoscape.view.presentation.property.TwoDVisualLexicon.*;
import java.awt.Color;
import java.awt.Dimension;
@@ -55,7 +53,7 @@
import org.cytoscape.view.vizmap.gui.event.SelectedVisualStyleSwitchedEvent;
import org.cytoscape.view.vizmap.gui.event.SelectedVisualStyleSwitchedListener;
-import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.NETWORK_TITLE;
+import static org.cytoscape.view.presentation.property.TwoDVisualLexicon.*;
/**
* Panel to show the default properties visually (as graphics).
Modified:
core3/vizmap-gui-impl/branches/vp-tree/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-09-22 22:16:41 UTC (rev 22011)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2010-09-28 01:31:25 UTC (rev 22081)
@@ -64,6 +64,7 @@
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
+import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.view.vizmap.events.VisualStyleCreatedEvent;
import org.cytoscape.view.vizmap.events.VisualStyleCreatedListener;
import org.cytoscape.view.vizmap.gui.DefaultViewEditor;
@@ -127,18 +128,20 @@
* @param menuMgr
* @param editorFactory
*/
- public VizMapperMainPanel(CySwingApplication desktop,
+ public VizMapperMainPanel(
+ final VisualStyleFactory vsFactory,
+ CySwingApplication desktop,
DefaultViewEditor defViewEditor, IconManager iconMgr,
ColorManager colorMgr, VisualMappingManager vmm,
VizMapperMenuManager menuMgr, EditorManager
editorFactory,
- PropertySheetPanel propertySheetPanel,
+ final PropertySheetPanel propertySheetPanel,
VizMapPropertySheetBuilder vizMapPropertySheetBuilder,
VizMapEventHandlerManager vizMapEventHandlerManager,
EditorWindowManager editorWindowManager,
CyNetworkManager cyNetworkManager, CyEventHelper
eventHelper,
VisualStyle defStyle) {
- super(desktop, defViewEditor, iconMgr, colorMgr, vmm, menuMgr,
+ super(vsFactory, desktop, defViewEditor, iconMgr, colorMgr,
vmm, menuMgr,
editorFactory, propertySheetPanel,
vizMapPropertySheetBuilder,
vizMapEventHandlerManager, editorWindowManager,
cyNetworkManager, eventHelper, defStyle);
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperProperty.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperProperty.java
2010-09-22 22:16:41 UTC (rev 22011)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperProperty.java
2010-09-28 01:31:25 UTC (rev 22081)
@@ -12,21 +12,16 @@
* @version 0.5
*/
public class VizMapperProperty<T> extends DefaultProperty {
+
private final static long serialVersionUID = 1202339868680341L;
+
private T hiddenObject;
public VizMapperProperty() {
}
+
-// @Override public Class<T> getType() {
-// return super.getType();
-// }
-//
-// @Override public T getValue() {
-// return
-// }
-
/**
* DOCUMENT ME!
*
@@ -45,22 +40,4 @@
public T getHiddenObject() {
return hiddenObject;
}
-
- /**
- * DOCUMENT ME!
- *
- * @param object
- * DOCUMENT ME!
- */
- public void readFromObject(Object object) {
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param object
- * DOCUMENT ME!
- */
- public void writeToObject(Object object) {
- }
}
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/EdgeBypass.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/EdgeBypass.java
2010-09-22 22:16:41 UTC (rev 22011)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/EdgeBypass.java
2010-09-28 01:31:25 UTC (rev 22081)
@@ -36,8 +36,6 @@
*/
package org.cytoscape.view.vizmap.gui.internal.bypass;
-import static org.cytoscape.model.CyTableEntry.EDGE;
-
import java.util.ArrayList;
import java.util.List;
@@ -46,12 +44,12 @@
import javax.swing.JMenuItem;
import org.cytoscape.model.CyEdge;
-import org.cytoscape.view.model.RootVisualLexicon;
+import org.cytoscape.view.model.VisualLexiconManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
class EdgeBypass extends VizMapBypass {
- EdgeBypass(EditorManager ef, RootVisualLexicon vpCatalog) {
+ EdgeBypass(EditorManager ef, VisualLexiconManager vpCatalog) {
super(ef, vpCatalog);
}
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypass.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypass.java
2010-09-22 22:16:41 UTC (rev 22011)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypass.java
2010-09-28 01:31:25 UTC (rev 22081)
@@ -36,8 +36,6 @@
*/
package org.cytoscape.view.vizmap.gui.internal.bypass;
-import static org.cytoscape.model.CyTableEntry.NODE;
-
import java.util.ArrayList;
import java.util.List;
@@ -46,13 +44,13 @@
import javax.swing.JMenuItem;
import org.cytoscape.model.CyNode;
-import org.cytoscape.view.model.RootVisualLexicon;
+import org.cytoscape.view.model.VisualLexiconManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
class NodeBypass extends VizMapBypass {
- NodeBypass(EditorManager ef, RootVisualLexicon vpCatalog) {
+ NodeBypass(EditorManager ef, VisualLexiconManager vpCatalog) {
super(ef, vpCatalog);
}
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/VizMapBypass.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/VizMapBypass.java
2010-09-22 22:16:41 UTC (rev 22011)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/VizMapBypass.java
2010-09-28 01:31:25 UTC (rev 22081)
@@ -46,7 +46,7 @@
import org.cytoscape.model.CyRow;
import org.cytoscape.model.CyTableEntry;
-import org.cytoscape.view.model.RootVisualLexicon;
+import org.cytoscape.view.model.VisualLexiconManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
@@ -63,9 +63,9 @@
abstract protected List<String> getBypassNames();
protected EditorManager editorFactory;
- protected RootVisualLexicon rootVisualLexicon;
+ protected VisualLexiconManager rootVisualLexicon;
- VizMapBypass(EditorManager editorFactory, RootVisualLexicon vpCatalog) {
+ VizMapBypass(EditorManager editorFactory, VisualLexiconManager
vpCatalog) {
this.editorFactory = editorFactory;
this.rootVisualLexicon = vpCatalog;
}
@@ -123,7 +123,7 @@
//TODO: what's the replacement?
// String val =
ObjectToString.getStringValue(obj);
-// CyTable table =
graphObj.attrs().getDataTable();
+// CyDataTable table =
graphObj.attrs().getDataTable();
//
// if
(!table.getColumnTypeMap().containsKey(type.getDisplayName()))
//
table.createColumn(type.getDisplayName(), String.class, false);
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
2010-09-22 22:16:41 UTC (rev 22011)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
2010-09-28 01:31:25 UTC (rev 22081)
@@ -37,6 +37,7 @@
import javax.swing.Icon;
import javax.swing.table.DefaultTableCellRenderer;
+import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.gui.VizMapGUI;
@@ -51,11 +52,11 @@
/**
* Creates a new DiscreteNumber object.
*/
- public NumberVisualPropertyEditor(VisualProperty<Number> vp, VizMapGUI
vizMapGUI, CyTableManager tm) {
+ public NumberVisualPropertyEditor(VisualProperty<Number> vp, VizMapGUI
vizMapGUI, CyTable attr) {
super(vp);
propertyEditor = new CyDoublePropertyEditor(null);
tableCellRenderer = new DefaultTableCellRenderer();
- continuousEditor = new C2CMappingEditor<Number>(this.vp,
vizMapGUI, tm);
+ continuousEditor = new C2CMappingEditor<Number>(this.vp,
vizMapGUI, attr);
}
/**
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
2010-09-22 22:16:41 UTC (rev 22011)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
2010-09-28 01:31:25 UTC (rev 22081)
@@ -40,6 +40,7 @@
import javax.swing.ImageIcon;
+import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.gui.VizMapGUI;
@@ -76,8 +77,8 @@
* @param type
* DOCUMENT ME!
*/
- public C2CMappingEditor(VisualProperty<V> type, VizMapGUI vizMapGUI,
CyTableManager tableMgr) {
- super(type, vizMapGUI, tableMgr);
+ public C2CMappingEditor(VisualProperty<V> type, VizMapGUI vizMapGUI,
CyTable attr) {
+ super(type, vizMapGUI, attr);
abovePanel.setVisible(false);
belowPanel.setVisible(false);
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
2010-09-22 22:16:41 UTC (rev 22011)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
2010-09-28 01:31:25 UTC (rev 22081)
@@ -43,7 +43,7 @@
import javax.swing.ImageIcon;
-import org.cytoscape.model.CyTableManager;
+import org.cytoscape.model.CyTable;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.gui.VizMapGUI;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
@@ -71,8 +71,8 @@
private EditorManager editorFactory;
public C2DMappingEditor(VisualProperty<V> type,
- EditorManager editorFactory, VizMapGUI vizMapGUI,
CyTableManager tm) {
- super(type, vizMapGUI, tm);
+ EditorManager editorFactory, VizMapGUI vizMapGUI,
CyTable attr) {
+ super(type, vizMapGUI, attr);
this.iconPanel.setVisible(false);
this.belowPanel.setVisible(false);
this.abovePanel.setVisible(false);
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2010-09-22 22:16:41 UTC (rev 22011)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2010-09-28 01:31:25 UTC (rev 22081)
@@ -53,8 +53,8 @@
import javax.swing.event.ChangeListener;
import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTableManager;
+import org.cytoscape.session.CyNetworkManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingFunction;
import org.cytoscape.view.vizmap.VisualMappingManager;
@@ -65,8 +65,6 @@
import org.jdesktop.swingx.JXMultiThumbSlider;
import org.jdesktop.swingx.multislider.Thumb;
-import org.cytoscape.session.CyNetworkManager;
-
/**
* Abstract class for all Continuous Mapping Editors. This is the mapping from
* Number to visual property value.
@@ -109,7 +107,8 @@
protected EditorValueRangeTracer tracer;
protected VizMapGUI vizMapGUI;
- private CyTableManager tableMgr;
+
+ private final CyTable attrs;
/**
*
@@ -118,10 +117,10 @@
*
* */
public ContinuousMappingEditorPanel(final VisualProperty<V> type,
- VizMapGUI vizMapGUI, CyTableManager tableMgr) {
+ VizMapGUI vizMapGUI, final CyTable attrs) {
this.type = type;
this.vizMapGUI = vizMapGUI;
- this.tableMgr = tableMgr;
+ this.attrs = attrs;
initComponents();
setVisualPropLabel();
@@ -381,11 +380,6 @@
private void initRangeValues() {
- // Attribute to be mapped.
- final CyTable attrs;
-
- attrs =
tableMgr.getTableMap(type.getObjectType(),cyNetworkManager.getCurrentNetwork()).get(CyNetwork.DEFAULT_ATTRS);
-
VisualMappingFunction<?, V> map =
vizMapGUI.getSelectedVisualStyle()
.getVisualMappingFunction(type);
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/EditorValueRangeTracer.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/EditorValueRangeTracer.java
2010-09-22 22:16:41 UTC (rev 22011)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/EditorValueRangeTracer.java
2010-09-28 01:31:25 UTC (rev 22081)
@@ -37,7 +37,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.cytoscape.view.model.RootVisualLexicon;
+import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
/**
@@ -52,10 +52,10 @@
* @param vpCatalog
* DOCUMENT ME!
*/
- public EditorValueRangeTracer(RootVisualLexicon vpCatalog) {
+ public EditorValueRangeTracer(final VisualLexicon lexicon) {
rangeMap = new HashMap<VisualProperty<?>, Range>();
- for (VisualProperty<?> v : vpCatalog.getAllVisualProperties()) {
+ for (VisualProperty<?> v : lexicon.getAllVisualProperties()) {
Range r = new Range(0d, 0d);
rangeMap.put(v, r);
}
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
2010-09-22 22:16:41 UTC (rev 22011)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
2010-09-28 01:31:25 UTC (rev 22081)
@@ -46,6 +46,7 @@
import javax.swing.JComponent;
import javax.swing.SwingUtilities;
+import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.gui.VizMapGUI;
@@ -79,8 +80,8 @@
* @param type
* DOCUMENT ME!
*/
- public GradientEditorPanel(VisualProperty<Color> type, VizMapGUI
vizMapGUI, CyTableManager tm) {
- super(type, vizMapGUI, tm);
+ public GradientEditorPanel(VisualProperty<Color> type, VizMapGUI
vizMapGUI, CyTable attr) {
+ super(type, vizMapGUI, attr);
iconPanel.setVisible(false);
initSlider();
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/DefaultVisualStyleBuilder.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/DefaultVisualStyleBuilder.java
2010-09-22 22:16:41 UTC (rev 22011)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/DefaultVisualStyleBuilder.java
2010-09-28 01:31:25 UTC (rev 22081)
@@ -1,15 +1,26 @@
package org.cytoscape.view.vizmap.gui.internal.util;
+import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.EDGE_COLOR;
+import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.EDGE_LABEL;
+import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.EDGE_LABEL_COLOR;
+import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.NETWORK_BACKGROUND_COLOR;
+import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.NODE_COLOR;
+import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.NODE_LABEL;
+import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.NODE_LABEL_COLOR;
+import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.NODE_X_SIZE;
+import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.NODE_Y_SIZE;
+
import java.awt.Color;
+import java.util.HashMap;
+import java.util.Map;
-import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.vizmap.VisualStyle;
+import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.view.vizmap.mappings.PassthroughMapping;
-import static org.cytoscape.view.presentation.property.TwoDVisualLexicon.*;
-
/**
* Builder object for default Visual Style.
*
@@ -44,24 +55,32 @@
// This should be injected
- private VisualMappingManager vmm;
+ private final VisualStyleFactory vsFactory;
- private final VisualStyle defaultStyle;
+ // Each lexicon has its own defaults.
+ private final Map<VisualLexicon, VisualStyle> styleMap;
- public DefaultVisualStyleBuilder(VisualMappingManager vmm) {
- this.vmm = vmm;
- defaultStyle = buildDefaultStyle();
+
+ public DefaultVisualStyleBuilder(final VisualStyleFactory vsFactory) {
+ this.vsFactory = vsFactory;
+ this.styleMap = new HashMap<VisualLexicon, VisualStyle>();
}
- public VisualStyle getDefaultStyle() {
- return defaultStyle;
+ public VisualStyle getDefaultStyle(final VisualLexicon lexicon) {
+ VisualStyle defStyle = styleMap.get(lexicon);
+ if(defStyle == null) {
+ defStyle = buildDefaultStyle(lexicon);
+ styleMap.put(lexicon, defStyle);
+ }
+
+ return defStyle;
}
- private VisualStyle buildDefaultStyle() {
+ private VisualStyle buildDefaultStyle(final VisualLexicon lexicon) {
// Create new style
- final VisualStyle newStyle =
vmm.createVisualStyle(DEFAULT_VS_NAME);
+ final VisualStyle newStyle =
vsFactory.createVisualStyle(DEFAULT_VS_NAME, lexicon);
// Set node appearance
newStyle.setDefaultValue(NODE_COLOR, DEFAULT_NODE_COLOR );
@@ -70,7 +89,7 @@
newStyle.setDefaultValue(NODE_Y_SIZE, DEFAULT_NODE_HEIGHT );
// Set edge appearance
- newStyle.setDefaultValue(EDGE_LABEL_COLOR, DEFAULT_EDGE_COLOR );
+ newStyle.setDefaultValue(EDGE_COLOR, DEFAULT_EDGE_COLOR );
newStyle.setDefaultValue(EDGE_LABEL_COLOR,
DEFAULT_EDGE_LABEL_COLOR );
// Set network appearance
--
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.
