mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-02 20:52:20 -07:00
Merge branch 'master' into fix_usb_rapid_commands
# Conflicts: # cura/PrinterOutput/GenericOutputController.py
This commit is contained in:
fieldOfView
commit
2def68edab
16 changed files with 83 additions and 55 deletions
|
|
@ -609,6 +609,7 @@ class CuraEngineBackend(QObject, Backend):
|
|||
|
||||
self._slicing = False
|
||||
Logger.log("d", "Slicing took %s seconds", time() - self._slice_start_time )
|
||||
Logger.log("d", "Number of models per buildplate: %s", dict(self._numObjectsPerBuildPlate()))
|
||||
|
||||
# See if we need to process the sliced layers job.
|
||||
active_build_plate = Application.getInstance().getMultiBuildPlateModel().activeBuildPlate
|
||||
|
|
|
|||
|
|
@ -58,5 +58,5 @@ Button {
|
|||
checkable: true
|
||||
checked: definition.expanded
|
||||
|
||||
onClicked: definition.expanded ? settingDefinitionsModel.collapse(definition.key) : settingDefinitionsModel.expandAll(definition.key)
|
||||
onClicked: definition.expanded ? settingDefinitionsModel.collapse(definition.key) : settingDefinitionsModel.expandRecursive(definition.key)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -301,46 +301,21 @@ class PluginBrowser(QObject, Extension):
|
|||
|
||||
return self._plugins_model
|
||||
|
||||
def _checkCanUpgrade(self, plugin_id, version):
|
||||
if plugin_id not in self._plugin_registry.getInstalledPlugins():
|
||||
return False
|
||||
|
||||
|
||||
def _checkCanUpgrade(self, id, version):
|
||||
|
||||
# TODO: This could maybe be done more efficiently using a dictionary...
|
||||
|
||||
plugin_object = self._plugin_registry.getPluginObject(plugin_id)
|
||||
# Scan plugin server data for plugin with the given id:
|
||||
for plugin in self._plugins_metadata:
|
||||
if id == plugin["id"]:
|
||||
reg_version = Version(version)
|
||||
if plugin_id == plugin["id"]:
|
||||
reg_version = Version(plugin_object.getVersion())
|
||||
new_version = Version(plugin["version"])
|
||||
if new_version > reg_version:
|
||||
Logger.log("i", "%s has an update availible: %s", plugin["id"], plugin["version"])
|
||||
Logger.log("i", "%s has an update available: %s", plugin["id"], plugin["version"])
|
||||
return True
|
||||
return False
|
||||
|
||||
def _checkAlreadyInstalled(self, id):
|
||||
metadata = self._plugin_registry.getMetaData(id)
|
||||
# We already installed this plugin, but the registry just doesn't know it yet.
|
||||
if id in self._newly_installed_plugin_ids:
|
||||
return True
|
||||
# We already uninstalled this plugin, but the registry just doesn't know it yet:
|
||||
elif id in self._newly_uninstalled_plugin_ids:
|
||||
return False
|
||||
elif metadata != {}:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
def _checkInstallStatus(self, plugin_id):
|
||||
if plugin_id in self._plugin_registry.getInstalledPlugins():
|
||||
return "installed"
|
||||
else:
|
||||
return "uninstalled"
|
||||
|
||||
def _checkEnabled(self, id):
|
||||
if id in self._plugin_registry.getActivePlugins():
|
||||
return True
|
||||
return False
|
||||
|
||||
def _onRequestFinished(self, reply):
|
||||
reply_url = reply.url().toString()
|
||||
if reply.error() == QNetworkReply.TimeoutError:
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ class SliceInfo(Extension):
|
|||
def messageActionTriggered(self, message_id, action_id):
|
||||
Preferences.getInstance().setValue("info/asked_send_slice_info", True)
|
||||
if action_id == "Disable":
|
||||
CuraApplication.getInstance().showPreferences()
|
||||
Preferences.getInstance().addPreference("info/send_slice_info", False)
|
||||
self.send_slice_info_message.hide()
|
||||
|
||||
def _onWriteStarted(self, output_device):
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ class BedLevelMachineAction(MachineAction):
|
|||
printer.homeBed()
|
||||
printer.moveHead(0, 0, 3)
|
||||
printer.homeHead()
|
||||
printer.homeBed()
|
||||
|
||||
def _getPrinterOutputDevices(self) -> List[PrinterOutputDevice]:
|
||||
return [printer_output_device for printer_output_device in Application.getInstance().getOutputDeviceManager().getOutputDevices() if isinstance(printer_output_device, PrinterOutputDevice)]
|
||||
|
|
@ -60,6 +61,7 @@ class BedLevelMachineAction(MachineAction):
|
|||
printer.moveHead(0, 0, 3)
|
||||
printer.moveHead(Application.getInstance().getGlobalContainerStack().getProperty("machine_width", "value") - 10, 0, 0)
|
||||
printer.moveHead(0, 0, -3)
|
||||
printer.homeBed()
|
||||
self._bed_level_position += 1
|
||||
elif self._bed_level_position == 1:
|
||||
printer.moveHead(0, 0, 3)
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ def getMetaData():
|
|||
# if any is updated.
|
||||
("quality_changes", 2000000): ("quality_changes", 2000001, upgrade.upgradeInstanceContainer),
|
||||
("user", 2000000): ("user", 2000001, upgrade.upgradeInstanceContainer),
|
||||
("quality", 2000000): ("quality", 2000001, upgrade.upgradeInstanceContainer),
|
||||
("definition_changes", 2000000): ("definition_changes", 2000001, upgrade.upgradeInstanceContainer),
|
||||
("machine_stack", 3000000): ("machine_stack", 3000001, upgrade.upgradeMachineStack),
|
||||
},
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ def getMetaData():
|
|||
# if any is updated.
|
||||
("quality_changes", 2000001): ("quality_changes", 2000002, upgrade.upgradeOtherContainer),
|
||||
("user", 2000001): ("user", 2000002, upgrade.upgradeOtherContainer),
|
||||
("quality", 2000001): ("quality", 2000002, upgrade.upgradeOtherContainer),
|
||||
("definition_changes", 2000001): ("definition_changes", 2000002, upgrade.upgradeOtherContainer),
|
||||
("variant", 2000000): ("variant", 2000002, upgrade.upgradeOtherContainer)
|
||||
},
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ def getMetaData():
|
|||
|
||||
("quality_changes", 2000002): ("quality_changes", 2000003, upgrade.upgradeQualityChangesContainer),
|
||||
("user", 2000002): ("user", 2000003, upgrade.upgradeOtherContainer),
|
||||
("quality", 2000002): ("quality", 2000003, upgrade.upgradeOtherContainer),
|
||||
("definition_changes", 2000002): ("definition_changes", 2000003, upgrade.upgradeOtherContainer),
|
||||
("variant", 2000002): ("variant", 2000003, upgrade.upgradeOtherContainer)
|
||||
},
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ def getMetaData():
|
|||
|
||||
("quality_changes", 2000003): ("quality_changes", 2000004, upgrade.upgradeInstanceContainer),
|
||||
("user", 2000003): ("user", 2000004, upgrade.upgradeInstanceContainer),
|
||||
("quality", 2000003): ("quality", 2000004, upgrade.upgradeInstanceContainer),
|
||||
("definition_changes", 2000003): ("definition_changes", 2000004, upgrade.upgradeInstanceContainer),
|
||||
("variant", 2000003): ("variant", 2000004, upgrade.upgradeInstanceContainer)
|
||||
},
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ def getMetaData():
|
|||
("extruder_train", 3000004): ("extruder_train", 4000004, upgrade.upgradeStack),
|
||||
|
||||
("definition_changes", 2000004): ("definition_changes", 3000004, upgrade.upgradeInstanceContainer),
|
||||
("quality", 2000004): ("quality", 3000004, upgrade.upgradeInstanceContainer),
|
||||
("quality_changes", 2000004): ("quality_changes", 3000004, upgrade.upgradeQualityChanges),
|
||||
("user", 2000004): ("user", 3000004, upgrade.upgradeInstanceContainer),
|
||||
("variant", 2000004): ("variant", 3000004, upgrade.upgradeVariants)
|
||||
|
|
@ -31,10 +30,6 @@ def getMetaData():
|
|||
"get_version": upgrade.getCfgVersion,
|
||||
"location": {"./definition_changes"}
|
||||
},
|
||||
"quality": {
|
||||
"get_version": upgrade.getCfgVersion,
|
||||
"location": {"./quality"}
|
||||
},
|
||||
"quality_changes": {
|
||||
"get_version": upgrade.getCfgVersion,
|
||||
"location": {"./quality"}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue