3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

WIP: Fix refresh and naming

Browse source
This commit is contained in:
Lipu Fei 2019-03-14 08:56:31 +01:00
parent e5b51c8edf
commit 2b0e9ea439
6 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/CuraApplication.py
View file

@ -114,7 +114,7 @@ from cura.Settings.CuraFormulaFunctions import CuraFormulaFunctions
from cura.ObjectsModel import ObjectsModel
from cura.Machines.Models.DiscoveredPrintersModel import DiscoveredPrinterModel
from cura.Machines.Models.DiscoveredPrintersModel import DiscoveredPrintersModel
from cura.PrinterOutputDevice import PrinterOutputDevice
from cura.PrinterOutput.NetworkMJPGImage import NetworkMJPGImage
@ -212,7 +212,7 @@ class CuraApplication(QtApplication):
self._cura_scene_controller = None
self._machine_error_checker = None
self._discovered_printer_model = DiscoveredPrinterModel(self)
self._discovered_printer_model = DiscoveredPrintersModel(self)
self._welcome_pages_model = WelcomePagesModel(self)
@ -851,7 +851,7 @@ class CuraApplication(QtApplication):
self.closeSplash()
@pyqtSlot(result = QObject)
def getDiscoveredPrinterModel(self, *args) -> "DiscoveredPrinterModel":
def getDiscoveredPrintersModel(self, *args) -> "DiscoveredPrintersModel":
return self._discovered_printer_model
@pyqtSlot(result = QObject)
@ -1011,7 +1011,7 @@ class CuraApplication(QtApplication):
qmlRegisterType(QualityManagementModel, "Cura", 1, 0, "QualityManagementModel")
qmlRegisterType(MachineManagementModel, "Cura", 1, 0, "MachineManagementModel")
qmlRegisterType(DiscoveredPrinterModel, "Cura", 1, 0, "DiscoveredPrinterModel")
qmlRegisterType(DiscoveredPrintersModel, "Cura", 1, 0, "DiscoveredPrintersModel")
qmlRegisterSingletonType(QualityProfilesDropDownMenuModel, "Cura", 1, 0,
"QualityProfilesDropDownMenuModel", self.getQualityProfilesDropDownMenuModel)

2
cura/Machines/Models/DiscoveredPrintersModel.py
View file

@ -72,7 +72,7 @@ class DiscoveredPrinter(QObject):
# to add networked printers (Plugin finds a bunch of printers, user can select one from the list, plugin can then
# add that printer to Cura as the active one).
#
class DiscoveredPrinterModel(QObject):
class DiscoveredPrintersModel(QObject):
def __init__(self, parent: Optional["QObject"]) -> None:
super().__init__(parent)

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

@ -632,9 +632,9 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
printer.updateName(data["friendly_name"])
printer.updateKey(data["uuid"])
printer.updateType(data["machine_variant"])
self._application.getDiscoveredPrinterModel().updateDiscoveredPrinter(data["ip_address"],
name = data["friendly_name"],
machine_type = data["machine_variant"])
self._application.getDiscoveredPrintersModel().updateDiscoveredPrinter(data["ip_address"],
name = data["friendly_name"],
machine_type = data["machine_variant"])
# Do not store the build plate information that comes from connect if the current printer has not build plate information
if "build_plate" in data and machine_definition.getMetaDataEntry("has_variant_buildplates", False):

4
plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py
View file

@ -315,7 +315,7 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
except TypeError:
# Disconnect already happened.
pass
self._application.getDiscoveredPrinterModel().removeDiscoveredPrinter(device.getId())
self._application.getDiscoveredPrintersModel().removeDiscoveredPrinter(device.address)
self.discoveredDevicesChanged.emit()
def _onAddDevice(self, name, address, properties):
@ -340,7 +340,7 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
device = ClusterUM3OutputDevice.ClusterUM3OutputDevice(name, address, properties)
else:
device = LegacyUM3OutputDevice.LegacyUM3OutputDevice(name, address, properties)
self._application.getDiscoveredPrinterModel().addDiscoveredPrinter(address, device.getId(), name, self._createMachineFromDiscoveredPrinter, properties[b"printer_type"].decode("utf-8"), device)
self._application.getDiscoveredPrintersModel().addDiscoveredPrinter(address, device.getId(), name, self._createMachineFromDiscoveredPrinter, properties[b"printer_type"].decode("utf-8"), device)
self._discovered_devices[device.getId()] = device
self.discoveredDevicesChanged.emit()

2
resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
View file

@ -69,7 +69,7 @@ Item
{
id: networkPrinterListView
anchors.fill: parent
model: CuraApplication.getDiscoveredPrinterModel().discovered_printers
model: CuraApplication.getDiscoveredPrintersModel().discovered_printers
//visible: base.visible && model.length > 0
delegate: MachineSelectorButton

4
resources/qml/WelcomePages/AddPrinterBySelectionContent.qml
View file

@ -62,7 +62,7 @@ Item
onRefreshButtonClicked:
{
UM.OutputDeviceManager.refreshConnections()
UM.OutputDeviceManager.startDiscovery()
}
onAddByIpButtonClicked:
@ -136,7 +136,7 @@ Item
{
// Create a network printer
const networkPrinterItem = addNetworkPrinterDropDown.contentItem.currentItem
CuraApplication.getDiscoveredPrinterModel().createMachineFromDiscoveredPrinter(networkPrinterItem)
CuraApplication.getDiscoveredPrintersModel().createMachineFromDiscoveredPrinter(networkPrinterItem)
}
else
{