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

Add return values to some functions that cause some crashes

Browse source
This commit is contained in:
Diego Prado Gesto 2017-11-07 17:43:27 +01:00
parent 97fd926654
commit b7172ad9e3
1 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
plugins/LayerView/LayerViewProxy.py
View file

@ -23,64 +23,67 @@ class LayerViewProxy(QObject):
@pyqtProperty(bool, notify=activityChanged) @pyqtProperty(bool, notify=activityChanged)
def layerActivity(self): def layerActivity(self):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if isinstance(active_view, LayerView.LayerView.LayerView):
return active_view.getActivity() return active_view.getActivity()
return False
@pyqtProperty(int, notify=maxLayersChanged) @pyqtProperty(int, notify=maxLayersChanged)
def numLayers(self): def numLayers(self):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if isinstance(active_view, LayerView.LayerView.LayerView):
return active_view.getMaxLayers() return active_view.getMaxLayers()
return 0
@pyqtProperty(int, notify=currentLayerChanged) @pyqtProperty(int, notify=currentLayerChanged)
def currentLayer(self): def currentLayer(self):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if isinstance(active_view, LayerView.LayerView.LayerView):
return active_view.getCurrentLayer() return active_view.getCurrentLayer()
return 0
@pyqtProperty(int, notify=currentLayerChanged) @pyqtProperty(int, notify=currentLayerChanged)
def minimumLayer(self): def minimumLayer(self):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if isinstance(active_view, LayerView.LayerView.LayerView):
return active_view.getMinimumLayer() return active_view.getMinimumLayer()
return 0
@pyqtProperty(bool, notify=busyChanged) @pyqtProperty(bool, notify=busyChanged)
def busy(self): def busy(self):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if isinstance(active_view, LayerView.LayerView.LayerView):
return active_view.isBusy() return active_view.isBusy()
return False return False
@pyqtProperty(bool, notify=preferencesChanged) @pyqtProperty(bool, notify=preferencesChanged)
def compatibilityMode(self): def compatibilityMode(self):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if isinstance(active_view, LayerView.LayerView.LayerView):
return active_view.getCompatibilityMode() return active_view.getCompatibilityMode()
return False return False
@pyqtSlot(int) @pyqtSlot(int)
def setCurrentLayer(self, layer_num): def setCurrentLayer(self, layer_num):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if isinstance(active_view, LayerView.LayerView.LayerView):
active_view.setLayer(layer_num) active_view.setLayer(layer_num)
@pyqtSlot(int) @pyqtSlot(int)
def setMinimumLayer(self, layer_num): def setMinimumLayer(self, layer_num):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if isinstance(active_view, LayerView.LayerView.LayerView):
active_view.setMinimumLayer(layer_num) active_view.setMinimumLayer(layer_num)
@pyqtSlot(int) @pyqtSlot(int)
def setLayerViewType(self, layer_view_type): def setLayerViewType(self, layer_view_type):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if isinstance(active_view, LayerView.LayerView.LayerView):
active_view.setLayerViewType(layer_view_type) active_view.setLayerViewType(layer_view_type)
@pyqtSlot(result=int) @pyqtSlot(result=int)
def getLayerViewType(self): def getLayerViewType(self):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if isinstance(active_view, LayerView.LayerView.LayerView):
return active_view.getLayerViewType() return active_view.getLayerViewType()
return 0 return 0
@ -88,37 +91,37 @@ class LayerViewProxy(QObject):
@pyqtSlot(int, float) @pyqtSlot(int, float)
def setExtruderOpacity(self, extruder_nr, opacity): def setExtruderOpacity(self, extruder_nr, opacity):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if isinstance(active_view, LayerView.LayerView.LayerView):
active_view.setExtruderOpacity(extruder_nr, opacity) active_view.setExtruderOpacity(extruder_nr, opacity)
@pyqtSlot(int) @pyqtSlot(int)
def setShowTravelMoves(self, show): def setShowTravelMoves(self, show):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if isinstance(active_view, LayerView.LayerView.LayerView):
active_view.setShowTravelMoves(show) active_view.setShowTravelMoves(show)
@pyqtSlot(int) @pyqtSlot(int)
def setShowHelpers(self, show): def setShowHelpers(self, show):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if isinstance(active_view, LayerView.LayerView.LayerView):
active_view.setShowHelpers(show) active_view.setShowHelpers(show)
@pyqtSlot(int) @pyqtSlot(int)
def setShowSkin(self, show): def setShowSkin(self, show):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if isinstance(active_view, LayerView.LayerView.LayerView):
active_view.setShowSkin(show) active_view.setShowSkin(show)
@pyqtSlot(int) @pyqtSlot(int)
def setShowInfill(self, show): def setShowInfill(self, show):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if isinstance(active_view, LayerView.LayerView.LayerView):
active_view.setShowInfill(show) active_view.setShowInfill(show)
@pyqtProperty(int, notify=globalStackChanged) @pyqtProperty(int, notify=globalStackChanged)
def extruderCount(self): def extruderCount(self):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if isinstance(active_view, LayerView.LayerView.LayerView):
return active_view.getExtruderCount() return active_view.getExtruderCount()
return 0 return 0
@ -143,7 +146,7 @@ class LayerViewProxy(QObject):
def _onActiveViewChanged(self): def _onActiveViewChanged(self):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if isinstance(active_view, LayerView.LayerView.LayerView):
active_view.currentLayerNumChanged.connect(self._onLayerChanged) active_view.currentLayerNumChanged.connect(self._onLayerChanged)
active_view.maxLayersChanged.connect(self._onMaxLayersChanged) active_view.maxLayersChanged.connect(self._onMaxLayersChanged)
active_view.busyChanged.connect(self._onBusyChanged) active_view.busyChanged.connect(self._onBusyChanged)