Author: onursumer
Date: 2011-10-18 04:38:56 -0700 (Tue, 18 Oct 2011)
New Revision: 27211
Modified:
cytoscapeweb/branches/compound/html-template/js/compound.js
cytoscapeweb/branches/compound/src/org/cytoscapeweb/util/Layouts.as
cytoscapeweb/branches/compound/src/org/cytoscapeweb/view/layout/CompoundSpringEmbedder.as
Log:
- some CoSE layout options renamed for consistency with the Force Directed
layout options.
- default value for gravitation option is set to -50 (negative values indicate
repulsion, while positive values indicate attraction).
Modified: cytoscapeweb/branches/compound/html-template/js/compound.js
===================================================================
--- cytoscapeweb/branches/compound/html-template/js/compound.js 2011-10-18
00:29:29 UTC (rev 27210)
+++ cytoscapeweb/branches/compound/html-template/js/compound.js 2011-10-18
11:38:56 UTC (rev 27211)
@@ -16,7 +16,19 @@
network: { }, // initial empty network
layout: {
name: "CompoundSpringEmbedder",
- options: { }
+ options: { /*layoutQuality: "default",
+ incremental: false,
+ uniformLeafNodeSizes: false,
+ tension: 50,
+ gravitation: -50,
+ smartDistance: true,
+ centralGravitation: 50,
+ centralGravityDistance: 50,
+ compoundCentralGravitation: 50,
+ compoundCentralGravityDistance: 50,
+ restLength: 50,
+ smartRestLength: true,
+ multiLevelScaling: false*/}
},
visualStyle: {
global: {
@@ -603,7 +615,10 @@
var label = "node " + autoLabel;
autoLabel++;
- var n = vis.addNode(evt.mouseX, evt.mouseY, {label: label},
true, evt.target);
+ var n = vis.addNode(evt.mouseX,
+ evt.mouseY,
+ {label: label, parent: evt.target.data.id},
+ true);
});
vis.addContextMenuItem("Toggle node labels", function(evt) {
Modified: cytoscapeweb/branches/compound/src/org/cytoscapeweb/util/Layouts.as
===================================================================
--- cytoscapeweb/branches/compound/src/org/cytoscapeweb/util/Layouts.as
2011-10-18 00:29:29 UTC (rev 27210)
+++ cytoscapeweb/branches/compound/src/org/cytoscapeweb/util/Layouts.as
2011-10-18 11:38:56 UTC (rev 27211)
@@ -92,7 +92,7 @@
tension: 50,
// Spring
repulsion: 50,
// Repulsion
smartDistance: true, //
Smart Range Calculation
- gravitation: 50, //
Gravity
+ gravitation: -50, //
Gravity
gravityDistance: 50, //
Gravity Range
compoundGravitation: 50, // Compound
Gravity
compoundGravityDistance: 50, // Compound
Gravity Range
Modified:
cytoscapeweb/branches/compound/src/org/cytoscapeweb/view/layout/CompoundSpringEmbedder.as
===================================================================
---
cytoscapeweb/branches/compound/src/org/cytoscapeweb/view/layout/CompoundSpringEmbedder.as
2011-10-18 00:29:29 UTC (rev 27210)
+++
cytoscapeweb/branches/compound/src/org/cytoscapeweb/view/layout/CompoundSpringEmbedder.as
2011-10-18 11:38:56 UTC (rev 27211)
@@ -102,14 +102,14 @@
genOpts.setLayoutQuality(quality);
genOpts.setIncremental(options.incremental);
genOpts.setUniformLeafNodeSizes(options.uniformLeafNodeSizes);
-
+
+ coseOpts.setRepulsionStrength(-1 * options.gravitation);
coseOpts.setSpringStrength(options.tension);
- coseOpts.setRepulsionStrength(options.repulsion);
coseOpts.setSmartRepulsionRangeCalc(options.smartDistance);
- coseOpts.setGravityStrength(options.gravitation);
- coseOpts.setGravityRange(options.gravityDistance);
-
coseOpts.setCompoundGravityStrength(options.compoundGravitation);
-
coseOpts.setCompoundGravityRange(options.compoundGravityDistance);
+ coseOpts.setGravityStrength(options.centralGravitation);
+
coseOpts.setGravityRange(options.centralGravityDistance);
+
coseOpts.setCompoundGravityStrength(options.compoundCentralGravitation);
+
coseOpts.setCompoundGravityRange(options.compoundCentralGravityDistance);
coseOpts.setIdealEdgeLength(options.restLength);
coseOpts.setSmartEdgeLengthCalc(options.smartRestLength);
coseOpts.setMultiLevelScaling(options.multiLevelScaling);
--
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.
