Skip to content

Commit 3843543

Browse files
committed
0.0.6 (#23)
* additional UltimakerFormatPackage compatibility * fix error related to deleting selected file * code clean-up * removed pop-up size limitation
1 parent 6db5d6e commit 3843543

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

octoprint_prusaslicerthumbnails/static/css/prusaslicerthumbnails.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#prusa_thumbnail_viewer {
1+
/* #prusa_thumbnail_viewer {
22
width: 330px;
33
margin-left: -165px;
4-
}
4+
} */
55

66
#prusa_thumbnail_viewer h3 {
77
overflow: hidden;

octoprint_prusaslicerthumbnails/static/js/prusaslicerthumbnails.js

+15-8
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ $(function() {
1616
self.thumbnail_title = ko.observable('');
1717
self.inline_thumbnail = ko.observable();
1818

19-
self.filesViewModel.open_thumbnail = function(data) {
19+
self.filesViewModel.prusaslicerthumbnails_open_thumbnail = function(data) {
2020
if(data.name.indexOf('.gcode') > 0){
2121
var thumbnail_title = data.path.replace('.gcode','');
22-
// var thumbnail_url = '/plugin/prusaslicerthumbnails/thumbnail/' + data.path.replace('.gcode','.png');
23-
// self.thumbnail_url(thumbnail_url);
2422
self.thumbnail_url(data.thumbnail);
2523
self.thumbnail_title(thumbnail_title);
2624
$('div#prusa_thumbnail_viewer').modal("show");
@@ -70,22 +68,31 @@ $(function() {
7068

7169
self.filesViewModel.listHelper.selectedItem.subscribe(function(data){
7270
// remove the state panel thumbnail in case it's already there
73-
$('#prusalicer_state_thumbnail').remove();
74-
if(self.settingsViewModel.settings.plugins.prusaslicerthumbnails.state_panel_thumbnail() && data.thumbnail && data.thumbnail_src == 'prusaslicerthumbnails'){
75-
$('#state > div > hr:nth-child(4)').after('<div id="prusalicer_state_thumbnail" class="row-fluid"><img src="'+data.thumbnail+'" width="100%"/>\n<hr/></div>');
71+
if(data){
72+
if(self.settingsViewModel.settings.plugins.prusaslicerthumbnails.state_panel_thumbnail() && data.thumbnail && data.thumbnail_src == 'prusaslicerthumbnails'){
73+
if($('#prusalicer_state_thumbnail').length) {
74+
$('#prusalicer_state_thumbnail > img').attr('src', data.thumbnail);
75+
} else {
76+
$('#state > div > hr:nth-child(4)').after('<div id="prusalicer_state_thumbnail" class="row-fluid"><img src="'+data.thumbnail+'" width="100%"/>\n<hr/></div>');
77+
}
78+
} else {
79+
$('#prusalicer_state_thumbnail').remove();
80+
}
81+
} else {
82+
$('#prusalicer_state_thumbnail').remove();
7683
}
7784
});
7885
}
7986

8087

8188
$(document).ready(function(){
8289
let regex = /<div class="btn-group action-buttons">([\s\S]*)<.div>/mi;
83-
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>';
90+
let template = '<div class="btn btn-mini" data-bind="click: function() { if ($root.loginState.isUser()) { $root.prusaslicerthumbnails_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>';
8491
let inline_thumbnail_template = '<div class="row-fluid inline_prusa_thumbnail" ' +
8592
'data-bind="if: ($data.thumbnail_src == \'prusaslicerthumbnails\' && $root.settingsViewModel.settings.plugins.prusaslicerthumbnails.inline_thumbnail() == true), style: {\'text-align\': $root.thumbnailAlignValue}">' +
8693
'<img data-bind="attr: {src: $data.thumbnail, width: $root.thumbnailScaleValue}, ' +
8794
'visible: ($data.thumbnail_src == \'prusaslicerthumbnails\' && $root.settingsViewModel.settings.plugins.prusaslicerthumbnails.inline_thumbnail() == true), ' +
88-
'click: function() { if ($root.loginState.isUser()) { $root.open_thumbnail($data) } else { return; } }" ' +
95+
'click: function() { if ($root.loginState.isUser()) { $root.prusaslicerthumbnails_open_thumbnail($data) } else { return; } }" ' +
8996
'style="display: none;"/></div>'
9097

9198
$("#files_template_machinecode").text(function () {

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
plugin_name = "PrusaSlicer Thumbnails"
1515

1616
# The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
17-
plugin_version = "0.0.5"
17+
plugin_version = "0.0.6"
1818

1919
# The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
2020
# module

0 commit comments

Comments
 (0)