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

local transformation displayed in mm.

Browse source
This commit is contained in:
Teja 2015-06-29 12:24:20 +02:00
parent 0a919c45d8
commit 1c861fc1d0
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1634,6 +1634,11 @@ input.search-query,
#wa_filelist .file_list_entry .detail_information {
clear: both;
}
#wa_filelist .file_list_entry .local_transformation span {
margin-left:0em;
margin-right:.8em;
}
.misfit_warning {
display: none;
}

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

@ -301,8 +301,9 @@ $(function(){
};
self.svgTransformUpdate = function(svg){
var tx = self.px2mm(svg.data('tx')).toFixed(0);
var ty = self.px2mm(svg.data('ty')).toFixed(0);
var globalScale = self.scaleMatrix().a;
var tx = self.px2mm(svg.data('tx')*globalScale).toFixed(1);
var ty = self.px2mm(svg.data('ty')*globalScale).toFixed(1);
var rot = svg.data('angle').toFixed(1);
var scale = Math.round(svg.data('scale')*100);
var id = svg.attr('id');

9
src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
View file

@ -199,9 +199,12 @@
</div>
<div class="detail_information" >
<div class="local_transformation muted">
<i class="icon-move translation" title="{{ _('translation') }}"> </i>
<i class="icon-resize-full scale" title="{{ _('scale') }}"> </i>
<i class="icon-repeat rotation" title="{{ _('rotation') }}"> </i>
<i class="icon-move" title="{{ _('translation') }}"></i>
<span class="translation" >0,0</span>
<i class="icon-resize-full" title="{{ _('scale') }}"></i>
<span class="scale" >100%</span>
<i class="icon-repeat" title="{{ _('rotation') }}"></i>
<span class="rotation" >0°</span>
</div>
<div class="misfit_warning" >