Merge branch '2.1'

plugins/CuraEngineBackend/ProcessSlicedLayersJob.py

@@ -103,7 +103,7 @@ class ProcessSlicedLayersJob(Job):
                 Job.yieldThread()
             Job.yieldThread()
             current_layer += 1
-            progress = (current_layer / layer_count) * 100
+            progress = (current_layer / layer_count) * 99
             # TODO: Rebuild the layer data mesh once the layer has been processed.
             # This needs some work in LayerData so we can add the new layers instead of recreating the entire mesh.
 

plugins/LayerView/LayerView.py

@@ -10,6 +10,7 @@ from UM.Scene.Selection import Selection
 from UM.Math.Color import Color
 from UM.Mesh.MeshData import MeshData
 from UM.Job import Job
+from UM.Preferences import Preferences
 
 from UM.View.RenderBatch import RenderBatch
 from UM.View.GL.OpenGL import OpenGL
@@ -41,7 +42,10 @@ class LayerView(View):
         self._top_layers_job = None
         self._activity = False
 
-        self._solid_layers = 1
+        Preferences.getInstance().addPreference("view/top_layer_count", 1)
+        Preferences.getInstance().preferenceChanged.connect(self._onPreferencesChanged)
+
+        self._solid_layers = int(Preferences.getInstance().getValue("view/top_layer_count"))
 
         self._top_layer_timer = QTimer()
         self._top_layer_timer.setInterval(50)
@@ -209,6 +213,16 @@ class LayerView(View):
 
         self._top_layers_job = None
 
+    def _onPreferencesChanged(self, preference):
+        if preference != "view/top_layer_count":
+            return
+
+        self._solid_layers = int(Preferences.getInstance().getValue("view/top_layer_count"))
+
+        self._current_layer_mesh = None
+        self._current_layer_jumps = None
+        self._top_layer_timer.start()
+
 class _CreateTopLayersJob(Job):
     def __init__(self, scene, layer_number, solid_layers):
         super().__init__()

resources/qml/ViewPage.qml

@@ -19,6 +19,7 @@ UM.PreferencesPage
     {
         UM.Preferences.resetPreference("view/show_overhang");
         UM.Preferences.resetPreference("view/center_on_select");
+        UM.Preferences.resetPreference("view/top_layer_count");
     }
 
     Column
@@ -57,12 +58,38 @@ UM.PreferencesPage
             }
         }
 
+        UM.TooltipArea {
+            width: childrenRect.width;
+            height: childrenRect.height;
+            text: catalog.i18nc("@info:tooltip","Display 5 top layers in layer view or only the top-most layer. Rendering 5 layers takes longer, but may show more information.")
+
+            CheckBox
+            {
+                id: topLayerCheckbox
+                text: catalog.i18nc("@action:button","Display five top layers in layer view.");
+                checked: UM.Preferences.getValue("view/top_layer_count") == 5
+                onClicked:
+                {
+                    if(UM.Preferences.getValue("view/top_layer_count") == 5)
+                    {
+                        UM.Preferences.setValue("view/top_layer_count", 1)
+                    }
+                    else
+                    {
+                        UM.Preferences.setValue("view/top_layer_count", 5)
+                    }
+                }
+            }
+        }
+
         Connections {
             target: UM.Preferences
             onPreferenceChanged:
             {
                 overhangCheckbox.checked = boolCheck(UM.Preferences.getValue("view/show_overhang"))
                 centerCheckbox.checked = boolCheck(UM.Preferences.getValue("view/center_on_select"))
+                topLayerCheckbox = UM.Preferences.getValue("view/top_layer_count") == 5
+
             }
         }
     }

resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg

@@ -15,6 +15,8 @@ wall_thickness = 0.7
 top_bottom_thickness = 0.75
 infill_sparse_density = 18
 speed_print = 60
+speed_wall = 50
+speed_topbottom = 30
 speed_travel = 150
 speed_layer_0 = 30
 cool_min_layer_time = 5

resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg

@@ -15,5 +15,6 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 speed_print = 50
+speed_topbottom = 20
 cool_min_layer_time = 5
 cool_min_speed = 10

resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg

@@ -15,5 +15,6 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.8
 infill_sparse_density = 20
 speed_print = 50
+speed_topbottom = 20
 cool_min_layer_time = 5
 cool_min_speed = 10

resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg

@@ -15,5 +15,8 @@ wall_thickness = 1.59
 top_bottom_thickness = 1.2
 infill_sparse_density = 20
 speed_print = 55
+speed_wall = 40
+speed_wall_0 = 25
+speed_topbottom = 20
 cool_min_layer_time = 5
 cool_min_speed = 10

resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg

@@ -15,5 +15,6 @@ wall_thickness = 2.1
 top_bottom_thickness = 1.2
 infill_sparse_density = 20
 speed_print = 40
+speed_wall_0 = 25
 cool_min_layer_time = 5
 cool_min_speed = 10

resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg

@@ -15,6 +15,8 @@ wall_thickness = 0.7
 top_bottom_thickness = 0.75
 infill_sparse_density = 18
 speed_print = 55
+speed_wall = 40
+speed_topbottom = 30
 speed_travel = 150
 speed_layer_0 = 30
 cool_min_layer_time = 3

resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 speed_print = 45
+speed_wall = 30
 cool_min_layer_time = 3
 cool_fan_speed_min = 20
 cool_min_speed = 10

resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.8
 infill_sparse_density = 20
 speed_print = 45
+speed_wall = 30
 cool_min_layer_time = 3
 cool_fan_speed_min = 20
 cool_min_speed = 10

resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 1.59
 top_bottom_thickness = 1.2
 infill_sparse_density = 20
 speed_print = 40
+speed_infill = 55
 cool_min_layer_time = 3
 cool_fan_speed_min = 50
 cool_min_speed = 20

resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 0.7
 top_bottom_thickness = 0.75
 infill_sparse_density = 18
 speed_print = 45
+speed_wall = 40
 speed_travel = 150
 speed_layer_0 = 30
 cool_min_layer_time = 3

resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 speed_print = 45
+speed_wall = 30
 cool_min_layer_time = 2
 cool_fan_speed_min = 80
 cool_min_speed = 15

resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.8
 infill_sparse_density = 20
 speed_print = 45
+speed_wall = 30
 cool_min_layer_time = 3
 cool_fan_speed_min = 80
 cool_min_speed = 10