Merge pull request #23 from NilsRo/Development

Releasee 1.0.3

octoprint_SlicerEstimator/__init__.py

@@ -385,11 +385,12 @@ def _do_analysis(self, high_priority=False):
                 if future.done() and self._result_slicer:
                     self._logger.info("Found {}s from slicer for file {}".format(self._result_slicer, self._current.name))
                     result["estimatedPrintTime"] = self._result_slicer
-                    return result
-                elif not future.done():
+                elif not future.done() and self._aborted:
                     future.shutdown(wait=False)
                     raise AnalysisAborted(reenqueue=self._reenqueue)
+                return result
         except AnalysisAborted as _:
+            self._logger.info("Probably starting printing, aborting analysis of file-upload.")
             raise
 
     def _do_abort(self, reenqueue=True):

octoprint_SlicerEstimator/templates/SlicerEstimator_settings.jinja2

@@ -30,7 +30,7 @@
                 </div>
                 <div class="control-group">
                     <label class="control-label">{{ _('Use average estimation before slicer') }}</label>
-                    <div class="controls" data-toggle="tooltip" title="{{ _('The average estimation is based on the last prints so it could be more accurate than the slicer estimation. It also includes the heatup time of the printer.') }}">
+                    <div class="controls" data-toggle="tooltip" title="{{ _('The average estimation is based on the last prints (green dot is shown). It can be more accurate in the first minutes compared to the slicer estimation as it also includes the heatup time of the printer and is based on the print-history. After print-start slicer estimation is fine.') }}">
                         <input type="checkbox" data-bind="checked: settings.plugins.SlicerEstimator.average_prio">                       
                     </div>
                 </div>

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.0.2"
+plugin_version = "1.0.3"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module