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

Renames to from activeStack to global stack

Browse source 
CURA-1278
This commit is contained in:
Jaime van Kessel 2016-05-10 11:16:35 +02:00
parent dbd2c911ce
commit 04f1e8d27c
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/BuildVolume.py
View file

@ -37,10 +37,8 @@ class BuildVolume(SceneNode):
self.setCalculateBoundingBox(False) self.setCalculateBoundingBox(False)
self._active_profile = None Application.getInstance().globalContainerStackChanged.connect(self._onGlobalContainerStackChanged)
self._active_instance = None self._onGlobalContainerStackChanged()
Application.getInstance().activeContainerStackChanged.connect(self._onActiveContainerStackChanged)
self._onActiveContainerStackChanged()
def setWidth(self, width): def setWidth(self, width):
if width: self._width = width if width: self._width = width
@ -159,7 +157,7 @@ class BuildVolume(SceneNode):
Application.getInstance().getController().getScene()._maximum_bounds = scale_to_max_bounds Application.getInstance().getController().getScene()._maximum_bounds = scale_to_max_bounds
def _onActiveContainerStackChanged(self): def _onGlobalContainerStackChanged(self):
self._active_container_stack = Application.getInstance().getGlobalContainerStack() self._active_container_stack = Application.getInstance().getGlobalContainerStack()
if self._active_container_stack: if self._active_container_stack:

7
cura/CuraApplication.py
View file

@ -101,7 +101,7 @@ class CuraApplication(QtApplication):
self._camera_animation = None self._camera_animation = None
self._cura_actions = None self._cura_actions = None
#self.getMachineManager().activeMachineInstanceChanged.connect(self._onActiveMachineChanged) #self.getMachineManager().activeMachineInstanceChanged.connect(self._onGlobalContainerStackChanged)
#self.getMachineManager().addMachineRequested.connect(self._onAddMachineRequested) #self.getMachineManager().addMachineRequested.connect(self._onAddMachineRequested)
self.getController().getScene().sceneChanged.connect(self.updatePlatformActivity) self.getController().getScene().sceneChanged.connect(self.updatePlatformActivity)
self.getController().toolOperationStopped.connect(self._onToolOperationStopped) self.getController().toolOperationStopped.connect(self._onToolOperationStopped)
@ -508,10 +508,9 @@ class CuraApplication(QtApplication):
@pyqtSlot(str, result = "QVariant") @pyqtSlot(str, result = "QVariant")
def getSettingValue(self, key): def getSettingValue(self, key):
if not self.getMachineManager().getWorkingProfile(): if not self._global_container_stack:
return None return None
return self.getMachineManager().getWorkingProfile().getSettingValue(key) return self._global_container_stack.getValue(key)
#return self.getActiveMachine().getSettingValueByKey(key)
## Change setting by key value pair ## Change setting by key value pair
@pyqtSlot(str, "QVariant") @pyqtSlot(str, "QVariant")