renkan: comparison client/js/paper-renderer.js

Mercurial Mercurial > renkan / comparison

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

client/js/paper-renderer.js

changeset 270	aaef418cdf8d
parent 269	070528af7375
child 271	b2cc6f238b0d

equal deleted inserted replaced

-:070528af7375
+:aaef418cdf8d
 });
 this.$.find(".Rk-ZoomSetSaved").click( function() {
 	var view = _this.renkan.project.get("views")[0];
 	_this.setScale(view.zoom_level, new paper.Point(view.offset_x, view.offset_y));
 });
+if(this.renkan.read_only && !isNaN(parseInt(this.renkan.options.default_view))){
+	this.$.find(".Rk-ZoomSetSaved").show();
+}
 this.$.find(".Rk-CurrentUser").mouseenter(
 function() { _this.$.find(".Rk-UserList").slideDown(); }
 );
 this.$.find(".Rk-Users").mouseleave(
 function() { _this.$.find(".Rk-UserList").slideUp(); }
 + '<form action="#" class="Rk-GraphSearch-Form"><input type="search" class="Rk-GraphSearch-Field" placeholder="<%- translate("Search in graph") %>" /></form><div class="Rk-TopBar-Separator"></div><% } %></div><% } %>'
 + '<div class="Rk-Editing-Space<% if (!options.show_top_bar) { %> Rk-Editing-Space-Full<% } %>">'
 + '<div class="Rk-Labels"></div><canvas class="Rk-Canvas" resize></canvas><div class="Rk-Notifications"></div><div class="Rk-Editor">'
 + '<% if (options.show_bins) { %><div class="Rk-Fold-Bins">&laquo;</div><% } %>'
 + '<div class="Rk-ZoomButtons"><div class="Rk-ZoomIn" title="<%-translate("Zoom In")%>"></div><div class="Rk-ZoomFit" title="<%-translate("Zoom Fit")%>"></div><div class="Rk-ZoomOut" title="<%-translate("Zoom Out")%>"></div>'
-+ '<div class="Rk-ZoomSave" title="<%-translate("Zoom Save")%>"></div><div class="Rk-ZoomSetSaved" title="<%-translate("View saved zoom")%>"></div></div>'
++ '<% if (options.editor_mode) { %><div class="Rk-ZoomSave" title="<%-translate("Zoom Save")%>"></div><% } %>'
++ '<% if (options.editor_mode || !isNaN(parseInt(options.default_view))) { %><div class="Rk-ZoomSetSaved" title="<%-translate("View saved zoom")%>"></div><% } %></div>'
 + '</div></div>'
 ),
 fixSize: function(_autoscale) {
 	console.log("fixSize", _autoscale, this.renkan.project.get("zoom_level"));
 var w = this.$.width(),
 });
 paper.view.viewSize = new paper.Size([w, h]);
 if (_autoscale) {
-	// If _autoscale, we get the initial zoom level set in the project datas.
+	// If _autoscale, we get the initial view (zoom+offset) set in the project datas.
-this.autoScale(this.renkan.project.get("zoom_level"));
+	if(this.renkan.read_only && !isNaN(parseInt(this.renkan.options.default_view))){
+		this.autoScale(this.renkan.project.get("views")[parseInt(this.renkan.options.default_view)]);
+}
+	else{
+this.autoScale();
+	}
 }
 },
 drawSector: function(_repr, _inR, _outR, _startAngle, _endAngle, _padding, _imgname, _caption) {
 var _options = this.renkan.options,
 _startRads = _startAngle * Math.PI / 180,
 this.offset = _offset;
 }
 this.redraw();
 }
 },
-autoScale: function(force_scale) {
+autoScale: function(force_view) {
-	console.log("autoScale", force_scale);
+	console.log("autoScale", force_view);
 var nodes = this.renkan.project.get("nodes");
 if (nodes.length > 1) {
 var _xx = nodes.map(function(_node) { return _node.get("position").x; }),
 _yy = nodes.map(function(_node) { return _node.get("position").y; }),
 _minx = Math.min.apply(Math, _xx),
 _maxx = Math.max.apply(Math, _xx),
 _maxy = Math.max.apply(Math, _yy);
 var _scale = Math.min( (paper.view.size.width - 2 * this.renkan.options.autoscale_padding) / (_maxx - _minx), (paper.view.size.height - 2 * this.renkan.options.autoscale_padding) / (_maxy - _miny));
 this.initialScale = _scale;
 // Override calculated scale if asked
-if((typeof force_scale !== "undefined") && parseFloat(force_scale)>0){
+if((typeof force_view !== "undefined") && parseFloat(force_view.zoom_level)>0 && parseFloat(force_view.offset_x)>0 && parseFloat(force_view.offset_y)>0){
-	_scale = parseFloat(force_scale);
+	this.setScale(parseFloat(force_view.zoom_level), new paper.Point(parseFloat(force_view.offset_x), parseFloat(force_view.offset_y)));
 }
-this.setScale(_scale, paper.view.center.subtract(new paper.Point([(_maxx + _minx) / 2, (_maxy + _miny) / 2]).multiply(_scale)));
+else{
+this.setScale(_scale, paper.view.center.subtract(new paper.Point([(_maxx + _minx) / 2, (_maxy + _miny) / 2]).multiply(_scale)));
+}
 }
 if (nodes.length === 1) {
 this.setScale(1, paper.view.center.subtract(new paper.Point([nodes.at(0).get("position").x, nodes.at(0).get("position").y])));
 }
 },

renkan