3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Remove active machine preference from CuraApplication, it is now handled by MachineManager

Browse source
This commit is contained in:
Arjen Hiemstra 2015-08-27 09:34:22 +02:00
parent 5ee587a745
commit 5637c9ad94
1 changed files with 1 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cura/CuraApplication.py
View file

@ -171,19 +171,9 @@ class CuraApplication(QtApplication):
self.initializeEngine() self.initializeEngine()
manager = self.getMachineManager() manager = self.getMachineManager()
if manager.getMachineInstances(): if not self.getMachineManager().getMachineInstances():
active_machine_pref = Preferences.getInstance().getValue("cura/active_machine")
if active_machine_pref:
index = manager.findMachineInstance(active_machine_pref)
if index != -1:
manager.setActiveMachineInstance(manager.getMachineInstance(index))
if not manager.getActiveMachineInstance():
manager.setActiveMachineInstance(manager.getMachineInstance(index))
else:
self.requestAddPrinter.emit() self.requestAddPrinter.emit()
manager.setActiveProfile(manager.getProfiles()[0])
if self._engine.rootObjects: if self._engine.rootObjects:
self.closeSplash() self.closeSplash()
@ -471,7 +461,6 @@ class CuraApplication(QtApplication):
def _onActiveMachineChanged(self): def _onActiveMachineChanged(self):
machine = self.getMachineManager().getActiveMachineInstance() machine = self.getMachineManager().getActiveMachineInstance()
if machine: if machine:
Preferences.getInstance().setValue("cura/active_machine", machine.getName())
self._volume.setWidth(machine.getSettingValueByKey("machine_width")) self._volume.setWidth(machine.getSettingValueByKey("machine_width"))
self._volume.setHeight(machine.getSettingValueByKey("machine_height")) self._volume.setHeight(machine.getSettingValueByKey("machine_height"))