Author: clopes
Date: 2012-07-20 10:39:11 -0700 (Fri, 20 Jul 2012)
New Revision: 29941
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/xgmml/GenericXGMMLReader.java
Log:
XGMML Import: Preventing the following visual properties from being imported as
locked visual properties: NETWORK_WIDTH/HEIGHT and NETWORK_SCALE_FACTOR--They
must be set directly to the network view.
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/xgmml/GenericXGMMLReader.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/xgmml/GenericXGMMLReader.java
2012-07-20 17:32:09 UTC (rev 29940)
+++
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/xgmml/GenericXGMMLReader.java
2012-07-20 17:39:11 UTC (rev 29941)
@@ -249,8 +249,9 @@
// These are NOT locked properties
boolean b = !((element instanceof CyNode) &&
attName.matches("x|y|z"));
b = b &&
- !((element instanceof CyNetwork) && attName
-
.matches("GRAPH_VIEW_ZOOM|GRAPH_VIEW_CENTER_X|GRAPH_VIEW_CENTER_Y"));
+ !((element instanceof CyNetwork) &&
+
attName.matches("GRAPH_VIEW_(ZOOM|CENTER_(X|Y))|" +
+
"NETWORK_(WIDTH|HEIGHT|SCALE_FACTOR|CENTER_(X|Y|Z)_LOCATION)"));
return b;
}
--
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.
