Merge pull request #30 from cytoscape/UD-2932

Resolved the issue of incorrect export values for network visual properties
cytoscape · Sep 14, 2024 · 506d7bc · 506d7bc
2 parents b97f970 + c6a20d9
commit 506d7bc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/main/java/org/cytoscape/io/internal/cx_writer/VisualPropertiesGatherer.java b/src/main/java/org/cytoscape/io/internal/cx_writer/VisualPropertiesGatherer.java
@@ -159,7 +159,7 @@ private  final static <T> void addProperties(final View<? extends CyIdentifiable
 
     }
 
-    private static <T> String getSerializableVisualProperty(View<? extends CyIdentifiable> view, VisualProperty<T> vp) {
+    public static <T> String getSerializableVisualProperty(View<? extends CyIdentifiable> view, VisualProperty<T> vp) {
     	T prop = view.getVisualProperty(vp);
 		if (prop == null) {
 			return null;

diff --git a/src/main/java/org/cytoscape/io/internal/cxio/CxExporter.java b/src/main/java/org/cytoscape/io/internal/cxio/CxExporter.java
@@ -155,7 +155,7 @@ public final class CxExporter {
 	private CyNetworkView view;
 
 	private TaskMonitor taskMonitor;
-
+	
 	/**
 	 * Constructor for CxExporter to write network (and it's collection) to CX. Specify 
 	 * if the exporter should attempt to use CX IDs from a previous import
@@ -1531,7 +1531,7 @@ private void writeCX2VisualProperties (CXWriter cx2Writer) throws NdexException,
         		current_visual_style, editorProps);
         VisualPropertiesGatherer.addCx2EditorPropsDependency(CxUtil.NODE_SIZE_LOCKED, current_visual_style, editorProps);
         VisualPropertiesGatherer.addCx2EditorPropsDependency(CxUtil.ARROW_COLOR_MATCHES_EDGE, current_visual_style, editorProps);
-        
+
         Map<String, Object> rawProps = editorProps.getProperties();
         boolean nodeSizeLocked = rawProps.get(CxUtil.NODE_SIZE_LOCKED).equals(Boolean.TRUE);
         boolean arrowColorMatchesEdge = rawProps.get(CxUtil.ARROW_COLOR_MATCHES_EDGE).equals(Boolean.TRUE);
@@ -1543,9 +1543,9 @@ private void writeCX2VisualProperties (CXWriter cx2Writer) throws NdexException,
         Map<String,String> cx1Style = new HashMap<>();
         for (final VisualProperty<?> visual_property : all_visual_properties) {
             if (visual_property.getTargetDataType() == CyNetwork.class) {
-            	String value_str = VisualPropertiesGatherer.getDefaultPropertyAsString(current_visual_style, visual_property);
-                if (value_str !=null && !CxioUtil.isEmpty(value_str)) {
-                	cx1Style.put(visual_property.getIdString(), value_str);
+            	String value_str = VisualPropertiesGatherer.getSerializableVisualProperty(view, visual_property);
+            	if (value_str !=null && !CxioUtil.isEmpty(value_str)) {
+            		cx1Style.put(visual_property.getIdString(), value_str);
                 }
             }
         }
@@ -1662,7 +1662,7 @@ private void writeCX2VisualProperties (CXWriter cx2Writer) throws NdexException,
 
        	List<CxEdgeBypass> edgeBypasses = VisualPropertiesGatherer.getEdgeBypasses(
     				view, all_visual_properties, useCxId, arrowColorMatchesEdge );
-        	cx2Writer.writeFullAspectFragment(edgeBypasses);
+    	cx2Writer.writeFullAspectFragment(edgeBypasses);
 
 
 	}
@@ -1852,8 +1852,7 @@ private CxAttributeDeclaration getAttributeDeclarations() {
 			return result;
 
 	}
-
-
+
 	public final void writeNetworkInCX2(Collection<String> aspects, final OutputStream out) throws IOException, NdexException {