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

WIP show text after upload in svg.

Browse source 
missing:
- add warning/dialogue about text in conversion dialogue
- cleanup
This commit is contained in:
clemniem 2016-06-21 15:13:36 +02:00
parent 6641390620
commit aad5efff2d
3 changed files with 33 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/octoprint/plugins/svgtogcode/static/js/matrix_oven.js
View file

@ -44,7 +44,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
var child = children[i];
child.bake(toCubics, dec);
}
elem.attr({transform: ''});
if(child.type !== "#text") elem.attr({transform: ''});
return;
}
if (elem.type !== "circle" &&

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

@ -274,10 +274,10 @@ $(function(){
newSvgAttrs['transform'] = scaleMatrixStr;
var newSvg = snap.group(f.selectAll("svg>*"));
var hasText = newSvg.selectAll('text,tspan');
if(hasText !== null && hasText.length > 0){
self.svg_contains_text_warning(newSvg);
}
// var hasText = newSvg.selectAll('text,tspan');
// if(hasText !== null && hasText.length > 0){
// self.svg_contains_text_warning(newSvg);
// }
newSvg.bake(); // remove transforms
newSvg.selectAll('path').attr({strokeWidth: '0.5'});
@ -397,15 +397,15 @@ $(function(){
};
self.svg_contains_text_warning = function(svg){
var error = "<p>" + gettext("The svg file contains text elements.<br/>Please convert them to paths.<br/>Otherwise they will be ignored.") + "</p>";
//error += pnotifyAdditionalInfo("<pre>" + data.jqXHR.responseText + "</pre>");
new PNotify({
title: "Text elements found",
text: error,
type: "warn",
hide: false
});
svg.selectAll('text,tspan').remove();
// var error = "<p>" + gettext("The svg file contains text elements.<br/>Please convert them to paths.<br/>Otherwise they will be ignored.") + "</p>";
// //error += pnotifyAdditionalInfo("<pre>" + data.jqXHR.responseText + "</pre>");
// new PNotify({
// title: "Text elements found",
// text: error,
// type: "warn",
// hide: false
// });
// svg.selectAll('text,tspan').remove();
};
self.svg_misfitting_warning = function(svg, misfitting){

2
src/octoprint/plugins/svgtogcode/templates/svgtogcode.jinja2
View file

@ -41,6 +41,8 @@
<label class="control-label">{{ _('Filled areas') }}</label>
<div class="controls">
<label class="checkbox">
{#TODO: CLEM make checkbox usable fill_text #}
<input type="checkbox" data-bind="checked: fill_text">{{ _('Engrave Text') }}
<input type="checkbox" data-bind="checked: fill_areas">{{ _('Engrave Infills') }}
</label>
</div>