Updated qtkit installation. Minor fix

Author: Jesus89

doc/development/darwin.md

@@ -12,25 +12,26 @@ If you are a developer and you want to modify the code, contribute, build packag
 #### Install FTDI driver
 * [FTDI USB Driver](http://www.ftdichip.com/Drivers/VCP/MacOSX/FTDIUSBSerialDriver_v2_3.dmg)
 
+#### Atom IDE
+Download open source [Atom code editor](https://atom.io/).
+
 #### Install Homebrew
 ```bash
 ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 ```
 
-#### Atom IDE
-Download open source [Atom code editor](https://atom.io/).
-
 #### Git version control
 ```bash
 brew install git
 ```
 
 #### Python
-Install non-system, framework-based, universal [Python](http://www.python.org/ftp/python/2.7.6/python-2.7.6-macosx10.6.dmg). Not with brew.
+Install non-system, framework-based, universal [Python](https://www.python.org/ftp/python/2.7.10/python-2.7.10-macosx10.6.pkg). Not with brew.
 
 #### Python tools
 ```bash
-pip install -U pip setuptools virtualenv
+pip install -U pip setuptools
+pip install -U virtualenv
 ```
 
 ### Dependencies
@@ -74,13 +75,34 @@ ln -s /usr/local/Cellar/wxpython/3.0.2.0/lib/python2.7/site-packages/wx* $HOME/v
 
 #### Python modules
 ```bash
-pip install -U pyserial pyopengl pyopengl-accelerate numpy scipy matplotlib==1.4.0 pyobjc-framework-qtkit
+pip install -U pyserial pyopengl pyopengl-accelerate numpy scipy matplotlib==1.4.0
 ```
 
-NOTE: if 'xcodebuild' fails, try:
+##### Pyobjc QTKit
+
+* Install Xcode.app. Then, switch xcode commands and accept the xcodebuild license
 
 ```bash
 sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
+sudo xcodebuild
+```
+
+* Downgrade setuptools
+```bash
+pip install -U setuptools==3.4
+```
+
+* Install qtkit 2.5.1
+```bash
+pip install -U pyobjc-core==2.5.1
+pip install -U pyobjc-framework-cocoa==2.5.1
+pip install -U pyobjc-framework-quartz==2.5.1
+pip install -U pyobjc-framework-qtkit==2.5.1
+```
+
+* Restore setuptools
+```bash
+pip install -U setuptools
 ```
 
 In order to generate dmg package, some extra dependencies are needed
@@ -117,10 +139,7 @@ All source code is available on GitHub. You can download main Horus project by d
 ### Horus
 ```bash
 git clone https://github.com/bq/horus.git
-```
-or
-```bash
-git clone [email protected]:bq/horus.git
+cd horus
 ```
 
 ## 3. Execute source code

src/horus/engine/algorithms/image_capture.py

@@ -73,7 +73,7 @@ def __init__(self):
             self._flush_stream_laser = 2
             self._flush_stream_pattern = 0
         elif system == 'Darwin':
-            self._flush_texture = 4
+            self._flush_texture = 5
             self._flush_laser = 4
             self._flush_pattern = 4
             self._flush_stream_texture = 0

src/horus/gui/util/custom_panels.py

@@ -8,7 +8,7 @@
 import wx._core
 from collections import OrderedDict
 
-from horus.util import profile, resources
+from horus.util import profile, resources, system
 
 
 class ExpandableCollection(wx.Panel):
@@ -258,7 +258,8 @@ def add_control(self, _name, _type, tooltip=None):
         self.control_panels.update({_name: control})
         self.vbox.Add(control, 0, wx.BOTTOM | wx.EXPAND, 5)
         self.vbox.Layout()
-        # self.SetSizerAndFit(self.vbox)  TODO: test on mac
+        if system.is_darwin():
+            self.SetSizerAndFit(self.vbox)
 
     def update_callback(self, _name, _callback):
         self.control_panels[_name].set_engine_callback(_callback)

src/horus/gui/workbench/scanning/view_page.py

@@ -18,7 +18,7 @@
 class ViewPage(wx.SplitterWindow):
 
     def __init__(self, parent, get_image):
-        wx.SplitterWindow.__init__(self, parent)  # , style=wx.SP_3D | wx.SP_LIVE_UPDATE)
+        wx.SplitterWindow.__init__(self, parent, style=wx.SP_3D | wx.SP_LIVE_UPDATE)
 
         self.get_image = get_image