metadataplayer: comparison src/js/libs/renkan-publish.js

Mercurial Mercurial > metadataplayer / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

src/js/libs/renkan-publish.js

changeset 950	b7e236e4ec1c
parent 938	991f897f1cb1
child 955	5055aa35340f

equal deleted inserted replaced

-:fb5ac4ca3c69
+:b7e236e4ec1c
 Rkns.Renderer.Edge.prototype._init = function() {
 this.renderer.edge_layer.activate();
 this.type = "Edge";
 this.from_representation = this.renderer.getRepresentationByModel(this.model.get("from"));
 this.to_representation = this.renderer.getRepresentationByModel(this.model.get("to"));
+this.bundle = this.renderer.addToBundles(this);
 this.line = new paper.Path();
-this.line.add([0,0],[0,0]);
+this.line.add([0,0],[0,0],[0,0]);
 this.line.__representation = this;
 this.arrow = new paper.Path();
 this.arrow.add([0,0],[Rkns.Renderer._ARROW_LENGTH,Rkns.Renderer._ARROW_WIDTH / 2],[0,Rkns.Renderer._ARROW_WIDTH]);
 this.arrow.__representation = this;
 this.text = new paper.PointText();
 this.text_angle = 0;
 this.arrow_angle = 0;
 }
 Rkns.Renderer.Edge.prototype.redraw = function() {
-var _p0o = this.from_representation.paper_coords,
+var _p0a = this.from_representation.paper_coords,
-_p1o = this.to_representation.paper_coords,
+_p1a = this.to_representation.paper_coords,
-_v = _p1o.subtract(_p0o),
+_v = _p1a.subtract(_p0a),
 _r = _v.length,
 _u = _v.divide(_r),
-_delta = new paper.Point([- _u.y, _u.x]).multiply( 4 ),
+_group_pos = this.bundle.getPosition(this),
-_p0 = _p0o.add(_delta), /* Adding a 4 px difference */
+_delta = new paper.Point([- _u.y, _u.x]).multiply( 12 * _group_pos ),
-_p1 = _p1o.add(_delta), /* to differentiate inbound and outbound links */
+_p0b = _p0a.add(_delta), /* Adding a 4 px difference */
+_p1b = _p1a.add(_delta), /* to differentiate inbound and outbound links */
 _a = _v.angle,
+_handle = _v.divide(3),
 _color = this.model.get("created_by").get("color");
-this.paper_coords = _p0.add(_p1).divide(2);
+this.paper_coords = _p0b.add(_p1b).divide(2);
 this.line.strokeColor = _color;
-this.line.segments[0].point = _p0;
+this.line.segments[0].point = _p0a;
-this.line.segments[1].point = _p1;
+this.line.segments[1].point = this.paper_coords;
+this.line.segments[1].handleIn = _handle.multiply(-1);
+this.line.segments[1].handleOut = _handle;
+this.line.segments[2].point = _p1a;
 this.arrow.rotate(_a - this.arrow_angle);
 this.arrow.fillColor = _color;
 this.arrow.position = this.paper_coords.subtract(_u.multiply(4));
 this.arrow_angle = _a;
 if (_a > 90) {
 Rkns.Renderer.Edge.prototype.destroy = function() {
 this.line.remove();
 this.arrow.remove();
 this.text.remove();
+var _this = this;
+this.bundle.edges = Rkns._(this.bundle.edges).reject(function(_edge) {
+return _edge === _this;
+});
 }
 /* */
 Rkns.Renderer.NodeTooltip = Rkns.Utils.inherit(Rkns.Renderer._BaseRepresentation);
 this.click_target = null;
 this.selected_target = null;
 this.edge_layer = new paper.Layer();
 this.node_layer = new paper.Layer();
 this.overlay_layer = new paper.Layer();
+this.bundles = [];
 var _tool = new paper.Tool(),
 _this = this;
 _tool.minDistance = Rkns.Renderer._MIN_DRAG_DISTANCE;
 _tool.onMouseMove = function(_event) {
 _this.onMouseMove(_event);
 Rkns.Renderer.Scene.prototype.template = Rkns._.template(
 '<canvas class="Rk-Canvas" width="<%=width%>" height="<%=height%>"></canvas><div class="Rk-Editor">'
 + '<div class="Rk-ZoomButtons"><div class="Rk-ZoomIn" title="<%=l10n.zoom_in%>"></div><div class="Rk-ZoomOut" title="<%=l10n.zoom_out%>"></div></div>'
 + '</div>'
 );
+Rkns.Renderer.Scene.prototype.addToBundles = function(_edgeRepr) {
+var _bundle = Rkns._(this.bundles).find(function(_bundle) {
+return (
+( _bundle.from === _edgeRepr.from_representation && _bundle.to === _edgeRepr.to_representation )
+|| ( _bundle.from === _edgeRepr.to_representation && _bundle.to === _edgeRepr.from_representation )
+);
+});
+if (typeof _bundle !== "undefined") {
+_bundle.edges.push(_edgeRepr)
+} else {
+_bundle = {
+from: _edgeRepr.from_representation,
+to: _edgeRepr.to_representation,
+edges: [ _edgeRepr ],
+getPosition: function(_er) {
+var _dir = (_er.from_representation === this.from) ? 1 : -1;
+return _dir * ( Rkns._(this.edges).indexOf(_er) - (this.edges.length - 1) / 2 );
+}
+}
+this.bundles.push(_bundle);
+}
+return _bundle;
+}
 Rkns.Renderer.Scene.prototype.autoScale = function() {
 if (this.renkan.project.get("nodes").length) {
 var _xx = this.renkan.project.get("nodes").map(function(_node) { return _node.get("position").x }),
 _yy = this.renkan.project.get("nodes").map(function(_node) { return _node.get("position").y }),

metadataplayer