Author: kono
Date: 2012-01-13 13:52:00 -0800 (Fri, 13 Jan 2012)
New Revision: 28014
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AttributeSetManager.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/PropertySheetUtil.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/SetViewModeAction.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/AbstractContinuousMappingEditor.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
Log:
fixes #575 Visual Property list view mode is in sync. both Mapping editor and
default editor.
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
2012-01-13 21:38:47 UTC (rev 28013)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
2012-01-13 21:52:00 UTC (rev 28014)
@@ -220,7 +220,6 @@
});
showAllVPButton.setUI(new BlueishButtonUI());
- showAllVPButton.setText("Show All");
showAllVPButton.setToolTipText("Show all Visual Properties");
for (Field f : fields) {
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AttributeSetManager.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AttributeSetManager.java
2012-01-13 21:38:47 UTC (rev 28013)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AttributeSetManager.java
2012-01-13 21:52:00 UTC (rev 28014)
@@ -27,6 +27,7 @@
private static final Logger logger =
LoggerFactory.getLogger(AttributeSetManager.class);
private static final Set<Class<? extends CyTableEntry>> GRAPH_OBJECTS;
+
static {
GRAPH_OBJECTS = new HashSet<Class<? extends CyTableEntry>>();
GRAPH_OBJECTS.add(CyNode.class);
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2012-01-13 21:38:47 UTC (rev 28013)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2012-01-13 21:52:00 UTC (rev 28014)
@@ -186,16 +186,14 @@
private void updateVisualPropertyLists() {
vpSets.clear();
- vpSets.put(CyNode.class,
-
getLeafNodes(util.getVisualPropertySet(CyNode.class)));
- vpSets.put(CyEdge.class,
-
getLeafNodes(util.getVisualPropertySet(CyEdge.class)));
+ vpSets.put(CyNode.class,
getLeafNodes(util.getVisualPropertySet(CyNode.class)));
+ vpSets.put(CyEdge.class,
getLeafNodes(util.getVisualPropertySet(CyEdge.class)));
vpSets.put(CyNetwork.class,
getNetworkLeafNodes(util.getVisualPropertySet(CyNetwork.class)));
}
- private Set<VisualProperty<?>> getLeafNodes(
- final Collection<VisualProperty<?>> props) {
+ private Set<VisualProperty<?>> getLeafNodes(final
Collection<VisualProperty<?>> props) {
+
final Set<VisualLexicon> lexSet = vmm.getAllVisualLexicon();
final Set<VisualProperty<?>> propSet = new
TreeSet<VisualProperty<?>>(
@@ -206,14 +204,13 @@
if
(lexicon.getVisualLexiconNode(vp).getChildren().size() == 0)
propSet.add(vp);
}
-
}
return propSet;
}
- private Set<VisualProperty<?>> getNetworkLeafNodes(
- final Collection<VisualProperty<?>> props) {
+
+ private Set<VisualProperty<?>> getNetworkLeafNodes(final
Collection<VisualProperty<?>> props) {
final Set<VisualLexicon> lexSet = vmm.getAllVisualLexicon();
final Set<VisualProperty<?>> propSet = new
TreeSet<VisualProperty<?>>(
@@ -554,6 +551,12 @@
if(VisualPropertyFilter.isCompatible(vp) ==
false)
continue;
+ // Filter based on mode
+ if (PropertySheetUtil.isAdvancedMode() ==
false) {
+ if (PropertySheetUtil.isBasic(vp) ==
false)
+ continue;
+ }
+
//Do not allow editing of the following two VP
if (vp.getDisplayName().contains("Edge Target
Arrow Selected Paint") ||
vp.getDisplayName().contains("Edge Source Arrow Selected Paint")){
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/PropertySheetUtil.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/PropertySheetUtil.java
2012-01-13 21:38:47 UTC (rev 28013)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/PropertySheetUtil.java
2012-01-13 21:52:00 UTC (rev 28014)
@@ -26,6 +26,8 @@
BASIC_PROPS.add(RichVisualLexicon.EDGE_WIDTH);
BASIC_PROPS.add(RichVisualLexicon.EDGE_LABEL);
BASIC_PROPS.add(RichVisualLexicon.EDGE_LINE_TYPE);
+
+ BASIC_PROPS.add(RichVisualLexicon.NETWORK_BACKGROUND_PAINT);
}
public static boolean isBasic(final VisualProperty<?> vp) {
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/SetViewModeAction.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/SetViewModeAction.java
2012-01-13 21:38:47 UTC (rev 28013)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/SetViewModeAction.java
2012-01-13 21:52:00 UTC (rev 28014)
@@ -9,6 +9,8 @@
public class SetViewModeAction extends AbstractCyAction {
+ private static final long serialVersionUID = -832910068413870738L;
+
// Local property changed event.
public static final String VIEW_MODE_CHANGED = "VIEW_MODE_CHANGED";
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/AbstractContinuousMappingEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/AbstractContinuousMappingEditor.java
2012-01-13 21:38:47 UTC (rev 28013)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/AbstractContinuousMappingEditor.java
2012-01-13 21:52:00 UTC (rev 28014)
@@ -80,6 +80,8 @@
editorDialog.setTitle("Continuous Mapping
Editor: Mapping for " + mapping.getVisualProperty().getDisplayName());
editorDialog.setLocationRelativeTo(editor);
+ editorDialog.setAlwaysOnTop(true);
+ editorDialog.setModal(true);
editorDialog.setVisible(true);
isEditorDialogActive = true;
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
2012-01-13 21:38:47 UTC (rev 28013)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
2012-01-13 21:52:00 UTC (rev 28014)
@@ -286,22 +286,16 @@
if ((dataType == Double.class) || (dataType ==
Integer.class)) {
// Do nothing
} else {
- JOptionPane
- .showMessageDialog(
- null,
- "Continuous
Mapper can be used with Numbers only.\nPlease select numerical attributes.",
- "Incompatible
Mapping Type!",
-
JOptionPane.INFORMATION_MESSAGE);
-
+ JOptionPane.showMessageDialog(null,
+ "Continuous Mapper can be used
with Numbers only.\nPlease select numerical attributes.",
+ "Incompatible Mapping Type!",
JOptionPane.INFORMATION_MESSAGE);
return;
}
} else if (mapping instanceof DiscreteMapping) {
- newMapping =
factory.createVisualMappingFunction(ctrAttrName,
- dataType, attrForTest, vp);
+ newMapping =
factory.createVisualMappingFunction(ctrAttrName, dataType, attrForTest, vp);
currentStyle.addVisualMappingFunction(newMapping);
- logger.debug("Changed to new Map from "
- + mapping.getMappingColumnName() + " to
"
+ logger.debug("Changed to new Map from " +
mapping.getMappingColumnName() + " to "
+ newMapping.getMappingColumnName());
}
@@ -309,8 +303,7 @@
propertySheetPanel.removeProperty(prop);
// Create new one.
-
- logger.debug("Creating new prop sheet objects for "
+ logger.warn("Creating new prop sheet objects for "
+ newMapping.getMappingColumnName() + ", "
+ vp.getDisplayName());
@@ -319,7 +312,6 @@
.getPropertyBuilder().buildProperty(newMapping,
category.getDisplayName(),
propertySheetPanel, factory);
- logger.debug("!!!!!!! Removing Prop: " + prop);
vizMapPropertySheetBuilder.removeProperty(prop, currentStyle);
final List<Property> propList =
vizMapPropertySheetBuilder.getPropertyList(currentStyle);
--
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.
