From 1e00eb55f9b948e9e24ac2bd78f4e387d2969639 Mon Sep 17 00:00:00 2001 From: Teja Date: Wed, 8 Jul 2015 11:56:34 +0200 Subject: [PATCH] bugfix. fix placement works better now. deprecation warnings fixed. --- src/octoprint/plugins/laser_safety_notes/__init__.py | 2 +- src/octoprint/plugins/lasercutterprofiles/__init__.py | 2 +- src/octoprint/plugins/svgtogcode/__init__.py | 2 +- src/octoprint/plugins/svgtogcode/static/css/mrbeam.css | 3 ++- .../plugins/svgtogcode/static/js/working_area.js | 9 ++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/octoprint/plugins/laser_safety_notes/__init__.py b/src/octoprint/plugins/laser_safety_notes/__init__.py index 00349311..511e8370 100644 --- a/src/octoprint/plugins/laser_safety_notes/__init__.py +++ b/src/octoprint/plugins/laser_safety_notes/__init__.py @@ -83,4 +83,4 @@ class LaserSafetyNotesPlugin(octoprint.plugin.SettingsPlugin, __plugin_name__ = "lasersafetynotes" __plugin_version__ = "0.1" -__plugin_implementations__ = [LaserSafetyNotesPlugin()] +__plugin_implementation__ = LaserSafetyNotesPlugin() diff --git a/src/octoprint/plugins/lasercutterprofiles/__init__.py b/src/octoprint/plugins/lasercutterprofiles/__init__.py index 25026f29..cbbe26a1 100644 --- a/src/octoprint/plugins/lasercutterprofiles/__init__.py +++ b/src/octoprint/plugins/lasercutterprofiles/__init__.py @@ -229,4 +229,4 @@ def _sanitize_name(name): __plugin_name__ = "lasercutterprofiles" __plugin_version__ = "0.1" -__plugin_implementations__ = [LaserCutterProfilesPlugin()] +__plugin_implementation__ = LaserCutterProfilesPlugin() diff --git a/src/octoprint/plugins/svgtogcode/__init__.py b/src/octoprint/plugins/svgtogcode/__init__.py index 303de48e..019daa70 100644 --- a/src/octoprint/plugins/svgtogcode/__init__.py +++ b/src/octoprint/plugins/svgtogcode/__init__.py @@ -481,4 +481,4 @@ def _sanitize_name(name): __plugin_name__ = "svgtogcode" __plugin_version__ = "0.1" -__plugin_implementations__ = [SvgToGcodePlugin()] +__plugin_implementation__ = SvgToGcodePlugin() diff --git a/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css b/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css index c244d17c..409be30c 100644 --- a/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css +++ b/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css @@ -1718,7 +1718,8 @@ input.search-query, } #working_area_files .entry { - height: 30px; + /*height: 30px;*/ + margin-bottom:.3em; } #working_area_files { diff --git a/src/octoprint/plugins/svgtogcode/static/js/working_area.js b/src/octoprint/plugins/svgtogcode/static/js/working_area.js index 1de497eb..48814520 100644 --- a/src/octoprint/plugins/svgtogcode/static/js/working_area.js +++ b/src/octoprint/plugins/svgtogcode/static/js/working_area.js @@ -311,7 +311,8 @@ $(function(){ // var rot = svg.data('angle') || 0; var startIdx = transform.local.indexOf('r') + 1; var endIdx = transform.local.indexOf(',', startIdx); - var rot = parseFloat(transform.local.substring(startIdx, endIdx)); + var rot = parseFloat(transform.local.substring(startIdx, endIdx)) || 0; +// if(!rot) rot = 0; // avoid NaN var scale = transform.localMatrix.a * 100; var id = svg.attr('id'); var label_id = id.substr(0, id.indexOf('-')); @@ -339,16 +340,14 @@ $(function(){ if(svgBB.x < waBB.x){ dx = -svgBB.x + 0.01; outside = true; - } - if(svgBB.x2 > waBB.x2){ + } else if(svgBB.x2 > waBB.x2){ dx = -svgBB.x2 + waBB.x2 - 0.01; outside = true; } if(svgBB.y < waBB.y){ dy = -svgBB.y + 0.01; outside = true; - } - if(svgBB.y2 > waBB.y2){ + } else if(svgBB.y2 > waBB.y2){ dy = -svgBB.y2 + waBB.y2 - 0.01; outside = true; }