diff --git a/src/octoprint/filemanager/analysis.py b/src/octoprint/filemanager/analysis.py
index cd4ca7fd..8fed445a 100644
--- a/src/octoprint/filemanager/analysis.py
+++ b/src/octoprint/filemanager/analysis.py
@@ -260,6 +260,8 @@ class GcodeAnalysisQueue(AbstractAnalysisQueue):
self._gcode.load(self._current.absolute_path, self._current.printer_profile, throttle=throttle_callback)
result = dict()
+ result["printingArea"] = {"minX" : self._gcode.minX, "minY" : self._gcode.minY, "minZ" : self._gcode.minZ,
+ "maxX" : self._gcode.maxX, "maxY" : self._gcode.maxY, "maxZ" : self._gcode.maxZ}
if self._gcode.totalMoveTimeMinute:
result["estimatedPrintTime"] = self._gcode.totalMoveTimeMinute * 60
if self._gcode.extrusionAmount:
diff --git a/src/octoprint/static/js/app/viewmodels/files.js b/src/octoprint/static/js/app/viewmodels/files.js
index 30da0ada..ecc660b5 100644
--- a/src/octoprint/static/js/app/viewmodels/files.js
+++ b/src/octoprint/static/js/app/viewmodels/files.js
@@ -6,6 +6,7 @@ $(function() {
self.loginState = parameters[1];
self.printerState = parameters[2];
self.slicing = parameters[3];
+ self.printerProfiles=parameters[4];
self.isErrorOrClosed = ko.observable(undefined);
self.isOperational = ko.observable(undefined);
@@ -423,6 +424,82 @@ $(function() {
}
}
output += gettext("Estimated Print Time") + ": " + formatDuration(data["gcodeAnalysis"]["estimatedPrintTime"]) + "
";
+ if (self.loginState.isUser())
+ {
+ var profileItems=self.printerProfiles.profiles.items();
+ var count=0;
+ while(count < profileItems.length && !profileItems[count].current)
+ {
+ count++;
+ }
+ if (count < profileItems.length)
+ {
+ var warn=false;
+ var volumeInfo=profileItems[count].volume;
+ var printingArea=data["gcodeAnalysis"]["printingArea"];
+ if(volumeInfo.origin=="lowerleft")
+ {
+ if(printingArea["maxX"]>volumeInfo.width || printingArea["maxY"]>volumeInfo.depth ||
+ printingArea["maxZ"]>volumeInfo.height)
+ {
+ warn=true;
+ }
+ }
+ else //origin is centre
+ {
+ if( printingArea["maxX"]>(volumeInfo.width/2) || printingArea["maxY"]>(volumeInfo.depth/2) ||
+ printingArea["maxZ"]>volumeInfo.height || Math.abs(printingArea["minX"])>(volumeInfo.width/2) ||
+ Math.abs(printingArea["minY"])>(volumeInfo.depth/2))
+ {
+ warn=true;
+ }
+ }
+ }
+ if(warn)
+ {
+ var warning = "" + _.sprintf(gettext("Revise file %s"), data["name"]) + "
";
+ var info="";
+
+ // set print volume boundaries
+ var boundaries = {
+ minX : 0,
+ maxX : volumeInfo.width,
+ minY : 0,
+ maxY : volumeInfo.depth,
+ minZ : 0,
+ maxZ : volumeInfo.height
+ };
+ if (volumeInfo.origin === "center") {
+ boundaries["maxX"] = volumeInfo.width / 2;
+ boundaries["minX"] = -1 * boundaries["maxX"];
+ boundaries["maxY"] = volumeInfo.depth / 2;
+ boundaries["minY"] = -1 * boundaries["maxY"];
+ }
+
+ // find exceeded dimensions
+ if (printingArea["minX"] < boundaries["minX"] || printingArea["maxX"] > boundaries["maxX"]) {
+ info += _.sprintf(gettext("Profile's width: ( %s, %s) vs object's width: (%s, %s)\n"), boundaries["minX"],
+ boundaries["maxX"],printingArea["minX"], printingArea["maxX"]);
+ }
+ if (printingArea["minY"] < boundaries["minY"] || printingArea["maxY"] > boundaries["maxY"]) {
+ info += _.sprintf(gettext("Profile's depth: (%s, %s) vs object's depth: (%s, %s)\n"),boundaries["minY"],
+ boundaries["maxY"], printingArea["minY"], printingArea["maxY"]);
+ }
+ if (printingArea["minZ"] < boundaries["minZ"] || printingArea["maxZ"] > boundaries["maxZ"]) {
+ info += _.sprintf(gettext("Profile's height: (%s, %s) vs object's height: (%s, %s)\n"),boundaries["minZ"],
+ boundaries["maxZ"], printingArea["minZ"], printingArea["maxZ"]);
+ }
+
+ //warn user
+ warning += pnotifyAdditionalInfo("" + info + "
");
+ new PNotify({
+ title: "Object exceeds the printing area",
+ text: warning,
+ type: "warning",
+ hide: false
+ });
+ }
+ }
}
if (data["prints"] && data["prints"]["last"]) {
output += gettext("Last Printed") + ": " + formatTimeAgo(data["prints"]["last"]["date"]) + "
";
@@ -501,8 +578,16 @@ $(function() {
self.uploadSdButton = $("#gcode_upload_sd");
if (!self.uploadSdButton.length) {
self.uploadSdButton = undefined;
+ if (_.endsWith(filename.toLowerCase(), ".stl")) {
+ self.slicing.show(location, filename);
+ }
+
+ if (data.result.done) {
+ $("#gcode_upload_progress .bar").css("width", "0%");
+ $("#gcode_upload_progress").removeClass("progress-striped").removeClass("active");
+ $("#gcode_upload_progress .bar").text("");
+ }
}
-
self.uploadProgress = $("#gcode_upload_progress");
self.uploadProgressBar = $(".bar", self.uploadProgress);
@@ -708,7 +793,7 @@ $(function() {
OCTOPRINT_VIEWMODELS.push([
GcodeFilesViewModel,
- ["settingsViewModel", "loginStateViewModel", "printerStateViewModel", "slicingViewModel"],
+ ["settingsViewModel", "loginStateViewModel", "printerStateViewModel", "slicingViewModel","printerProfilesViewModel"],
["#files_wrapper", "#add_folder_dialog"]
]);
});
diff --git a/src/octoprint/util/gcodeInterpreter.py b/src/octoprint/util/gcodeInterpreter.py
index e32b3062..08d0f5cc 100644
--- a/src/octoprint/util/gcodeInterpreter.py
+++ b/src/octoprint/util/gcodeInterpreter.py
@@ -21,7 +21,6 @@ class AnalysisAborted(Exception):
class gcode(object):
def __init__(self):
self._logger = logging.getLogger(__name__)
-
self.layerList = None
self.extrusionAmount = [0]
self.extrusionVolume = [0]
@@ -30,6 +29,13 @@ class gcode(object):
self.progressCallback = None
self._abort = False
self._filamentDiameter = 0
+ #Parameters for object size check
+ self.minX=None
+ self.minY=None
+ self.minZ=None
+ self.maxX=None
+ self.maxY=None
+ self.maxZ=None
def load(self, filename, printer_profile, throttle=None):
if os.path.isfile(filename):
@@ -143,7 +149,14 @@ class gcode(object):
if e is not None:
if absoluteE:
e -= currentE[currentExtruder]
+ # If move includes extrusion, calculate new min/max coordinates of model
if e > 0.0:
+ self.minX = pos[0] if self.minX is None or pos[0] < self.minX else self.minX
+ self.maxX = pos[0] if self.maxX is None or pos[0] > self.maxX else self.maxX
+ self.minY = pos[1] if self.minY is None or pos[1] < self.minY else self.minY
+ self.maxY = pos[1] if self.maxY is None or pos[1] > self.maxY else self.maxY
+ self.minZ = pos[2] if self.minZ is None or pos[2] < self.minZ else self.minZ
+ self.maxZ = pos[2] if self.maxZ is None or pos[2] > self.maxZ else self.maxZ
moveType = 'extrude'
if e < 0.0:
moveType = 'retract'
@@ -271,7 +284,6 @@ class gcode(object):
def _parseCuraProfileString(self, comment, prefix):
return {key: value for (key, value) in map(lambda x: x.split("=", 1), zlib.decompress(base64.b64decode(comment[len(prefix):])).split("\b"))}
-
def getCodeInt(line, code):
n = line.find(code) + 1
if n < 1: