vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-08-20 12:30:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set position integrated !

Browse Source
This commit is contained in:
Paulo Veiga 2012-01-11 19:47:00 -03:00
parent 8cf9e6d18e
commit d9cdcc5160
14 changed files with 82 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mindplot/pom.xml
View File

@ -209,7 +209,11 @@
<filelist dir="${basedir}/src/main/javascript/"
files="nlayout/ChildrenSorterStrategy.js"/>
<filelist dir="${basedir}/src/main/javascript/"
files="nlayout/SymetricSorter.js"/>
files="nlayout/AbstractBasicSorter.js"/>
<filelist dir="${basedir}/src/main/javascript/"
files="nlayout/BalancedSorter.js"/>
<filelist dir="${basedir}/src/main/javascript/"
files="nlayout/SymmetricSorter.js"/>
<filelist dir="${basedir}/src/main/javascript/"
files="nlayout/GridSorter.js"/>
<filelist dir="${basedir}/src/main/javascript/"

2
mindplot/src/main/javascript/Topic.js
View File

@ -1044,7 +1044,7 @@ mindplot.Topic = new Class({
// Update the figure position(ej: central topic must be centered) and children position.
this._updatePositionOnChangeSize(oldSize, size);
mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.NodeResizeEvent, [this]);
mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.NodeResizeEvent, {node:this.getModel(),size:size});
}
},

2
mindplot/src/main/javascript/layout/BaseLayoutManager.js
View File

@ -26,7 +26,7 @@ mindplot.layout.BaseLayoutManager = new Class({
this.setOptions(options);
this._createBoard();
this._designer = designer;
mindplot.EventBus.instance.addEvent(mindplot.EventBus.events.NodeResizeEvent, this._nodeResizeEvent.bind(this));
// mindplot.EventBus.instance.addEvent(mindplot.EventBus.events.NodeResizeEvent, this._nodeResizeEvent.bind(this));
mindplot.EventBus.instance.addEvent(mindplot.EventBus.events.NodeMoveEvent, this._nodeMoveEvent.bind(this));
mindplot.EventBus.instance.addEvent(mindplot.EventBus.events.ONodeDisconnectEvent, this._nodeDisconnectEvent.bind(this));
mindplot.EventBus.instance.addEvent(mindplot.EventBus.events.ONodeConnectEvent, this._nodeConnectEvent.bind(this));

9
mindplot/src/main/javascript/nlayout/AbstractBasicSorter.js
View File

@ -53,14 +53,5 @@ mindplot.nlayout.AbstractBasicSorter = new Class({
return a.getOrder() - b.getOrder()
});
return result;
},
verify:function(treeSet, node) {
// Check that all is consistent ...
var children = this._getSortedChildren(treeSet, node);
for (var i = 0; i < children.length; i++) {
$assert(children[i].getOrder() == i, "missing order elements");
}
}
});

46
mindplot/src/main/javascript/nlayout/BalancedSorter.js
View File

@ -1,3 +1,20 @@
/*
* Copyright [2011] [wisemapping]
*
* Licensed under WiseMapping Public License, Version 1.0 (the "License").
* It is basically the Apache License, Version 2.0 (the "License") plus the
* "powered by wisemapping" text requirement on every single page;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the license at
*
* http://www.wisemapping.org/license
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
mindplot.nlayout.BalancedSorter = new Class({
Extends: mindplot.nlayout.AbstractBasicSorter,
@ -66,13 +83,17 @@ mindplot.nlayout.BalancedSorter = new Class({
insert: function(treeSet, parent, child, order) {
var children = this._getSortedChildren(treeSet, parent);
$assert(order <= children.length, "Order must be continues and can not have holes. Order:" + order);
$assert(order <= children.length, "Order must be continues and can not have holes. Order:" + order);
// Shift all the elements in one .
// Shift all the elements in one. In case of balanced sorter, order don't need to be continues ...
var collision = order;
for (var i = order; i < children.length; i++) {
var node = children[i];
node.setOrder(i + 1);
// @Todo: This must be review. Order balance need to be defined ...
if (node.getOrder() == collision) {
collision = collision + 1;
node.setOrder(collision);
}
}
child.setOrder(order);
},
@ -98,9 +119,10 @@ mindplot.nlayout.BalancedSorter = new Class({
var children = this._getSortedChildren(treeSet, node);
// Compute heights ...
var heights = children.map(function(child) {
return {id:child.getId(), order:child.getOrder(), height:this._computeChildrenHeight(treeSet, child)};
}, this).reverse();
var heights = children.map(
function(child) {
return {id:child.getId(), order:child.getOrder(), height:this._computeChildrenHeight(treeSet, child)};
}, this).reverse();
// Compute the center of the branch ...
@ -114,8 +136,8 @@ mindplot.nlayout.BalancedSorter = new Class({
totalNHeight += elem.height;
}
});
var psum = totalPHeight/2;
var nsum = totalNHeight/2;
var psum = totalPHeight / 2;
var nsum = totalNHeight / 2;
var ysum = 0;
// Calculate the offsets ...
@ -131,7 +153,7 @@ mindplot.nlayout.BalancedSorter = new Class({
ysum = nsum;
}
var yOffset = ysum + heights[i].height/2;
var yOffset = ysum + heights[i].height / 2;
var xOffset = direction * (node.getSize().width + mindplot.nlayout.SymmetricSorter.INTERNODE_HORIZONTAL_PADDING);
$assert(!isNaN(xOffset), "xOffset can not be null");
@ -144,6 +166,10 @@ mindplot.nlayout.BalancedSorter = new Class({
toString:function() {
return "Balanced Sorter";
},
verify:function(treeSet, node) {
// @todo...
}
});

20
mindplot/src/main/javascript/nlayout/EventBusDispatcher.js
View File

@ -27,7 +27,10 @@ mindplot.nlayout.EventBusDispatcher = new Class({
this._layoutManager.addEvent('change', function(event) {
var id = event.getId();
var topic = designerModel.findTopicById(id);
console.log("Modifing position to:" + id);
console.log("Modify position to:" + id);
topic.setPosition(event.getPosition());
topic.setOrder(event.getOrder());
});
},
@ -43,8 +46,8 @@ mindplot.nlayout.EventBusDispatcher = new Class({
mindplot.EventBus.instance.addEvent(mindplot.EventBus.events.DoLayout, this._doLayout.bind(this));
},
_nodeResizeEvent: function(node) {
console.log("mindplot.nlayout.EventBusDispatcher._nodeResizeEvent: Not Implemented yet");
_nodeResizeEvent: function(args) {
this._layoutManager.updateNodeSize(args.node.getId(), args.size);
},
_nodeMoveEvent: function(node) {
@ -82,11 +85,12 @@ mindplot.nlayout.EventBusDispatcher = new Class({
},
_doLayout: function() {
this._layoutManager.layout(true);
console.log("---------");
this._layoutManager.dump();
console.log("---------");
(function() {
this._layoutManager.layout(true);
console.log("---------");
this._layoutManager.dump();
console.log("---------");
}).delay(0, this);
}
});

4
mindplot/src/main/javascript/nlayout/LayoutManager.js
View File

@ -32,7 +32,9 @@ mindplot.nlayout.LayoutManager = new Class({
updateNodeSize: function(id, size) {
var node = this._treeSet.find(id);
node.setSize(size);
// @Todo: finish...
console.log("Size:"+size.width);
// Todo: This must be completed ...
},
updateShirkState: function(id, isShrink) {

1
mindplot/src/main/javascript/nlayout/OriginalLayout.js
View File

@ -121,7 +121,6 @@ mindplot.nlayout.OriginalLayout = new Class({
});
mindplot.nlayout.OriginalLayout.SYMMETRIC_SORTER = new mindplot.nlayout.SymmetricSorter();
mindplot.nlayout.OriginalLayout.GRID_SORTER = new mindplot.nlayout.GridSorter();
mindplot.nlayout.OriginalLayout.BALANCED_SORTER = new mindplot.nlayout.BalancedSorter();

19
mindplot/src/main/javascript/nlayout/SymmetricSorter.js
View File

@ -54,7 +54,6 @@ mindplot.nlayout.SymmetricSorter = new Class({
insert: function(treeSet, parent, child, order) {
var children = this._getSortedChildren(treeSet, parent);
$assert(order <= children.length, "Order must be continues and can not have holes. Order:" + order);
$assert(order <= children.length, "Order must be continues and can not have holes. Order:" + order);
// Shift all the elements in one .
for (var i = order; i < children.length; i++) {
@ -85,9 +84,10 @@ mindplot.nlayout.SymmetricSorter = new Class({
var children = this._getSortedChildren(treeSet, node);
// Compute heights ...
var heights = children.map(function(child) {
return {id:child.getId(), order:child.getOrder(), position: child.getPosition(), height: this._computeChildrenHeight(treeSet, child)};
}, this).reverse();
var heights = children.map(
function(child) {
return {id:child.getId(), order:child.getOrder(), position: child.getPosition(), height: this._computeChildrenHeight(treeSet, child)};
}, this).reverse();
// Compute the center of the branch ...
var totalHeight = 0;
@ -104,7 +104,7 @@ mindplot.nlayout.SymmetricSorter = new Class({
var parent = treeSet.getParent(treeSet.find(heights[i].id));
var direction = parent.getPosition().x > 0 ? 1 : -1;
var yOffset = ysum + heights[i].height/2;
var yOffset = ysum + heights[i].height / 2;
var xOffset = direction * (node.getSize().width + mindplot.nlayout.SymmetricSorter.INTERNODE_HORIZONTAL_PADDING);
$assert(!isNaN(xOffset), "xOffset can not be null");
@ -115,6 +115,15 @@ mindplot.nlayout.SymmetricSorter = new Class({
return result;
},
verify:function(treeSet, node) {
// Check that all is consistent ...
var children = this._getSortedChildren(treeSet, node);
for (var i = 0; i < children.length; i++) {
$assert(children[i].getOrder() == i, "missing order elements");
}
},
toString:function() {
return "Symmetric Sorter";
}

0
mindplot/src/main/javascript/nlayout/TestSuite.js → mindplot/src/test/javascript/static/TestSuite.js
View File

6
mindplot/src/test/javascript/static/layout.html
View File

@ -19,10 +19,10 @@
<script type='text/javascript' src='../../../main/javascript/nlayout/OriginalLayout.js'></script>
<script type='text/javascript' src='../../../main/javascript/nlayout/ChangeEvent.js'></script>
<script type="text/javascript" src="../../../main/javascript/nlayout/raphael-min.js"></script>
<script type="text/javascript" src="../../../main/javascript/nlayout/raphael-plugins.js"></script>
<script type="text/javascript" src="raphael-min.js"></script>
<script type="text/javascript" src="raphael-plugins.js"></script>
<script type='text/javascript' src='../../../main/javascript/nlayout/TestSuite.js'></script>
<script type='text/javascript' src='TestSuite.js'></script>
<script type='text/javascript'>

0
mindplot/src/main/javascript/nlayout/raphael-min.js → mindplot/src/test/javascript/static/raphael-min.js vendored
View File

0
mindplot/src/main/javascript/nlayout/raphael-plugins.js → mindplot/src/test/javascript/static/raphael-plugins.js
View File

7
mindplot/src/test/javascript/static/sample.xml Normal file
View File

@ -0,0 +1,7 @@
<map name="mapId" version="pela">
<topic central="true" id="0">
<topic position="-268,50" order="2" id="1">
<topic position="-387,51" order="0" id="2"/>
</topic>
</topic>
</map>