pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix. fix placement works better now. deprecation warnings fixed.

Browse source
This commit is contained in:
Teja 2015-07-08 11:56:34 +02:00
parent 14fb9b9665
commit 1e00eb55f9
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/octoprint/plugins/laser_safety_notes/__init__.py
View file

@ -83,4 +83,4 @@ class LaserSafetyNotesPlugin(octoprint.plugin.SettingsPlugin,
__plugin_name__ = "lasersafetynotes"
__plugin_version__ = "0.1"
__plugin_implementations__ = [LaserSafetyNotesPlugin()]
__plugin_implementation__ = LaserSafetyNotesPlugin()

2
src/octoprint/plugins/lasercutterprofiles/__init__.py
View file

@ -229,4 +229,4 @@ def _sanitize_name(name):
__plugin_name__ = "lasercutterprofiles"
__plugin_version__ = "0.1"
__plugin_implementations__ = [LaserCutterProfilesPlugin()]
__plugin_implementation__ = LaserCutterProfilesPlugin()

2
src/octoprint/plugins/svgtogcode/__init__.py
View file

@ -481,4 +481,4 @@ def _sanitize_name(name):
__plugin_name__ = "svgtogcode"
__plugin_version__ = "0.1"
__plugin_implementations__ = [SvgToGcodePlugin()]
__plugin_implementation__ = SvgToGcodePlugin()

3
src/octoprint/plugins/svgtogcode/static/css/mrbeam.css
View file

@ -1718,7 +1718,8 @@ input.search-query,
}
#working_area_files .entry {
height: 30px;
/*height: 30px;*/
margin-bottom:.3em;
}
#working_area_files {

9
src/octoprint/plugins/svgtogcode/static/js/working_area.js
View file

@ -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;
}