Merge branch 'main' into CURA-12950-5.12_upgrade-script

Author: HellAholic

plugins/PaintTool/PaintTool.py

@@ -51,6 +51,7 @@ def __init__(self, view: PaintView) -> None:
         self._view: PaintView = view
         self._view.canUndoChanged.connect(self._onCanUndoChanged)
         self._view.canRedoChanged.connect(self._onCanRedoChanged)
+        self._view.currentPaintedObjectMeshDataChanged.connect(self._updateState)
 
         self._picking_pass: Optional[PickingPass] = None
         self._faces_selection_pass: Optional[SelectionPass] = None
@@ -198,40 +199,6 @@ def clear(self) -> None:
         self._view.clearPaint()
         self._updateScene(update_node = True)
 
-    @staticmethod
-    def _get_intersect_ratio_via_pt(a: numpy.ndarray, pt: numpy.ndarray, b: numpy.ndarray, c: numpy.ndarray) -> float:
-        # compute the intersection of (param) A - pt with (param) B - (param) C
-        if all(a == pt) or all(b == c) or all(a == c) or all(a == b):
-            return 1.0
-
-        # compute unit vectors of directions of lines A and B
-        udir_a = a - pt
-        udir_a /= numpy.linalg.norm(udir_a)
-        udir_b = b - c
-        udir_b /= numpy.linalg.norm(udir_b)
-
-        # find unit direction vector for line C, which is perpendicular to lines A and B
-        udir_res = numpy.cross(udir_b, udir_a)
-        udir_res_len = numpy.linalg.norm(udir_res)
-        if udir_res_len == 0:
-            return 1.0
-        udir_res /= udir_res_len
-
-        # solve system of equations
-        rhs = b - a
-        lhs = numpy.array([udir_a, -udir_b, udir_res]).T
-        try:
-            solved = numpy.linalg.solve(lhs, rhs)
-        except numpy.linalg.LinAlgError:
-            return 1.0
-
-        # get the ratio
-        intersect = ((a + solved[0] * udir_a) + (b + solved[1] * udir_b)) * 0.5
-        a_intersect_dist = numpy.linalg.norm(a - intersect)
-        if a_intersect_dist == 0:
-            return 1.0
-        return numpy.linalg.norm(pt - intersect) / a_intersect_dist
-
     def _nodeTransformChanged(self, *args) -> None:
         self._cache_dirty = True
 
@@ -453,7 +420,7 @@ def _updateActiveView(self) -> None:
     def _updateState(self):
         painted_object = self._view.getPaintedObject()
         if painted_object is not None and self._controller.getActiveTool() == self:
-            if painted_object.callDecoration("getPaintTexture") is not None:
+            if painted_object.callDecoration("getPaintTexture") is not None and painted_object.getMeshData().hasUVCoordinates():
                 new_state = PaintTool.Paint.State.READY
             else:
                 new_state = PaintTool.Paint.State.PREPARING_MODEL
@@ -472,6 +439,7 @@ def _onPrepareTextureFinished(self, job: Job):
             self._prepare_texture_job = None
             self._state = PaintTool.Paint.State.READY
             self.propertyChanged.emit()
+            self._updateScene()
 
     def _updateIgnoreUnselectedObjects(self):
         ignore_unselected_objects = self._controller.getActiveView().name == "PaintTool"

plugins/PaintTool/PaintView.py

@@ -61,11 +61,13 @@ def __init__(self) -> None:
 
     canUndoChanged = pyqtSignal(bool)
     canRedoChanged = pyqtSignal(bool)
+    currentPaintedObjectMeshDataChanged = pyqtSignal()
 
     def setPaintedObject(self, painted_object: Optional[SceneNode]):
         if self._painted_object is not None:
             texture_changed_signal = self._painted_object.callDecoration("getPaintTextureChangedSignal")
             texture_changed_signal.disconnect(self._onCurrentPaintedObjectTextureChanged)
+            self._painted_object.meshDataChanged.disconnect(self._onCurrentPaintedObjectMesDataChanged)
 
         self._paint_texture = None
         self._cursor_texture = None
@@ -78,6 +80,7 @@ def setPaintedObject(self, painted_object: Optional[SceneNode]):
             if texture_changed_signal is not None:
                 texture_changed_signal.connect(self._onCurrentPaintedObjectTextureChanged)
             self._onCurrentPaintedObjectTextureChanged()
+            self._painted_object.meshDataChanged.connect(self._onCurrentPaintedObjectMesDataChanged)
 
         self._updateCurrentBitsRanges()
 
@@ -99,6 +102,10 @@ def _onCurrentPaintedObjectTextureChanged(self) -> None:
         else:
             self._cursor_texture = None
 
+    def _onCurrentPaintedObjectMesDataChanged(self, object: SceneNode) -> None:
+        if object == self._painted_object:
+            self.currentPaintedObjectMeshDataChanged.emit()
+
     def canUndo(self):
         stack = self._getUndoStack()
         return stack.canUndo() if stack is not None else False

resources/definitions/fdmprinter.def.json

@@ -2202,11 +2202,8 @@
                     "type": "enum",
                     "options":
                     {
-                        "grid": "Grid",
                         "lines": "Lines",
-                        "triangles": "Triangles",
                         "trihexagon": "Tri-Hexagon",
-                        "cubic": "Cubic",
                         "cubicsubdiv": "Cubic Subdivision",
                         "tetrahedral": "Octet",
                         "quarter_cubic": "Quarter Cubic",
@@ -2217,7 +2214,10 @@
                         "gyroid": "Gyroid",
                         "lightning": "Lightning",
                         "honeycomb": "Honeycomb",
-                        "octagon": "Octagon"
+                        "octagon": "Octagon",
+                        "grid": "Grid",
+                        "cubic": "Cubic",
+                        "triangles": "Triangles"
                     },
                     "default_value": "grid",
                     "enabled": "infill_line_distance > 0",

resources/definitions/ultimaker_s8.def.json

@@ -241,7 +241,7 @@
         "infill_material_flow": { "value": "material_flow if infill_sparse_density < 95 else 95" },
         "infill_move_inwards_length": { "value": "3*machine_nozzle_size" },
         "infill_overlap": { "value": 10 },
-        "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 50 else 'grid'" },
+        "infill_pattern": { "value": "'zigzag'" },
         "infill_sparse_density": { "value": 15 },
         "infill_wall_line_count": { "value": "1 if infill_sparse_density > 80 else 0" },
         "initial_bottom_layers": { "value": "2 if extruderValueFromContainer(top_bottom_extruder_nr, 'bottom_layers', 2) == bottom_layers else bottom_layers" },
@@ -425,7 +425,7 @@
         "material_pressure_advance_factor":
         {
             "enabled": true,
-            "value": 0.5
+            "value": 0.75
         },
         "material_print_temperature": { "maximum_value_warning": 320 },
         "material_print_temperature_layer_0": { "maximum_value_warning": 320 },
@@ -457,6 +457,7 @@
         "skin_material_flow": { "value": 93 },
         "skin_outline_count": { "value": 0 },
         "skin_support": { "value": "infill_sparse_density < 20" },
+        "skin_preshrink": { "value": 0 },
         "skin_support_speed": { "value": "speed_infill * infill_material_flow / skin_support_material_flow" },
         "skirt_brim_minimal_length": { "value": 1000 },
         "skirt_line_count": { "value": 5 },

resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.15mm_visual.inst.cfg

@@ -13,7 +13,9 @@ variant = AA+ 0.4
 
 [values]
 material_print_temperature = =default_material_print_temperature - 5
+skin_preshrink = 0
 speed_print = 100
 speed_wall = 75
 top_bottom_thickness = =round(layer_height*6,3)
+wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
 

resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_engineering.inst.cfg

@@ -13,10 +13,13 @@ variant = AA+ 0.4
 
 [values]
 hole_xy_offset = 0.1
+infill_overlap = 10
+infill_pattern = honeycomb
 infill_sparse_density = 20
 initial_bottom_layers = =bottom_layers
 inset_direction = inside_out
+skin_preshrink = 0
 top_bottom_thickness = =wall_thickness
-wall_thickness = =line_width * 4
+wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
 xy_offset = 0.025
 

resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_quick.inst.cfg

@@ -23,6 +23,5 @@ speed_wall = =speed_print
 speed_wall_x = =speed_print
 speed_wall_x_roofing = =speed_wall
 wall_line_width_x = =wall_line_width
-wall_thickness = =wall_line_width_0 + wall_line_width_x
 xy_offset = 0.075
 

resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg

@@ -13,10 +13,13 @@ variant = AA+ 0.4
 
 [values]
 hole_xy_offset = 0.1
+infill_overlap = 10
+infill_pattern = honeycomb
 infill_sparse_density = 20
 initial_bottom_layers = =bottom_layers
 inset_direction = inside_out
+skin_preshrink = 0
 top_bottom_thickness = =wall_thickness
-wall_thickness = =line_width * 4
+wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
 xy_offset = 0.025
 

resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe_0.2mm_engineering.inst.cfg

@@ -13,10 +13,13 @@ variant = AA+ 0.4
 
 [values]
 hole_xy_offset = 0.1
+infill_overlap = 10
+infill_pattern = honeycomb
 infill_sparse_density = 20
 initial_bottom_layers = =bottom_layers
 inset_direction = inside_out
+skin_preshrink = 0
 top_bottom_thickness = =wall_thickness
-wall_thickness = =line_width * 4
+wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
 xy_offset = 0.025
 

resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pc_0.2mm_engineering.inst.cfg

@@ -13,10 +13,13 @@ variant = AA+ 0.4
 
 [values]
 hole_xy_offset = 0.1
+infill_overlap = 10
+infill_pattern = honeycomb
 infill_sparse_density = 20
 initial_bottom_layers = =bottom_layers
 inset_direction = inside_out
+skin_preshrink = 0
 top_bottom_thickness = =wall_thickness
-wall_thickness = =line_width * 4
+wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
 xy_offset = 0.025