Add support angle setting.

[cura.git] / Cura / gui / sceneView.py

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index 63c331f00185171098fe8bdeb8649121839cc885..ebf28566e3d8c15d0a354e6b544b475effdfc9cd 100644 (file)
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -292,7 +292,6 @@ class SceneView(openglGui.glGuiPanel):
                self._usbPrintMonitor.loadFile(self._gcodeFilename, self._slicer.getID())
                if self._gcodeFilename == self._slicer.getGCodeFilename():
                        self._slicer.submitSliceInfoOnline()
-               self.viewSelection.setValue(4)
 
        def showSaveGCode(self):
                if len(self._scene._objectList) < 1:
@@ -681,7 +680,7 @@ class SceneView(openglGui.glGuiPanel):
                        if self._selectedObj is not None:
                                self._deleteObject(self._selectedObj)
                                self.QueueRefresh()
-               if self.viewMode == 'gcode':
+               if self.viewMode == 'gcode' and (wx.GetKeyState(wx.WXK_SHIFT) or wx.GetKeyState(wx.WXK_CONTROL)):
                        if keyCode == wx.WXK_UP:
                                self.layerSelect.setValue(self.layerSelect.getValue() + 1)
                                self.QueueRefresh()
@@ -1136,7 +1135,7 @@ void main(void)
 
                        if self.viewMode == 'overhang':
                                self._objectOverhangShader.bind()
-                               self._objectOverhangShader.setUniform('cosAngle', math.cos(math.radians(90 - 60)))
+                               self._objectOverhangShader.setUniform('cosAngle', math.cos(math.radians(90 - profile.getProfileSettingFloat('support_angle'))))
                        else:
                                self._objectShader.bind()
                        for obj in self._scene.objects():
@@ -1428,12 +1427,17 @@ void main(void)
 
                polys = profile.getMachineSizePolygons()
                height = profile.getMachineSettingFloat('machine_height')
+               circular = profile.getMachineSetting('machine_shape') == 'Circular'
                glBegin(GL_QUADS)
                for n in xrange(0, len(polys[0])):
-                       if n % 2 == 0:
-                               glColor4ub(5, 171, 231, 96)
+                       if not circular:
+                               if n % 2 == 0:
+                                       glColor4ub(5, 171, 231, 96)
+                               else:
+                                       glColor4ub(5, 171, 231, 64)
                        else:
-                               glColor4ub(5, 171, 231, 64)
+                               glColor4ub(5, 171, 231, 96)
+
                        glVertex3f(polys[0][n][0], polys[0][n][1], height)
                        glVertex3f(polys[0][n][0], polys[0][n][1], 0)
                        glVertex3f(polys[0][n-1][0], polys[0][n-1][1], 0)