mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-06 14:37:29 -06:00
Revert "Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7""
This reverts commit 28f4d8513d.
The original revert was to revert an accidental merge from master to 4.7. This now reverts the revert on Master, so that we still have those changes on Master.
This commit is contained in:
Ghostkeeper
parent
a757dc7fa0
commit
9ea418c0a1
12 changed files with 278 additions and 143 deletions
|
|
@ -1,5 +1,6 @@
|
|||
# Copyright (c) 2016 Ultimaker B.V.
|
||||
# Copyright (c) 2020 Ultimaker B.V.
|
||||
# Cura is released under the terms of the LGPLv3 or higher.
|
||||
from typing import List, Optional, Dict, cast
|
||||
|
||||
from PyQt5.QtCore import pyqtSignal, QObject, pyqtProperty, QCoreApplication
|
||||
from UM.FlameProfiler import pyqtSlot
|
||||
|
|
@ -7,10 +8,15 @@ from UM.PluginRegistry import PluginRegistry
|
|||
from UM.Application import Application
|
||||
from UM.i18n import i18nCatalog
|
||||
from UM.Settings.ContainerRegistry import ContainerRegistry
|
||||
from cura.Settings.GlobalStack import GlobalStack
|
||||
from .UpdatableMachinesModel import UpdatableMachinesModel
|
||||
|
||||
import os
|
||||
import threading
|
||||
import time
|
||||
|
||||
from cura.CuraApplication import CuraApplication
|
||||
|
||||
i18n_catalog = i18nCatalog("cura")
|
||||
|
||||
|
||||
|
|
@ -29,6 +35,7 @@ class WorkspaceDialog(QObject):
|
|||
"quality_changes": self._default_strategy,
|
||||
"definition_changes": self._default_strategy,
|
||||
"material": self._default_strategy}
|
||||
self._override_machine = None
|
||||
self._visible = False
|
||||
self.showDialogSignal.connect(self.__show)
|
||||
|
||||
|
|
@ -51,6 +58,7 @@ class WorkspaceDialog(QObject):
|
|||
self._extruders = []
|
||||
self._objects_on_plate = False
|
||||
self._is_printer_group = False
|
||||
self._updatable_machines_model = UpdatableMachinesModel(self)
|
||||
|
||||
machineConflictChanged = pyqtSignal()
|
||||
qualityChangesConflictChanged = pyqtSignal()
|
||||
|
|
@ -63,6 +71,7 @@ class WorkspaceDialog(QObject):
|
|||
qualityTypeChanged = pyqtSignal()
|
||||
intentNameChanged = pyqtSignal()
|
||||
machineNameChanged = pyqtSignal()
|
||||
updatableMachinesChanged = pyqtSignal()
|
||||
materialLabelsChanged = pyqtSignal()
|
||||
objectsOnPlateChanged = pyqtSignal()
|
||||
numUserSettingsChanged = pyqtSignal()
|
||||
|
|
@ -81,33 +90,33 @@ class WorkspaceDialog(QObject):
|
|||
self.isPrinterGroupChanged.emit()
|
||||
|
||||
@pyqtProperty(str, notify=variantTypeChanged)
|
||||
def variantType(self):
|
||||
def variantType(self) -> str:
|
||||
return self._variant_type
|
||||
|
||||
def setVariantType(self, variant_type):
|
||||
def setVariantType(self, variant_type: str) -> None:
|
||||
if self._variant_type != variant_type:
|
||||
self._variant_type = variant_type
|
||||
self.variantTypeChanged.emit()
|
||||
|
||||
@pyqtProperty(str, notify=machineTypeChanged)
|
||||
def machineType(self):
|
||||
def machineType(self) -> str:
|
||||
return self._machine_type
|
||||
|
||||
def setMachineType(self, machine_type):
|
||||
def setMachineType(self, machine_type: str) -> None:
|
||||
self._machine_type = machine_type
|
||||
self.machineTypeChanged.emit()
|
||||
|
||||
def setNumUserSettings(self, num_user_settings):
|
||||
def setNumUserSettings(self, num_user_settings: int) -> None:
|
||||
if self._num_user_settings != num_user_settings:
|
||||
self._num_user_settings = num_user_settings
|
||||
self.numVisibleSettingsChanged.emit()
|
||||
|
||||
@pyqtProperty(int, notify=numUserSettingsChanged)
|
||||
def numUserSettings(self):
|
||||
def numUserSettings(self) -> int:
|
||||
return self._num_user_settings
|
||||
|
||||
@pyqtProperty(bool, notify=objectsOnPlateChanged)
|
||||
def hasObjectsOnPlate(self):
|
||||
def hasObjectsOnPlate(self) -> bool:
|
||||
return self._objects_on_plate
|
||||
|
||||
def setHasObjectsOnPlate(self, objects_on_plate):
|
||||
|
|
@ -116,10 +125,10 @@ class WorkspaceDialog(QObject):
|
|||
self.objectsOnPlateChanged.emit()
|
||||
|
||||
@pyqtProperty("QVariantList", notify = materialLabelsChanged)
|
||||
def materialLabels(self):
|
||||
def materialLabels(self) -> List[str]:
|
||||
return self._material_labels
|
||||
|
||||
def setMaterialLabels(self, material_labels):
|
||||
def setMaterialLabels(self, material_labels: List[str]) -> None:
|
||||
if self._material_labels != material_labels:
|
||||
self._material_labels = material_labels
|
||||
self.materialLabelsChanged.emit()
|
||||
|
|
@ -134,36 +143,44 @@ class WorkspaceDialog(QObject):
|
|||
self.extrudersChanged.emit()
|
||||
|
||||
@pyqtProperty(str, notify = machineNameChanged)
|
||||
def machineName(self):
|
||||
def machineName(self) -> str:
|
||||
return self._machine_name
|
||||
|
||||
def setMachineName(self, machine_name):
|
||||
def setMachineName(self, machine_name: str) -> None:
|
||||
if self._machine_name != machine_name:
|
||||
self._machine_name = machine_name
|
||||
self.machineNameChanged.emit()
|
||||
|
||||
@pyqtProperty(QObject, notify = updatableMachinesChanged)
|
||||
def updatableMachinesModel(self) -> UpdatableMachinesModel:
|
||||
return cast(UpdatableMachinesModel, self._updatable_machines_model)
|
||||
|
||||
def setUpdatableMachines(self, updatable_machines: List[GlobalStack]) -> None:
|
||||
self._updatable_machines_model.update(updatable_machines)
|
||||
self.updatableMachinesChanged.emit()
|
||||
|
||||
@pyqtProperty(str, notify=qualityTypeChanged)
|
||||
def qualityType(self):
|
||||
def qualityType(self) -> str:
|
||||
return self._quality_type
|
||||
|
||||
def setQualityType(self, quality_type):
|
||||
def setQualityType(self, quality_type: str) -> None:
|
||||
if self._quality_type != quality_type:
|
||||
self._quality_type = quality_type
|
||||
self.qualityTypeChanged.emit()
|
||||
|
||||
@pyqtProperty(int, notify=numSettingsOverridenByQualityChangesChanged)
|
||||
def numSettingsOverridenByQualityChanges(self):
|
||||
def numSettingsOverridenByQualityChanges(self) -> int:
|
||||
return self._num_settings_overridden_by_quality_changes
|
||||
|
||||
def setNumSettingsOverriddenByQualityChanges(self, num_settings_overridden_by_quality_changes):
|
||||
def setNumSettingsOverriddenByQualityChanges(self, num_settings_overridden_by_quality_changes: int) -> None:
|
||||
self._num_settings_overridden_by_quality_changes = num_settings_overridden_by_quality_changes
|
||||
self.numSettingsOverridenByQualityChangesChanged.emit()
|
||||
|
||||
@pyqtProperty(str, notify=qualityNameChanged)
|
||||
def qualityName(self):
|
||||
def qualityName(self) -> str:
|
||||
return self._quality_name
|
||||
|
||||
def setQualityName(self, quality_name):
|
||||
def setQualityName(self, quality_name: str) -> None:
|
||||
if self._quality_name != quality_name:
|
||||
self._quality_name = quality_name
|
||||
self.qualityNameChanged.emit()
|
||||
|
|
@ -178,80 +195,87 @@ class WorkspaceDialog(QObject):
|
|||
self.intentNameChanged.emit()
|
||||
|
||||
@pyqtProperty(str, notify=activeModeChanged)
|
||||
def activeMode(self):
|
||||
def activeMode(self) -> str:
|
||||
return self._active_mode
|
||||
|
||||
def setActiveMode(self, active_mode):
|
||||
def setActiveMode(self, active_mode: int) -> None:
|
||||
if active_mode == 0:
|
||||
self._active_mode = i18n_catalog.i18nc("@title:tab", "Recommended")
|
||||
else:
|
||||
self._active_mode = i18n_catalog.i18nc("@title:tab", "Custom")
|
||||
self.activeModeChanged.emit()
|
||||
|
||||
@pyqtProperty(int, notify = hasVisibleSettingsFieldChanged)
|
||||
def hasVisibleSettingsField(self):
|
||||
@pyqtProperty(bool, notify = hasVisibleSettingsFieldChanged)
|
||||
def hasVisibleSettingsField(self) -> bool:
|
||||
return self._has_visible_settings_field
|
||||
|
||||
def setHasVisibleSettingsField(self, has_visible_settings_field):
|
||||
def setHasVisibleSettingsField(self, has_visible_settings_field: bool) -> None:
|
||||
self._has_visible_settings_field = has_visible_settings_field
|
||||
self.hasVisibleSettingsFieldChanged.emit()
|
||||
|
||||
@pyqtProperty(int, constant = True)
|
||||
def totalNumberOfSettings(self):
|
||||
def totalNumberOfSettings(self) -> int:
|
||||
general_definition_containers = ContainerRegistry.getInstance().findDefinitionContainers(id = "fdmprinter")
|
||||
if not general_definition_containers:
|
||||
return 0
|
||||
return len(general_definition_containers[0].getAllKeys())
|
||||
|
||||
@pyqtProperty(int, notify = numVisibleSettingsChanged)
|
||||
def numVisibleSettings(self):
|
||||
def numVisibleSettings(self) -> int:
|
||||
return self._num_visible_settings
|
||||
|
||||
def setNumVisibleSettings(self, num_visible_settings):
|
||||
def setNumVisibleSettings(self, num_visible_settings: int) -> None:
|
||||
if self._num_visible_settings != num_visible_settings:
|
||||
self._num_visible_settings = num_visible_settings
|
||||
self.numVisibleSettingsChanged.emit()
|
||||
|
||||
@pyqtProperty(bool, notify = machineConflictChanged)
|
||||
def machineConflict(self):
|
||||
def machineConflict(self) -> bool:
|
||||
return self._has_machine_conflict
|
||||
|
||||
@pyqtProperty(bool, notify=qualityChangesConflictChanged)
|
||||
def qualityChangesConflict(self):
|
||||
def qualityChangesConflict(self) -> bool:
|
||||
return self._has_quality_changes_conflict
|
||||
|
||||
@pyqtProperty(bool, notify=materialConflictChanged)
|
||||
def materialConflict(self):
|
||||
def materialConflict(self) -> bool:
|
||||
return self._has_material_conflict
|
||||
|
||||
@pyqtSlot(str, str)
|
||||
def setResolveStrategy(self, key, strategy):
|
||||
def setResolveStrategy(self, key: str, strategy: Optional[str]) -> None:
|
||||
if key in self._result:
|
||||
self._result[key] = strategy
|
||||
|
||||
def getMachineToOverride(self) -> str:
|
||||
return self._override_machine
|
||||
|
||||
@pyqtSlot(str)
|
||||
def setMachineToOverride(self, machine_name: str) -> None:
|
||||
self._override_machine = machine_name
|
||||
|
||||
@pyqtSlot()
|
||||
def closeBackend(self):
|
||||
def closeBackend(self) -> None:
|
||||
"""Close the backend: otherwise one could end up with "Slicing..."""
|
||||
|
||||
Application.getInstance().getBackend().close()
|
||||
|
||||
def setMaterialConflict(self, material_conflict):
|
||||
def setMaterialConflict(self, material_conflict: bool) -> None:
|
||||
if self._has_material_conflict != material_conflict:
|
||||
self._has_material_conflict = material_conflict
|
||||
self.materialConflictChanged.emit()
|
||||
|
||||
def setMachineConflict(self, machine_conflict):
|
||||
def setMachineConflict(self, machine_conflict: bool) -> None:
|
||||
if self._has_machine_conflict != machine_conflict:
|
||||
self._has_machine_conflict = machine_conflict
|
||||
self.machineConflictChanged.emit()
|
||||
|
||||
def setQualityChangesConflict(self, quality_changes_conflict):
|
||||
def setQualityChangesConflict(self, quality_changes_conflict: bool) -> None:
|
||||
if self._has_quality_changes_conflict != quality_changes_conflict:
|
||||
self._has_quality_changes_conflict = quality_changes_conflict
|
||||
self.qualityChangesConflictChanged.emit()
|
||||
|
||||
def getResult(self):
|
||||
if "machine" in self._result and not self._has_machine_conflict:
|
||||
def getResult(self) -> Dict[str, Optional[str]]:
|
||||
if "machine" in self._result and self.updatableMachinesModel.count <= 1:
|
||||
self._result["machine"] = None
|
||||
if "quality_changes" in self._result and not self._has_quality_changes_conflict:
|
||||
self._result["quality_changes"] = None
|
||||
|
|
@ -267,11 +291,13 @@ class WorkspaceDialog(QObject):
|
|||
|
||||
return self._result
|
||||
|
||||
def _createViewFromQML(self):
|
||||
path = os.path.join(PluginRegistry.getInstance().getPluginPath("3MFReader"), self._qml_url)
|
||||
self._view = Application.getInstance().createQmlComponent(path, {"manager": self})
|
||||
def _createViewFromQML(self) -> None:
|
||||
three_mf_reader_path = PluginRegistry.getInstance().getPluginPath("3MFReader")
|
||||
if three_mf_reader_path:
|
||||
path = os.path.join(three_mf_reader_path, self._qml_url)
|
||||
self._view = CuraApplication.getInstance().createQmlComponent(path, {"manager": self})
|
||||
|
||||
def show(self):
|
||||
def show(self) -> None:
|
||||
# Emit signal so the right thread actually shows the view.
|
||||
if threading.current_thread() != threading.main_thread():
|
||||
self._lock.acquire()
|
||||
|
|
@ -284,7 +310,7 @@ class WorkspaceDialog(QObject):
|
|||
self.showDialogSignal.emit()
|
||||
|
||||
@pyqtSlot()
|
||||
def notifyClosed(self):
|
||||
def notifyClosed(self) -> None:
|
||||
"""Used to notify the dialog so the lock can be released."""
|
||||
|
||||
self._result = {} # The result should be cleared before hide, because after it is released the main thread lock
|
||||
|
|
@ -294,7 +320,7 @@ class WorkspaceDialog(QObject):
|
|||
except:
|
||||
pass
|
||||
|
||||
def hide(self):
|
||||
def hide(self) -> None:
|
||||
self._visible = False
|
||||
self._view.hide()
|
||||
try:
|
||||
|
|
@ -303,7 +329,7 @@ class WorkspaceDialog(QObject):
|
|||
pass
|
||||
|
||||
@pyqtSlot(bool)
|
||||
def _onVisibilityChanged(self, visible):
|
||||
def _onVisibilityChanged(self, visible: bool) -> None:
|
||||
if not visible:
|
||||
try:
|
||||
self._lock.release()
|
||||
|
|
@ -311,17 +337,17 @@ class WorkspaceDialog(QObject):
|
|||
pass
|
||||
|
||||
@pyqtSlot()
|
||||
def onOkButtonClicked(self):
|
||||
def onOkButtonClicked(self) -> None:
|
||||
self._view.hide()
|
||||
self.hide()
|
||||
|
||||
@pyqtSlot()
|
||||
def onCancelButtonClicked(self):
|
||||
def onCancelButtonClicked(self) -> None:
|
||||
self._result = {}
|
||||
self._view.hide()
|
||||
self.hide()
|
||||
|
||||
def waitForClose(self):
|
||||
def waitForClose(self) -> None:
|
||||
"""Block thread until the dialog is closed."""
|
||||
|
||||
if self._visible:
|
||||
|
|
@ -334,7 +360,7 @@ class WorkspaceDialog(QObject):
|
|||
time.sleep(1 / 50)
|
||||
QCoreApplication.processEvents() # Ensure that the GUI does not freeze.
|
||||
|
||||
def __show(self):
|
||||
def __show(self) -> None:
|
||||
if self._view is None:
|
||||
self._createViewFromQML()
|
||||
if self._view:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue