GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-13 23:03:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refactor_singleton_settingsbase'

Browse Source
This commit is contained in:
Ghostkeeper 2018-09-27 11:53:11 +02:00
commit 80804b232f
No known key found for this signature in database
GPG Key ID: 5252B696FB5E7C7A
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/CuraEngineBackend/CuraEngineBackend.py
View File

@ -179,8 +179,7 @@ class CuraEngineBackend(QObject, Backend):
# This is useful for debugging and used to actually start the engine. # This is useful for debugging and used to actually start the engine.
# \return list of commands and args / parameters. # \return list of commands and args / parameters.
def getEngineCommand(self) -> List[str]: def getEngineCommand(self) -> List[str]:
json_path = Resources.getPath(Resources.DefinitionContainers, "fdmprinter.def.json") command = [self._application.getPreferences().getValue("backend/location"), "connect", "127.0.0.1:{0}".format(self._port), ""]
command = [self._application.getPreferences().getValue("backend/location"), "connect", "127.0.0.1:{0}".format(self._port), "-j", json_path, ""]
parser = argparse.ArgumentParser(prog = "cura", add_help = False) parser = argparse.ArgumentParser(prog = "cura", add_help = False)
parser.add_argument("--debug", action = "store_true", default = False, help = "Turn on the debug mode by setting this option.") parser.add_argument("--debug", action = "store_true", default = False, help = "Turn on the debug mode by setting this option.")

3
plugins/CuraEngineBackend/StartSliceJob.py
View File

@ -440,8 +440,7 @@ class StartSliceJob(Job):
Job.yieldThread() Job.yieldThread()
# Ensure that the engine is aware what the build extruder is. # Ensure that the engine is aware what the build extruder is.
if stack.getProperty("machine_extruder_count", "value") > 1: changed_setting_keys.add("extruder_nr")
changed_setting_keys.add("extruder_nr")
# Get values for all changed settings # Get values for all changed settings
for key in changed_setting_keys: for key in changed_setting_keys:

1
resources/definitions/fdmprinter.def.json
View File

@ -230,6 +230,7 @@
"label": "Number of Extruders that are enabled", "label": "Number of Extruders that are enabled",
"description": "Number of extruder trains that are enabled; automatically set in software", "description": "Number of extruder trains that are enabled; automatically set in software",
"value": "machine_extruder_count", "value": "machine_extruder_count",
"default_value": 1,
"minimum_value": "1", "minimum_value": "1",
"maximum_value": "16", "maximum_value": "16",
"type": "int", "type": "int",