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

cura/CuraApplication.py

@@ -231,6 +231,8 @@ class CuraApplication(QtApplication):
             shell
                 wall_thickness
                 top_bottom_thickness
+                z_seam_x
+                z_seam_y
             infill
                 infill_sparse_density
             material

resources/definitions/fdmprinter.def.json

@@ -961,17 +961,39 @@
                 "z_seam_type":
                 {
                     "label": "Z Seam Alignment",
-                    "description": "Starting point of each path in a layer. When paths in consecutive layers start at the same point a vertical seam may show on the print. When aligning these at the back, the seam is easiest to remove. When placed randomly the inaccuracies at the paths' start will be less noticeable. When taking the shortest path the print will be quicker.",
+                    "description": "Starting point of each path in a layer. When paths in consecutive layers start at the same point a vertical seam may show on the print. When aligning these near a user specified location, the seam is easiest to remove. When placed randomly the inaccuracies at the paths' start will be less noticeable. When taking the shortest path the print will be quicker.",
                     "type": "enum",
                     "options":
                     {
-                        "back": "Back",
+                        "back": "User Specified",
                         "shortest": "Shortest",
                         "random": "Random"
                     },
                     "default_value": "shortest",
                     "settable_per_mesh": true
                 },
+                "z_seam_x":
+                {
+                    "label": "Z Seam X",
+                    "description": "The X coordinate of the position near where to start printing each part in a layer.",
+                    "unit": "mm",
+                    "type": "float",
+                    "default_value": 100.0,
+                    "value": "machine_width / 2",
+                    "enabled": "z_seam_type == 'back'",
+                    "settable_per_mesh": true
+                },
+                "z_seam_y":
+                {
+                    "label": "Z Seam Y",
+                    "description": "The Y coordinate of the position near where to start printing each part in a layer.",
+                    "unit": "mm",
+                    "type": "float",
+                    "default_value": 100.0,
+                    "value": "machine_depth / 2",
+                    "enabled": "z_seam_type == 'back'",
+                    "settable_per_mesh": true
+                },
                 "skin_no_small_gaps_heuristic":
                 {
                     "label": "Ignore Small Z Gaps",
@@ -3865,7 +3887,7 @@
                 "multiple_mesh_overlap":
                 {
                     "label": "Merged Meshes Overlap",
-                    "description": "Make meshes which are placed directly close to each other overlap a bit. This makes them bond together better.",
+                    "description": "Make meshes which are touching each other overlap a bit. This makes them bond together better.",
                     "type": "float",
                     "unit": "mm",
                     "default_value": 0.15,

resources/definitions/printrbot_simple_extended.def.json

@@ -0,0 +1,45 @@
+{
+    "id": "printrbot_simple_extended",
+    "version": 2, 
+    "name": "Printrbot Simple Metal Extended",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "samsector",
+        "manufacturer": "PrintrBot",
+        "category": "Other",
+        "platform": "printrbot_simple_metal_upgrade.stl",
+        "platform_offset": [0, -0.3, 0],
+        "file_formats": "text/x-gcode"
+    },
+
+    "overrides": {
+        "machine_name": { "default_value": "Printrbot Simple Metal Extended" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_width": { "default_value": 250 },
+        "machine_height": { "default_value": 235 },
+        "machine_depth": { "default_value": 150 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+        "machine_nozzle_heat_up_speed": { "default_value": 2 },
+        "machine_nozzle_cool_down_speed": { "default_value": 2 },
+        "machine_head_with_fans_polygon": {
+            "default_value": [
+                [ 55, -20 ],
+                [ 55, 99999 ],
+                [ -49, 99999 ],
+                [ -49, -20 ]
+            ]
+        },
+        "gantry_height": { "default_value": 99999 },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+
+        "machine_start_gcode": {
+            "default_value": "G21       ;metric values\nG90       ;absolute positioning\nM82       ;set extruder to absolute mode\nM106      ;start with the fan on\nG28 X0 Y0 ;home X/Y\nG28 Z0    ;home Z\nG92 E0    ;zero the extruded length\nG29       ;initiate auto bed leveling sequence\n;start cleaning sequance\nG1 X250 Y150 Z15 F4000\nG1 X250 Y150 Z0.30 F1000\nG1 X1 Y150 Z0.25 E15.0 F2000\nG1 X1 Y150 Z0.25 E14.0 F4000\nG1 X1 Y1 Z0.25 F16000/nG1 X1 Y1 Z0.25 E15.0 F4000\nG92 E0\nM107      ;start with the fan off\n;end cleaning sequance\n;G92 X132.4 Y20 ;correct bed origin (G29 changes it)"
+        },
+        "machine_end_gcode": {
+            "default_value": "M104 S0     ;extruder heater off\nM140 S0     ;heated bed heater off (if you have it)\nM106 S0     ;fan off\nG91         ;relative positioning\nG1 E-1 F300 ;retract the filament a bit\nG1 Z+1 E-5 F9000 ;move Z up a bit and retract even more\nG28 X0 Y0   ;home X/Y, so the head is out of the way\nM84         ;steppers off\nG90         ;absolute positioning"
+        }
+    }
+}

resources/qml/Settings/SettingExtruder.qml

@@ -141,7 +141,7 @@ SettingItem
         {
             for(var i = 0; i < extruders_model.rowCount(); ++i)
             {
-                if(extruders_model.getItem(i).index == propertyProvider.properties.value)
+                if(extruders_model.getItem(i).index == currentIndex)
                 {
                     control.color = extruders_model.getItem(i).color;
                     return;