From 202209a6dbd44eb09689270f6852a3f529c2a812 Mon Sep 17 00:00:00 2001 From: Teja Date: Mon, 9 Feb 2015 15:36:25 +0100 Subject: [PATCH] bugfix. feedrate slider works on multiple sequential converts --- .../plugins/svgtogcode/static/js/convert.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/octoprint/plugins/svgtogcode/static/js/convert.js b/src/octoprint/plugins/svgtogcode/static/js/convert.js index b92456ce..7c6c9c4f 100644 --- a/src/octoprint/plugins/svgtogcode/static/js/convert.js +++ b/src/octoprint/plugins/svgtogcode/static/js/convert.js @@ -48,11 +48,14 @@ $(function(){ self.gcodeFilename(gcodeFile); if(self.svg !== undefined){ - var intensity = self.settings.settings.plugins.svgtogcode.defaultIntensity(); - var speed = self.settings.settings.plugins.svgtogcode.defaultFeedrate(); - self.laserIntensity(intensity); - self.laserSpeed(speed); - + if(self.laserIntensity() === undefined){ + var intensity = self.settings.settings.plugins.svgtogcode.defaultIntensity(); + self.laserIntensity(intensity); + } + if(self.laserSpeed() === undefined){ + var speed = self.settings.settings.plugins.svgtogcode.defaultFeedrate(); + self.laserSpeed(speed); + } // TODO: js svg conversion self.title(gettext("Converting"));