3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

CURA-4525 created CuraSceneController and took out logic from ObjectsModel and BuildPlateModel

Browse source
This commit is contained in:
Jack Ha 2018-01-04 09:26:15 +01:00
parent 9e5f0e10b9
commit 8c7a0d4a8e
6 changed files with 187 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

16
resources/qml/ObjectsList.qml
View file

@ -85,7 +85,7 @@ Rectangle
anchors.fill: parent;
onClicked:
{
Cura.BuildPlateModel.setActiveBuildPlate(index);
Cura.SceneController.setActiveBuildPlate(index);
}
}
}
@ -131,7 +131,7 @@ Rectangle
Rectangle
{
height: childrenRect.height
color: Cura.ObjectManager.getItem(index).isSelected ? palette.highlight : index % 2 ? palette.base : palette.alternateBase
color: Cura.ObjectsModel.getItem(index).isSelected ? palette.highlight : index % 2 ? palette.base : palette.alternateBase
width: parent.width
Label
{
@ -139,8 +139,8 @@ Rectangle
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
width: parent.width - 2 * UM.Theme.getSize("default_margin").width - 30
text: Cura.ObjectManager.getItem(index) ? Cura.ObjectManager.getItem(index).name : "";
color: Cura.ObjectManager.getItem(index).isSelected ? palette.highlightedText : (Cura.ObjectManager.getItem(index).isOutsideBuildArea ? palette.mid : palette.text)
text: Cura.ObjectsModel.getItem(index) ? Cura.ObjectsModel.getItem(index).name : "";
color: Cura.ObjectsModel.getItem(index).isSelected ? palette.highlightedText : (Cura.ObjectsModel.getItem(index).isOutsideBuildArea ? palette.mid : palette.text)
elide: Text.ElideRight
}
@ -151,8 +151,8 @@ Rectangle
anchors.left: nodeNameLabel.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.right: parent.right
text: Cura.ObjectManager.getItem(index).buildPlateNumber != -1 ? Cura.ObjectManager.getItem(index).buildPlateNumber + 1 : "";
color: Cura.ObjectManager.getItem(index).isSelected ? palette.highlightedText : palette.text
text: Cura.ObjectsModel.getItem(index).buildPlateNumber != -1 ? Cura.ObjectsModel.getItem(index).buildPlateNumber + 1 : "";
color: Cura.ObjectsModel.getItem(index).isSelected ? palette.highlightedText : palette.text
elide: Text.ElideRight
}
@ -161,7 +161,7 @@ Rectangle
anchors.fill: parent;
onClicked:
{
Cura.ObjectManager.changeSelection(index);
Cura.SceneController.changeSelection(index);
}
}
}
@ -195,7 +195,7 @@ Rectangle
ListView
{
id: listview
model: Cura.ObjectManager
model: Cura.ObjectsModel
width: parent.width
delegate: objectDelegate
}