3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 06:45:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '4.0' into STAR-322_cloud-connection

Browse source
This commit is contained in:
ChrisTerBeke 2018-12-14 16:10:20 +01:00
commit 2772b3bcbd
25 changed files with 76 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/MachineSettingsAction/MachineSettingsAction.qml
View file

@ -13,7 +13,7 @@ import Cura 1.0 as Cura
Cura.MachineAction
{
id: base
property var extrudersModel: Cura.ExtrudersModel{}
property var extrudersModel: CuraApplication.getExtrudersModel()
property int extruderTabsCount: 0
property var activeMachineId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.id : ""

2
plugins/SimulationView/SimulationViewMenuComponent.qml
View file

@ -163,7 +163,7 @@ Cura.ExpandableComponent
Repeater
{
model: Cura.ExtrudersModel{}
model: CuraApplication.getExtrudersModel()
CheckBox
{

6
plugins/SolidView/SolidView.py
View file

@ -12,7 +12,6 @@ from UM.Math.Color import Color
from UM.View.GL.OpenGL import OpenGL
from cura.Settings.ExtruderManager import ExtruderManager
from cura.Settings.ExtrudersModel import ExtrudersModel
import math
@ -29,13 +28,16 @@ class SolidView(View):
self._non_printing_shader = None
self._support_mesh_shader = None
self._extruders_model = ExtrudersModel()
self._extruders_model = None
self._theme = None
def beginRendering(self):
scene = self.getController().getScene()
renderer = self.getRenderer()
if not self._extruders_model:
self._extruders_model = Application.getInstance().getExtrudersModel()
if not self._theme:
self._theme = Application.getInstance().getTheme()

4
plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
View file

@ -83,9 +83,7 @@ Item {
Column {
Repeater {
model: Cura.ExtrudersModel {
simpleNames: true;
}
model: CuraApplication.getExtrudersModel()
Label {
text: model.name;