Author: clopes
Date: 2011-10-20 13:23:22 -0700 (Thu, 20 Oct 2011)
New Revision: 27247
Modified:
cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/model/converters/SIFConverterTest.as
cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/controller/SetVisualStyleBypassCommand.as
cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/controller/SetVisualStyleCommand.as
Log:
Fixed updating compound node bounds after applying visual style or bypass.
Modified:
cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/controller/SetVisualStyleBypassCommand.as
===================================================================
---
cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/controller/SetVisualStyleBypassCommand.as
2011-10-20 18:52:24 UTC (rev 27246)
+++
cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/controller/SetVisualStyleBypassCommand.as
2011-10-20 20:23:22 UTC (rev 27247)
@@ -57,6 +57,10 @@
private function ready(obj:Object=null):void {
graphMediator.applyVisualBypass(configProxy.visualStyleBypass);
+
+ if (graphProxy.compoundGraph) {
+ graphMediator.updateParentNodes(graphProxy.nodes);
+ }
}
}
}
Modified:
cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/controller/SetVisualStyleCommand.as
===================================================================
---
cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/controller/SetVisualStyleCommand.as
2011-10-20 18:52:24 UTC (rev 27246)
+++
cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/controller/SetVisualStyleCommand.as
2011-10-20 20:23:22 UTC (rev 27247)
@@ -62,6 +62,10 @@
// Ask the mediators to apply the new style:
appMediator.applyVisualStyle(configProxy.visualStyle);
graphMediator.applyVisualStyle(configProxy.visualStyle);
+
+ if (graphProxy.compoundGraph) {
+ graphMediator.updateParentNodes(graphProxy.nodes);
+ }
}
}
}
\ No newline at end of file
Modified:
cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/model/converters/SIFConverterTest.as
===================================================================
---
cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/model/converters/SIFConverterTest.as
2011-10-20 18:52:24 UTC (rev 27246)
+++
cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/model/converters/SIFConverterTest.as
2011-10-20 20:23:22 UTC (rev 27247)
@@ -34,6 +34,8 @@
import flare.data.DataSet;
import flare.data.DataUtil;
import flare.vis.data.Data;
+ import flare.vis.data.EdgeSprite;
+ import flare.vis.data.NodeSprite;
import flash.utils.ByteArray;
import flash.utils.IDataOutput;
@@ -46,6 +48,7 @@
public function testRead():void {
var toTest:Array = [Fixtures.SIF_TABS, Fixtures.SIF_SPACES];
+ var id:String;
for each (var fixture:Class in toTest) {
var input:ByteArray = new (fixture)() as ByteArray;
@@ -73,6 +76,7 @@
// Nodes:
for each (tuple in nodesData) {
+ if (tuple is NodeSprite) tuple = tuple.data;
nodesMap[tuple.id] = tuple;
assertEquals(tuple.id, tuple.label);
// Each node data must have come from the SIF file:
@@ -85,7 +89,8 @@
// The same for edges:
for each (tuple in edgesData) {
- var id:String = tuple.source + " (" + tuple.interaction +
") " + tuple.target;
+ if (tuple is EdgeSprite) tuple = tuple.data;
+ id = tuple.source + " (" + tuple.interaction + ") " +
tuple.target;
assertEquals(id, tuple.id);
assertNotNull(tuple.interaction);
assertEquals(tuple.interaction, tuple.label);
--
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.
