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

Merge branch '4.7'

Browse source
This commit is contained in:
Ghostkeeper 2020-08-10 11:26:25 +02:00
commit 1f09ea58cc
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
63 changed files with 197 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

27
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -762,21 +762,22 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
Job.yieldThread()
QCoreApplication.processEvents() # Ensure that the GUI does not freeze.
# Handle quality changes if any
self._processQualityChanges(global_stack)
if global_stack:
# Handle quality changes if any
self._processQualityChanges(global_stack)
# Prepare the machine
self._applyChangesToMachine(global_stack, extruder_stack_dict)
# Prepare the machine
self._applyChangesToMachine(global_stack, extruder_stack_dict)
Logger.log("d", "Workspace loading is notifying rest of the code of changes...")
# Actually change the active machine.
#
# This is scheduled for later is because it depends on the Variant/Material/Qualitiy Managers to have the latest
# data, but those managers will only update upon a container/container metadata changed signal. Because this
# function is running on the main thread (Qt thread), although those "changed" signals have been emitted, but
# they won't take effect until this function is done.
# To solve this, we schedule _updateActiveMachine() for later so it will have the latest data.
self._updateActiveMachine(global_stack)
Logger.log("d", "Workspace loading is notifying rest of the code of changes...")
# Actually change the active machine.
#
# This is scheduled for later is because it depends on the Variant/Material/Qualitiy Managers to have the latest
# data, but those managers will only update upon a container/container metadata changed signal. Because this
# function is running on the main thread (Qt thread), although those "changed" signals have been emitted, but
# they won't take effect until this function is done.
# To solve this, we schedule _updateActiveMachine() for later so it will have the latest data.
self._updateActiveMachine(global_stack)
# Load all the nodes / mesh data of the workspace
nodes = self._3mf_mesh_reader.read(file_name)

2
plugins/3MFReader/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides support for reading 3MF files.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/3MFWriter/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides support for writing 3MF files.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/AMFReader/plugin.json
View file

@ -3,5 +3,5 @@
"author": "fieldOfView",
"version": "1.0.0",
"description": "Provides support for reading AMF files.",
"api": "7.2.0"
"api": "7.3.0"
}

2
plugins/CuraDrive/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"description": "Backup and restore your configuration.",
"version": "1.2.0",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/CuraEngineBackend/plugin.json
View file

@ -2,7 +2,7 @@
"name": "CuraEngine Backend",
"author": "Ultimaker B.V.",
"description": "Provides the link to the CuraEngine slicing backend.",
"api": "7.2.0",
"api": "7.3.0",
"version": "1.0.1",
"i18n-catalog": "cura"
}

2
plugins/CuraProfileReader/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides support for importing Cura profiles.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/CuraProfileWriter/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides support for exporting Cura profiles.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog":"cura"
}

2
plugins/FirmwareUpdateChecker/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Checks for firmware updates.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/FirmwareUpdater/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides a machine actions for updating firmware.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/GCodeGzReader/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Reads g-code from a compressed archive.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/GCodeGzWriter/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Writes g-code to a compressed archive.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/GCodeProfileReader/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides support for importing profiles from g-code files.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/GCodeReader/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Victor Larchenko, Ultimaker B.V.",
"version": "1.0.1",
"description": "Allows loading and displaying G-code files.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/GCodeWriter/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Writes g-code to a file.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/ImageReader/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Enables ability to generate printable geometry from 2D image files.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/LegacyProfileReader/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides support for importing profiles from legacy Cura versions.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/MachineSettingsAction/plugin.json
View file

@ -3,6 +3,6 @@
"author": "fieldOfView, Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides a way to change machine settings (such as build volume, nozzle size, etc.).",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/ModelChecker/plugin.json
View file

@ -2,7 +2,7 @@
"name": "Model Checker",
"author": "Ultimaker B.V.",
"version": "1.0.1",
"api": "7.2.0",
"api": "7.3.0",
"description": "Checks models and print configuration for possible printing issues and give suggestions.",
"i18n-catalog": "cura"
}

2
plugins/MonitorStage/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides a monitor stage in Cura.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/PerObjectSettingsTool/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides the Per Model Settings.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/PostProcessingPlugin/plugin.json
View file

@ -2,7 +2,7 @@
"name": "Post Processing",
"author": "Ultimaker",
"version": "2.2.1",
"api": "7.2.0",
"api": "7.3.0",
"description": "Extension that allows for user created scripts for post processing",
"catalog": "cura"
}

2
plugins/PrepareStage/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides a prepare stage in Cura.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/PreviewStage/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides a preview stage in Cura.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/RemovableDriveOutputDevice/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"description": "Provides removable drive hotplugging and writing support.",
"version": "1.0.1",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/SentryLogger/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.0",
"description": "Logs certain events so that they can be used by the crash reporter",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/SimulationView/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides the Simulation view.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/SliceInfoPlugin/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Submits anonymous slice info. Can be disabled through preferences.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/SolidView/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides a normal solid mesh view.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/SupportEraser/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Creates an eraser mesh to block the printing of support in certain places",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/Toolbox/plugin.json
View file

@ -2,6 +2,6 @@
"name": "Toolbox",
"author": "Ultimaker B.V.",
"version": "1.0.1",
"api": "7.2.0",
"api": "7.3.0",
"description": "Find, manage and install new Cura packages."
}

2
plugins/TrimeshReader/plugin.json
View file

@ -3,5 +3,5 @@
"author": "Ultimaker B.V.",
"version": "1.0.0",
"description": "Provides support for reading model files.",
"api": "7.2.0"
"api": "7.3.0"
}

2
plugins/UFPReader/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.0",
"description": "Provides support for reading Ultimaker Format Packages.",
"supported_sdk_versions": ["7.2.0"],
"supported_sdk_versions": ["7.3.0"],
"i18n-catalog": "cura"
}

2
plugins/UFPWriter/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides support for writing Ultimaker Format Packages.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/UM3NetworkPrinting/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"description": "Manages network connections to Ultimaker networked printers.",
"version": "2.0.0",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/USBPrinting/plugin.json
View file

@ -2,7 +2,7 @@
"name": "USB printing",
"author": "Ultimaker B.V.",
"version": "1.0.2",
"api": "7.2.0",
"api": "7.3.0",
"description": "Accepts G-Code and sends them to a printer. Plugin can also update firmware.",
"i18n-catalog": "cura"
}

2
plugins/UltimakerMachineActions/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.).",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade21to22/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Upgrades configurations from Cura 2.1 to Cura 2.2.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade22to24/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Upgrades configurations from Cura 2.2 to Cura 2.4.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade25to26/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Upgrades configurations from Cura 2.5 to Cura 2.6.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade26to27/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Upgrades configurations from Cura 2.6 to Cura 2.7.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade27to30/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Upgrades configurations from Cura 2.7 to Cura 3.0.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade30to31/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Upgrades configurations from Cura 3.0 to Cura 3.1.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade32to33/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Upgrades configurations from Cura 3.2 to Cura 3.3.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade33to34/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Upgrades configurations from Cura 3.3 to Cura 3.4.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade34to35/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Upgrades configurations from Cura 3.4 to Cura 3.5.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade35to40/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.0",
"description": "Upgrades configurations from Cura 3.5 to Cura 4.0.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade40to41/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Upgrades configurations from Cura 4.0 to Cura 4.1.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.0",
"description": "Upgrades configurations from Cura 4.1 to Cura 4.2.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade42to43/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.0",
"description": "Upgrades configurations from Cura 4.2 to Cura 4.3.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.0",
"description": "Upgrades configurations from Cura 4.3 to Cura 4.4.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade44to45/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.0",
"description": "Upgrades configurations from Cura 4.4 to Cura 4.5.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade45to46/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.0",
"description": "Upgrades configurations from Cura 4.5 to Cura 4.6.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade460to462/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.0",
"description": "Upgrades configurations from Cura 4.6.0 to Cura 4.6.2.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/VersionUpgrade/VersionUpgrade462to47/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.0",
"description": "Upgrades configurations from Cura 4.6.2 to Cura 4.7.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/X3DReader/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Seva Alekseyev, Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides support for reading X3D files.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/XRayView/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides the X-Ray view.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}

2
plugins/XmlMaterialProfile/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides capabilities to read and write XML-based material profiles.",
"api": "7.2.0",
"api": "7.3.0",
"i18n-catalog": "cura"
}