From 47dafac24c80628e91240e5dc0c88f33182b83ea Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 1 Jun 2009 22:01:07 +0000 Subject: [PATCH] added stroke style git-svn-id: http://svg-edit.googlecode.com/svn/trunk@14 eee81c28-f429-11dd-99c0-75d572ba1ddd --- canvas.js | 21 +++++++++++++++++---- svg-editor.html | 10 ++++++++-- svg-editor.js | 6 +++++- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/canvas.js b/canvas.js index 3cb0b919..94266b97 100644 --- a/canvas.js +++ b/canvas.js @@ -21,8 +21,9 @@ function SvgCanvas(doc) var rect_y = null; var current_draw_element = "path"; var current_draw_element_fill = "none"; - var current_draw_element_stroke_width = "1px"; var current_draw_element_stroke = "black"; + var current_draw_element_stroke_width = "1px"; + var current_draw_element_stroke_style = "0"; var freehand_min_x = null; var freehand_max_x = null; var freehand_min_y = null; @@ -123,6 +124,7 @@ function SvgCanvas(doc) "fill": "none", "stroke": current_draw_element_stroke, "stroke-width": current_draw_element_stroke_width, + "stroke-dasharray": current_draw_element_stroke_style, "stroke-opacity": 0.5 } }); @@ -142,6 +144,7 @@ function SvgCanvas(doc) "fill": "none", "stroke": current_draw_element_stroke, "stroke-width": current_draw_element_stroke_width, + "stroke-dasharray": current_draw_element_stroke_style, "stroke-opacity": 0.5 } }); @@ -161,6 +164,7 @@ function SvgCanvas(doc) "fill": "none", "stroke": current_draw_element_stroke, "stroke-width": current_draw_element_stroke_width, + "stroke-dasharray": current_draw_element_stroke_style, "stroke-opacity": 0.5 } }); @@ -181,6 +185,7 @@ function SvgCanvas(doc) "fill": current_draw_element_fill, "stroke": current_draw_element_stroke, "stroke-width": current_draw_element_stroke_width, + "stroke-dasharray": current_draw_element_stroke_style, "fill-opacity": 0.5, "stroke-opacity": 0.5 } @@ -198,6 +203,7 @@ function SvgCanvas(doc) "id": "line_" + obj_num, "stroke": current_draw_element_stroke, "stroke-width": current_draw_element_stroke_width, + "stroke-dasharray": current_draw_element_stroke_style, "stroke-opacity": 0.5 } }); @@ -216,6 +222,7 @@ function SvgCanvas(doc) "fill": current_draw_element_fill, "stroke": current_draw_element_stroke, "stroke-width": current_draw_element_stroke_width, + "stroke-dasharray": current_draw_element_stroke_style, "fill-opacity": 0.5, "stroke-opacity": 0.5 } @@ -368,7 +375,8 @@ function SvgCanvas(doc) "id": "ellipse_" + obj_num, "fill": current_draw_element_fill, "stroke": current_draw_element_stroke, - "stroke-width": current_draw_element_stroke_width + "stroke-width": current_draw_element_stroke_width, + "stroke-dasharray": current_draw_element_stroke_style } }); obj_num++; @@ -387,7 +395,8 @@ function SvgCanvas(doc) "id": "rect_" + obj_num, "fill": current_draw_element_fill, "stroke": current_draw_element_stroke, - "stroke-width": current_draw_element_stroke_width + "stroke-width": current_draw_element_stroke_width, + "stroke-dasharray": current_draw_element_stroke_style } }); obj_num++; @@ -430,10 +439,14 @@ function SvgCanvas(doc) current_draw_element_fill = color; } - this.setStrokeColor = function(val) { + this.setStrokeWidth = function(val) { current_draw_element_stroke_width = val; } + this.setStrokeStyle = function(val) { + current_draw_element_stroke_style = val; + } + this.setup = function(evt) { assignAttributes(svgroot, { "onmouseup": "canvas.mouseUp(evt)", diff --git a/svg-editor.html b/svg-editor.html index f0be931f..f9c858b3 100644 --- a/svg-editor.html +++ b/svg-editor.html @@ -35,7 +35,7 @@
Stroke - +
-
+
diff --git a/svg-editor.js b/svg-editor.js index 8662d171..c6e0ba04 100644 --- a/svg-editor.js +++ b/svg-editor.js @@ -8,7 +8,11 @@ $(document).ready(function(){ $('#palette').append(str); $('#stroke_width').change(function(){ - SvgCanvas.setStrokeColor(this.options[this.selectedIndex].value); + SvgCanvas.setStrokeWidth(this.options[this.selectedIndex].value); + }); + + $('#stroke_style').change(function(){ + SvgCanvas.setStrokeStyle(this.options[this.selectedIndex].value); }); $('.palette_item').click(function(){