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

Move material translations to separate dictionary

Browse source 
This prevents a mix-up of how material names should be translated for quality profiles and how material names should be translated for material profiles.

Contributes to issue CURA-844.
This commit is contained in:
Ghostkeeper 2016-08-24 11:39:59 +02:00
parent b836311d67
commit 368a836ff2
No known key found for this signature in database
GPG key ID: 701948C5954A7385
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py
View file

@ -74,11 +74,12 @@ class MachineInstance:
import VersionUpgrade21to22 # Import here to prevent circular dependencies. import VersionUpgrade21to22 # Import here to prevent circular dependencies.
has_machine_qualities = self._type_name in VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.machinesWithMachineQuality() has_machine_qualities = self._type_name in VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.machinesWithMachineQuality()
type_name = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translatePrinter(self._type_name) type_name = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translatePrinter(self._type_name)
active_material = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateProfile(self._active_material_name) active_material = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateMaterial(self._active_material_name)
variant = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateVariant(self._variant_name, type_name) variant = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateVariant(self._variant_name, type_name)
variant_materials = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateVariantForMaterials(self._variant_name, type_name) variant_materials = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateVariantForMaterials(self._variant_name, type_name)
active_profile = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateProfile(self._active_profile_name) active_profile = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateProfile(self._active_profile_name)
if has_machine_qualities: #This machine now has machine-quality profiles. if has_machine_qualities: #This machine now has machine-quality profiles.
if active_material == "pla"
active_profile += "_" + active_material + "_" + variant active_profile += "_" + active_material + "_" + variant
active_material += "_" + variant_materials #That means that the profile was split into multiple. active_material += "_" + variant_materials #That means that the profile was split into multiple.
current_settings = "empty" #The profile didn't know the definition ID when it was upgraded, so it will have been invalid. Sorry, your current settings are lost now. current_settings = "empty" #The profile didn't know the definition ID when it was upgraded, so it will have been invalid. Sorry, your current settings are lost now.

18
plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py
View file

@ -32,13 +32,8 @@ _machines_with_machine_quality = {
} }
} }
## How to translate printer names from the old version to the new. ## How to translate material names from the old version to the new.
_printer_translations = { _material_translations = {
"ultimaker2plus": "ultimaker2_plus"
}
## How to translate profile names from the old version to the new.
_profile_translations = {
"PLA": "generic_pla", "PLA": "generic_pla",
"ABS": "generic_abs", "ABS": "generic_abs",
"CPE": "generic_cpe", "CPE": "generic_cpe",
@ -46,6 +41,15 @@ _profile_translations = {
"Nylon": "generic_nylon", "Nylon": "generic_nylon",
"PC": "generic_pc", "PC": "generic_pc",
"TPU": "generic_tpu", "TPU": "generic_tpu",
}
## How to translate printer names from the old version to the new.
_printer_translations = {
"ultimaker2plus": "ultimaker2_plus"
}
## How to translate profile names from the old version to the new.
_profile_translations = {
"Low Quality": "low", "Low Quality": "low",
"Normal Quality": "normal", "Normal Quality": "normal",
"High Quality": "high", "High Quality": "high",