Skip to content

Commit

Permalink
Merge pull request #81 from introlab/dev
Browse files Browse the repository at this point in the history
Main merge for 1.1.1 release
  • Loading branch information
SBriere authored Apr 18, 2024
2 parents e09c831 + b4ef7ea commit 920b59d
Show file tree
Hide file tree
Showing 7 changed files with 151 additions and 41 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ python-3.10
.DS_Store
*.dmg
python-3.11
build
10 changes: 5 additions & 5 deletions python/env/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pypiwin32==223; sys_platform == 'win32'
PySide6==6.6.0
cython==3.0.5
numpy==1.26.2
PySide6==6.7.0
cython==3.0.10
numpy==1.26.4
scipy==1.11.4
sqlalchemy==2.0.23
alembic==1.12.1
sqlalchemy==2.0.29
alembic==1.13.1
pyinstaller==5.13.2
172 changes: 139 additions & 33 deletions python/libopenimu/importers/AppleWatchImporter.py

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion python/resources/ui/StartDialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ in database</string>
</font>
</property>
<property name="text">
<string notr="true">1.1.0</string>
<string notr="true">1.1.1</string>
</property>
</widget>
</item>
Expand Down
3 changes: 3 additions & 0 deletions python/resources/ui/StreamWindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,9 @@
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string>Progress</string>
Expand Down
2 changes: 1 addition & 1 deletion setup/create_dmg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rm -r ${SCRIPT_PATH}/../python/dist/dmg/*
cp -R "${SCRIPT_PATH}/../python/dist/OpenIMU.app" "${SCRIPT_PATH}/../python/dist/dmg"
# If the DMG already exists, delete it.
test -f "${SCRIPT_PATH}/../python/dist/OpenIMU.dmg" && rm "${SCRIPT_PATH}/../python/dist/OpenIMU.dmg"
/usr/local/bin/create-dmg \
create-dmg \
--volname "OpenIMU" \
--volicon "${SCRIPT_PATH}/../python/resources/icons/OpenIMU.icns" \
--window-pos 200 120 \
Expand Down
2 changes: 1 addition & 1 deletion setup/setup_windows.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "OpenIMU"
#define MyAppVersion "1.1.0"
#define MyAppVersion "1.1.1"
#define MyAppPublisher "INTER - CdRV - 3IT - USherbrooke"
#define MyAppURL "https://github.com/introlab/OpenIMU"
#define MyAppExeName "OpenIMU.exe"
Expand Down

0 comments on commit 920b59d

Please sign in to comment.