Merge branch 'master' into release

Author: lvjonok

.github/workflows/build.yaml

@@ -32,10 +32,10 @@ jobs:
         run: |
           python3 -m pip install --upgrade pip setuptools wheel flake8 pyinstaller==6.10.0
           python3 -m pip install -r win-req.txt
-      - name: Lint with flake8
-        run: |
-          # stop the build if there are Python syntax errors or undefined names
-          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+      # - name: Lint with flake8
+      #   run: |
+      #     # stop the build if there are Python syntax errors or undefined names
+      #     flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
       - name: Run pyinstaller
         run: |
           pyinstaller main.spec

settings.yaml

@@ -87,6 +87,7 @@ slicing:
   fan_speed: 95
   fill_density: 20
   filling_type: Triangles
+  minimum_fill_area: 0.2
   filter_tolerance: 0.01
   flat_5d: 0
   ftetwild_cmd: ./lib/FloatTetwild_bin.exe -i sett.slicing.stl_file -o lib/goosli_middle.msh
@@ -96,7 +97,7 @@ slicing:
   lids_depth: 3
   bottoms_depth: 3
   line_width: 0.4
-  magic_epsilon: 40
+  magic_epsilon: 15
   material_shrinkage: 0.0
   flow_rate: 100
   pressure_advance_on: true
@@ -112,14 +113,14 @@ slicing:
   random_layer_start: false
   is_wall_outside_in: true
   planes_contact_with_nozzle: ""
-  print_speed: 50
-  print_speed_layer1: 50
-  print_speed_wall: 50
+  print_speed: 60
+  print_speed_layer1: 30
+  print_speed_wall: 60
   print_time: 0
-  retract_compensation_amount: 3.0
-  retraction_distance: 3.0
+  retract_compensation_amount: 1.9
+  retraction_distance: 2.0
   retraction_on: true
-  retraction_speed: 50
+  retraction_speed: 30
   rotationx: 0.0
   rotationy: -0.0
   rotationz: 0.0

src/controller.py

@@ -381,8 +381,8 @@ def download_planes(self):
                 if file_ext == ".TXT":
                     try:
                         self.load_planes_from_file(filename)
-                    except:
-                        showErrorDialog("Error during reading planes file")
+                    except Exception as e:
+                        showErrorDialog("Error during reading planes file: " + str(e))
                 else:
                     showErrorDialog("This file format isn't supported:" + file_ext)
         except IOError as e:
@@ -411,10 +411,16 @@ def load_figure_settings(self):
                     )
                 )
 
+            if isinstance(sett().figures[idx], dict):
+                sett().figures[idx] = settings.Settings(sett().figures[idx])
+
             if not hasattr(sett().figures[idx], "settings"):
                 setattr(sett().figures[idx], "settings", settings.Settings({}))
 
-            self.model.figures_setts.append(sett().figures[idx].settings)
+            try:
+                self.model.figures_setts.append(sett().figures[idx].settings)
+            except Exception as e:
+                showErrorDialog("Error accessing settings: " + str(e))
 
     def load_planes_from_file(self, filename):
         self.load_planes(read_planes(filename))

src/figure_editor.py

@@ -161,7 +161,7 @@ def emmit_value(state: int):
 
         # part regarding additional settings per figure
         self.__additional_settings_widget = (
-            SettingsWidget(settings_provider=settings_provider)
+            SettingsWidget(settings_provider=settings_provider, use_grouping=False)
             .from_settings(settings_provider())
             .with_delete()
         )

src/locales.py

@@ -9,6 +9,7 @@ class Locale:
     ExtruderTemp = "Extruder temperature, °C:"
     BedTemp = "Bed temperature, °C:"
     FillDensity = "Fill density, %:"
+    MinimumFillArea = "Minimum fill area, mm²:"
     WallThickness = "Wall thickness:"
     NumberWallLines = "Number of wall lines:"
     BottomThickness = "Bottom thickness:"
@@ -158,6 +159,12 @@ class Locale:
     AutoFanArea = "Auto fan max area, mm²:"
     AutoFanSpeed = "Auto fan speed:"
 
+    GroupNames = {
+        "model": "Model Settings",
+        "material": "Material Settings",
+        "supports": "Supports Settings",
+    }
+
     def __init__(self, **entries):
         self.__dict__.update(entries)
 
@@ -172,6 +179,7 @@ def __init__(self, **entries):
         ExtruderTemp="Температура сопла, °C:",
         BedTemp="Температура стола, °C:",
         FillDensity="Плотность заполнения, %:",
+        MinimumFillArea="Минимальная площадь заполнения, мм²:",
         WallThickness="Толщина стенки:",
         NumberWallLines="Количество проходов стенки:",
         BottomThickness="Толщина дна:",
@@ -319,6 +327,11 @@ def __init__(self, **entries):
         AutoFanEnabled="Включить автоматическое управление обдувом",
         AutoFanArea="Максимальная площадь для автоматического обдува, мм²:",
         AutoFanSpeed="Скорость автоматического обдува:",
+        GroupNames={
+            "model": "Настройки модели",
+            "material": "Настройки материала",
+            "supports": "Настройки поддержек",
+        },
     ),
 }