Merge pull request #77 from introlab/dev

Main merge for 1.1.2 release

Author: SBriere

CMakeLists.txt

@@ -17,7 +17,7 @@ cmake_policy(SET CMP0043 NEW)
 # Software version
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
 SET(CPACK_PACKAGE_VERSION_MINOR "1")
-SET(CPACK_PACKAGE_VERSION_PATCH "1")
+SET(CPACK_PACKAGE_VERSION_PATCH "2")
 SET(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 add_definitions(-DOPENTERAPLUS_VERSION="${CPACK_PACKAGE_VERSION}" )
 add_definitions(-DOPENTERAPLUS_VERSION_MAJOR="${CPACK_PACKAGE_VERSION_MAJOR}" )
@@ -44,7 +44,7 @@ if (UNIX AND NOT APPLE)
     # Fix QWebEngine linking issues on Linux (https://bugreports.qt.io/browse/QTBUG-80964)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
-endif(UNIX)
+endif(UNIX AND NOT APPLE)
 
 
 set(CMAKE_VERBOSE_MAKEFILE ON)

README.md

@@ -8,6 +8,10 @@ OpenTeraPlus is a client that works with [OpenTera Server](https://github.com/in
 * Simon Brière, ing. M.Sc.A., Research Center on Aging, CIUSSS de l'Estrie-CHUS (@sbriere)
 * Dominic Létourneau, ing. M.Sc.A., IntRoLab, Université de Sherbrooke (@doumdi)
 
+## 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)
+
 ## Current Features
 
 ### High-level features

client/resources/controls/check_off_disabled.png

@@ -183,7 +183,7 @@ QLabel {
 */
 QTreeWidget, QTableWidget{
     selection-background-color: rgba(255,255,255,50%);/*rgba(0,5,45,50%)*/;
-    selection-color: black;
+    selection-color: lightblue;
 }
 
 QTreeWidget#treeNavigator {
@@ -581,14 +581,14 @@ QPushButton#btnLogout:hover {
 }
 
 /* Green buttons */
-QPushButton#btnNewSession, QPushButton#btnStartSession {
+QPushButton#btnNewSession, QPushButton#btnStartSession, QPushButton#btnLauncher {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 rgba(0,45,5,100%), stop: 1 rgba(10,140,10,100%));/*qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 rgba(10,140,10,100%), stop: 0.2  rgba(0,45,5,100%), stop:1 rgba(10,140,10,100%));*/
     color: white;
     border: 1px solid rgb(0,150,0);
     min-height:36px;
 }
 
-QPushButton#btnNewSession:hover, QPushButton#btnStartSession:hover {
+QPushButton#btnNewSession:hover, QPushButton#btnStartSession:hover, QPushButton#btnLauncher:hover {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 rgba(10,140,10,100%), stop: 1 rgba(0,45,5,100%));/*qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 rgba(0,45,5,100%), stop: 0.2  rgba(10,140,10,100%), stop:1 rgba(0,45,5,100%));*/
     color: white;
     border: 1px solid rgb(0,150,0);

client/resources/stylesheet.qss

@@ -72,6 +72,7 @@ set(headers
     services/BaseServiceWidget.h
     services/BaseServiceToolsWidget.h
     services/BaseServiceSetupWidget.h
+    services/VideoRehabService/ScreenController.h
     services/VideoRehabService/VideoRehabWidget.h
     services/VideoRehabService/VideoRehabWebPage.h
     services/VideoRehabService/VideoRehabSetupWidget.h
@@ -171,6 +172,7 @@ set(srcs
     services/BaseServiceWidget.cpp
     services/BaseServiceToolsWidget.cpp
     services/BaseServiceSetupWidget.cpp
+    services/VideoRehabService/ScreenController.cpp
     services/VideoRehabService/VideoRehabWidget.cpp
     services/VideoRehabService/VideoRehabWebPage.cpp
     services/VideoRehabService/VideoRehabSetupWidget.cpp

client/resources/translations/openteraplus_en.ts

@@ -142,7 +142,7 @@ void ClientApp::showMainWindow()
     if (m_mainWindow != nullptr){
         m_mainWindow->deleteLater();
     }
-    m_mainWindow = new MainWindow(m_comMan);
+    m_mainWindow = new MainWindow(m_comMan, m_loginDiag->currentServerName());
 
     // Delete login window, if present
     if (m_loginDiag){

client/resources/translations/openteraplus_fr.ts

@@ -73,6 +73,14 @@ void LoginDialog::showServers(bool show)
     ui->icoServer->setVisible(show);
 }
 
+QString LoginDialog::currentServerName()
+{
+    if (ui->cmbServers->currentIndex() >=0 && ui->cmbServers->isVisible()){
+        return ui->cmbServers->currentText();
+    }
+    return QString();
+}
+
 void LoginDialog::setStatusMessage(QString message, bool error)
 {
     if (message.isEmpty()){

client/src/CMakeLists.txt

@@ -19,6 +19,7 @@ class LoginDialog : public QDialog
 
     void setServerNames(QStringList servers);
     void showServers(bool show);
+    QString currentServerName();
 
     void setStatusMessage(QString message, bool error=false);