Skip to content

Commit 8447868

Browse files
authored
Merge pull request #355 from qualisys/dev-qualisys
Added QualisysTab
2 parents 9efa284 + 1c3be7c commit 8447868

File tree

6 files changed

+2481
-2
lines changed

6 files changed

+2481
-2
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ msvcp90.dll
2323
# PyCharm
2424
.idea/*
2525
.DS_Store
26+
27+
# vscode
28+
.vscode/

setup.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
'build_exe': {'includes': ['numpy.core._methods',
1818
'numpy.lib.format',
1919
'pyqtgraph.debug',
20-
'pyqtgraph.ThreadsafeTimer']}
20+
'pyqtgraph.ThreadsafeTimer',
21+
],
22+
'packages': ['asyncio'],
23+
'excludes': ['tkinter']}
2124
},
2225
'executables': [Executable("bin/cfclient", icon='bitcraze.ico')],
2326
}
@@ -128,7 +131,9 @@ def relative(lst, base=''):
128131
'appdirs>=1.4.0',
129132
'pyzmq',
130133
'pyqtgraph>=0.10',
131-
'PyYAML'],
134+
'PyYAML',
135+
'quamash==0.6.1',
136+
'qtm>=2.0.2'],
132137

133138
# List of dev and qt dependencies
134139
# You can install them by running

src/cfclient/gui.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@
2828

2929
import sys
3030
import os
31+
import asyncio
3132
import argparse
3233
import datetime
3334

3435
import logging
3536

37+
from quamash import QSelectorEventLoop
3638
import cfclient
3739

3840
__author__ = 'Bitcraze AB'
@@ -138,6 +140,10 @@ def main():
138140

139141
app = QApplication(sys.argv)
140142

143+
# Create and set an event loop that combines qt and asyncio
144+
loop = QSelectorEventLoop(app)
145+
asyncio.set_event_loop(loop)
146+
141147
app.setWindowIcon(QIcon(cfclient.module_path + "/icon-256.png"))
142148
# Make sure the right icon is set in Windows 7+ taskbar
143149
if os.name == 'nt':

0 commit comments

Comments
 (0)