Merge branch 'main' into CURA-11622_conan_v2

README.md

@@ -2,6 +2,8 @@
 
 <div align = center>
 
+# ⚠️ ⚠️ On 03-12-2024, we will start merging branches on all the Cura-related repositories, that contain a migration of our Conan recipes to use Conan 2, and also a huge rework on many GitHub workflows. Unfortunately, we cannot test everything until it is merged, so it is very likely that some existing workflows will stop working. If you are a developer, you may also encounter troubles when updating your branches or updating your Conan dependencies. This message will be removed when the situation is stable enough. After that, please open new issues if you are still in trouble with the new recipes/workflows. Sorry for the inconvenience. ⚠️ ⚠️
+
 [![Badge Issues]][Issues]   
 [![Badge PullRequests]][PullRequests]   
 [![Badge Closed]][Closed]

plugins/SimulationView/SimulationView.py

@@ -222,12 +222,11 @@ class SimulationView(CuraView):
 
             self.setPath(i + fractional_value)
 
-    def advanceTime(self, time_increase: float) -> bool:
+    def advanceTime(self, time_increase: float) -> None:
         """
         Advance the time by the given amount.
 
         :param time_increase: The amount of time to advance (in seconds).
-        :return: True if the time was advanced, False if the end of the simulation was reached.
         """
         total_duration = 0.0
         if len(self.cumulativeLineDuration()) > 0:
@@ -237,15 +236,13 @@ class SimulationView(CuraView):
             # If we have reached the end of the simulation, go to the next layer.
             if self.getCurrentLayer() == self.getMaxLayers():
                 # If we are already at the last layer, go to the first layer.
-                self.setTime(total_duration)
-                return False
-
-            # advance to the next layer, and reset the time
-            self.setLayer(self.getCurrentLayer() + 1)
+                self.setLayer(0)
+            else:
+                # advance to the next layer, and reset the time
+                self.setLayer(self.getCurrentLayer() + 1)
             self.setTime(0.0)
         else:
             self.setTime(self._current_time + time_increase)
-        return True
 
     def cumulativeLineDuration(self) -> List[float]:
         # Make sure _cumulative_line_duration is initialized properly

plugins/SimulationView/SimulationViewMainComponent.qml

@@ -144,9 +144,7 @@ Item
         {
             // divide by 1000 to account for ms to s conversion
             const advance_time = simulationTimer.interval / 1000.0;
-            if (!UM.SimulationView.advanceTime(advance_time)) {
-                playButton.pauseSimulation();
-            }
+            UM.SimulationView.advanceTime(advance_time);
             // The status must be set here instead of in the resumeSimulation function otherwise it won't work
             // correctly, because part of the logic is in this trigger function.
             isSimulationPlaying = true;

plugins/SimulationView/SimulationViewProxy.py

@@ -54,9 +54,9 @@ class SimulationViewProxy(QObject):
     def currentPath(self):
         return self._simulation_view.getCurrentPath()
 
-    @pyqtSlot(float, result=bool)
-    def advanceTime(self, duration: float) -> bool:
-        return self._simulation_view.advanceTime(duration)
+    @pyqtSlot(float)
+    def advanceTime(self, duration: float) -> None:
+        self._simulation_view.advanceTime(duration)
 
     @pyqtProperty(int, notify=currentPathChanged)
     def minimumPath(self):

resources/qml/Preferences/GeneralPage.qml

@@ -109,6 +109,9 @@ UM.PreferencesPage
         UM.Preferences.resetPreference("general/restore_window_geometry")
         restoreWindowPositionCheckbox.checked = boolCheck(UM.Preferences.getValue("general/restore_window_geometry"))
 
+        UM.Preferences.resetPreference("tool/flip_y_axis_tool_handle")
+        flipToolhandleYCheckbox.checked = boolcheck(UM.Preferences.getValue("tool/flip_y_axis_tool_handle"))
+
         UM.Preferences.resetPreference("general/camera_perspective_mode")
         //var defaultCameraMode = UM.Preferences.getValue("general/camera_perspective_mode")
 //        /setDefaultCameraMode(defaultCameraMode)
@@ -662,6 +665,21 @@ UM.PreferencesPage
                     }
                 }
             }
+            UM.TooltipArea
+            {
+                width: childrenRect.width
+                height: childrenRect.height
+                text: catalog.i18nc("@info:tooltip", "Should the Y axis of the translate toolhandle be flipped?")
+
+                UM.CheckBox
+                {
+                    id: flipToolhandleYCheckbox
+                    text: catalog.i18nc("@option:check", "Flip toolhandle Y axis")
+                    checked: boolCheck(UM.Preferences.getValue("tool/flip_y_axis_tool_handle"))
+                    onCheckedChanged: UM.Preferences.setValue("tool/flip_y_axis_tool_handle", checked)
+                }
+            }
+
 
             Item
             {

tests/TestBuildVolume.py

@@ -424,4 +424,3 @@ class TestGetEdgeDisallowedSize:
         with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance"):
             with patch.dict(self.setting_property_dict, {"print_sequence": {"value": "one_at_a_time"}}):
                 assert build_volume.getEdgeDisallowedSize() == 0.1
-

tests/TestConvexHullDecorator.py

@@ -188,4 +188,4 @@ def test_compute2DConvexHullMeshDataGrouped(convex_hull_decorator):
             copied_decorator._global_stack = mocked_stack
             copied_decorator._getSettingProperty = MagicMock(return_value=0)
         node.addDecorator(copied_decorator)
-    assert convex_hull_decorator._compute2DConvexHull() == Polygon([[-5.0, 5.0], [5.0, 5.0], [5.0, -5.0], [-5.0, -5.0]])
+    assert convex_hull_decorator._compute2DConvexHull() == Polygon([[-5.0, 5.0], [5.0, 5.0], [5.0, -5.0], [-5.0, -5.0]])

tests/TestCuraSceneController.py

@@ -75,5 +75,4 @@ def test_updateMaxBuildPlate(objects_model, multi_build_plate_model):
         # And check what happens if we move down again!
         controller._calcMaxBuildPlate = MagicMock(return_value=2)
         controller.updateMaxBuildPlate(SceneNode())
-        assert controller._active_build_plate == 0 # We don't have any items anywhere, so default to 0
-
+        assert controller._active_build_plate == 0  # We don't have any items anywhere, so default to 0

tests/TestCuraSceneNode.py

@@ -53,5 +53,3 @@ class TestCollidesWithAreas:
 def test_outsideBuildArea(cura_scene_node):
     cura_scene_node.setOutsideBuildArea(True)
     assert cura_scene_node.isOutsideBuildArea
-
-

tests/TestLayer.py

@@ -36,4 +36,4 @@ def test_elementCount():
     layer_polygon.elementCount = 12
     layer.polygons.append(layer_polygon)
     assert layer.build(0, 0, [], [], [], [], [] ,[] , []) == (9001, 9002)
-    assert layer.elementCount == 12
+    assert layer.elementCount == 12