Merge branch 'main' into PP-713-Honeycomb-for-S-line

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/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 UltiMaker
+// Copyright (c) 2026 UltiMaker
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.7
@@ -60,6 +60,7 @@ RecommendedSettingSection
                 width: parent.width
                 settingName: "infill_pattern"
                 updateAllExtruders: true
+                hideOptions: ["ultimaker_factor4"].includes(Cura.MachineManager.activeMachine.definition.id) ? ["grid", "triangles", "cubic"] : []
             }
         },
         RecommendedSettingItem

resources/qml/Widgets/SingleSettingComboBox.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 UltiMaker
+// Copyright (c) 2026 UltiMaker
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10
@@ -24,8 +24,23 @@ Cura.ComboBox
     // This is only used if updateAllExtruders == true
     property int defaultExtruderIndex: Cura.ExtruderManager.activeExtruderIndex
 
+    // For dropdown boxes, settings included in this property are hidden from the user on _selection_ (not show).
+    property list<string> hideOptions: []
+
     UM.I18nCatalog { id: settings_catalog; name: "fdmprinter.def.json" }
 
+    Text
+    {
+        // Used if a hidden option ends up selected anyway.
+        text: propertyProvider.properties.options ? propertyProvider.properties.options[propertyProvider.properties.value] : ""
+        visible: currentIndex < 0
+        color: UM.Theme.getColor("text")
+        anchors.fill: parent
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignLeft
+        leftPadding: UM.Theme.getSize("narrow_margin").width
+    }
+
     model:  ListModel
     {
         id: comboboxModel
@@ -44,6 +59,10 @@ Cura.ComboBox
             for (var i = 0; i < propertyProvider.properties["options"].keys().length; i++)
             {
                 var key = propertyProvider.properties["options"].keys()[i]
+                if (hideOptions.includes(key))
+                {
+                    continue;
+                }
                 var value = propertyProvider.properties["options"][key]
                 value = settings_catalog.i18nc(settingName + " option " + key, value)
                 comboboxModel.append({ text: value, code: key})

resources/setting_visibility/advanced.cfg

@@ -46,6 +46,7 @@ infill_multiplier
 infill_overlap
 infill_sparse_thickness
 gradual_infill_steps
+skin_support
 
 [material]
 material_print_temperature

resources/setting_visibility/expert.cfg

@@ -110,6 +110,9 @@ bottom_skin_expand_distance
 max_skin_angle_for_expansion
 min_skin_width_for_expansion
 infill_randomize_start_location
+skin_support
+skin_support_interlace_lines
+infill_move_inwards_length
 
 [material]
 default_material_print_temperature
@@ -219,6 +222,7 @@ travel_avoid_distance
 retraction_combing_avoid_distance
 layer_start_x
 layer_start_y
+layer_start_at_z_seam
 retraction_min_travel
 retraction_hop_enabled
 retraction_hop_only_when_collides