Skip to content

Commit 920b59d

Browse files
authored
Merge pull request #81 from introlab/dev
Main merge for 1.1.1 release
2 parents e09c831 + b4ef7ea commit 920b59d

File tree

7 files changed

+151
-41
lines changed

7 files changed

+151
-41
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ python-3.10
1919
.DS_Store
2020
*.dmg
2121
python-3.11
22+
build

Diff for: python/env/requirements.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
pypiwin32==223; sys_platform == 'win32'
2-
PySide6==6.6.0
3-
cython==3.0.5
4-
numpy==1.26.2
2+
PySide6==6.7.0
3+
cython==3.0.10
4+
numpy==1.26.4
55
scipy==1.11.4
6-
sqlalchemy==2.0.23
7-
alembic==1.12.1
6+
sqlalchemy==2.0.29
7+
alembic==1.13.1
88
pyinstaller==5.13.2

Diff for: python/libopenimu/importers/AppleWatchImporter.py

+139-33
Large diffs are not rendered by default.

Diff for: python/resources/ui/StartDialog.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ in database</string>
385385
</font>
386386
</property>
387387
<property name="text">
388-
<string notr="true">1.1.0</string>
388+
<string notr="true">1.1.1</string>
389389
</property>
390390
</widget>
391391
</item>

Diff for: python/resources/ui/StreamWindow.ui

+3
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,9 @@
535535
<attribute name="horizontalHeaderStretchLastSection">
536536
<bool>true</bool>
537537
</attribute>
538+
<attribute name="verticalHeaderVisible">
539+
<bool>false</bool>
540+
</attribute>
538541
<column>
539542
<property name="text">
540543
<string>Progress</string>

Diff for: setup/create_dmg.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ rm -r ${SCRIPT_PATH}/../python/dist/dmg/*
99
cp -R "${SCRIPT_PATH}/../python/dist/OpenIMU.app" "${SCRIPT_PATH}/../python/dist/dmg"
1010
# If the DMG already exists, delete it.
1111
test -f "${SCRIPT_PATH}/../python/dist/OpenIMU.dmg" && rm "${SCRIPT_PATH}/../python/dist/OpenIMU.dmg"
12-
/usr/local/bin/create-dmg \
12+
create-dmg \
1313
--volname "OpenIMU" \
1414
--volicon "${SCRIPT_PATH}/../python/resources/icons/OpenIMU.icns" \
1515
--window-pos 200 120 \

Diff for: setup/setup_windows.iss

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

44
#define MyAppName "OpenIMU"
5-
#define MyAppVersion "1.1.0"
5+
#define MyAppVersion "1.1.1"
66
#define MyAppPublisher "INTER - CdRV - 3IT - USherbrooke"
77
#define MyAppURL "https://github.com/introlab/OpenIMU"
88
#define MyAppExeName "OpenIMU.exe"

0 commit comments

Comments
 (0)