Thumbnails feature revamp. (#5555)

* Thumbnails feature revamp. Support generating different size/format combinations * misc fix Co-authored-by: Lukas Matena <lukasmatena@seznam.cz>
SoftFever · Jun 3, 2024 · c083541 · c083541
1 parent 50d00a1
commit c083541
Show file tree

Hide file tree

Showing 26 changed files with 1,146 additions and 855 deletions.
diff --git a/resources/profiles/Elegoo/machine/fdm_neptune_4_common.json b/resources/profiles/Elegoo/machine/fdm_neptune_4_common.json
@@ -137,8 +137,9 @@
   "nozzle_type": "undefine",
   "auxiliary_fan": "0",
   "thumbnails": [
-    "320x320",
-    "160x160"
+    "320x320/PNG",
+    "32x32/COLPIC",
+    "160x160/COLPIC"
   ],
-  "thumbnails_format": "ColPic"
+  "thumbnails_format": "PNG"
 }
diff --git a/resources/profiles/Prusa/machine/Prusa MINI 0.25 nozzle.json b/resources/profiles/Prusa/machine/Prusa MINI 0.25 nozzle.json
@@ -1,95 +1,100 @@
 {
-  "type": "machine",
-  "setting_id": "GM003",
-  "name": "Prusa MINI 0.25 nozzle",
-  "from": "system",
-  "instantiation": "true",
-  "inherits": "fdm_machine_common",
-  "gcode_flavor": "marlin2",
-  "printer_model": "MINI",
-  "printer_variant": "0.25",
-  "default_filament_profile": [
-      "Prusa Generic PLA"
-  ],
-  "default_print_profile": "0.20mm Standard @MINI 0.25",
-  "nozzle_diameter": [
-      "0.25"
-  ],
-  "max_layer_height": [
-    "0.15"
+    "type": "machine",
+    "setting_id": "GM003",
+    "name": "Prusa MINI 0.25 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_machine_common",
+    "gcode_flavor": "marlin2",
+    "printer_model": "MINI",
+    "printer_variant": "0.25",
+    "default_filament_profile": [
+        "Prusa Generic PLA"
+    ],
+    "default_print_profile": "0.20mm Standard @MINI 0.25",
+    "nozzle_diameter": [
+        "0.25"
+    ],
+    "max_layer_height": [
+        "0.15"
     ],
     "min_layer_height": [
-    "0.05"
-    ],
-  "bed_exclude_area": [
-    "0x0"
-  ],
-  "printable_area": [
-    "0x0",
-    "180x0",
-    "180x180",
-    "0x180"
-  ],
-  "machine_max_acceleration_extruding": [
-    "1250",
-    "2000"
-  ],
-  "machine_max_acceleration_x": [
-      "2500",
-      "2000"
-  ],
-  "machine_max_acceleration_y": [
-      "2500",
-      "2000"
-  ],
-  "machine_max_acceleration_z": [
-      "400",
-      "200"
-  ],
-  "machine_max_jerk_e": [
-      "10",
-      "2.5"
-  ],
-  "machine_max_jerk_x": [
-      "8",
-      "9"
-  ],
-  "machine_max_jerk_y": [
-      "8",
-      "9"
-  ],
-  "machine_max_speed_e": [
-      "80",
-      "25"
-  ],
-  "machine_max_speed_x": [
-      "180",
-      "200"
-  ],
-  "machine_max_speed_y": [
-      "180",
-      "200"
-  ],
-  "retraction_length": [
-      "3.2"
-  ],
-  "retraction_minimum_travel": [
-      "1.5"
-  ],
-  "retraction_speed": [
-      "70"
-  ],
-  "printable_height": "180",
-  "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
-  "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
-  "machine_end_gcode": "G1 E-1 F2100 ; retract\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720 ; Move print head up{endif}\nG1 X178 Y178 F4200 ; park print head\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM900 K0 ; reset LA\nM84 ; disable motors\n; max_layer_z = [max_layer_z]",
-  "machine_pause_gcode": "M601",
-  "machine_start_gcode": "M862.3 P \"[printer_model]\" ; printer model check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow",
-  "printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_MINI\n",
-
-  "scan_first_layer": "0",
-  "machine_load_filament_time": "17",
-  "machine_unload_filament_time": "16",
-  "nozzle_type": "hardened_steel",
-  "auxiliary_fan": "0"
-}
+        "0.05"
+    ],
+    "bed_exclude_area": [
+        "0x0"
+    ],
+    "printable_area": [
+        "0x0",
+        "180x0",
+        "180x180",
+        "0x180"
+    ],
+    "machine_max_acceleration_extruding": [
+        "1250",
+        "2000"
+    ],
+    "machine_max_acceleration_x": [
+        "2500",
+        "2000"
+    ],
+    "machine_max_acceleration_y": [
+        "2500",
+        "2000"
+    ],
+    "machine_max_acceleration_z": [
+        "400",
+        "200"
+    ],
+    "machine_max_jerk_e": [
+        "10",
+        "2.5"
+    ],
+    "machine_max_jerk_x": [
+        "8",
+        "9"
+    ],
+    "machine_max_jerk_y": [
+        "8",
+        "9"
+    ],
+    "machine_max_speed_e": [
+        "80",
+        "25"
+    ],
+    "machine_max_speed_x": [
+        "180",
+        "200"
+    ],
+    "machine_max_speed_y": [
+        "180",
+        "200"
+    ],
+    "retraction_length": [
+        "3.2"
+    ],
+    "retraction_minimum_travel": [
+        "1.5"
+    ],
+    "retraction_speed": [
+        "70"
+    ],
+    "printable_height": "180",
+    "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
+    "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
+    "machine_end_gcode": "G1 E-1 F2100 ; retract\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720 ; Move print head up{endif}\nG1 X178 Y178 F4200 ; park print head\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM900 K0 ; reset LA\nM84 ; disable motors\n; max_layer_z = [max_layer_z]",
+    "machine_pause_gcode": "M601",
+    "machine_start_gcode": "M862.3 P \"[printer_model]\" ; printer model check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow",
+    "printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_MINI\n",
+    "scan_first_layer": "0",
+    "machine_load_filament_time": "17",
+    "machine_unload_filament_time": "16",
+    "nozzle_type": "hardened_steel",
+    "auxiliary_fan": "0",
+    "thumbnails": [
+        "16x16/QOI",
+        "220x124/QOI",
+        "200x240/QOI",
+        "640x480/PNG"
+    ]
+}
diff --git a/resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json
@@ -1,89 +1,94 @@
 {
-  "type": "machine",
-  "setting_id": "GM003",
-  "name": "Prusa MINI 0.4 nozzle",
-  "from": "system",
-  "instantiation": "true",
-  "inherits": "fdm_machine_common",
-  "gcode_flavor": "marlin2",
-  "printer_model": "MINI",
-  "printer_variant": "0.4",
-  "default_filament_profile": [
-      "Prusa Generic PLA"
-  ],
-  "default_print_profile": "0.20mm Standard @MINI",
-  "nozzle_diameter": [
-      "0.4"
-  ],
-  "bed_exclude_area": [
-    "0x0"
-  ],
-  "printable_area": [
-    "0x0",
-    "180x0",
-    "180x180",
-    "0x180"
-  ],
-  "machine_max_acceleration_extruding": [
-    "1250",
-    "2000"
-  ],
-  "machine_max_acceleration_x": [
-      "2500",
-      "2000"
-  ],
-  "machine_max_acceleration_y": [
-      "2500",
-      "2000"
-  ],
-  "machine_max_acceleration_z": [
-      "400",
-      "200"
-  ],
-  "machine_max_jerk_e": [
-      "10",
-      "2.5"
-  ],
-  "machine_max_jerk_x": [
-      "8",
-      "9"
-  ],
-  "machine_max_jerk_y": [
-      "8",
-      "9"
-  ],
-  "machine_max_speed_e": [
-      "80",
-      "25"
-  ],
-  "machine_max_speed_x": [
-      "180",
-      "200"
-  ],
-  "machine_max_speed_y": [
-      "180",
-      "200"
-  ],
-  "retraction_length": [
-      "3.2"
-  ],
-  "retraction_minimum_travel": [
-      "1.5"
-  ],
-  "retraction_speed": [
-      "70"
-  ],
-  "printable_height": "180",
-  "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
-  "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
-  "machine_end_gcode": "G1 E-1 F2100 ; retract\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720 ; Move print head up{endif}\nG1 X178 Y178 F4200 ; park print head\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM900 K0 ; reset LA\nM84 ; disable motors\n; max_layer_z = [max_layer_z]",
-  "machine_pause_gcode": "M601",
-  "machine_start_gcode": "M862.3 P \"[printer_model]\" ; printer model check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow",
-  "printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_MINI\n",
-
-  "scan_first_layer": "0",
-  "machine_load_filament_time": "17",
-  "machine_unload_filament_time": "16",
-  "nozzle_type": "hardened_steel",
-  "auxiliary_fan": "0"
-}
+    "type": "machine",
+    "setting_id": "GM003",
+    "name": "Prusa MINI 0.4 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_machine_common",
+    "gcode_flavor": "marlin2",
+    "printer_model": "MINI",
+    "printer_variant": "0.4",
+    "default_filament_profile": [
+        "Prusa Generic PLA"
+    ],
+    "default_print_profile": "0.20mm Standard @MINI",
+    "nozzle_diameter": [
+        "0.4"
+    ],
+    "bed_exclude_area": [
+        "0x0"
+    ],
+    "printable_area": [
+        "0x0",
+        "180x0",
+        "180x180",
+        "0x180"
+    ],
+    "machine_max_acceleration_extruding": [
+        "1250",
+        "2000"
+    ],
+    "machine_max_acceleration_x": [
+        "2500",
+        "2000"
+    ],
+    "machine_max_acceleration_y": [
+        "2500",
+        "2000"
+    ],
+    "machine_max_acceleration_z": [
+        "400",
+        "200"
+    ],
+    "machine_max_jerk_e": [
+        "10",
+        "2.5"
+    ],
+    "machine_max_jerk_x": [
+        "8",
+        "9"
+    ],
+    "machine_max_jerk_y": [
+        "8",
+        "9"
+    ],
+    "machine_max_speed_e": [
+        "80",
+        "25"
+    ],
+    "machine_max_speed_x": [
+        "180",
+        "200"
+    ],
+    "machine_max_speed_y": [
+        "180",
+        "200"
+    ],
+    "retraction_length": [
+        "3.2"
+    ],
+    "retraction_minimum_travel": [
+        "1.5"
+    ],
+    "retraction_speed": [
+        "70"
+    ],
+    "printable_height": "180",
+    "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
+    "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
+    "machine_end_gcode": "G1 E-1 F2100 ; retract\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720 ; Move print head up{endif}\nG1 X178 Y178 F4200 ; park print head\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM900 K0 ; reset LA\nM84 ; disable motors\n; max_layer_z = [max_layer_z]",
+    "machine_pause_gcode": "M601",
+    "machine_start_gcode": "M862.3 P \"[printer_model]\" ; printer model check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow",
+    "printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_MINI\n",
+    "scan_first_layer": "0",
+    "machine_load_filament_time": "17",
+    "machine_unload_filament_time": "16",
+    "nozzle_type": "hardened_steel",
+    "auxiliary_fan": "0",
+    "thumbnails": [
+        "16x16/QOI",
+        "220x124/QOI",
+        "200x240/QOI",
+        "640x480/PNG"
+    ]
+}