Просмотр исходного кода

Revert "Restore prime tower options"

This reverts commit 60c3f6f2cbf4751960726eacfbc0d766ed4f16c7.
c.lamboo 1 год назад
Родитель
Сommit
d009839f9e
1 измененных файлов с 4 добавлено и 4 удалено
  1. 4 4
      resources/definitions/fdmprinter.def.json

+ 4 - 4
resources/definitions/fdmprinter.def.json

@@ -6781,14 +6781,14 @@
                 "prime_tower_mode":
                 "prime_tower_mode":
                 {
                 {
                     "label": "Prime Tower",
                     "label": "Prime Tower",
-                    "description": "<html>Print a tower next to the model, which serves to prime the material after each nozzle switch.<ul><li><b>None:</b> do not generate a prime tower</li><li><b>Normal:</b> generate a bucket in which secondary materials are primed</li><li><b>Interleaved:</b> generate a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.</li></ul></html>",
+                    "description": "<html>Print a tower next to the model, which serves to prime the material after each nozzle switch.<ul><li><b>None:</b> do not generate a prime tower</li><li><b>Bucket:</b> generate a bucket in which secondary materials are primed</li><li><b>Sparse:</b> generate a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.</li></ul></html>",
                     "type": "enum",
                     "type": "enum",
-                    "value": "'none' if (extruders_enabled_count < 2) else 'normal'",
+                    "value": "'optimized' if all(material_type == extruderValues('material_type')[0] for material_type in extruderValues('material_type')) else 'optimized_consistent'",
                     "options":
                     "options":
                     {
                     {
                         "none": "None",
                         "none": "None",
-                        "normal": "Normal",
-                        "interleaved": "Interleaved"
+                        "bucket": "Bucket",
+                        "sparse": "Sparse"
                     },
                     },
                     "default_value": "none",
                     "default_value": "none",
                     "enabled": "extruders_enabled_count > 1",
                     "enabled": "extruders_enabled_count > 1",