Merge remote-tracking branch 'remotes/origin/dev'

introlab · Sep 14, 2018 · 6fa894f · 6fa894f
2 parents e7ffcf8 + d7a6b47
commit 6fa894f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/python/OpenIMUApp.py b/python/OpenIMUApp.py
@@ -1,6 +1,9 @@
 from PyQt5.QtWidgets import QMainWindow, QWidget, QHBoxLayout
 from PyQt5.QtWidgets import QApplication, QDialog, QPushButton, QTreeWidget, QTreeWidgetItem, QMessageBox
 from PyQt5.QtGui import QIcon, QFont, QDragEnterEvent
+import PyQt5
+from PyQt5.QtCore import QLibraryInfo
+from pprint import pprint
 
 # from PyQt5.QtWebEngineWidgets import QWebEngineView, QWebEnginePage, QWebEngineSettings
 from PyQt5.QtQuickWidgets import QQuickWidget
@@ -719,6 +722,10 @@ def dropEvent(self, event):
     app = QApplication(sys.argv)
     app.setAttribute(Qt.AA_EnableHighDpiScaling)
 
+    print(PyQt5.__file__)
+    paths = [x for x in dir(QLibraryInfo) if x.endswith('Path')]
+    pprint({x: QLibraryInfo.location(getattr(QLibraryInfo, x)) for x in paths})
+
     # WebEngine settings
     # QWebEngineSettings.globalSettings().setAttribute(QWebEngineSettings.PluginsEnabled, True)
     # QWebEngineSettings.globalSettings().setAttribute(QWebEngineSettings.JavascriptCanOpenWindows, True)

diff --git a/python/env/CMakeLists.txt b/python/env/CMakeLists.txt
@@ -21,20 +21,26 @@ if(WIN32)
         PyQtChart
         PyQt3D
         pypiwin32
+        # PyInstaller
+        # Warning, development version for now to fix OSX package
+        https://github.com/pyinstaller/pyinstaller/tarball/develop
     )
 else(WIN32)
     set (pip_packages
         PyQt5
         PyQtChart
         PyQt3D
+        # PyInstaller
+        # Warning, development version for now to fix OSX package
+        https://github.com/pyinstaller/pyinstaller/tarball/develop
     )
 endif(WIN32)
 
 set (conda_packages
+    # PyInstaller
     cython
     numpy
     scipy
-    PyInstaller
     jupyter
     sqlalchemy
 )
@@ -70,7 +76,7 @@ else(WIN32)
     # TODO - INSTALL WITH CONDA ?
     add_custom_target(
         python-env
-        COMMAND ${ENV_PATH}/bin/pip install ${pip_packages}
+        COMMAND ${ENV_PATH}/bin/pip install --upgrade ${pip_packages}
         WORKING_DIRECTORY ${ENV_PATH}
         DEPENDS ${ENV_PATH}/bin/python
     )

diff --git a/python/resources/ui/StartDialog.ui b/python/resources/ui/StartDialog.ui
@@ -216,7 +216,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>Version 0.2</string>
+        <string>Version 0.3</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set>