Added warning when trying to load project with objects on buildplate

CURA-1263
This commit is contained in:
Jaime van Kessel 2016-12-02 15:30:21 +01:00
parent 5d1ba828bc
commit a0813b3af3
3 changed files with 24 additions and 0 deletions

View file

@ -145,6 +145,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
self._dialog.setActiveMode(active_mode) self._dialog.setActiveMode(active_mode)
self._dialog.setMachineName(machine_name) self._dialog.setMachineName(machine_name)
self._dialog.setMaterialLabels(material_labels) self._dialog.setMaterialLabels(material_labels)
self._dialog.setHasObjectsOnPlate(Application.getInstance().getPlatformActivity)
self._dialog.show() self._dialog.show()
# Block until the dialog is closed. # Block until the dialog is closed.

View file

@ -38,6 +38,7 @@ class WorkspaceDialog(QObject):
self._quality_type = "" self._quality_type = ""
self._machine_name = "" self._machine_name = ""
self._material_labels = [] self._material_labels = []
self._objects_on_plate = False
machineConflictChanged = pyqtSignal() machineConflictChanged = pyqtSignal()
qualityChangesConflictChanged = pyqtSignal() qualityChangesConflictChanged = pyqtSignal()
@ -49,6 +50,15 @@ class WorkspaceDialog(QObject):
qualityTypeChanged = pyqtSignal() qualityTypeChanged = pyqtSignal()
machineNameChanged = pyqtSignal() machineNameChanged = pyqtSignal()
materialLabelsChanged = pyqtSignal() materialLabelsChanged = pyqtSignal()
objectsOnPlateChanged = pyqtSignal()
@pyqtProperty(bool, notify=objectsOnPlateChanged)
def hasObjectsOnPlate(self):
return self._objects_on_plate
def setHasObjectsOnPlate(self, objects_on_plate):
self._objects_on_plate = objects_on_plate
self.objectsOnPlateChanged.emit()
@pyqtProperty("QVariantList", notify = materialLabelsChanged) @pyqtProperty("QVariantList", notify = materialLabelsChanged)
def materialLabels(self): def materialLabels(self):

View file

@ -284,6 +284,19 @@ UM.Dialog
width: parent.width / 3 width: parent.width / 3
} }
} }
Item // Spacer
{
height: spacerHeight
width: height
}
Label
{
text: catalog.i18nc("@action:warning", "Loading a project will clear all models on the buildplate")
visible: manager.hasObjectsOnPlate
color: "red"
width: parent.width
wrapMode: Text.Wrap
}
} }
} }
rightButtons: [ rightButtons: [