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

bugfix. () in filenames are stripped by svg id generation.

Browse source
This commit is contained in:
Teja 2015-01-29 17:36:00 +01:00
parent 9bd5a71875
commit b837975805
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/octoprint/plugins/svgtogcode/static/js/convert.js
View file

@ -1,11 +1,7 @@
$(function(){
function VectorConversionViewModel(params) {
var self = this;
console.log('conversion', params);
self.loginState = params[0];
self.settings = params[1];

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

@ -1,7 +1,6 @@
$(function(){
function WorkingAreaViewModel(params) {
console.log('workingaera', params);
var self = this;
self.loginState = params[0];
@ -204,7 +203,8 @@ $(function(){
};
self.generateId = function(url){
var idBase = '_'+url.substring(url.lastIndexOf('/')+1).replace('.', '-'); // _ at first place if filename starts with a digit
var idBase = '_'+url.substring(url.lastIndexOf('/')+1).replace(/[^a-zA-Z0-9_.]/ig, '-'); // _ at first place if filename starts with a digit
idBase = idBase.replace('')
var suffix = 0;
var id = idBase + "-" + suffix;
while(snap.select('#'+id) !== null){
@ -215,8 +215,7 @@ $(function(){
};
self.getCompositionSVG = function(){
// TODO use lasercutterprofiles
var dpiFactor = self.svgDPI()/25.4; // convert mm to pix with 90dpi (inkscape default - TODO use 72 for illustrator svg and fetch from settings)
var dpiFactor = self.svgDPI()/25.4; // convert mm to pix 90dpi for inkscape, 72 for illustrator
var w = dpiFactor * self.settings.printerProfiles.currentProfileData().volume.width;
var h = dpiFactor * self.settings.printerProfiles.currentProfileData().volume.depth;