0.0.5 (#21)

* modifications to allow both UltimakerFormatPackage and this plugin to play nice together

* Updated configuration section of readme about the need to restart PrusaSlicer once the ini file has been updated

* add state panel thumbnail for selected file if available

Author: jneilliii

README.md

@@ -26,7 +26,9 @@ Since PrusaSlicer only enables thumbnails by default for the Prusa Mini you may
 
 **Note:** If you don't see your printer's ini file in the printers sub-folder; you are probably using one of the bundled Prusa Printer profiles (ie MK3S). If so you may need to create a copy of this printer profile to be able to have an ini file to edit. To do this in PrusaSlicer go to the Printer Settings tab and Click the save button next to the printer list and give it a new name. Alternatively, push Prusa Research to update their bundled profiles to match the Mini by commenting in the issue posted on their repository [here](https://github.com/prusa3d/PrusaSlicer/issues/3488).
 
-Open your desired printer profile in your favorite text editor and find the `thumbnails =` section and add the resolution that you would like to include in your sliced files, and therefore visible by this plugin. For example `thumbnails = 16x16,220x124` will be the equivalent of the Prusa Mini as described above.
+Open your desired printer profile in your favorite text editor and find the `thumbnails =` section and add the resolution that you would like to include in your sliced files, and therefore visible by this plugin. For example `thumbnails = 16x16,220x124` will be the equivalent of the Prusa Mini as described above. 
+
+**Note:** Once you've made your changes you will need to restart PrusaSlicer in order for the changes to be used and embed the thumbnails in the exported gcode files.
 
 **Warning**: the higher the resolution of the thumbnail you enter in this setting the larger your gcode file will be when sliced.
 

octoprint_prusaslicerthumbnails/__init__.py

@@ -30,7 +30,8 @@ def get_settings_defaults(self):
 			scale_inline_thumbnail=False,
 			inline_thumbnail_scale_value="50",
 			align_inline_thumbnail=False,
-			inline_thumbnail_align_value="left"
+			inline_thumbnail_align_value="left",
+			state_panel_thumbnail=True
 		)
 
 	##~~ AssetPlugin mixin
@@ -78,6 +79,7 @@ def on_event(self, event, payload):
 				if os.path.exists(thumbnail_filename):
 					thumbnail_url = "plugin/prusaslicerthumbnails/thumbnail/" + payload["path"].replace(".gcode", ".png") + "?" + "{:%Y%m%d%H%M%S}".format(datetime.datetime.now())
 					self._file_manager.set_additional_metadata("local", payload["path"], "thumbnail", thumbnail_url, overwrite=True)
+					self._file_manager.set_additional_metadata("local", payload["path"], "thumbnail_src", self._identifier, overwrite=True)
 
 	##~~ Routes hook
 	def route_hook(self, server_routes, *args, **kwargs):

octoprint_prusaslicerthumbnails/static/js/prusaslicerthumbnails.js

@@ -10,6 +10,7 @@ $(function() {
 
 		self.settingsViewModel = parameters[0];
 		self.filesViewModel = parameters[1];
+		self.printerStateViewModel = parameters[2];
 
 		self.thumbnail_url = ko.observable('/static/img/tentacle-20x20.png');
 		self.thumbnail_title = ko.observable('');
@@ -26,11 +27,6 @@ $(function() {
 			}
 		}
 
-/* 		self.filesViewModel.inline_thumbnail_url = function(data) {
-			// return '/plugin/prusaslicerthumbnails/thumbnail/' + data.path.replace('.gcode','.png');
-			return data.thumbnail;
-		} */
-
 		self.DEFAULT_THUMBNAIL_SCALE = "100%"
 		self.filesViewModel.thumbnailScaleValue = ko.observable(self.DEFAULT_THUMBNAIL_SCALE)
 
@@ -71,18 +67,25 @@ $(function() {
 			self.settingsViewModel.settings.plugins.prusaslicerthumbnails.inline_thumbnail_align_value.subscribe(function(newValue){
 				self.filesViewModel.thumbnailAlignValue(newValue);
 			});
+
+			self.filesViewModel.listHelper.selectedItem.subscribe(function(data){
+				// remove the state panel thumbnail in case it's already there
+				$('#prusalicer_state_thumbnail').remove();
+				if(self.settingsViewModel.settings.plugins.prusaslicerthumbnails.state_panel_thumbnail() && data.thumbnail && data.thumbnail_src == 'prusaslicerthumbnails'){
+					$('#state > div > hr:nth-child(4)').after('<div id="prusalicer_state_thumbnail" class="row-fluid"><img src="'+data.thumbnail+'" width="100%"/>\n<hr/></div>');
+				}
+			});
 		}
 
 
 		$(document).ready(function(){
 			let regex = /<div class="btn-group action-buttons">([\s\S]*)<.div>/mi;
-			let template = '<div class="btn btn-mini" data-bind="click: function() { if ($root.loginState.isUser()) { $root.open_thumbnail($data) } else { return; } }, visible: ($data.thumbnail && $root.settingsViewModel.settings.plugins.prusaslicerthumbnails.inline_thumbnail() == false)" title="Show Thumbnail" style="display: none;"><i class="fa fa-image"></i></div>';
+			let template = '<div class="btn btn-mini" data-bind="click: function() { if ($root.loginState.isUser()) { $root.open_thumbnail($data) } else { return; } }, visible: ($data.thumbnail_src == \'prusaslicerthumbnails\' && $root.settingsViewModel.settings.plugins.prusaslicerthumbnails.inline_thumbnail() == false)" title="Show Thumbnail" style="display: none;"><i class="fa fa-image"></i></div>';
 			let inline_thumbnail_template = '<div class="row-fluid inline_prusa_thumbnail" ' +
-			                                'data-bind="if: ($data.thumbnail && $root.settingsViewModel.settings.plugins.prusaslicerthumbnails.inline_thumbnail() == true), style: {\'text-align\': $root.thumbnailAlignValue}">' +
+			                                'data-bind="if: ($data.thumbnail_src == \'prusaslicerthumbnails\' && $root.settingsViewModel.settings.plugins.prusaslicerthumbnails.inline_thumbnail() == true), style: {\'text-align\': $root.thumbnailAlignValue}">' +
 			                                '<img data-bind="attr: {src: $data.thumbnail, width: $root.thumbnailScaleValue}, ' +
-			                                'visible: ($data.thumbnail.length > 0 && $root.settingsViewModel.settings.plugins.prusaslicerthumbnails.inline_thumbnail() == true), ' +
+			                                'visible: ($data.thumbnail_src == \'prusaslicerthumbnails\' && $root.settingsViewModel.settings.plugins.prusaslicerthumbnails.inline_thumbnail() == true), ' +
 			                                'click: function() { if ($root.loginState.isUser()) { $root.open_thumbnail($data) } else { return; } }" ' +
-//			                                'width="100%" ' +
 			                                'style="display: none;"/></div>'
 
 			$("#files_template_machinecode").text(function () {
@@ -95,7 +98,7 @@ $(function() {
 
 	OCTOPRINT_VIEWMODELS.push({
 		construct: PrusaslicerthumbnailsViewModel,
-		dependencies: ['settingsViewModel', 'filesViewModel'],
+		dependencies: ['settingsViewModel', 'filesViewModel', 'printerStateViewModel'],
 		elements: ['div#prusa_thumbnail_viewer']
 	});
 });

octoprint_prusaslicerthumbnails/templates/prusaslicerthumbnails_settings.jinja2

@@ -1,5 +1,10 @@
 <h3>{{ _('PrusaSlicer Thumbnails') }}</h3>
 <div class="control-group">
+	<div class="controls">
+		<label class="checkbox">
+		<input type="checkbox" data-bind="checked: settings.plugins.prusaslicerthumbnails.state_panel_thumbnail"> Show thumbnail in state panel.
+		</label>
+	</div>
 	<div class="controls">
 		<label class="checkbox">
 		<input type="checkbox" data-bind="checked: settings.plugins.prusaslicerthumbnails.inline_thumbnail"> Use inline thumbnails.

setup.py

@@ -14,7 +14,7 @@
 plugin_name = "PrusaSlicer Thumbnails"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "0.0.4"
+plugin_version = "0.0.5"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module