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

Fix circular import problem caused by moving SettingVersion into CuraApplication

Browse source 
CURA-3756
This commit is contained in:
Lipu Fei 2017-05-16 14:54:57 +02:00
parent 50bda1c9dd
commit 121ebd79cf
4 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cura/Settings/CuraStackBuilder.py
View file

@ -11,7 +11,6 @@ from .GlobalStack import GlobalStack
from .ExtruderStack import ExtruderStack
from typing import Optional
import cura.CuraApplication
## Contains helper functions to create new machines.
class CuraStackBuilder:
@ -76,7 +75,8 @@ class CuraStackBuilder:
user_container = InstanceContainer(new_stack_id + "_user")
user_container.addMetaDataEntry("type", "user")
user_container.addMetaDataEntry("extruder", new_stack_id)
user_container.addMetaDataEntry("setting_version", cura.CuraApplication.CuraApplication.SettingVersion)
from cura.CuraApplication import CuraApplication
user_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion)
user_container.setDefinition(machine_definition)
stack.setUserChanges(user_container)
@ -125,7 +125,8 @@ class CuraStackBuilder:
user_container = InstanceContainer(new_stack_id + "_user")
user_container.addMetaDataEntry("type", "user")
user_container.addMetaDataEntry("machine", new_stack_id)
user_container.addMetaDataEntry("setting_version", cura.CuraApplication.CuraApplication.SettingVersion)
from cura.CuraApplication import CuraApplication
user_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion)
user_container.setDefinition(definition)
stack.setUserChanges(user_container)