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

Fix call to VersionUpgrade21to22.machinesWithMachineQuality

Browse source 
It needs that stupidly long path if we're using imports inside a plug-in.

Contributes to issue CURA-844.
This commit is contained in:
Ghostkeeper 2016-08-09 13:40:22 +02:00
parent 1428f67798
commit 9a555fcab0
No known key found for this signature in database
GPG key ID: 701948C5954A7385
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -74,8 +74,10 @@ class MachineInstance:
import VersionUpgrade21to22 # Import here to prevent circular dependencies. import VersionUpgrade21to22 # Import here to prevent circular dependencies.
type_name = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translatePrinter(self._type_name) type_name = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translatePrinter(self._type_name)
active_profile = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateProfile(self._active_profile_name)
active_material = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateProfile(self._active_material_name) active_material = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateProfile(self._active_material_name)
active_profile = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateProfile(self._active_profile_name)
if self._type_name in VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.machinesWithMachineQuality(): #This machine now has machine-quality profiles.
active_profile += "_" + active_material #That means that the profile was split into multiple.
variant = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateVariant(self._variant_name, type_name) variant = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateVariant(self._variant_name, type_name)
containers = [ containers = [

2
plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py
View file

@ -142,7 +142,7 @@ class Profile:
config.set("metadata", "material", self._material_name) config.set("metadata", "material", self._material_name)
filenames.append(self._filename) filenames.append(self._filename)
configs.append(config) configs.append(config)
elif self._type != "material" and self._machine_type_id in VersionUpgrade21to22.machinesWithMachineQuality(): elif self._type != "material" and self._machine_type_id in VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.machinesWithMachineQuality():
#Split this profile into multiple profiles, one for each material. #Split this profile into multiple profiles, one for each material.
for material_id in _new_materials: for material_id in _new_materials:
filenames.append("{profile}_{material}".format(profile = self._filename, material = material_id)) filenames.append("{profile}_{material}".format(profile = self._filename, material = material_id))

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

@ -92,7 +92,7 @@ class VersionUpgrade21to22(VersionUpgrade):
# #
# \return A set of machine identifiers. # \return A set of machine identifiers.
@staticmethod @staticmethod
def machinesWithMachineQuality(self): def machinesWithMachineQuality():
return _machines_with_machine_quality return _machines_with_machine_quality
## Converts machine instances from format version 1 to version 2. ## Converts machine instances from format version 1 to version 2.