Merge pull request #355 from qualisys/dev-qualisys

Added QualisysTab

.gitignore

@@ -23,3 +23,6 @@ msvcp90.dll
 # PyCharm
 .idea/*
 .DS_Store
+
+# vscode
+.vscode/
\ No newline at end of file

setup.py

@@ -17,7 +17,10 @@ if sys.argv[1] == 'build':
             'build_exe': {'includes': ['numpy.core._methods',
                                        'numpy.lib.format',
                                        'pyqtgraph.debug',
-                                       'pyqtgraph.ThreadsafeTimer']}
+                                       'pyqtgraph.ThreadsafeTimer',
+                                       ],
+                          'packages': ['asyncio'],
+                          'excludes': ['tkinter']}
         },
         'executables': [Executable("bin/cfclient", icon='bitcraze.ico')],
     }
@@ -128,7 +131,9 @@ setup(
                                           'appdirs>=1.4.0',
                                           'pyzmq',
                                           'pyqtgraph>=0.10',
-                                          'PyYAML'],
+                                          'PyYAML',
+                                          'quamash==0.6.1',
+                                          'qtm>=2.0.2'],
 
     # List of dev and qt dependencies
     # You can install them by running

src/cfclient/gui.py

@@ -28,11 +28,13 @@
 
 import sys
 import os
+import asyncio
 import argparse
 import datetime
 
 import logging
 
+from quamash import QSelectorEventLoop
 import cfclient
 
 __author__ = 'Bitcraze AB'
@@ -138,6 +140,10 @@ def main():
 
     app = QApplication(sys.argv)
 
+    # Create and set an event loop that combines qt and asyncio
+    loop = QSelectorEventLoop(app)
+    asyncio.set_event_loop(loop)
+
     app.setWindowIcon(QIcon(cfclient.module_path + "/icon-256.png"))
     # Make sure the right icon is set in Windows 7+ taskbar
     if os.name == 'nt':

src/cfclient/ui/tabs/__init__.py

@@ -39,6 +39,7 @@ from .LogTab import LogTab
 from .ParamTab import ParamTab
 from .PlotTab import PlotTab
 from .locopositioning_tab import LocoPositioningTab
+from .QualisysTab import QualisysTab
 
 __author__ = 'Bitcraze AB'
 __all__ = []
@@ -54,4 +55,5 @@ available = [
     ParamTab,
     PlotTab,
     LocoPositioningTab,
+    QualisysTab,
 ]