GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 17:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.3'

Browse Source
This commit is contained in:
Lipu Fei 2018-03-27 14:33:41 +02:00
commit c6579b571a
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cura/Settings/CuraContainerRegistry.py
View File

@ -516,7 +516,7 @@ class CuraContainerRegistry(ContainerRegistry):
user_container.addMetaDataEntry("machine", machine.getId()) user_container.addMetaDataEntry("machine", machine.getId())
user_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion) user_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion)
user_container.setDefinition(machine.definition.getId()) user_container.setDefinition(machine.definition.getId())
user_container.setMetaDataEntry("extruder", extruder_stack.getId()) user_container.setMetaDataEntry("position", extruder_stack.getMetaDataEntry("position"))
if machine.userChanges: if machine.userChanges:
# for the newly created extruder stack, we need to move all "per-extruder" settings to the user changes # for the newly created extruder stack, we need to move all "per-extruder" settings to the user changes
@ -579,7 +579,7 @@ class CuraContainerRegistry(ContainerRegistry):
extruder_quality_changes_container = self._findQualityChangesContainerInCuraFolder(machine_quality_changes.getName()) extruder_quality_changes_container = self._findQualityChangesContainerInCuraFolder(machine_quality_changes.getName())
if extruder_quality_changes_container: if extruder_quality_changes_container:
quality_changes_id = extruder_quality_changes_container.getId() quality_changes_id = extruder_quality_changes_container.getId()
extruder_quality_changes_container.addMetaDataEntry("extruder", extruder_stack.definition.getId()) extruder_quality_changes_container.addMetaDataEntry("position", extruder_definition.getMetaDataEntry("position"))
extruder_stack.qualityChanges = self.findInstanceContainers(id = quality_changes_id)[0] extruder_stack.qualityChanges = self.findInstanceContainers(id = quality_changes_id)[0]
else: else:
# if we still cannot find a quality changes container for the extruder, create a new one # if we still cannot find a quality changes container for the extruder, create a new one
@ -589,7 +589,7 @@ class CuraContainerRegistry(ContainerRegistry):
extruder_quality_changes_container.setName(container_name) extruder_quality_changes_container.setName(container_name)
extruder_quality_changes_container.addMetaDataEntry("type", "quality_changes") extruder_quality_changes_container.addMetaDataEntry("type", "quality_changes")
extruder_quality_changes_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion) extruder_quality_changes_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion)
extruder_quality_changes_container.addMetaDataEntry("extruder", extruder_stack.definition.getId()) extruder_quality_changes_container.addMetaDataEntry("position", extruder_definition.getMetaDataEntry("position"))
extruder_quality_changes_container.addMetaDataEntry("quality_type", machine_quality_changes.getMetaDataEntry("quality_type")) extruder_quality_changes_container.addMetaDataEntry("quality_type", machine_quality_changes.getMetaDataEntry("quality_type"))
extruder_quality_changes_container.setDefinition(machine_quality_changes.getDefinition().getId()) extruder_quality_changes_container.setDefinition(machine_quality_changes.getDefinition().getId())
@ -649,8 +649,8 @@ class CuraContainerRegistry(ContainerRegistry):
for qc_name, qc_list in qc_groups.items(): for qc_name, qc_list in qc_groups.items():
qc_dict = {"global": None, "extruders": []} qc_dict = {"global": None, "extruders": []}
for qc in qc_list: for qc in qc_list:
extruder_def_id = qc.getMetaDataEntry("extruder") extruder_position = qc.getMetaDataEntry("position")
if extruder_def_id is not None: if extruder_position is not None:
qc_dict["extruders"].append(qc) qc_dict["extruders"].append(qc)
else: else:
qc_dict["global"] = qc qc_dict["global"] = qc

2
cura/Settings/MachineManager.py
View File

@ -1316,6 +1316,8 @@ class MachineManager(QObject):
return name return name
def _updateUponMaterialMetadataChange(self): def _updateUponMaterialMetadataChange(self):
if self._global_container_stack is None:
return
with postponeSignals(*self._getContainerChangedSignals(), compress = CompressTechnique.CompressPerParameterValue): with postponeSignals(*self._getContainerChangedSignals(), compress = CompressTechnique.CompressPerParameterValue):
self._updateMaterialWithVariant(None) self._updateMaterialWithVariant(None)
self._updateQualityWithMaterial() self._updateQualityWithMaterial()

8
plugins/ChangeLogPlugin/ChangeLog.txt
View File

@ -18,7 +18,7 @@ This new feature allows you to easily add small cubic areas which prevent suppor
A convenient way to select a preset of settings to be visible. These presets guide you to find the most important Cura settings in an incremental way. A small menu is located next to the ‘search bar’ to easily access these new setting visibility presets. A convenient way to select a preset of settings to be visible. These presets guide you to find the most important Cura settings in an incremental way. A small menu is located next to the ‘search bar’ to easily access these new setting visibility presets.
*Model assistant *Model assistant
This feature provides useful information to the user based on their model. For now, it informs the user when printing models with a footprint larger than 15x15x15cm, printed with ABS, PC, PP or CPE+, that they may want to make changes to the model such as filleting sharp edges. This feature provides useful information to the user based on their model. For now, it informs the user when printing models with a footprint larger than 15x15x10cm, printed with ABS, PC, PP or CPE+, that they may want to make changes to the model such as filleting sharp edges.
*Circular prime tower *Circular prime tower
The prime tower shape has changed from rectangular to circular. This shape should increase the adhesion to the build plate, overall strength, and prevent delamination of the layers. The prime tower shape has changed from rectangular to circular. This shape should increase the adhesion to the build plate, overall strength, and prevent delamination of the layers.
@ -60,6 +60,12 @@ Also Alexander Roessler made a new NGC writer plugin so you can export files in
*Pre-heat extruders - fieldOfView *Pre-heat extruders - fieldOfView
This new feature allows to preheat the extruders in the printer monitor. This new feature allows to preheat the extruders in the printer monitor.
*Persistent post-processing scripts
Scripts are no longer erased after restarting Ultimaker Cura.
*GZ Reader
By default, G-code for Ultimaker 3 machines is now saved as gzipped G-Code.
*Print preview image *Print preview image
Adds a preview image of the gcode to the slice information. This can be shown in Cura Connect. Adds a preview image of the gcode to the slice information. This can be shown in Cura Connect.