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

Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam

Browse source
This commit is contained in:
Teja 2015-09-24 12:20:12 +02:00
commit beaa41c2c1
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -414,7 +414,7 @@ $(function(){
newImg.transformable();
newImg.ftDisableRotate();
newImg.ftRegisterCallback(self.svgTransformUpdate);
file.id = previewId;
file.id = id;
file.previewId = previewId;
file.url = url;
file.subtype = "bitmap";

9
src/octoprint/templates/mrbeam_index.jinja2
View file

@ -242,11 +242,12 @@
<div class="local_transformation muted">
<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>
<span class="rotation" >0°</span></br>
<i class="icon-resize-horizontal" title="{{ _('horizontal') }}"></i>
<span class="horizontal" >0mm</span>
<i class="icon-resize-vertical" title="{{ _('vertical') }}"></i>
<span class="vertical" >0mm</span>
</div>
<div class="misfit_warning" >
<i class="icon-exclamation-sign" style="color:red;" title="{{ _('exceeds working area') }}"> Design exceeds the working area.</i>