Author: kono
Date: 2012-04-27 16:45:13 -0700 (Fri, 27 Apr 2012)
New Revision: 29037
Removed:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/VisualPropertyFilter.java
Modified:
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/util/PropertySheetUtil.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/VizMapPropertySheetBuilder.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
Log:
fixes #920 Incompatible network Visual Properties had been added to the list.
Also, the incompatible list is now accessible for RenderingEngine developers.
If they implement 3D stuff, they can remove it from the incompatible VP list.
Modified:
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/util/PropertySheetUtil.java
===================================================================
---
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/util/PropertySheetUtil.java
2012-04-27 23:16:06 UTC (rev 29036)
+++
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/util/PropertySheetUtil.java
2012-04-27 23:45:13 UTC (rev 29037)
@@ -8,14 +8,15 @@
/**
* Utility class to provide access to basic set of Visual Properties.
- *
+ *
*/
public final class PropertySheetUtil {
-
+
private static final Set<VisualProperty<?>> BASIC_PROPS = new
HashSet<VisualProperty<?>>();
-
+ private static final Set<VisualProperty<?>> INCOMPATIBLE_VP_SET = new
HashSet<VisualProperty<?>>();
+
private static boolean mode = false;
-
+
// Preset Basic Properties
static {
BASIC_PROPS.add(BasicVisualLexicon.NODE_FILL_COLOR);
@@ -25,29 +26,37 @@
BASIC_PROPS.add(BasicVisualLexicon.NODE_LABEL);
BASIC_PROPS.add(BasicVisualLexicon.NODE_BORDER_PAINT);
BASIC_PROPS.add(BasicVisualLexicon.NODE_BORDER_WIDTH);
-
+
BASIC_PROPS.add(BasicVisualLexicon.EDGE_STROKE_UNSELECTED_PAINT);
BASIC_PROPS.add(BasicVisualLexicon.EDGE_WIDTH);
BASIC_PROPS.add(BasicVisualLexicon.EDGE_LABEL);
BASIC_PROPS.add(BasicVisualLexicon.EDGE_LINE_TYPE);
-
+
BASIC_PROPS.add(BasicVisualLexicon.NETWORK_BACKGROUND_PAINT);
+
+ // These VPs are not compatible with current rendering engine
(ding).
+ INCOMPATIBLE_VP_SET.add(BasicVisualLexicon.NODE_DEPTH);
+ INCOMPATIBLE_VP_SET.add(BasicVisualLexicon.NODE_Z_LOCATION);
+
+
INCOMPATIBLE_VP_SET.add(BasicVisualLexicon.NETWORK_CENTER_Z_LOCATION);
+ INCOMPATIBLE_VP_SET.add(BasicVisualLexicon.NETWORK_DEPTH);
}
-
/**
* Check whether given Visual Property is categorized as Basic or not.
- * @param vp Visual Property to be checked
*
+ * @param vp
+ * Visual Property to be checked
+ *
* @return true if it is a part of preset basic visual properties.
*/
public static final boolean isBasic(final VisualProperty<?> vp) {
- if(BASIC_PROPS.contains(vp))
+ if (BASIC_PROPS.contains(vp))
return true;
else
return false;
}
-
+
/**
* Check the status of display mode
*
@@ -56,27 +65,58 @@
public static final boolean isAdvancedMode() {
return mode;
}
-
+
/**
* Switch the current display mode.
*
- * @param advanced If true, it is in advanced mode.
+ * @param advanced
+ * If true, it is in advanced mode.
*/
public static final void setMode(boolean advanced) {
mode = advanced;
}
-
-
+
/**
- * Add a new basic visual property. This will be used by Rendering
Engine developers.
+ * Add a new basic visual property. This will be used by Rendering
Engine
+ * developers.
*
- * @param vp New Visual Property to be set as basic set.
+ * @param vp
+ * New Visual Property to be set as basic set.
*/
public static final void addBasicVisualProperty(final VisualProperty<?>
vp) {
// Ignore null values.
- if(vp == null)
+ if (vp == null)
return;
-
+
BASIC_PROPS.add(vp);
}
+
+ /**
+ * Returns true if given VisualProperty is compatible with current
rendering engine.
+ *
+ * @param vp VisualProperty to be tested
+ *
+ * @return true if compatible
+ */
+ public static final Boolean isCompatible(final VisualProperty<?> vp) {
+ if (INCOMPATIBLE_VP_SET.contains(vp))
+ return false;
+ else
+ return true;
+ }
+
+ /**
+ * Remove incompatible VisualProperty from list if new RenderingEngine
can handle it.
+ * For example, default rendering engine (ding) is 2D rendering engine
and cannot handle
+ * Z-coordinate, but if you add 3D renderer, you can remove NODE_DEPTH
from the list.
+ *
+ * @param vp VisualProperty to be removed from the incompatible list.
+ */
+ public static final void removeIncompatibleVisualProperty(final
VisualProperty<?> vp) {
+ // Ignore null values.
+ if (vp == null)
+ return;
+
+ INCOMPATIBLE_VP_SET.remove(vp);
+ }
}
\ No newline at end of file
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-04-27 23:16:06 UTC (rev 29036)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2012-04-27 23:45:13 UTC (rev 29037)
@@ -76,7 +76,6 @@
import org.cytoscape.view.vizmap.gui.event.LexiconStateChangedListener;
import org.cytoscape.view.vizmap.gui.event.SelectedVisualStyleSwitchedEvent;
import org.cytoscape.view.vizmap.gui.event.SelectedVisualStyleSwitchedListener;
-import org.cytoscape.view.vizmap.gui.internal.util.VisualPropertyFilter;
import org.cytoscape.view.vizmap.gui.internal.util.VizMapperUtil;
import org.cytoscape.view.vizmap.gui.util.PropertySheetUtil;
import org.jdesktop.swingx.JXList;
@@ -469,7 +468,7 @@
for (final VisualProperty<?> vp : vps) {
// Check supported or not.
- if (VisualPropertyFilter.isCompatible(vp) ==
false)
+ if (PropertySheetUtil.isCompatible(vp) == false)
continue;
// Filter based on mode
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
2012-04-27 23:16:06 UTC (rev 29036)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
2012-04-27 23:45:13 UTC (rev 29037)
@@ -3,7 +3,6 @@
import java.awt.Color;
import java.awt.Font;
import java.beans.PropertyEditor;
-import java.security.KeyStore.Entry;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -16,9 +15,9 @@
import javax.swing.table.DefaultTableCellRenderer;
import org.cytoscape.model.CyEdge;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualLexiconNode;
@@ -33,7 +32,6 @@
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.CyComboBoxPropertyEditor;
import org.cytoscape.view.vizmap.gui.internal.event.CellType;
-import org.cytoscape.view.vizmap.gui.internal.util.VisualPropertyFilter;
import org.cytoscape.view.vizmap.gui.internal.util.VizMapperUtil;
import org.cytoscape.view.vizmap.gui.util.PropertySheetUtil;
import org.slf4j.Logger;
@@ -273,7 +271,7 @@
for (final VisualProperty<?> vp :
lex.getAllVisualProperties()) {
- if(VisualPropertyFilter.isCompatible(vp) ==
false)
+ if(PropertySheetUtil.isCompatible(vp) == false)
continue;
if (PropertySheetUtil.isAdvancedMode() ==
false) {
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
2012-04-27 23:16:06 UTC (rev 29036)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
2012-04-27 23:45:13 UTC (rev 29037)
@@ -16,7 +16,7 @@
import org.cytoscape.view.presentation.property.BasicVisualLexicon;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
-import org.cytoscape.view.vizmap.gui.internal.util.VisualPropertyFilter;
+import org.cytoscape.view.vizmap.gui.util.PropertySheetUtil;
import org.cytoscape.work.ServiceProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,7 +61,7 @@
final VisualProperty<?> vp = child.getVisualProperty();
// Ignore incompatible VP
- if(VisualPropertyFilter.isCompatible(vp) == false)
+ if(PropertySheetUtil.isCompatible(vp) == false)
continue;
final String newMenu = menuText + "." +
vp.getDisplayName();
Deleted:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/VisualPropertyFilter.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/VisualPropertyFilter.java
2012-04-27 23:16:06 UTC (rev 29036)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/VisualPropertyFilter.java
2012-04-27 23:45:13 UTC (rev 29037)
@@ -1,26 +0,0 @@
-package org.cytoscape.view.vizmap.gui.internal.util;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.presentation.property.BasicVisualLexicon;
-
-public final class VisualPropertyFilter {
-
- private static final Set<VisualProperty<?>> INCOMPATIBLE_VP_SET = new
HashSet<VisualProperty<?>>();
-
- // Visual Properties which are not compatible with current rendering
engine.
- static {
- INCOMPATIBLE_VP_SET.add(BasicVisualLexicon.NODE_DEPTH);
- INCOMPATIBLE_VP_SET.add(BasicVisualLexicon.NODE_Z_LOCATION);
- }
-
-
- public static Boolean isCompatible(final VisualProperty<?> vp) {
- if (INCOMPATIBLE_VP_SET.contains(vp))
- return false;
- else
- return true;
- }
-}
--
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.
