diff --git a/plugins/LayerView/LayerPass.py b/plugins/LayerView/LayerPass.py index 4fc5f66793..b706f21877 100644 --- a/plugins/LayerView/LayerPass.py +++ b/plugins/LayerView/LayerPass.py @@ -97,11 +97,11 @@ class LayerPass(RenderPass): # Create a new batch that is not range-limited batch = RenderBatch(self._layer_shader, type = RenderBatch.RenderType.Solid) - if self._layer_view._current_layer_mesh: - batch.addItem(node.getWorldTransformation(), self._layer_view._current_layer_mesh) + if self._layer_view.getCurrentLayerMesh(): + batch.addItem(node.getWorldTransformation(), self._layer_view.getCurrentLayerMesh()) - if self._layer_view._current_layer_jumps: - batch.addItem(node.getWorldTransformation(), self._layer_view._current_layer_jumps) + if self._layer_view.getCurrentLayerJumps(): + batch.addItem(node.getWorldTransformation(), self._layer_view.getCurrentLayerJumps()) if len(batch.items) > 0: batch.render(self._scene.getActiveCamera()) diff --git a/plugins/LayerView/LayerView.py b/plugins/LayerView/LayerView.py index ca8d57926d..fb130cb3ff 100644 --- a/plugins/LayerView/LayerView.py +++ b/plugins/LayerView/LayerView.py @@ -67,6 +67,7 @@ class LayerView(View): self._resetSettings() self._legend_items = None + self._show_travel_moves = False Preferences.getInstance().addPreference("view/top_layer_count", 5) Preferences.getInstance().addPreference("view/only_show_top_layers", False) @@ -319,6 +320,12 @@ class LayerView(View): self._composite_pass.setLayerBindings(self._old_layer_bindings) self._composite_pass.setCompositeShader(self._old_composite_shader) + def getCurrentLayerMesh(self): + return self._current_layer_mesh + + def getCurrentLayerJumps(self): + return self._current_layer_jumps + def _onGlobalStackChanged(self): if self._global_container_stack: self._global_container_stack.propertyChanged.disconnect(self._onPropertyChanged) @@ -359,7 +366,8 @@ class LayerView(View): return self.resetLayerData() # Reset the layer data only when job is done. Doing it now prevents "blinking" data. self._current_layer_mesh = job.getResult().get("layers") - self._current_layer_jumps = job.getResult().get("jumps") + if self._show_travel_moves: + self._current_layer_jumps = job.getResult().get("jumps") self._controller.getScene().sceneChanged.emit(self._controller.getScene().getRoot()) self._top_layers_job = None @@ -377,7 +385,8 @@ class LayerView(View): self.setExtruderOpacity(2, float(Preferences.getInstance().getValue("layerview/extruder2_opacity"))) self.setExtruderOpacity(3, float(Preferences.getInstance().getValue("layerview/extruder3_opacity"))) - self.setShowTravelMoves(bool(Preferences.getInstance().getValue("layerview/show_travel_moves"))) + self._show_travel_moves = bool(Preferences.getInstance().getValue("layerview/show_travel_moves")) + self.setShowTravelMoves(self._show_travel_moves) self.setShowHelpers(bool(Preferences.getInstance().getValue("layerview/show_helpers"))) self.setShowSkin(bool(Preferences.getInstance().getValue("layerview/show_skin"))) self.setShowInfill(bool(Preferences.getInstance().getValue("layerview/show_infill"))) diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index cb19d330e7..52eff89011 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -295,7 +295,7 @@ "slider_layerview_background": [4.0, 0.0], "slider_layerview_margin": [3.0, 1.0], - "layerview_menu_size": [17.0, 20.0], + "layerview_menu_size": [16.5, 20.0], "layerview_legend_size": [1.0, 1.0], "layerview_row": [11.0, 1.5], "layerview_row_spacing": [0.0, 0.5],