3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Move ConfigurationModel into cura.UI module

Browse source
This commit is contained in:
Lipu Fei 2019-03-20 09:51:06 +01:00
parent 69eb381f10
commit e555f7da68
9 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/PrinterOutput/PrinterOutputDevice.py
View file

@ -17,7 +17,7 @@ from UM.FlameProfiler import pyqtSlot
MYPY = False MYPY = False
if MYPY: if MYPY:
from cura.UI.PrinterOutputModel import PrinterOutputModel from cura.UI.PrinterOutputModel import PrinterOutputModel
from cura.PrinterOutput.ConfigurationModel import ConfigurationModel from cura.UI.ConfigurationModel import ConfigurationModel
from cura.PrinterOutput.FirmwareUpdater import FirmwareUpdater from cura.PrinterOutput.FirmwareUpdater import FirmwareUpdater
from UM.FileHandler.FileHandler import FileHandler from UM.FileHandler.FileHandler import FileHandler
from UM.Scene.SceneNode import SceneNode from UM.Scene.SceneNode import SceneNode

2
cura/Settings/MachineManager.py
View file

@ -23,7 +23,7 @@ from UM.Signal import postponeSignals, CompressTechnique
from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch
from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionType from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionType
from cura.PrinterOutput.ConfigurationModel import ConfigurationModel from cura.UI.ConfigurationModel import ConfigurationModel
from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
from cura.UI.MaterialOutputModel import MaterialOutputModel from cura.UI.MaterialOutputModel import MaterialOutputModel
from cura.Settings.CuraContainerRegistry import CuraContainerRegistry from cura.Settings.CuraContainerRegistry import CuraContainerRegistry

4
cura/PrinterOutput/ConfigurationModel.py → cura/UI/ConfigurationModel.py
View file

@ -19,14 +19,14 @@ class ConfigurationModel(QObject):
self._extruder_configurations = [] # type: List[ExtruderConfigurationModel] self._extruder_configurations = [] # type: List[ExtruderConfigurationModel]
self._buildplate_configuration = "" self._buildplate_configuration = ""
def setPrinterType(self, printer_type): def setPrinterType(self, printer_type: str) -> None:
self._printer_type = printer_type self._printer_type = printer_type
@pyqtProperty(str, fset = setPrinterType, notify = configurationChanged) @pyqtProperty(str, fset = setPrinterType, notify = configurationChanged)
def printerType(self) -> str: def printerType(self) -> str:
return self._printer_type return self._printer_type
def setExtruderConfigurations(self, extruder_configurations: List["ExtruderConfigurationModel"]): def setExtruderConfigurations(self, extruder_configurations: List["ExtruderConfigurationModel"]) -> None:
if self._extruder_configurations != extruder_configurations: if self._extruder_configurations != extruder_configurations:
self._extruder_configurations = extruder_configurations self._extruder_configurations = extruder_configurations

2
cura/UI/PrintJobOutputModel.py
View file

@ -9,7 +9,7 @@ from PyQt5.QtGui import QImage
if TYPE_CHECKING: if TYPE_CHECKING:
from cura.PrinterOutput.PrinterOutputController import PrinterOutputController from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
from cura.UI.PrinterOutputModel import PrinterOutputModel from cura.UI.PrinterOutputModel import PrinterOutputModel
from cura.PrinterOutput.ConfigurationModel import ConfigurationModel from cura.UI.ConfigurationModel import ConfigurationModel
class PrintJobOutputModel(QObject): class PrintJobOutputModel(QObject):

2
cura/UI/PrinterOutputModel.py
View file

@ -4,7 +4,7 @@
from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, QVariant, pyqtSlot, QUrl from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, QVariant, pyqtSlot, QUrl
from typing import List, Dict, Optional from typing import List, Dict, Optional
from UM.Math.Vector import Vector from UM.Math.Vector import Vector
from cura.PrinterOutput.ConfigurationModel import ConfigurationModel from cura.UI.ConfigurationModel import ConfigurationModel
from cura.UI.ExtruderOutputModel import ExtruderOutputModel from cura.UI.ExtruderOutputModel import ExtruderOutputModel
MYPY = False MYPY = False

2
plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintJobStatus.py
View file

@ -2,7 +2,7 @@
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
from typing import List, Optional, Union, Dict, Any from typing import List, Optional, Union, Dict, Any
from cura.PrinterOutput.ConfigurationModel import ConfigurationModel from cura.UI.ConfigurationModel import ConfigurationModel
from ...UM3PrintJobOutputModel import UM3PrintJobOutputModel from ...UM3PrintJobOutputModel import UM3PrintJobOutputModel
from ...ConfigurationChangeModel import ConfigurationChangeModel from ...ConfigurationChangeModel import ConfigurationChangeModel
from ..CloudOutputController import CloudOutputController from ..CloudOutputController import CloudOutputController

2
plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py
View file

@ -19,7 +19,7 @@ from UM.Scene.SceneNode import SceneNode # For typing.
from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.ContainerRegistry import ContainerRegistry
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
from cura.PrinterOutput.ConfigurationModel import ConfigurationModel from cura.UI.ConfigurationModel import ConfigurationModel
from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState, NetworkedPrinterOutputDevice from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState, NetworkedPrinterOutputDevice
from cura.UI.PrinterOutputModel import PrinterOutputModel from cura.UI.PrinterOutputModel import PrinterOutputModel

2
tests/PrinterOutput/TestConfigurationModel.py → tests/UI/TestConfigurationModel.py
View file

@ -4,7 +4,7 @@ from unittest.mock import MagicMock
import pytest import pytest
from cura.PrinterOutput.ConfigurationModel import ConfigurationModel from cura.UI.ConfigurationModel import ConfigurationModel
from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
test_validate_data_get_set = [ test_validate_data_get_set = [

2
tests/UI/TestPrintJobOutputModel.py
View file

@ -2,7 +2,7 @@ from unittest.mock import MagicMock
import pytest import pytest
from cura.PrinterOutput.ConfigurationModel import ConfigurationModel from cura.UI.ConfigurationModel import ConfigurationModel
from cura.UI.PrintJobOutputModel import PrintJobOutputModel from cura.UI.PrintJobOutputModel import PrintJobOutputModel
from cura.UI.PrinterOutputModel import PrinterOutputModel from cura.UI.PrinterOutputModel import PrinterOutputModel