Merge branch 'master' into ValentinPitre-contribution

cura/CuraApplication.py

@@ -1605,8 +1605,7 @@ class CuraApplication(QtApplication):
         self._currently_loading_files.remove(file_name)
 
         self.fileLoaded.emit(file_name)
-        arrange_objects_on_load = not self.getPreferences().getValue("cura/use_multi_build_plate")
-        target_build_plate = self.getMultiBuildPlateModel().activeBuildPlate if arrange_objects_on_load else -1
+        target_build_plate = self.getMultiBuildPlateModel().activeBuildPlate
 
         root = self.getController().getScene().getRoot()
         fixed_nodes = []
@@ -1660,7 +1659,7 @@ class CuraApplication(QtApplication):
                 if not child.getDecorator(ConvexHullDecorator):
                     child.addDecorator(ConvexHullDecorator())
 
-            if file_extension != "3mf" and arrange_objects_on_load:
+            if file_extension != "3mf":
                 if node.callDecoration("isSliceable"):
                     # Only check position if it's not already blatantly obvious that it won't fit.
                     if node.getBoundingBox() is None or self._volume.getBoundingBox() is None or node.getBoundingBox().width < self._volume.getBoundingBox().width or node.getBoundingBox().depth < self._volume.getBoundingBox().depth:

cura/PrintInformation.py

@@ -267,6 +267,7 @@ class PrintInformation(QObject):
         new_active_build_plate = self._multi_build_plate_model.activeBuildPlate
         if new_active_build_plate != self._active_build_plate:
             self._active_build_plate = new_active_build_plate
+            self._updateJobName()
 
             self._initVariablesWithBuildPlate(self._active_build_plate)
 
@@ -320,6 +321,15 @@ class PrintInformation(QObject):
             else:
                 self._job_name = base_name
 
+        # In case there are several buildplates, a suffix is attached
+        if self._multi_build_plate_model.maxBuildPlate > 0:
+            connector = "_#"
+            suffix = connector + str(self._active_build_plate + 1)
+            if connector in self._job_name:
+                self._job_name = self._job_name.split(connector)[0] # get the real name
+            if self._active_build_plate != 0:
+                self._job_name += suffix
+
         self.jobNameChanged.emit()
 
     @pyqtSlot(str)

plugins/PostProcessingPlugin/scripts/Stretch.py

@@ -62,13 +62,12 @@ class GCodeStep():
             delta_step_y = _getValue(line, "Y", 0)
             delta_step_z = _getValue(line, "Z", 0)
             delta_step_e = _getValue(line, "E", 0)
-            delta_step_f = _getValue(line, "F", 0)
 
             self.step_x += delta_step_x
             self.step_y += delta_step_y
             self.step_z += delta_step_z
             self.step_e += delta_step_e
-            self.step_f += delta_step_f
+            self.step_f = _getValue(line, "F", self.step_f)  # the feedrate is not relative
 
     def copyPosFrom(self, step):
         """

plugins/SimulationView/SimulationSliderLabel.qml

@@ -25,10 +25,6 @@ UM.PointingRectangle {
     width: valueLabel.width + UM.Theme.getSize("default_margin").width
     visible: false
 
-    // make sure the text field is focussed when pressing the parent handle
-    // needed to connect the key bindings when switching active handle
-    onVisibleChanged: if (visible) valueLabel.forceActiveFocus()
-
     color: UM.Theme.getColor("tool_panel_background")
     borderColor: UM.Theme.getColor("lining")
     borderWidth: UM.Theme.getSize("default_lining").width

resources/definitions/fdmprinter.def.json

@@ -1074,7 +1074,7 @@
                     "maximum_value_warning": "top_layers - 1",
                     "type": "int",
                     "value": "0",
-                    "limit_to_extruder": "top_bottom_extruder_nr",
+                    "limit_to_extruder": "roofing_extruder_nr",
                     "settable_per_mesh": true,
                     "enabled": "top_layers > 0"
                 },

resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg

@@ -1,7 +1,7 @@
 [general]
 version = 4
 name = Fast
-definition = dagoma_neva
+definition = dagoma_neva_magis
 
 [metadata]
 setting_version = 5

resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg

@@ -1,7 +1,7 @@
 [general]
 version = 4
 name = Fine
-definition = dagoma_neva
+definition = dagoma_neva_magis
 
 [metadata]
 setting_version = 5

resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg

@@ -1,7 +1,7 @@
 [general]
 version = 4
 name = Standard
-definition = dagoma_neva
+definition = dagoma_neva_magis
 
 [metadata]
 setting_version = 5