Skip to content

Commit

Permalink
Merge pull request #181 from introlab/dev
Browse files Browse the repository at this point in the history 
Main merge for 1.1.3 release
  • Loading branch information
@SBriere
SBriere committed Sep 21, 2022
2 parents 1cc97d8 + 48aebf2 commit 924b28f
Show file tree
Hide file tree
Showing 37 changed files with 647 additions and 1,000 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/python-package-pypi.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8]
python-version: [3.10.7]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -42,8 +42,8 @@ jobs:
- name: Build dist package with setuptools
working-directory: teraserver/python
run: |
./env/python-3.8/bin/python3 -m pip install --upgrade setuptools wheel twine
./env/python-3.8/bin/python3 setup.py sdist bdist_wheel
./env/python-3.10/bin/python3 -m pip install --upgrade setuptools wheel twine
./env/python-3.10/bin/python3 setup.py sdist bdist_wheel
du -h dist
- name: Run Tests
Expand All @@ -56,7 +56,7 @@ jobs:
- name: Upload package to PyPi
working-directory: teraserver/python
run: |
./env/python-3.8/bin/python3 -m twine upload dist/*
./env/python-3.10/bin/python3 -m twine upload dist/*
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run_tests_on_pull_request.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8]
python-version: [3.10.7]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
run: |
cmake .
make python-all
echo "OPENTERA_PYTHON=$(echo $PWD/python/env/python-3.8/bin/python)" >> $GITHUB_ENV
echo "OPENTERA_PYTHON=$(echo $PWD/python/env/python-3.10/bin/python)" >> $GITHUB_ENV
echo "PYTHONPATH=$(echo $PWD/python)" >> $GITHUB_ENV
- name: Generate Self Signed TLS Certificates
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,4 @@ teraserver/python/services/BureauActif/uploads/
/teraserver/python/services/FileTransferService/upload
files
build-teraserver-Desktop_Qt_5_15_2_MSVC2019_64bit-Debug
python-3.10
4 changes: 4 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ You are welcome to participate in this effort. Leave us comments or report [Issu
* Marc-Antoine Maheux
* Cynthia Vilanova

## Publication(s)

* Panchea, A.M., Létourneau, D., Brière, S. et al., [OpenTera: A microservice architecture solution for rapid prototyping of robotic solutions to COVID-19 challenges in care facilities](https://rdcu.be/cHzmf), Health Technol. 12, 583–596 (2022)

## Videos

### OpenTera Telehealth Platform
Expand Down
2 changes: 1 addition & 1 deletion teraserver/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ endif(NOT CMAKE_BUILD_TYPE)
# Software version
SET(OPENTERA_VERSION_MAJOR "1")
SET(OPENTERA_VERSION_MINOR "1")
SET(OPENTERA_VERSION_PATCH "2")
SET(OPENTERA_VERSION_PATCH "3")

SET(OPENTERA_SERVER_VERSION OpenTera_v${OPENTERA_VERSION_MAJOR}.${OPENTERA_VERSION_MINOR}.${OPENTERA_VERSION_PATCH})

Expand Down
344 changes: 0 additions & 344 deletions teraserver/easyrtc/protected/index_old.html
View file

This file was deleted.

113 changes: 9 additions & 104 deletions teraserver/easyrtc/protected/index_participants.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<script src="js/bootstrap/bootstrap.bundle.min.js"></script>
<script src="js/socket.io.js"></script>
<script src="easyrtc/easyrtc.js"></script>
<script src="js/bowser/bowser.js"></script>

<script src="js/tera_layout_participants.js"></script>
<script src="js/tera_main.js"></script>
Expand All @@ -36,7 +37,10 @@
console.log('Page loaded. Ready to start!');
preInitSystem();
initTranslator();
initialUserLayout();
$(document).ready(function(){
initVideoAreas();
});
//initialUserLayout();
initUI();
initSystem();
}
Expand Down Expand Up @@ -131,7 +135,7 @@ <h5 class="modal-title" id="errorDialogLongTitle" data-i18n="errorDialog.title">
onmouseleave="stopInactiveTimer(true, 1);showButtons(true, false, 1); return false;"
oncontextmenu="resetInactiveTimer(true, 1);showButtons(true, true, 1);">

<span class="badge badge-info" id="localViewTitle1">Vue locale #1</span>
<span class="badge badge-info d-lg-inline d-none" id="localViewTitle1">Vue locale #1</span>
<!-- Video controls -->
<div id="localVideoControls1" class="overlay-top-right" style="">
<input id="localBtnSwapVideo1" type="image" alt="image" src="images/swap.png" class="image-icon" onclick="enlargeView(true,1);event.stopPropagation();" style="display: none;"/>
Expand Down Expand Up @@ -205,7 +209,7 @@ <h5 class="modal-title" id="errorDialogLongTitle" data-i18n="errorDialog.title">
onmousemove="resetInactiveTimer(true, 2);showButtons(true, true, 2);"
onmouseleave="stopInactiveTimer(true, 2);showButtons(true, false, 2); return false;"
oncontextmenu="resetInactiveTimer(true, 2);showButtons(true, true, 2);">
<span class="badge badge-info" id="localViewTitle2">Vue locale #2</span>
<span class="badge badge-info d-lg-inline d-none" id="localViewTitle2">Vue locale #2</span>

<!-- Video controls -->
<div id="localVideoControls2" class="overlay-top-right" style="">
Expand Down Expand Up @@ -235,107 +239,8 @@ <h5 class="modal-title" id="errorDialogLongTitle" data-i18n="errorDialog.title">
</div>
</div>
<div class="col-2 h-100" id="remoteViews">
<div class="row h-100" id="remoteRows1" style="flex-flow: column;">
<div class="col videoView" id="remoteView1"
onmousemove="resetInactiveTimer(false, 1);showButtons(false, true, 1);"
onmouseleave="stopInactiveTimer(false, 1);showButtons(false, false, 1); return false;"
oncontextmenu="resetInactiveTimer(false, 1);showButtons(false, true, 1);">
<span class="badge badge-primary" id="remoteViewTitle1">Participant #1</span>
<!--span class="badge badge-danger text-white-50" id="remoteViewRec1" style="display:none;">REC</span>-->

<!-- Video controls -->
<div id="remoteVideoControls1" class="overlay-top-right" style="">
<input id="remoteBtnSwapVideo1" type="image" alt="image" src="images/swap.png" class="image-icon" onclick="enlargeView(false,1);event.stopPropagation();" style="display: none;"/>
</div>

<!-- Micro, video, sensors, ... controls -->
<div id="remoteLockedViewControls1" class="overlay-bottom-center" >
<input id="remoteMicStatus1" type="image" alt="image" src="images/mic.png" class="image-icon" style="display: none;"/>
<input id="remoteVideoStatus1" type="image" alt="image" src="images/video.png" class="image-icon" style="display: none;"/>
<input id="remoteSpeakerStatus1" type="image" alt="image" src="images/speaker.png" class="image-icon" style="display: none;"/>
</div>

<!-- Video ! -->
<video id="remoteVideo1" playsinline
oncontextmenu="return false;"
onclick=""
onwheel="" class=""></video>
</div>
<div class="col videoView" id="remoteView2"
onmousemove="resetInactiveTimer(false, 2);showButtons(false, true, 2);"
onmouseleave="stopInactiveTimer(false, 2);showButtons(false, false, 2); return false;"
oncontextmenu="resetInactiveTimer(false, 2);showButtons(false, true, 2);">
<span class="badge badge-primary" id="remoteViewTitle2">Participant #2</span>
<!--<span class="badge badge-danger text-white-50" id="remoteViewRec2" style="display:none;">REC</span>-->

<!-- Video controls -->
<div id="remoteVideoControls2" class="overlay-top-right" style="">
<input id="remoteBtnSwapVideo2" type="image" alt="image" src="images/swap.png" class="image-icon" onclick="enlargeView(false,2);event.stopPropagation();" style="display: none;"/>
</div>

<!-- Micro, video, sensors, ... controls -->
<div id="remoteLockedViewControls2" class="overlay-bottom-center" >
<input id="remoteMicStatus2" type="image" alt="image" src="images/mic.png" class="image-icon" style="display: none;"/>
<input id="remoteVideoStatus2" type="image" alt="image" src="images/video.png" class="image-icon" style="display: none;"/>
<input id="remoteSpeakerStatus2" type="image" alt="image" src="images/speaker.png" class="image-icon" style="display: none;"/>
</div>

<!-- Video ! -->
<video id="remoteVideo2" playsinline
oncontextmenu="return false;"
onclick=""
onwheel="" class=""></video>
</div>
<div class="col videoView" id="remoteView3"
onmousemove="resetInactiveTimer(false, 3);showButtons(false, true, 3);"
onmouseleave="stopInactiveTimer(false, 3);showButtons(false, false, 3); return false;"
oncontextmenu="resetInactiveTimer(false, 3);showButtons(false, true, 3);">
<span class="badge badge-primary" id="remoteViewTitle3">Participant #3</span>
<!--<span class="badge badge-danger text-white-50" id="remoteViewRec3" style="display:none;">REC</span>-->

<!-- Video controls -->
<div id="remoteVideoControls3" class="overlay-top-right" style="">
<input id="remoteBtnSwapVideo3" type="image" alt="image" src="images/swap.png" class="image-icon" onclick="enlargeView(false,3);event.stopPropagation();" style="display: none;"/>
</div>

<!-- Micro, video, sensors, ... controls -->
<div id="remoteLockedViewControls3" class="overlay-bottom-center" >
<input id="remoteMicStatus3" type="image" alt="image" src="images/mic.png" class="image-icon" style="display: none;"/>
<input id="remoteVideoStatus3" type="image" alt="image" src="images/video.png" class="image-icon" style="display: none;"/>
<input id="remoteSpeakerStatus3" type="image" alt="image" src="images/speaker.png" class="image-icon" style="display: none;"/>
</div>

<!-- Video ! -->
<video id="remoteVideo3" playsinline
oncontextmenu="return false;"
onclick=""
onwheel="" class=""></video>
</div>
<div class="col videoView" id="remoteView4"
onmousemove="resetInactiveTimer(false, 4);showButtons(false, true, 4);"
onmouseleave="stopInactiveTimer(false, 4);showButtons(false, false, 4); return false;"
oncontextmenu="resetInactiveTimer(false, 4);showButtons(false, true, 4);">
<span class="badge badge-primary" id="remoteViewTitle4">Participant #4</span>
<!--<span class="badge badge-danger text-white-50" id="remoteViewRec4" style="display:none;">REC</span>-->

<!-- Video controls -->
<div id="remoteVideoControls4" class="overlay-top-right" style="">
<input id="remoteBtnSwapVideo4" type="image" alt="image" src="images/swap.png" class="image-icon" onclick="enlargeView(false,4);event.stopPropagation();" style="display: none;"/>
</div>

<!-- Micro, video, sensors, ... controls -->
<div id="remoteLockedViewControls4" class="overlay-bottom-center" >
<input id="remoteMicStatus4" type="image" alt="image" src="images/mic.png" class="image-icon" style="display: none;"/>
<input id="remoteVideoStatus4" type="image" alt="image" src="images/video.png" class="image-icon" style="display: none;"/>
<input id="remoteSpeakerStatus4" type="image" alt="image" src="images/speaker.png" class="image-icon" style="display: none;"/>
</div>

<!-- Video ! -->
<video id="remoteVideo4" playsinline
oncontextmenu="return false;"
onclick=""
onwheel="" class=""></video>
</div>
<div class="row h-100" id="remoteRows" style="">
<!-- This area will be populated with remote videos tags on page load -->
</div>
</div>
</div>
Expand Down

0 comments on commit 924b28f

Please sign in to comment.