Merge branch 'master' into ui_rework_4_0

cura/BuildVolume.py

@@ -479,6 +479,8 @@ class BuildVolume(SceneNode):
             maximum = Vector(max_w - bed_adhesion_size - 1, max_h - self._raft_thickness - self._extra_z_clearance, max_d - disallowed_area_size + bed_adhesion_size - 1)
         )
 
+        self._application.getController().getScene()._maximum_bounds = scale_to_max_bounds
+
         self.updateNodeBoundaryCheck()
 
     def getBoundingBox(self) -> AxisAlignedBox:

cura/CrashHandler.py

@@ -36,18 +36,14 @@ else:
     except ImportError:
         CuraDebugMode = False  # [CodeStyle: Reflecting imported value]
 
-# List of exceptions that should be considered "fatal" and abort the program.
+# List of exceptions that should not be considered "fatal" and abort the program.
-# These are primarily some exception types that we simply cannot really recover from
+# These are primarily some exception types that we simply skip
-# (MemoryError and SystemError) and exceptions that indicate grave errors in the
+skip_exception_types = [
-# code that cause the Python interpreter to fail (SyntaxError, ImportError).
+    SystemExit,
-fatal_exception_types = [
+    KeyboardInterrupt,
-    MemoryError,
+    GeneratorExit
-    SyntaxError,
-    ImportError,
-    SystemError,
 ]
 
-
 class CrashHandler:
     crash_url = "https://stats.ultimaker.com/api/cura"
 
@@ -70,7 +66,7 @@ class CrashHandler:
         # If Cura has fully started, we only show fatal errors.
         # If Cura has not fully started yet, we always show the early crash dialog. Otherwise, Cura will just crash
         # without any information.
-        if has_started and exception_type not in fatal_exception_types:
+        if has_started and exception_type in skip_exception_types:
             return
 
         if not has_started:
@@ -387,7 +383,7 @@ class CrashHandler:
         Application.getInstance().callLater(self._show)
 
     def _show(self):
-        # When the exception is not in the fatal_exception_types list, the dialog is not created, so we don't need to show it
+        # When the exception is in the skip_exception_types list, the dialog is not created, so we don't need to show it
         if self.dialog:
             self.dialog.exec_()
         os._exit(1)

cura/CuraApplication.py

@@ -181,7 +181,6 @@ class CuraApplication(QtApplication):
         # Variables set from CLI
         self._files_to_open = []
         self._use_single_instance = False
-        self._trigger_early_crash = False  # For debug only
 
         self._single_instance = None
 
@@ -292,7 +291,10 @@ class CuraApplication(QtApplication):
             sys.exit(0)
 
         self._use_single_instance = self._cli_args.single_instance
-        self._trigger_early_crash = self._cli_args.trigger_early_crash
+        # FOR TESTING ONLY
+        if self._cli_args.trigger_early_crash:
+            assert not "This crash is triggered by the trigger_early_crash command line argument."
+
         for filename in self._cli_args.file:
             self._files_to_open.append(os.path.abspath(filename))
 

cura_app.py

@@ -17,12 +17,6 @@ parser.add_argument("--debug",
                     default = False,
                     help = "Turn on the debug mode by setting this option."
                     )
-parser.add_argument("--trigger-early-crash",
-                    dest = "trigger_early_crash",
-                    action = "store_true",
-                    default = False,
-                    help = "FOR TESTING ONLY. Trigger an early crash to show the crash dialog."
-                    )
 known_args = vars(parser.parse_known_args()[0])
 
 if not known_args["debug"]: