Merge pull request #51 from NilsRo/Development

Development
NilsRo · Oct 31, 2022 · d5612ad · d5612ad
2 parents 3435d91 + 49fa1bb
commit d5612ad
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/octoprint_SlicerEstimator/metadata.py b/octoprint_SlicerEstimator/metadata.py
@@ -160,7 +160,7 @@ def _detect_slicer(self):
                 return SLICER_SUPERSLICER            
             elif "Simplify3D" in line:
                 self._logger.info("Detected Simplify3D")
-                self._regex = re.compile(";   Build time: ([0-9]+) hours? ([0-9]+) minutes")
+                self._regex = re.compile(";   Build time: ([0-9]+) hours? ([0-9]+) minutes?")
                 return SLICER_SIMPLIFY3D
         else:
             self._logger.warning("Autoselection of slicer not successful!")

diff --git a/octoprint_SlicerEstimator/static/js/SlicerEstimator.js b/octoprint_SlicerEstimator/static/js/SlicerEstimator.js
@@ -181,7 +181,12 @@ $(function() {
           let cnt = 0;
           for (const [key, value] of Object.entries(data.slicer_filament_change)) {
             cnt += 1;
-            let changeTimeString = self.filamentChangeTimeFormat(data.slicer_additional["printtime"] - value[1]);
+            let changeTimeString;
+            if (value[1] == null) { 
+              changeTimeString = self.filamentChangeTimeFormat(data.slicer_additional["printtime"] * (value[3] / data.size));
+            } else {
+              changeTimeString = self.filamentChangeTimeFormat(data.slicer_additional["printtime"] - value[1]);
+            }
             let changeType;
             if (value[0] == "M600") {
               changeType = gettext("filament change (M600)");

diff --git a/octoprint_SlicerEstimator/static/less/SlicerEstimator.less b/octoprint_SlicerEstimator/static/less/SlicerEstimator.less
@@ -1 +0,0 @@
-// TODO: Put your plugin's LESS here, have it generated to ../css.

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 plugin_name = "OctoPrint-SlicerEstimator"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "1.5.6"
+plugin_version = "1.5.7"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module
Original file line number	Diff line number	Diff line change
		@@ -1 +0,0 @@
		// TODO: Put your plugin's LESS here, have it generated to ../css.