Merge branch 'master' of github.com:Ultimaker/Cura

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)

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):

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"}
     }
 }

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"
         }
-
     }
 }

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"
         }
     }
 }

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:
                 {