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

Merge remote-tracking branch 'origin/devel' into devel

Browse source
This commit is contained in:
Gina Häußge 2016-05-31 13:33:28 +02:00
commit e4c7ccecef
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/api/slicing.rst
View file

@ -32,7 +32,7 @@ List All Slicers and Slicing Profiles
.. sourcecode:: http
GET /api/slicing/profiles HTTP/1.1
GET /api/slicing HTTP/1.1
Host: example.com
X-Api-Key: abcdef...

14
src/octoprint/static/js/app/viewmodels/files.js
View file

@ -487,24 +487,24 @@ $(function() {
object: printingArea
};
info += _.sprintf(gettext("Object's bounding box: (%(object.minX).2f, %(object.minY).2f, %(object.minZ).2f) × (%(object.maxX).2f, %(object.maxY).2f, %(object.maxZ).2f)"), formatData);
info += "<br>";
info += _.sprintf(gettext("Print volume: (%(profile.minX).2f, %(profile.minY).2f, %(profile.minZ).2f) &times; (%(profile.maxX).2f, %(profile.maxY).2f, %(profile.maxZ).2f)"), formatData);
// find exceeded dimensions
if (printingArea["minX"] < boundaries["minX"] || printingArea["maxX"] > boundaries["maxX"]) {
info += gettext("<br>Object exceeds print volume in width.");
info += gettext("Object exceeds print volume in width.<br>");
}
if (printingArea["minY"] < boundaries["minY"] || printingArea["maxY"] > boundaries["maxY"]) {
info += gettext("<br>Object exceeds print volume in depth.");
info += gettext("Object exceeds print volume in depth.<br>");
}
if (printingArea["minZ"] < boundaries["minZ"] || printingArea["maxZ"] > boundaries["maxZ"]) {
info += gettext("<br>Object exceeds print volume in height.");
info += gettext("Object exceeds print volume in height.<br>");
}
//warn user
if (info != "") {
if (notify) {
info += _.sprintf(gettext("Object's bounding box: (%(object.minX).2f, %(object.minY).2f, %(object.minZ).2f) &times; (%(object.maxX).2f, %(object.maxY).2f, %(object.maxZ).2f)"), formatData);
info += "<br>";
info += _.sprintf(gettext("Print volume: (%(profile.minX).2f, %(profile.minY).2f, %(profile.minZ).2f) &times; (%(profile.maxX).2f, %(profile.maxY).2f, %(profile.maxZ).2f)"), formatData);
warning += pnotifyAdditionalInfo(info);
new PNotify({