From 9e18bb8b4cec211b33be3684ee7efa42d45d82c9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 4 Jul 2018 17:31:58 +0200 Subject: [PATCH 1/3] Remove ID from Raise3D definition These IDs are not used and should never be added again. --- resources/extruders/raise3D_N2_plus_single_extruder_0.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/extruders/raise3D_N2_plus_single_extruder_0.def.json b/resources/extruders/raise3D_N2_plus_single_extruder_0.def.json index bb6e631864..efb071cb8c 100644 --- a/resources/extruders/raise3D_N2_plus_single_extruder_0.def.json +++ b/resources/extruders/raise3D_N2_plus_single_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "raise3D_N2_plus_single_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", From 4f1b2d51cca017ec5ea93d39a1f3db9e54625c36 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 5 Jul 2018 09:44:32 +0200 Subject: [PATCH 2/3] Remove old commented code This is not valid any more by a long shot. --- cura/CuraApplication.py | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 845ed0325f..bf26e72685 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -407,43 +407,6 @@ class CuraApplication(QtApplication): } ) - """ - self._currently_loading_files = [] - self._non_sliceable_extensions = [] - - self._machine_action_manager = MachineActionManager.MachineActionManager() - self._machine_manager = None # This is initialized on demand. - self._extruder_manager = None - self._material_manager = None - self._quality_manager = None - self._object_manager = None - self._build_plate_model = None - self._multi_build_plate_model = None - self._setting_visibility_presets_model = None - self._setting_inheritance_manager = None - self._simple_mode_settings_manager = None - self._cura_scene_controller = None - self._machine_error_checker = None - self._auto_save = None - self._save_data_enabled = True - - self._additional_components = {} # Components to add to certain areas in the interface - - super().__init__(name = "cura", - version = CuraVersion, - buildtype = CuraBuildType, - is_debug_mode = CuraDebugMode, - tray_icon_name = "cura-icon-32.png", - **kwargs) - - # FOR TESTING ONLY - if kwargs["parsed_command_line"].get("trigger_early_crash", False): - assert not "This crash is triggered by the trigger_early_crash command line argument." - - self._variant_manager = None - - self.default_theme = "cura-light" - """ # Runs preparations that needs to be done before the starting process. def startSplashWindowPhase(self): super().startSplashWindowPhase() From e87f3d7ca9cf135142bee488f188b9639c8b38fd Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 5 Jul 2018 10:23:18 +0200 Subject: [PATCH 3/3] Fix plugins import in CuraApplication CURA-5543 Only import types for type checking when TYPE_CHECKING is true. --- cura/CuraApplication.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index bf26e72685..e5c0c5688c 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -84,7 +84,6 @@ from cura.Settings.SettingInheritanceManager import SettingInheritanceManager from cura.Settings.SimpleModeSettingsManager import SimpleModeSettingsManager from cura.Machines.VariantManager import VariantManager -from plugins.SliceInfoPlugin.SliceInfo import SliceInfo from .SingleInstance import SingleInstance from .AutoSave import AutoSave @@ -110,6 +109,10 @@ from cura.ObjectsModel import ObjectsModel from UM.FlameProfiler import pyqtSlot +if TYPE_CHECKING: + from plugins.SliceInfoPlugin.SliceInfo import SliceInfo + + numpy.seterr(all = "ignore") try: