Slight update on the button layout, and possible help for issue #269

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index 31963a3c68b6dccc2d8e2f91134f292ae700c4e7..69ab9bebe30b00e424b49a60db55ca1a49884d7e 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -105,23 +105,23 @@ class previewPanel(wx.Panel):
                self.checkReloadFileTimer.Start(1000)
 
                group = []
-               self.rotateToolButton = openglGui.glRadioButton(self.glCanvas, 1, 'Rotate', (0,1), group, self.OnToolSelect)
-               self.scaleToolButton  = openglGui.glRadioButton(self.glCanvas, 2, 'Scale', (0,2), group, self.OnToolSelect)
-               self.mirrorToolButton  = openglGui.glRadioButton(self.glCanvas, 12, 'Mirror', (0,3), group, self.OnToolSelect)
+               self.rotateToolButton = openglGui.glRadioButton(self.glCanvas, 1, 'Rotate', (0,-1), group, self.OnToolSelect)
+               self.scaleToolButton  = openglGui.glRadioButton(self.glCanvas, 2, 'Scale', (1,-1), group, self.OnToolSelect)
+               self.mirrorToolButton  = openglGui.glRadioButton(self.glCanvas, 12, 'Mirror', (2,-1), group, self.OnToolSelect)
 
-               self.resetRotationButton = openglGui.glButton(self.glCanvas, 4, 'Reset rotation', (1,1), self.OnRotateReset)
-               self.layFlatButton       = openglGui.glButton(self.glCanvas, 5, 'Lay flat', (1,2), self.OnLayFlat)
+               self.resetRotationButton = openglGui.glButton(self.glCanvas, 4, 'Reset rotation', (0,-2), self.OnRotateReset)
+               self.layFlatButton       = openglGui.glButton(self.glCanvas, 5, 'Lay flat', (0,-3), self.OnLayFlat)
 
-               self.resetScaleButton    = openglGui.glButton(self.glCanvas, 8, 'Scale reset', (1,1), self.OnScaleReset)
-               self.scaleMaxButton      = openglGui.glButton(self.glCanvas, 9, 'Scale to machine size', (1,2), self.OnScaleMax)
+               self.resetScaleButton    = openglGui.glButton(self.glCanvas, 8, 'Scale reset', (1,-2), self.OnScaleReset)
+               self.scaleMaxButton      = openglGui.glButton(self.glCanvas, 9, 'Scale to machine size', (1,-3), self.OnScaleMax)
 
-               self.mirrorXButton       = openglGui.glButton(self.glCanvas, 12, 'Mirror X', (1,1), lambda : self.OnMirror(0))
-               self.mirrorYButton       = openglGui.glButton(self.glCanvas, 13, 'Mirror Y', (1,2), lambda : self.OnMirror(1))
-               self.mirrorZButton       = openglGui.glButton(self.glCanvas, 14, 'Mirror Z', (1,3), lambda : self.OnMirror(2))
+               self.mirrorXButton       = openglGui.glButton(self.glCanvas, 12, 'Mirror X', (2,-2), lambda : self.OnMirror(0))
+               self.mirrorYButton       = openglGui.glButton(self.glCanvas, 13, 'Mirror Y', (2,-3), lambda : self.OnMirror(1))
+               self.mirrorZButton       = openglGui.glButton(self.glCanvas, 14, 'Mirror Z', (2,-4), lambda : self.OnMirror(2))
 
                self.openFileButton      = openglGui.glButton(self.glCanvas, 3, 'Load model', (0,0), lambda : self.GetParent().GetParent().GetParent()._showModelLoadDialog(1))
-               self.sliceButton         = openglGui.glButton(self.glCanvas, 6, 'Prepare model', (0,-2), lambda : self.GetParent().GetParent().GetParent().OnSlice(None))
-               self.printButton         = openglGui.glButton(self.glCanvas, 7, 'Print model', (0,-1), lambda : self.GetParent().GetParent().GetParent().OnPrint(None))
+               self.sliceButton         = openglGui.glButton(self.glCanvas, 6, 'Prepare model', (1,0), lambda : self.GetParent().GetParent().GetParent().OnSlice(None))
+               self.printButton         = openglGui.glButton(self.glCanvas, 7, 'Print model', (2,0), lambda : self.GetParent().GetParent().GetParent().OnPrint(None))
 
                extruderCount = int(profile.getPreference('extruder_amount'))
                if extruderCount > 1:
@@ -131,7 +131,7 @@ class previewPanel(wx.Panel):
                if extruderCount > 3:
                        openglGui.glButton(self.glCanvas, 3, 'Load quad model', (3,0), lambda : self.GetParent().GetParent().GetParent()._showModelLoadDialog(4))
 
-               self.scaleForm = openglGui.glFrame(self.glCanvas, (1, 3))
+               self.scaleForm = openglGui.glFrame(self.glCanvas, (2, -3))
                openglGui.glGuiLayoutGrid(self.scaleForm)
                openglGui.glLabel(self.scaleForm, 'Scale X', (0,0))
                self.scaleXctrl = openglGui.glNumberCtrl(self.scaleForm, '1.0', (1,0), lambda value: self.OnScaleEntry(value, 0))

diff --git a/Cura/gui/util/openglGui.py b/Cura/gui/util/openglGui.py
index c5c965ef20de7e2d59a07a0e7a93be0ac1924c67..dd7cf2464ac543d7b53cb1904551d3eefcca2da6 100644 (file)
--- a/Cura/gui/util/openglGui.py
+++ b/Cura/gui/util/openglGui.py
@@ -440,7 +440,6 @@ class glComboButton(glButton):
                                return True
                return super(glComboButton, self).OnMouseDown(x, y)
 
-
 class glFrame(glGuiContainer):
        def __init__(self, parent, pos):
                super(glFrame, self).__init__(parent, pos)

diff --git a/Cura/util/machineCom.py b/Cura/util/machineCom.py
index a0754a251f85617edb85752225d162eddfe4d069..949d12e8f7e293be4962f84b028859fd82969785 100644 (file)
--- a/Cura/util/machineCom.py
+++ b/Cura/util/machineCom.py
@@ -303,7 +303,10 @@ class MachineCom(object):
                        self._changeState(self.STATE_CONNECTING)
 
                #Start monitoring the serial port.
-               timeout = time.time() + 5
+               if self._state == self.STATE_CONNECTING:
+                       timeout = time.time() + 15
+               else:
+                       timeout = time.time() + 5
                tempRequestTimeout = timeout
                while True:
                        line = self._readline()