From eef6a98da7594902d3b9a6b9468827cc3951e063 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 13 Dec 2016 10:32:28 +0100 Subject: [PATCH 1/4] Fix elliptic buildplate mesh when machine_height != machine_width Silly y/z mixup. --- cura/BuildVolume.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 72cad13468..b6c5b7cf02 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -225,7 +225,7 @@ class BuildVolume(SceneNode): scale_matrix = Matrix() if self._width != 0: # Scale circular meshes by aspect ratio if width != height - aspect = self._height / self._width + aspect = self._depth / self._width scale_matrix.compose(scale = Vector(1, 1, aspect)) mb = MeshBuilder() mb.addArc(max_w, Vector.Unit_Y, center = (0, min_h - z_fight_distance, 0), color = self.VolumeOutlineColor) From 88f73d881c4833a3c8a1e198e9c99313b1866c84 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Tue, 13 Dec 2016 10:34:58 +0100 Subject: [PATCH 2/4] Enable Support tooltip translation. CURA-3123 --- resources/qml/SidebarSimple.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index 499125a6f9..e40e114e0e 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -263,7 +263,7 @@ Item onEntered: { base.showTooltip(enableSupportCheckBox, Qt.point(-enableSupportCheckBox.x, 0), - catalog.i18nc("@label", supportEnabled.properties.description)); + catalog.i18nc("@label", "Enable support structures. These structures support parts of the model with severe overhangs.")); } onExited: { From 655850e7b985abe1509d0404266252e184362a7d Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 13 Dec 2016 11:08:23 +0100 Subject: [PATCH 3/4] Add machine_shape to delta printer definitions... ...and fix some z-fighting --- resources/definitions/deltabot.def.json | 3 ++- resources/definitions/kossel_mini.def.json | 17 ++++------------- resources/definitions/kossel_pro.def.json | 7 ++++--- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/resources/definitions/deltabot.def.json b/resources/definitions/deltabot.def.json index 5d36857e9e..1132f7e7bb 100644 --- a/resources/definitions/deltabot.def.json +++ b/resources/definitions/deltabot.def.json @@ -30,6 +30,7 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_depth": { "default_value": 150 }, "machine_width": { "default_value": 150 }, - "machine_name": { "default_value": "DeltaBot style" } + "machine_name": { "default_value": "DeltaBot style" }, + "machine_shape": { "default_value": "elliptic"} } } diff --git a/resources/definitions/kossel_mini.def.json b/resources/definitions/kossel_mini.def.json index 1b79d61a91..78ee3aac1e 100644 --- a/resources/definitions/kossel_mini.def.json +++ b/resources/definitions/kossel_mini.def.json @@ -10,7 +10,8 @@ "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", - "platform": "kossel_platform.stl" + "platform": "kossel_platform.stl", + "platform_offset": [0, -0.25, 0] }, "overrides": { @@ -50,18 +51,8 @@ "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" }, - "machine_disallowed_areas": { - "default_value": [ - [[-34, -85], [ -85, -85], [-70, -70]], - [[-85, -85], [-85, -34], [-70, -70]], - [[34, -85], [ 85, -85], [70, -70]], - [[85, -85], [85, -34], [70, -70]], - [[-34, 85], [ -85, 85], [-70, 70]], - [[-85, 85], [-85, 34], [-70, 70]], - [[34, 85], [ 85, 85], [70, 70]], - [[85, 85], [85, 34], [70, 70]] - ] + "machine_shape": { + "default_value": "elliptic" } - } } diff --git a/resources/definitions/kossel_pro.def.json b/resources/definitions/kossel_pro.def.json index f8df616bf2..a0774b3a06 100644 --- a/resources/definitions/kossel_pro.def.json +++ b/resources/definitions/kossel_pro.def.json @@ -10,7 +10,8 @@ "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", - "platform": "kossel_pro_build_platform.stl" + "platform": "kossel_pro_build_platform.stl", + "platform_offset": [0, -0.25, 0] }, "overrides": { "machine_heated_bed": { @@ -49,8 +50,8 @@ "machine_end_gcode": { "default_value": "M104 S0 ; turn off temperature\nM140 S0 ; turn off bed\nG28 ; home all axes\nM84 ; disable motors\n" }, - "machine_disallowed_areas": { - "default_value": [[[125.0, 125.0], [125.0, 0.0], [120.741, 32.352]], [[-125.0, 125.0], [-125.0, 0.0], [-120.741, 32.352]], [[125.0, -125.0], [125.0, -0.0], [120.741, -32.352]], [[-125.0, -125.0], [-125.0, -0.0], [-120.741, -32.352]], [[125.0, 125.0], [120.741, 32.352], [108.253, 62.5]], [[-125.0, 125.0], [-120.741, 32.352], [-108.253, 62.5]], [[125.0, -125.0], [120.741, -32.352], [108.253, -62.5]], [[-125.0, -125.0], [-120.741, -32.352], [-108.253, -62.5]], [[125.0, 125.0], [108.253, 62.5], [88.388, 88.388]], [[-125.0, 125.0], [-108.253, 62.5], [-88.388, 88.388]], [[125.0, -125.0], [108.253, -62.5], [88.388, -88.388]], [[-125.0, -125.0], [-108.253, -62.5], [-88.388, -88.388]], [[125.0, 125.0], [88.388, 88.388], [62.5, 108.253]], [[-125.0, 125.0], [-88.388, 88.388], [-62.5, 108.253]], [[125.0, -125.0], [88.388, -88.388], [62.5, -108.253]], [[-125.0, -125.0], [-88.388, -88.388], [-62.5, -108.253]], [[125.0, 125.0], [62.5, 108.253], [32.352, 120.741]], [[-125.0, 125.0], [-62.5, 108.253], [-32.352, 120.741]], [[125.0, -125.0], [62.5, -108.253], [32.352, -120.741]], [[-125.0, -125.0], [-62.5, -108.253], [-32.352, -120.741]], [[125.0, 125.0], [32.352, 120.741], [0.0, 125.0]], [[-125.0, 125.0], [-32.352, 120.741], [-0.0, 125.0]], [[125.0, -125.0], [32.352, -120.741], [0.0, -125.0]], [[-125.0, -125.0], [-32.352, -120.741], [-0.0, -125.0]]] + "machine_shape": { + "default_value": "elliptic" } } } \ No newline at end of file From 4085cfe67e332ce30be345a4af06a0048381195a Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Tue, 13 Dec 2016 16:03:26 +0100 Subject: [PATCH 4/4] Fix crash loading almost empty project. Added return value to functions in SettingInheritanceManager --- cura/Settings/SettingInheritanceManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Settings/SettingInheritanceManager.py b/cura/Settings/SettingInheritanceManager.py index b13faadd0e..6560f2b227 100644 --- a/cura/Settings/SettingInheritanceManager.py +++ b/cura/Settings/SettingInheritanceManager.py @@ -32,7 +32,7 @@ class SettingInheritanceManager(QObject): def getChildrenKeysWithOverride(self, key): definitions = self._global_container_stack.getBottom().findDefinitions(key=key) if not definitions: - return + return [] result = [] for key in definitions[0].getAllKeys(): if key in self._settings_with_inheritance_warning: @@ -51,7 +51,7 @@ class SettingInheritanceManager(QObject): definitions = self._global_container_stack.getBottom().findDefinitions(key=key) if not definitions: - return + return [] result = [] for key in definitions[0].getAllKeys(): if self._settingIsOverwritingInheritance(key, extruder):