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

Fixes namechanges caused by api change

Browse source
This commit is contained in:
Jaime van Kessel 2015-09-02 13:50:04 +02:00
parent 0daf2301a7
commit a9208ccf3f
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/CuraApplication.py
View file

@ -400,7 +400,7 @@ class CuraApplication(QtApplication):
def getSettingValue(self, key): def getSettingValue(self, key):
if not self.getMachineManager().getActiveProfile(): if not self.getMachineManager().getActiveProfile():
return None return None
return self.getMachineManager().getActiveProfile().getSettingValueByKey(key) return self.getMachineManager().getActiveProfile().getSettingValue(key)
#return self.getActiveMachine().getSettingValueByKey(key) #return self.getActiveMachine().getSettingValueByKey(key)
## Change setting by key value pair ## Change setting by key value pair
@ -409,7 +409,7 @@ class CuraApplication(QtApplication):
if not self.getMachineManager().getActiveProfile(): if not self.getMachineManager().getActiveProfile():
return return
self.getMachineManager().getActiveProfile().getSettingValueByKey(key, value) self.getMachineManager().getActiveProfile().setSettingValue(key, value)
@pyqtSlot() @pyqtSlot()
def mergeSelected(self): def mergeSelected(self):

2
resources/qml/Sidebar.qml
View file

@ -133,7 +133,7 @@ Rectangle
if(model.getItem(i).name == UM.MachineManager.activeProfile) if(model.getItem(i).name == UM.MachineManager.activeProfile)
return i; return i;
} }
UM.MachineManager.setActiveProfile(model.getItem(0).name)
return 0; return 0;
} }
} }