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

CURA-5449 Do not check if the name is the correct group name if the

Browse source 
output device is manual create device and it is marked as temporary.
Wait until all the information is retrieved when the request finishes.
This commit is contained in:
Diego Prado Gesto 2018-06-06 14:54:26 +02:00
parent 4652c3be0f
commit 1019f2dd65
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cura/PrinterOutput/NetworkedPrinterOutputDevice.py
View file

@ -3,7 +3,6 @@
from UM.Application import Application from UM.Application import Application
from UM.Logger import Logger from UM.Logger import Logger
from cura.CuraApplication import CuraApplication
from cura.PrinterOutputDevice import PrinterOutputDevice, ConnectionState from cura.PrinterOutputDevice import PrinterOutputDevice, ConnectionState
@ -255,8 +254,8 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
self._last_manager_create_time = time() self._last_manager_create_time = time()
self._manager.authenticationRequired.connect(self._onAuthenticationRequired) self._manager.authenticationRequired.connect(self._onAuthenticationRequired)
machine_manager = CuraApplication.getInstance().getMachineManager() if b'temporary' not in self._properties:
machine_manager.checkCorrectGroupName(self.getId(), self.name) Application.getInstance().getMachineManager().checkCorrectGroupName(self.getId(), self.name)
def _registerOnFinishedCallback(self, reply: QNetworkReply, onFinished: Optional[Callable[[Any, QNetworkReply], None]]) -> None: def _registerOnFinishedCallback(self, reply: QNetworkReply, onFinished: Optional[Callable[[Any, QNetworkReply], None]]) -> None:
if onFinished is not None: if onFinished is not None:

4
cura/Settings/MachineManager.py
View file

@ -1308,8 +1308,8 @@ class MachineManager(QObject):
# Check if the connect_group_name is correct. If not, update all the containers connected to the same printer # Check if the connect_group_name is correct. If not, update all the containers connected to the same printer
if self.activeMachineNetworkGroupName != group_name: if self.activeMachineNetworkGroupName != group_name:
metadata_filter = {"um_network_key": self.activeMachineNetworkKey} metadata_filter = {"um_network_key": self.activeMachineNetworkKey}
hidden_containers = ContainerRegistry.getInstance().findContainerStacks(type = "machine", **metadata_filter) containers = ContainerRegistry.getInstance().findContainerStacks(type = "machine", **metadata_filter)
for container in hidden_containers: for container in containers:
container.setMetaDataEntry("connect_group_name", group_name) container.setMetaDataEntry("connect_group_name", group_name)
## This method checks if there is an instance connected to the given network_key ## This method checks if there is an instance connected to the given network_key

3
plugins/UM3NetworkPrinting/UM3OutputDevicePlugin.py
View file

@ -162,7 +162,8 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
b"name": address.encode("utf-8"), b"name": address.encode("utf-8"),
b"address": address.encode("utf-8"), b"address": address.encode("utf-8"),
b"manual": b"true", b"manual": b"true",
b"incomplete": b"true" b"incomplete": b"true",
b"temporary": b"true" # Still a temporary device until all the info is retrieved in _onNetworkRequestFinished
} }
if instance_name not in self._discovered_devices: if instance_name not in self._discovered_devices: