Author: kono
Date: 2010-09-28 20:04:19 -0700 (Tue, 28 Sep 2010)
New Revision: 22102
Modified:
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/VizMapPropertyBuilder.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
Log:
Default view editor bugs are fixed. Still need to fix dummy view panel.
Modified:
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/DefaultViewEditorImpl.java
2010-09-29 00:58:32 UTC (rev 22101)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2010-09-29 03:04:19 UTC (rev 22102)
@@ -49,10 +49,12 @@
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.Collection;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.util.TreeSet;
import javax.swing.DefaultListModel;
import javax.swing.GroupLayout;
@@ -111,8 +113,6 @@
DefaultViewEditor, SelectedVisualStyleSwitchedListener {
private final static long serialVersionUID = 1202339876675416L;
-
- private final Logger logger = LoggerFactory.getLogger(getClass());
private final Map<String, Set<VisualProperty<?>>> vpSets;
private final Map<String, JList> listMap;
@@ -135,12 +135,12 @@
*/
public DefaultViewEditorImpl(final DefaultViewPanelImpl mainView,
final EditorManager editorFactory,
- final CyNetworkManager cyNetworkManager, VisualStyle
defaultStyle,
- VisualMappingManager vmm) {
+ final CyNetworkManager cyNetworkManager,
+ final VisualStyle selectedStyle, final
VisualMappingManager vmm) {
super();
this.vmm = vmm;
- this.selectedStyle = defaultStyle;
+ this.selectedStyle = selectedStyle;
vpSets = new HashMap<String, Set<VisualProperty<?>>>();
listMap = new HashMap<String, JList>();
@@ -159,36 +159,56 @@
public void componentResized(ComponentEvent e) {
defaultObjectTabbedPane.repaint();
mainView.repaint();
- // mainView.updateView();
+ mainView.updateView();
}
});
}
-
private void updateVisualPropertyLists() {
vpSets.clear();
final VisualLexicon lexicon = selectedStyle.getVisualLexicon();
-
- vpSets.put(NODE,
getLeafNodes(lexicon.getAllDescendants(TwoDVisualLexicon.NODE)));
- vpSets.put(EDGE,
getLeafNodes(lexicon.getAllDescendants(TwoDVisualLexicon.EDGE)));
- vpSets.put(NETWORK,
getLeafNodes(lexicon.getAllDescendants(TwoDVisualLexicon.NETWORK)));
+
+ vpSets.put(NODE,
+
getLeafNodes(lexicon.getAllDescendants(TwoDVisualLexicon.NODE)));
+ vpSets.put(EDGE,
+
getLeafNodes(lexicon.getAllDescendants(TwoDVisualLexicon.EDGE)));
+ vpSets.put(NETWORK, getNetworkLeafNodes(lexicon
+ .getAllDescendants(TwoDVisualLexicon.NETWORK)));
+
}
-
- private Set<VisualProperty<?>> getLeafNodes(final
Collection<VisualProperty<?>> props) {
+
+ private Set<VisualProperty<?>> getLeafNodes(
+ final Collection<VisualProperty<?>> props) {
final VisualLexicon lexicon = selectedStyle.getVisualLexicon();
- final Set<VisualProperty<?>> propSet = new
HashSet<VisualProperty<?>>();
-
- for(VisualProperty<?> vp: props) {
-
if(lexicon.getVisualLexiconNode(vp).getChildren().size() == 0)
+ final Set<VisualProperty<?>> propSet = new
TreeSet<VisualProperty<?>>(new VisualPropertyComparator());
+
+ for (VisualProperty<?> vp : props) {
+ if
(lexicon.getVisualLexiconNode(vp).getChildren().size() == 0)
propSet.add(vp);
}
-
+
return propSet;
-
+
}
+ private Set<VisualProperty<?>> getNetworkLeafNodes(
+ final Collection<VisualProperty<?>> props) {
+ final VisualLexicon lexicon = selectedStyle.getVisualLexicon();
+ final Set<VisualProperty<?>> propSet = new
TreeSet<VisualProperty<?>>(new VisualPropertyComparator());
+
+ for (VisualProperty<?> vp : props) {
+ if
(lexicon.getVisualLexiconNode(vp).getChildren().size() == 0
+ &&
lexicon.getVisualLexiconNode(vp).getParent()
+ .getVisualProperty() ==
TwoDVisualLexicon.NETWORK)
+ propSet.add(vp);
+ }
+
+ return propSet;
+
+ }
+
/*
* (non-Javadoc)
*
@@ -197,19 +217,7 @@
* .Component)
*/
public void showEditor(Component parent) {
- setSize(900, 400);
-
- // TODO: fix the width/height lock
- // lockSize();
- // lockNodeSizeCheckBox.setSelected(nac.getNodeSizeLocked());
-
- // mainView.updateView();
-
- updateVisualPropertyLists();
- // initComponents();
- buildList();
-
- repaint();
+ setSize(900, 450);
setLocationRelativeTo(parent);
setVisible(true);
}
@@ -310,8 +318,8 @@
defaultObjectTabbedPane.addTab("Edge", edgeScrollPane);
defaultObjectTabbedPane.addTab("Network", globalScrollPane);
- GroupLayout jXTitledPanel1Layout = new
GroupLayout(jXTitledPanel1
- .getContentContainer());
+ GroupLayout jXTitledPanel1Layout = new GroupLayout(
+ jXTitledPanel1.getContentContainer());
jXTitledPanel1.getContentContainer().setLayout(jXTitledPanel1Layout);
jXTitledPanel1Layout.setHorizontalGroup(jXTitledPanel1Layout
.createParallelGroup(GroupLayout.Alignment.LEADING)
@@ -338,9 +346,10 @@
applyButton.setText("Apply");
applyButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
- //
vmm.setNetworkView(cyNetworkManager.getCurrentNetworkView());
- //
Cytoscape.redrawGraph(cyNetworkManager.getCurrentNetworkView());
-
applyNewStyle(cyNetworkManager.getCurrentNetworkView());
+ final CyNetworkView view = cyNetworkManager
+ .getCurrentNetworkView();
+ if (view != null)
+ applyNewStyle(view);
dispose();
}
});
@@ -391,8 +400,8 @@
LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jXTitledPanel1,
GroupLayout.PREFERRED_SIZE,
-
198, Short.MAX_VALUE).addGap(
-
12, 12, 12)));
+
198, Short.MAX_VALUE)
+
.addGap(12, 12, 12)));
jXPanel1Layout
.setVerticalGroup(jXPanel1Layout
.createParallelGroup(GroupLayout.Alignment.LEADING)
@@ -447,19 +456,23 @@
} // </editor-fold>
private <V> void listActionPerformed(MouseEvent e) {
+ final Object source = e.getSource();
+ final JList list;
+ if(source instanceof JList)
+ list = (JList) source;
+ else
+ return;
+
V newValue = null;
- final JList list = (JList) e.getSource();
- final VisualProperty<V> vp = (VisualProperty<V>) list
- .getSelectedValue();
+
+ final VisualProperty<V> vp = (VisualProperty<V>)
list.getSelectedValue();
if (SwingUtilities.isLeftMouseButton(e) && e.getClickCount() ==
2) {
try {
- newValue =
editorFactory.showVisualPropertyValueEditor(this,
- vp, null);
+ newValue =
editorFactory.showVisualPropertyValueEditor(this, vp, null);
} catch (Exception e1) {
- // TODO Auto-generated catch block
e1.printStackTrace();
}
@@ -467,11 +480,9 @@
selectedStyle.setDefaultValue(vp, newValue);
selectedStyle.apply(cyNetworkManager.getCurrentNetworkView());
}
- updateVisualPropertyLists();
- buildList();
-
- cyNetworkManager.getCurrentNetworkView().updateView();
-
+
+ repaint();
+ this.mainView.getView().updateView();
}
}
@@ -510,7 +521,7 @@
*/
private void buildList() {
- VisualPropCellRenderer renderer = new VisualPropCellRenderer();
+ final VisualPropCellRenderer renderer = new
VisualPropCellRenderer();
for (String key : vpSets.keySet()) {
DefaultListModel model = new DefaultListModel();
@@ -519,8 +530,8 @@
Set<VisualProperty<?>> vps = vpSets.get(key);
for (VisualProperty<?> vp : vps) {
model.addElement(vp);
-// logger.debug("New Visual Property set to GUI: "
-// + vp.getDisplayName() + " = " +
vp.getDefault());
+ // logger.debug("New Visual Property set to
GUI: "
+ // + vp.getDisplayName() + " = " +
vp.getDefault());
}
list.setCellRenderer(renderer);
}
@@ -578,7 +589,7 @@
RenderingEngine<?> presentation =
cyNetworkManager
.getCurrentRenderingEngine();
- if(presentation != null)
+ if (presentation != null)
icon = presentation.createIcon(vp);
}
setText(vp.getDisplayName() + " = "
@@ -644,4 +655,16 @@
setTitle("Default Appearance for " + selectedStyle.getTitle());
}
+
+ private static class VisualPropertyComparator implements
Comparator<VisualProperty<?>> {
+
+ @Override
+ public int compare(VisualProperty<?> vp1, VisualProperty<?>
vp2) {
+ String name1 = vp1.getDisplayName();
+ String name2 = vp2.getDisplayName();
+
+ return name1.compareTo(name2);
+ }
+
+ }
}
Modified:
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/DefaultViewPanelImpl.java
2010-09-29 00:58:32 UTC (rev 22101)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
2010-09-29 03:04:19 UTC (rev 22102)
@@ -144,20 +144,12 @@
dummyview.getNodeView(target).setVisualProperty(NODE_X_LOCATION, 150d);
dummyview.getNodeView(target).setVisualProperty(NODE_Y_LOCATION, 10d);
- // dummyview.getNodeView(target).setVisualProperty(NODE_X_SIZE,
30.0);
- // dummyview.getNodeView(target).setVisualProperty(NODE_Y_SIZE,
30.0);
- // dummyview.getNodeView(source).setVisualProperty(NODE_X_SIZE,
30.0);
- // dummyview.getNodeView(source).setVisualProperty(NODE_Y_SIZE,
30.0);
-
- dummyview.setVisualProperty(NETWORK_TITLE, "Dummy Network
View");
-
// Set background color
// background = vs.getDefaultValue(NETWORK_BACKGROUND_COLOR);
// view.setVisualProperty(NETWORK_BACKGROUND_COLOR, background);
// Render it in this panel
presentationFactory.render(this, dummyview);
-
}
/**
@@ -200,7 +192,9 @@
}
public void handleEvent(SelectedVisualStyleSwitchedEvent e) {
+
this.vs = e.getNewVisualStyle();
+
// Apply the given visual style to the dummy net
this.vs.apply(dummyview);
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
===================================================================
---
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2010-09-29 00:58:32 UTC (rev 22101)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2010-09-29 03:04:19 UTC (rev 22102)
@@ -38,22 +38,20 @@
import static org.cytoscape.model.CyTableEntry.EDGE;
import static org.cytoscape.model.CyTableEntry.NODE;
-import java.beans.PropertyEditor;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.table.TableCellRenderer;
+import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTableEntry;
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.gui.editor.EditorManager;
@@ -61,18 +59,20 @@
import org.cytoscape.view.vizmap.mappings.ContinuousMapping;
import org.cytoscape.view.vizmap.mappings.DiscreteMapping;
import org.cytoscape.view.vizmap.mappings.PassthroughMapping;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.l2fprod.common.propertysheet.DefaultProperty;
import com.l2fprod.common.propertysheet.PropertyEditorRegistry;
import com.l2fprod.common.propertysheet.PropertyRendererRegistry;
import com.l2fprod.common.propertysheet.PropertySheetPanel;
-import org.cytoscape.session.CyNetworkManager;
-
/**
* Create property for the Property Sheet object.
*/
public class VizMapPropertyBuilder {
+
+ private static final Logger logger =
LoggerFactory.getLogger(VizMapPropertyBuilder.class);
private DefaultTableCellRenderer emptyBoxRenderer;
private DefaultTableCellRenderer filledBoxRenderer;
@@ -102,6 +102,9 @@
final String rootObjectCategory,
final PropertySheetPanel propertySheetPanel,
final String objectType) {
+
+ logger.debug("\n\n\nbuildProp called!");
+
// Mapping is empty
if (visualMapping == null)
return null;
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
===================================================================
---
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
2010-09-29 00:58:32 UTC (rev 22101)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
2010-09-29 03:04:19 UTC (rev 22102)
@@ -11,12 +11,15 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import javax.swing.Icon;
import javax.swing.ListSelectionModel;
import javax.swing.SwingConstants;
import javax.swing.table.DefaultTableCellRenderer;
import org.cytoscape.model.CyTableManager;
+import org.cytoscape.session.CyNetworkManager;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingFunction;
@@ -25,21 +28,16 @@
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
import org.cytoscape.view.vizmap.gui.event.SelectedVisualStyleSwitchedEvent;
import org.cytoscape.view.vizmap.gui.event.SelectedVisualStyleSwitchedListener;
-import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.CyComboBoxPropertyEditor;
import org.cytoscape.view.vizmap.gui.internal.theme.ColorManager;
import org.cytoscape.view.vizmap.mappings.ContinuousMapping;
import com.l2fprod.common.propertysheet.Property;
-import com.l2fprod.common.propertysheet.PropertyEditorFactory;
import com.l2fprod.common.propertysheet.PropertyEditorRegistry;
-import com.l2fprod.common.propertysheet.PropertyRendererFactory;
import com.l2fprod.common.propertysheet.PropertyRendererRegistry;
import com.l2fprod.common.propertysheet.PropertySheetPanel;
import com.l2fprod.common.propertysheet.PropertySheetTable;
import com.l2fprod.common.propertysheet.PropertySheetTableModel.Item;
-import org.cytoscape.session.CyNetworkManager;
-
/**
* Maintain property sheet table states.
*
@@ -79,18 +77,18 @@
private List<VisualProperty<?>> unusedVisualPropType;
public VizMapPropertySheetBuilder(CyNetworkManager cyNetworkManager,
- PropertySheetPanel propertySheetPanel,
- EditorManager editorManager,
+ PropertySheetPanel propertySheetPanel, EditorManager
editorManager,
DefaultViewPanel defViewPanel, CyTableManager tableMgr)
{
-
+
this.cyNetworkManager = cyNetworkManager;
this.propertySheetPanel = propertySheetPanel;
this.editorManager = editorManager;
-
+
propertyMap = new HashMap<VisualStyle, List<Property>>();
- vizMapPropertyBuilder = new
VizMapPropertyBuilder(cyNetworkManager, editorManager, tableMgr);
+ vizMapPropertyBuilder = new
VizMapPropertyBuilder(cyNetworkManager,
+ editorManager, tableMgr);
}
public Map<VisualStyle, List<Property>> getPropertyMap() {
@@ -98,10 +96,11 @@
}
public void setPropertyTable() {
-
- if(selectedStyle == null ||
cyNetworkManager.getCurrentRenderingEngine() == null)
+
+ if (selectedStyle == null
+ || cyNetworkManager.getCurrentRenderingEngine()
== null)
return;
-
+
setPropertySheetAppearence();
for (Property item : propertySheetPanel.getProperties())
@@ -158,129 +157,134 @@
* Set editors
*/
// FIXME
- //
emptyBoxRenderer.setHorizontalTextPosition(SwingConstants.CENTER);
- //
emptyBoxRenderer.setHorizontalAlignment(SwingConstants.CENTER);
- // emptyBoxRenderer.setBackground(new Color(0, 200, 255, 20));
- // emptyBoxRenderer.setForeground(Color.red);
- // emptyBoxRenderer.setFont(new Font("SansSerif", Font.BOLD,
12));
- //
- // filledBoxRenderer.setBackground(Color.white);
- // filledBoxRenderer.setForeground(Color.blue);
- // TODO: fix icon list
- // VisualPropertyIcon newIcon;
- //
- // List<Icon> iconList = new ArrayList<Icon>();
- // final List<NodeShape> nodeShapes = new
ArrayList<NodeShape>();
- //
- // for (Object key : nodeShapeIcons.keySet()) {
- // NodeShape shape = (NodeShape) key;
- //
- // if (shape.isSupported()) {
- // iconList.add(nodeShapeIcons.get(key));
- // nodeShapes.add(shape);
- // }
- // }
- //
- // Icon[] iconArray = new Icon[iconList.size()];
- // String[] shapeNames = new String[iconList.size()];
- //
- // for (int i = 0; i < iconArray.length; i++) {
- // newIcon = ((NodeIcon) iconList.get(i)).clone();
- // newIcon.setIconHeight(16);
- // newIcon.setIconWidth(16);
- // iconArray[i] = newIcon;
- // shapeNames[i] = nodeShapes.get(i).getShapeName();
- // }
- //
- // // shapeCellEditor.setAvailableValues(nodeShapes.toArray());
- // // shapeCellEditor.setAvailableIcons(iconArray);
- // iconList.clear();
- // iconList.addAll(arrowShapeIcons.values());
- // iconArray = new Icon[iconList.size()];
- //
- // String[] arrowNames = new String[iconList.size()];
- // Set arrowShapes = arrowShapeIcons.keySet();
- //
- // for (int i = 0; i < iconArray.length; i++) {
- // newIcon = ((ArrowIcon) iconList.get(i));
- // newIcon.setIconHeight(16);
- // newIcon.setIconWidth(40);
- // newIcon.setBottomPadding(-9);
- // iconArray[i] = newIcon;
- // arrowNames[i] = newIcon.getName();
- // }
- //
- // // arrowCellEditor.setAvailableValues(arrowShapes.toArray());
- // // arrowCellEditor.setAvailableIcons(iconArray);
- // iconList = new ArrayList();
- // iconList.addAll(lineTypeIcons.values());
- // iconArray = new Icon[iconList.size()];
- // shapeNames = new String[iconList.size()];
- //
- // Set lineTypes = lineTypeIcons.keySet();
- //
- // for (int i = 0; i < iconArray.length; i++) {
- // newIcon = (VisualPropertyIcon) (iconList.get(i));
- // newIcon.setIconHeight(16);
- // newIcon.setIconWidth(16);
- // iconArray[i] = newIcon;
- // shapeNames[i] = newIcon.getName();
- // }
- // lineCellEditor.setAvailableValues(lineTypes.toArray());
- // lineCellEditor.setAvailableIcons(iconArray);
+
emptyBoxRenderer.setHorizontalTextPosition(SwingConstants.CENTER);
+ emptyBoxRenderer.setHorizontalAlignment(SwingConstants.CENTER);
+ emptyBoxRenderer.setBackground(new Color(0, 200, 255, 20));
+ emptyBoxRenderer.setForeground(Color.red);
+ emptyBoxRenderer.setFont(new Font("SansSerif", Font.BOLD, 12));
+
+ filledBoxRenderer.setBackground(Color.white);
+ filledBoxRenderer.setForeground(Color.blue);
+ //TODO: fix icon list
+// VisualPropertyIcon newIcon;
+//
+// List<Icon> iconList = new ArrayList<Icon>();
+// final List<NodeShape> nodeShapes = new ArrayList<NodeShape>();
+//
+// for (Object key : nodeShapeIcons.keySet()) {
+// NodeShape shape = (NodeShape) key;
+//
+// if (shape.isSupported()) {
+// iconList.add(nodeShapeIcons.get(key));
+// nodeShapes.add(shape);
+// }
+// }
+//
+// Icon[] iconArray = new Icon[iconList.size()];
+// String[] shapeNames = new String[iconList.size()];
+//
+// for (int i = 0; i < iconArray.length; i++) {
+// newIcon = ((NodeIcon) iconList.get(i)).clone();
+// newIcon.setIconHeight(16);
+// newIcon.setIconWidth(16);
+// iconArray[i] = newIcon;
+// shapeNames[i] = nodeShapes.get(i).getShapeName();
+// }
+//
+// // shapeCellEditor.setAvailableValues(nodeShapes.toArray());
+// // shapeCellEditor.setAvailableIcons(iconArray);
+// iconList.clear();
+// iconList.addAll(arrowShapeIcons.values());
+// iconArray = new Icon[iconList.size()];
+//
+// String[] arrowNames = new String[iconList.size()];
+// Set arrowShapes = arrowShapeIcons.keySet();
+//
+// for (int i = 0; i < iconArray.length; i++) {
+// newIcon = ((ArrowIcon) iconList.get(i));
+// newIcon.setIconHeight(16);
+// newIcon.setIconWidth(40);
+// newIcon.setBottomPadding(-9);
+// iconArray[i] = newIcon;
+// arrowNames[i] = newIcon.getName();
+// }
+//
+// // arrowCellEditor.setAvailableValues(arrowShapes.toArray());
+// // arrowCellEditor.setAvailableIcons(iconArray);
+// iconList = new ArrayList();
+// iconList.addAll(lineTypeIcons.values());
+// iconArray = new Icon[iconList.size()];
+// shapeNames = new String[iconList.size()];
+//
+// Set lineTypes = lineTypeIcons.keySet();
+//
+// for (int i = 0; i < iconArray.length; i++) {
+// newIcon = (VisualPropertyIcon) (iconList.get(i));
+// newIcon.setIconHeight(16);
+// newIcon.setIconWidth(16);
+// iconArray[i] = newIcon;
+// shapeNames[i] = newIcon.getName();
+// }
+// lineCellEditor.setAvailableValues(lineTypes.toArray());
+// lineCellEditor.setAvailableIcons(iconArray);
}
private List<Property> setPropertyFromCalculator() {
final List<Property> props = new ArrayList<Property>();
-
- //FIXME
-// // Loop for each category: node, edge, and network
-// for (String cat : CATEGORY) {
-//
-// for (VisualMappingFunction<?, ?> mapping : selectedStyle
-// .getAllVisualMappingFunctions()) {
-//
-// // execute the following only if category
matches.
-//
if(cat.equalsIgnoreCase(mapping.getVisualProperty().getObjectType()) == false)
continue;
-//
-// VisualProperty<?> type = null;
-//
-// final VizMapperProperty<?> calculatorTypeProp =
vizMapPropertyBuilder
-// .buildProperty(mapping, cat,
propertySheetPanel);
-//
-// PropertyEditor editor =
((PropertyEditorRegistry)
this.propertySheetPanel.getTable().getEditorFactory()).getEditor(calculatorTypeProp);
-//
-// if ((editor == null)
-// &&
(calculatorTypeProp.getCategory().equals(
-// "Unused
Properties") == false)) {
-//
-// type = (VisualProperty<?>)
calculatorTypeProp
-// .getHiddenObject();
-//
-// if (type.getObjectType().equals(NODE)) {
-//
-// ((PropertyEditorRegistry)
this.propertySheetPanel.getTable().getEditorFactory())
-// .registerEditor(
-//
calculatorTypeProp,
-//
editorManager
-//
.getDefaultComboBoxEditor("nodeAttrEditor"));
-// } else
if(type.getObjectType().equals(EDGE)) {
-// ((PropertyEditorRegistry)
this.propertySheetPanel.getTable().getEditorFactory())
-// .registerEditor(
-//
calculatorTypeProp,
-//
editorManager
-//
.getDefaultComboBoxEditor("edgeAttrEditor"));
-// } else {
-// // Network
-//
-// }
-// }
-// props.add(calculatorTypeProp);
-// }
-// }
+ // FIXME
+ // Loop for each category: node, edge, and network
+ for (String cat : CATEGORY) {
+
+ for (VisualMappingFunction<?, ?> mapping : selectedStyle
+ .getAllVisualMappingFunctions()) {
+
+ // execute the following only if category
matches.
+ //
if(cat.equalsIgnoreCase(mapping.getVisualProperty().getObjectType())
+ // == false) continue;
+
+ VisualProperty<?> type = null;
+
+ final VizMapperProperty<?> calculatorTypeProp =
vizMapPropertyBuilder
+ .buildProperty(mapping, cat,
propertySheetPanel, cat);
+
+ PropertyEditor editor =
((PropertyEditorRegistry) this.propertySheetPanel
+ .getTable().getEditorFactory())
+ .getEditor(calculatorTypeProp);
+
+ if ((editor == null)
+ &&
(calculatorTypeProp.getCategory().equals(
+ "Unused
Properties") == false)) {
+
+ type = (VisualProperty<?>)
calculatorTypeProp
+ .getHiddenObject();
+
+ if (cat.equals(NODE)) {
+
+ ((PropertyEditorRegistry)
this.propertySheetPanel
+
.getTable().getEditorFactory())
+ .registerEditor(
+
calculatorTypeProp,
+
editorManager
+
.getDefaultComboBoxEditor("nodeAttrEditor"));
+ } else if (cat.equals(EDGE)) {
+ ((PropertyEditorRegistry)
this.propertySheetPanel
+
.getTable().getEditorFactory())
+ .registerEditor(
+
calculatorTypeProp,
+
editorManager
+
.getDefaultComboBoxEditor("edgeAttrEditor"));
+ } else {
+ // Network
+
+ }
+ }
+ props.add(calculatorTypeProp);
+ }
+ }
+
return props;
}
@@ -289,7 +293,7 @@
// TODO: Sort the unused list.
// Collections.sort(getUnusedVisualPropType());
-
+
for (VisualProperty<?> type : getUnusedVisualPropType()) {
VizMapperProperty<VisualProperty<?>> prop = new
VizMapperProperty<VisualProperty<?>>();
prop.setCategory(AbstractVizMapperPanel.CATEGORY_UNUSED);
@@ -307,7 +311,8 @@
VisualMappingFunction<?, ?> mapping = null;
- VisualLexicon lex =
this.cyNetworkManager.getCurrentRenderingEngine().getVisualLexicon();
+ VisualLexicon lex =
this.cyNetworkManager.getCurrentRenderingEngine()
+ .getVisualLexicon();
for (VisualProperty<?> type : lex.getAllVisualProperties()) {
mapping = selectedStyle.getVisualMappingFunction(type);
@@ -367,10 +372,12 @@
&& (shownProp.getCategory() != null)
&& shownProp.getCategory().equals(
AbstractVizMapperPanel.CATEGORY_UNUSED)) {
-
- //FIXME
-
//empRenderer.setForeground(colorMgr.getColor("UNUSED_COLOR"));
- ((PropertyRendererRegistry)
this.propertySheetPanel.getTable().getRendererFactory()).registerRenderer(shownProp,
empRenderer);
+
+ // FIXME
+ //
empRenderer.setForeground(colorMgr.getColor("UNUSED_COLOR"));
+ ((PropertyRendererRegistry)
this.propertySheetPanel.getTable()
+
.getRendererFactory()).registerRenderer(shownProp,
+ empRenderer);
}
}
propertySheetPanel.repaint();
@@ -423,62 +430,64 @@
public void setAttrComboBox() {
// Attribute Names
final List<String> names = new ArrayList<String>();
-//
-// CyTable attr = /* TODO
*/getTargetNetwork().getNodeCyDataTables()
-// .get(CyNetwork.DEFAULT_ATTRS);
-//
-// // TODO remove the next line too!
-// if (attr == null)
-// return;
-//
-// Map<String, Class<?>> cols = attr.getColumnTypeMap();
-// names.addAll(cols.keySet());
-//
-// Collections.sort(names);
-//
-// // nodeAttrEditor.setAvailableValues(names.toArray());
-// spcs.firePropertyChange("UPDATE_AVAILABLE_VAL",
"nodeAttrEditor", names
-// .toArray());
-//
-// names.clear();
-//
-// for (String name : cols.keySet()) {
-// Class<?> dataClass = cols.get(name);
-//
-// if ((dataClass == Integer.class) || (dataClass ==
Double.class))
-// names.add(name);
-// }
-//
-// Collections.sort(names);
-// // nodeNumericalAttrEditor.setAvailableValues(names.toArray());
-// spcs.firePropertyChange("UPDATE_AVAILABLE_VAL",
-// "nodeNumericalAttrEditor", names.toArray());
-//
-// names.clear();
-//
-// attr = getTargetNetwork().getEdgeCyDataTables().get(
-// CyNetwork.DEFAULT_ATTRS);
-// cols = attr.getColumnTypeMap();
-// names.addAll(cols.keySet());
-// Collections.sort(names);
-//
-// // edgeAttrEditor.setAvailableValues(names.toArray());
-// spcs.firePropertyChange("UPDATE_AVAILABLE_VAL",
"edgeAttrEditor", names
-// .toArray());
-// names.clear();
-//
-// for (String name : cols.keySet()) {
-// Class<?> dataClass = cols.get(name);
-//
-// if ((dataClass == Integer.class) || (dataClass ==
Double.class))
-// names.add(name);
-// }
-//
-// Collections.sort(names);
-// // edgeNumericalAttrEditor.setAvailableValues(names.toArray());
-// spcs.firePropertyChange("UPDATE_AVAILABLE_VAL",
-// "edgeNumericalAttrEditor", names.toArray());
-// propertySheetPanel.repaint();
+ //
+ // CyTable attr = /* TODO
*/getTargetNetwork().getNodeCyDataTables()
+ // .get(CyNetwork.DEFAULT_ATTRS);
+ //
+ // // TODO remove the next line too!
+ // if (attr == null)
+ // return;
+ //
+ // Map<String, Class<?>> cols = attr.getColumnTypeMap();
+ // names.addAll(cols.keySet());
+ //
+ // Collections.sort(names);
+ //
+ // // nodeAttrEditor.setAvailableValues(names.toArray());
+ // spcs.firePropertyChange("UPDATE_AVAILABLE_VAL",
"nodeAttrEditor",
+ // names
+ // .toArray());
+ //
+ // names.clear();
+ //
+ // for (String name : cols.keySet()) {
+ // Class<?> dataClass = cols.get(name);
+ //
+ // if ((dataClass == Integer.class) || (dataClass ==
Double.class))
+ // names.add(name);
+ // }
+ //
+ // Collections.sort(names);
+ // //
nodeNumericalAttrEditor.setAvailableValues(names.toArray());
+ // spcs.firePropertyChange("UPDATE_AVAILABLE_VAL",
+ // "nodeNumericalAttrEditor", names.toArray());
+ //
+ // names.clear();
+ //
+ // attr = getTargetNetwork().getEdgeCyDataTables().get(
+ // CyNetwork.DEFAULT_ATTRS);
+ // cols = attr.getColumnTypeMap();
+ // names.addAll(cols.keySet());
+ // Collections.sort(names);
+ //
+ // // edgeAttrEditor.setAvailableValues(names.toArray());
+ // spcs.firePropertyChange("UPDATE_AVAILABLE_VAL",
"edgeAttrEditor",
+ // names
+ // .toArray());
+ // names.clear();
+ //
+ // for (String name : cols.keySet()) {
+ // Class<?> dataClass = cols.get(name);
+ //
+ // if ((dataClass == Integer.class) || (dataClass ==
Double.class))
+ // names.add(name);
+ // }
+ //
+ // Collections.sort(names);
+ // //
edgeNumericalAttrEditor.setAvailableValues(names.toArray());
+ // spcs.firePropertyChange("UPDATE_AVAILABLE_VAL",
+ // "edgeNumericalAttrEditor", names.toArray());
+ // propertySheetPanel.repaint();
}
public VizMapPropertyBuilder getPropertyBuilder() {
@@ -488,7 +497,7 @@
public List<VisualProperty<?>> getUnusedVisualPropType() {
return unusedVisualPropType;
}
-
+
protected void setSelectedStyle(VisualStyle selectedStyle) {
this.selectedStyle = selectedStyle;
}
Modified:
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/VizMapperMainPanel.java
2010-09-29 00:58:32 UTC (rev 22101)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2010-09-29 03:04:19 UTC (rev 22102)
@@ -168,8 +168,6 @@
refreshUI();
cytoscapeDesktop.getCytoPanel(CytoPanelName.WEST).add(TAB_TITLE, this);
- // cytoscapeDesktop.getSwingPropertyChangeSupport()
- // .addPropertyChangeListener(this);
// Switch to the default style.
switchVS(defaultVS);
--
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.
