From 96202d98160c4b96c3ae59c867e04dabc2e0f0b4 Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Wed, 26 Sep 2018 07:38:38 +1200 Subject: [PATCH] Fixed rulers --- desktop/sources/index.html | 1 - desktop/sources/scripts/guide.js | 41 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/desktop/sources/index.html b/desktop/sources/index.html index 85702d2..1086cdb 100644 --- a/desktop/sources/index.html +++ b/desktop/sources/index.html @@ -37,7 +37,6 @@ dotgrid.controller.add("default","*","Fullscreen",() => { app.toggle_fullscreen(); },"CmdOrCtrl+Enter"); dotgrid.controller.add("default","*","Hide",() => { app.toggle_visible(); },"CmdOrCtrl+H"); dotgrid.controller.add("default","*","Inspect",() => { app.inspect(); },"CmdOrCtrl+."); - dotgrid.controller.add("default","*","Documentation",() => { dotgrid.controller.docs(); },"CmdOrCtrl+Esc"); dotgrid.controller.add("default","*","Reset",() => { dotgrid.reset(); dotgrid.theme.reset(); },"CmdOrCtrl+Backspace"); dotgrid.controller.add("default","*","Quit",() => { app.exit(); },"CmdOrCtrl+Q"); diff --git a/desktop/sources/scripts/guide.js b/desktop/sources/scripts/guide.js index d0e712b..c102334 100644 --- a/desktop/sources/scripts/guide.js +++ b/desktop/sources/scripts/guide.js @@ -24,6 +24,8 @@ function Guide() this.el.getContext('2d').restore(); + this.draw_rulers(); + if(dotgrid.tool.index == 2){ this.draw_markers() ; this.draw_vertices() } this.draw_path(new Generator(dotgrid.tool.layers[2],dotgrid.tool.styles[2]).toString({x:0,y:0},this.scale),dotgrid.tool.styles[2]) if(dotgrid.tool.index == 1){ this.draw_markers() ; this.draw_vertices() } @@ -124,6 +126,45 @@ function Guide() ctx.closePath(); } + this.draw_rule = function(from,to) + { + let ctx = this.el.getContext('2d'); + + ctx.beginPath(); + ctx.moveTo(from.x,from.y); + ctx.lineTo(to.x,to.y); + ctx.lineCap="round"; + ctx.lineWidth = 3; + ctx.strokeStyle = dotgrid.theme.active.b_low; + ctx.stroke(); + ctx.closePath(); + } + + this.draw_ruler = function(pos) + { + let offset = 15 * this.scale; + let top = offset + let bottom = (dotgrid.tool.settings.size.height * this.scale)+offset + let left = offset + let right = (dotgrid.tool.settings.size.width * this.scale) + + // Translation + this.draw_rule({x:pos.x * this.scale,y:top},{x:pos.x * this.scale,y:bottom}); + this.draw_rule({x:left,y:pos.y * this.scale},{x:right,y:pos.y * this.scale}); + } + + this.draw_rulers = function() + { + if(!dotgrid.cursor.translation){ return; } + + let ctx = this.el.getContext('2d'); + + this.draw_ruler(dotgrid.cursor.translation.to) + + ctx.setLineDash([]); + ctx.restore(); + } + this.draw_handle = function(pos, radius = 6) { let ctx = this.el.getContext('2d');