Merge pull request #59 from NilsRo/Development

Filament Changetime is not updated in GUI
NilsRo · Feb 17, 2023 · 38c42f1 · 38c42f1
2 parents e020ceb + 5d1509f
commit 38c42f1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/octoprint_SlicerEstimator/static/js/SlicerEstimator.js b/octoprint_SlicerEstimator/static/js/SlicerEstimator.js
@@ -304,11 +304,18 @@ $(function() {
         }
       });
     };
-
+    
     //get list of enabled metadata and filament change if a file is selected
-    self.onEventFileSelected = function(payload) {
-      self.addMetadata(payload["origin"], payload["path"]);
-    }
+    self.addMetadataLocal = function(filepath)
+    {
+      if (self.printerStateViewModel.sd() == false && filepath !== null) {
+        self.addMetadata("local", filepath);
+      }
+    };
+    self.printerStateViewModel.filepath.subscribe(function(filepath) {self.addMetadataLocal(filepath)});
+    self.printerStateViewModel.printTimeLeft.subscribe(function() {self.addMetadataLocal(self.printerStateViewModel.filepath())});
+    self.printerStateViewModel.estimatedPrintTime.subscribe(function() {self.addMetadataLocal(self.printerStateViewModel.filepath())});
+    self.printerStateViewModel.filepos.subscribe(function() {self.addMetadataLocal(self.printerStateViewModel.filepath())});
 
     //on reload if GUI refresh selected file
     ko.when(function () {

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