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

cura_app.py

@@ -3,8 +3,25 @@
 # Copyright (c) 2015 Ultimaker B.V.
 # Cura is released under the terms of the AGPLv3 or higher.
 
+import os
 import sys
 
+#WORKAROUND: GITHUB-704 GITHUB-708
+# It looks like setuptools creates a .pth file in
+# the default /usr/lib which causes the default site-packages
+# to be inserted into sys.path before PYTHONPATH.
+# This can cause issues such as having libsip loaded from
+# the system instead of the one provided with Cura, which causes
+# incompatibility issues with libArcus
+if "PYTHONPATH" in os.environ.keys():                       # If PYTHONPATH is used
+    PYTHONPATH = os.environ["PYTHONPATH"].split(os.pathsep) # Get the value, split it..
+    PYTHONPATH.reverse()                                    # and reverse it, because we always insert at 1
+    for PATH in PYTHONPATH:                                 # Now beginning with the last PATH
+        PATH_real = os.path.realpath(PATH)                  # Making the the path "real"
+        if PATH_real in sys.path:                           # This should always work, but keep it to be sure..
+            sys.path.remove(PATH_real)
+        sys.path.insert(1, PATH_real)                       # Insert it at 1 after os.curdir, which is 0.
+
 def exceptHook(hook_type, value, traceback):
     import cura.CrashHandler
     cura.CrashHandler.show(hook_type, value, traceback)

plugins/LayerView/LayerView.py

@@ -34,8 +34,8 @@ class LayerView(View):
         self._layer_percentage = 0 # what percentage of layers need to be shown (SLider gives value between 0 - 100)
         self._proxy = LayerViewProxy.LayerViewProxy()
         self._controller.getScene().getRoot().childrenChanged.connect(self._onSceneChanged)
-        self._max_layers = 10
-        self._current_layer_num = 10
+        self._max_layers = 0
+        self._current_layer_num = 0
         self._current_layer_mesh = None
         self._current_layer_jumps = None
         self._top_layers_job = None

resources/machines/fdmprinter.json

@@ -912,7 +912,7 @@
                             "default": 60,
                             "visible": false,
                             "inherit_function": "speed_print",
-                            "enabled": "support_enable",
+                            "enabled": "support_roof_enable",
                             "children": {
                                 "speed_support_infill": {
                                     "label": "Support Infill Speed",
@@ -925,7 +925,7 @@
                                     "max_value_warning": "150",
                                     "visible": false,
                                     "inherit": true,
-                                    "enabled": "support_roof_enable",
+                                    "enabled": "support_enable",
                                     "global_only": true
                                 },
                                 "speed_support_roof": {

resources/machines/uniqbot_one.json

@@ -0,0 +1,31 @@
+{
+    "id": "uniqbot_one",
+    "version": 1, 
+    "name": "Uniqbot",
+    "manufacturer": "Unimatech",
+    "author": "Unimatech",
+    "icon": "icon_ultimaker2.png",
+    "file_formats": "text/x-gcode",
+    "inherits": "fdmprinter.json",
+
+    "overrides": {
+        "machine_heated_bed": { "default": false },
+        "machine_width": { "default": 140 },
+        "machine_height": { "default": 120 },
+        "machine_depth": { "default": 160 },
+        "machine_center_is_zero": { "default": false },
+        "machine_nozzle_size": { "default": 0.5 },
+        "material_diameter": { "default": 1.75 },
+        "machine_nozzle_heat_up_speed": { "default": 2.0 },
+        "machine_nozzle_cool_down_speed": { "default": 2.0 },
+        "machine_nozzle_gantry_distance": { "default": 55 },
+        "machine_gcode_flavor": { "default": "RepRap (Marlin/Sprinter)" },
+
+        "machine_start_gcode": {
+            "default": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
+        },
+        "machine_end_gcode": {
+            "default": "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\nG1 Z+5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
+        }
+    }
+}