Merge pull request #57 from introlab/dev

Merge for 1.0.4 release

CMakeLists.txt

@@ -13,7 +13,7 @@ cmake_policy(SET CMP0043 NEW)
 # Software version
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
 SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "3")
+SET(CPACK_PACKAGE_VERSION_PATCH "4")
 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}" )

client/resources/TeraClient.qrc

@@ -14,7 +14,6 @@
         <file>controls/branch_left.png</file>
         <file>controls/branch_opened.png</file>
         <file>controls/branch_up.png</file>
-        <file>icons/connect.png</file>
         <file>icons/copy.png</file>
         <file>icons/data.png</file>
         <file>icons/data_sensor.png</file>
@@ -31,27 +30,14 @@
         <file>icons/new.png</file>
         <file>icons/options.png</file>
         <file>icons/patient.png</file>
-        <file>icons/patient_add.png</file>
-        <file>icons/patient_filter_red.png</file>
         <file>icons/patient_installed.png</file>
-        <file>icons/patient_installed_v1.png</file>
-        <file>icons/patient_installed_warning.png</file>
-        <file>icons/patient_offline.png</file>
-        <file>icons/patient_offline_v2.png</file>
         <file>icons/patient_online.png</file>
         <file>icons/patient_online_busy.png</file>
-        <file>icons/patient_online_busy_warning.png</file>
-        <file>icons/patient_online_v1.png</file>
-        <file>icons/patient_online_warning.png</file>
-        <file>icons/photo.png</file>
-        <file>icons/photo_add.png</file>
         <file>icons/refresh.png</file>
         <file>icons/save.png</file>
         <file>icons/search.png</file>
         <file>icons/sensors.png</file>
         <file>icons/session.png</file>
-        <file>icons/session_add.png</file>
-        <file>icons/session_disconnect.png</file>
         <file>icons/session_offline.png</file>
         <file>icons/session_offline_warning.png</file>
         <file>icons/session_online.png</file>
@@ -67,8 +53,6 @@
         <file>icons/unlock.png</file>
         <file>icons/user_info.png</file>
         <file>icons/usergroup.png</file>
-        <file>icons/video.png</file>
-        <file>icons/video_add.png</file>
         <file>icons/warning.png</file>
         <file>TeRA_Background.png</file>
         <file>icons/error.png</file>
@@ -77,11 +61,9 @@
         <file>icons/device.png</file>
         <file>icons/project.png</file>
         <file>icons/device_installed.png</file>
-        <file>icons/device_offline.png</file>
         <file>icons/device_online.png</file>
         <file>stylesheet.qss</file>
         <file>icons/info.png</file>
-        <file>icons/camera.png</file>
         <file>icons/navtree.png</file>
         <file>icons/history.png</file>
         <file>icons/config.png</file>
@@ -103,7 +85,6 @@
         <file>icons/service.png</file>
         <file>icons/stop.png</file>
         <file>status/session_loading.gif</file>
-        <file>icons/software_user_offline.png</file>
         <file>icons/software_user_online.png</file>
         <file>controls/radio-off.png</file>
         <file>controls/radio-on.png</file>

client/resources/stylesheet.qss

@@ -692,12 +692,8 @@ QWidget#wdgParticipantsNum{
     border-radius: 10px;
 }
 
-QListWidget#lstOnlineParticipants, QListWidget#lstOnlineUsers, QListWidget#lstOnlineDevices{
-    background-color: rgba(255,255,255,20%);
-    selection-background-color: rgba(0,0,0,20%);
+QTreeWidget#treeOnline{
+    background-color: rgba(255,255,255,10%);
+    selection-background-color: rgba(0,0,0,0%);
     /*selection-color: black;*/
 }
-
-QFrame#frameOnlineParticipants, QFrame#frameOnlineUsers, QFrame#frameOnlineDevices{
-    background-color: transparent;
-}

client/src/ClientApp.cpp

@@ -26,8 +26,8 @@ ClientApp::ClientApp(int &argc, char **argv)
     QString stylesheet = QLatin1String(file.readAll());
     setStyleSheet(stylesheet);
 
-    setApplicationName(QString("OpenTeraPlus v") + QString(OPENTERAPLUS_VERSION));
-    qDebug() << "Starting App " << applicationName();
+    //setApplicationName(QString("OpenTeraPlus v") + QString(OPENTERAPLUS_VERSION));
+    qDebug() << "Starting App " << applicationName() + " v" +  QString(OPENTERAPLUS_VERSION);
 
     // Load config
     loadConfig();

client/src/dialogs/BaseDialog.cpp

@@ -21,7 +21,7 @@ void BaseDialog::setCentralWidget(QWidget *widget)
 {
     widget->setParent(m_ui.centralWidget);
     m_centralWidgetLayout->addWidget(widget);
-    widget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    //widget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 
 }
 

client/src/dialogs/BaseDialog.ui

@@ -39,13 +39,20 @@
     <number>5</number>
    </property>
    <item>
-    <widget class="QWidget" name="centralWidget" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="widgetResizable">
+      <bool>true</bool>
      </property>
+     <widget class="QWidget" name="centralWidget">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>672</width>
+        <height>259</height>
+       </rect>
+      </property>
+     </widget>
     </widget>
    </item>
    <item>

client/src/editors/DataEditorWidget.cpp

@@ -13,8 +13,8 @@ DataEditorWidget::DataEditorWidget(ComManager *comMan, const TeraData *data, QWi
     m_cancelButton = nullptr;
     m_mainForm = nullptr;
 
-    setData(data);
-    setLoading();
+    DataEditorWidget::setData(data);
+    DataEditorWidget::setLoading();
 
     // Set ComManager pointer
     m_comManager = comMan;

client/src/editors/DataListWidget.cpp

@@ -105,7 +105,7 @@ void DataListWidget::updateDataInList(TeraData* data, bool select_item){
     // If we have extra fields to display, append them
     QString extra_field = "";
     if (!m_extraDisplayFields.isEmpty() && !m_extraInfos.contains(data->getId())){
-        for (QString field:m_extraDisplayFields){
+        for (QString field:qAsConst(m_extraDisplayFields)){
             QStringList subfields = field.split(".");
             QString subfield;
             if (subfields.count() > 1){
@@ -120,7 +120,7 @@ void DataListWidget::updateDataInList(TeraData* data, bool select_item){
                 if (field_value.canConvert(QMetaType::QVariantList)){
                     QVariantList field_values = field_value.toList();
                     QString merged_list;
-                    for (QVariant field_value:field_values){
+                    for (QVariant field_value:qAsConst(field_values)){
                         if (!merged_list.isEmpty())
                             merged_list += ", ";
                         // Search for subfield?
@@ -159,10 +159,10 @@ void DataListWidget::updateDataInList(TeraData* data, bool select_item){
         }
     }
 
-    /*QString color_field = TeraData::getDataTypeName(m_dataType) + "_color";
+    QString color_field = TeraData::getDataTypeName(m_dataType) + "_color";
     if (data->hasFieldName(color_field)){
         item->setForeground(QColor(data->getFieldValue(color_field).toString()));
-    }*/
+    }
 
     if (select_item){
         ui->lstData->setCurrentItem(item);

client/src/editors/GroupWidget.cpp

@@ -191,7 +191,7 @@ void GroupWidget::processStatsReply(TeraData stats, QUrlQuery reply_query)
 
         QVariantList parts_list = stats.getFieldValue("participants").toList();
 
-        for(QVariant part:parts_list){
+        for(const QVariant &part:qAsConst(parts_list)){
             QVariantMap part_info = part.toMap();
             int part_id = part_info["id_participant"].toInt();
 
@@ -252,6 +252,8 @@ void GroupWidget::processStatsReply(TeraData stats, QUrlQuery reply_query)
             }
             ui->tableSummary->setItem(current_row, 5, item);
         }
+        ui->tableSummary->resizeColumnsToContents();
+        ui->tableSummary->sortByColumn(4, Qt::DescendingOrder); // Sort by last session date
     }
 
 }