3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 15:37:27 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Prevent circular dependencies

Browse source 
Contributes to CL-1274
This commit is contained in:
Ian Paschal 2019-03-04 11:27:52 +01:00
parent a1e0ddd9df
commit c8580cf417
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py
View file

@ -23,7 +23,6 @@ from cura.PrinterOutputDevice import ConnectionType
from .CloudOutputController import CloudOutputController
from ..MeshFormatHandler import MeshFormatHandler
from ..UM3OutputDevicePlugin import UM3OutputDevicePlugin
from ..UM3PrintJobOutputModel import UM3PrintJobOutputModel
from .CloudProgressMessage import CloudProgressMessage
from .CloudApiClient import CloudApiClient
@ -86,7 +85,7 @@ class CloudOutputDevice(NetworkedPrinterOutputDevice):
# We use the Cura Connect monitor tab to get most functionality right away.
self._monitor_view_qml_path = os.path.join(
PluginRegistry.getInstance().getPluginPath(UM3OutputDevicePlugin().getPluginId()),
PluginRegistry.getInstance().getPluginPath("UM3NetworkPrinting"),
"resources", "qml", "MonitorStage.qml"
)

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

@ -32,7 +32,6 @@ from .ConfigurationChangeModel import ConfigurationChangeModel
from .MeshFormatHandler import MeshFormatHandler
from .SendMaterialJob import SendMaterialJob
from .UM3PrintJobOutputModel import UM3PrintJobOutputModel
from .UM3OutputDevicePlugin import UM3OutputDevicePlugin
from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
from PyQt5.QtGui import QDesktopServices, QImage
@ -67,7 +66,7 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
self._received_print_jobs = False # type: bool
self._monitor_view_qml_path = os.path.join(
PluginRegistry.getInstance().getPluginPath(UM3OutputDevicePlugin().getPluginId()),
PluginRegistry.getInstance().getPluginPath("UM3NetworkPrinting"),
"resources", "qml", "MonitorStage.qml"
)

3
plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py
View file

@ -23,7 +23,6 @@ from PyQt5.QtCore import QTimer, QUrl
from PyQt5.QtWidgets import QMessageBox
from .LegacyUM3PrinterOutputController import LegacyUM3PrinterOutputController
from .UM3OutputDevicePlugin import UM3OutputDevicePlugin
from time import time
@ -79,7 +78,7 @@ class LegacyUM3OutputDevice(NetworkedPrinterOutputDevice):
self.setIconName("print")
self._monitor_view_qml_path = os.path.join(
PluginRegistry.getInstance().getPluginPath(UM3OutputDevicePlugin().getPluginId()),
PluginRegistry.getInstance().getPluginPath("UM3NetworkPrinting"),
"resources", "qml", "MonitorStage.qml"
)