diff -r 121a24be9da4 -r b5ada3bb8e53 client/js/paper-renderer.js --- a/client/js/paper-renderer.js Tue Aug 21 16:27:26 2012 +0200 +++ b/client/js/paper-renderer.js Tue Aug 21 18:49:41 2012 +0200 @@ -434,7 +434,7 @@ + '
' + '' + '' - + '<%=node.created_by.title%>
' + + '<%=node.created_by_title%>
' ); Rkns.Renderer.NodeEditor.prototype.redraw = function() { @@ -447,10 +447,8 @@ title: _model.get("title"), uri: _model.get("uri"), description: _model.get("description"), - created_by: { - color: _model.get("created_by").get("color"), - title: _model.get("created_by").get("title") - } + created_by_color: _model.get("created_by").get("color"), + created_by_title: _model.get("created_by").get("title") }, l10n: this.renderer.renkan.l10n })) @@ -506,9 +504,9 @@ '<%=edge.from.title%>
' - + '<%=edge.to.title%>
' - + '<%=edge.created_by.title%>
' + + '<%=edge.from_title%>
' + + '<%=edge.to_title%>
' + + '<%=edge.created_by_title%>
' ); Rkns.Renderer.EdgeEditor.prototype.redraw = function() { @@ -517,7 +515,17 @@ _css = Rkns.Renderer.Utils.drawEditBox(_coords, this.editor_block, 250, 200); this.editor_$ .html(this.template({ - edge: _model, + edge: { + title: _model.get("title"), + uri: _model.get("uri"), + description: _model.get("description"), + from_title: _model.get("from").get("title"), + to_title: _model.get("to").get("title"), + from_created_by_color: _model.get("from").get("created_by").get("color"), + to_created_by_color: _model.get("to").get("created_by").get("color"), + created_by_color: _model.get("created_by").get("color"), + created_by_title: _model.get("created_by").get("title") + }, l10n: this.renderer.renkan.l10n })) .show() @@ -841,6 +849,18 @@ + '' ); +Rkns.Renderer.Scene.prototype.autoScale = function() { + 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 }), + _minx = Math.min.apply(Math, _xx), + _miny = Math.min.apply(Math, _yy), + _maxx = Math.max.apply(Math, _xx), + _maxy = Math.max.apply(Math, _yy); + this.scale = Math.min((paper.view.size.width - 2 * this._MARGIN_X) / (_maxx - _minx), (paper.view.size.height - 2 * this._MARGIN_Y) / (_maxy - _miny)); + this.offset = paper.view.center.subtract(new paper.Point([(_maxx + _minx) / 2, (_maxy + _miny) / 2]).multiply(this.scale)); + this.redraw(); +} + Rkns.Renderer.Scene.prototype.toPaperCoords = function(_point) { return _point.multiply(this.scale).add(this.offset); }