V1.08 déployée

Otarcik_CAN/Sources/Gui/LoggingSettingsPage.cpp

@@ -18,6 +18,8 @@ CLoggingSettingsPage::CLoggingSettingsPage(QWidget *parent) :
     ui->mCloudMQTTTopicPrefixEdit->setEnabled(false);
     ui->mCloudMQTTUserNameEdit->setEnabled(false);
     ui->mCloudMQTTRefreshRateSpinBx->setEnabled(false);
+    ui->mCloudMQTTActivateBrokerChkBx->setEnabled(false);
+    ui->mCloudMQTTActivateBufferingChkBx->setEnabled(false);
     ui->mCloudMQTTClientID->setEnabled(false);
 
     ui->mDevicePresCancelBtn->hide();
@@ -199,6 +201,8 @@ void CLoggingSettingsPage::ModifyParamsBtnPressed()
         ui->mCloudMQTTRefreshRateSpinBx->setEnabled(true);
         ui->mCloudMQTTClientID->setEnabled(true);
         ui->mChangeParamsBtn->setText("Appliquer");
+        ui->mCloudMQTTActivateBufferingChkBx->setEnabled(true);
+        ui->mCloudMQTTActivateBrokerChkBx->setEnabled(true);
         ui->mMQTTBrokersList->setEnabled(false);
     }
     else
@@ -213,6 +217,8 @@ void CLoggingSettingsPage::ModifyParamsBtnPressed()
         ui->mCloudMQTTUserNameEdit->setEnabled(false);
         ui->mCloudMQTTRefreshRateSpinBx->setEnabled(false);
         ui->mCloudMQTTClientID->setEnabled(false);
+        ui->mCloudMQTTActivateBufferingChkBx->setEnabled(false);
+        ui->mCloudMQTTActivateBrokerChkBx->setEnabled(false);
         ui->mMQTTBrokersList->setEnabled(true);
 
 
@@ -242,8 +248,15 @@ void CLoggingSettingsPage::ModifyParamsBtnPressed()
         BrokerParams->mMQTTBrokerUserName = ui->mCloudMQTTUserNameEdit->text();
         BrokerParams->mMQTTTransmitTimeout = (quint32)ui->mCloudMQTTRefreshRateSpinBx->value();
         BrokerParams->mMQTTClientID = ui->mCloudMQTTClientID->text();
+        BrokerParams->mMQTTBrokerActive = ui->mCloudMQTTActivateBrokerChkBx->isChecked();
+        BrokerParams->mMQTTEnableDataLogging = ui->mCloudMQTTActivateBufferingChkBx->isChecked();
         ui->mMQTTBrokersList->item(index)->setText(BrokerParams->mMQTTBrokerHostName);
 
+        for(int i = 0; i < mCloudParams.size(); i++)
+        {
+            mCloudParams.at(i)->mMQTTTransmitTimeout = ui->mCloudMQTTRefreshRateSpinBx->value();
+        }
+
         mProgramHandle->SaveCloudLoggingConfigRequest(&mCloudParams);
 
 
@@ -254,6 +267,7 @@ void CLoggingSettingsPage::ModifyParamsBtnPressed()
 void CLoggingSettingsPage::CancelBtnPressed()
 {
     EditMode = false;
+    ui->mChangeParamsBtn->setText("Modifier");
     ui->mCancelBtn->hide();
     ui->mCloudMQTTHostNameEdit->setEnabled(false);
     ui->mCloudMQTTPasswordEdit->setEnabled(false);
@@ -263,6 +277,8 @@ void CLoggingSettingsPage::CancelBtnPressed()
     ui->mCloudMQTTRefreshRateSpinBx->setEnabled(false);
     ui->mCloudMQTTClientID->setEnabled(false);
     ui->mMQTTBrokersList->setEnabled(true);
+    ui->mCloudMQTTActivateBrokerChkBx->setEnabled(false);
+    ui->mCloudMQTTActivateBufferingChkBx->setEnabled(false);
 
     UpdateCloudConfig();
 }
@@ -283,6 +299,8 @@ int CLoggingSettingsPage::UpdateCloudConfig()
     ui->mCloudMQTTUserNameEdit->setText(BrokerParams->mMQTTBrokerUserName);
     ui->mCloudMQTTRefreshRateSpinBx->setValue(BrokerParams->mMQTTTransmitTimeout);
     ui->mCloudMQTTClientID->setText(BrokerParams->mMQTTClientID);
+    ui->mCloudMQTTActivateBrokerChkBx->setChecked(BrokerParams->mMQTTBrokerActive);
+    ui->mCloudMQTTActivateBufferingChkBx->setChecked(BrokerParams->mMQTTEnableDataLogging);
 
     return RET_OK;
 }
@@ -671,6 +689,7 @@ void CLoggingSettingsPage::DeleteMQTTBrokerBtnPressed()
     else
     {
         ui->mMQTTBrokersList->setCurrentRow(0);
+        mProgramHandle->SaveCloudLoggingConfigRequest(&mCloudParams);
     }
 }
 

Otarcik_CAN/Sources/Gui/LoggingSettingsPage.ui

@@ -37,7 +37,7 @@
      <x>220</x>
      <y>100</y>
      <width>351</width>
-     <height>271</height>
+     <height>261</height>
     </rect>
    </property>
    <property name="title">
@@ -235,44 +235,30 @@
      </rect>
     </property>
    </widget>
-   <widget class="QLabel" name="mCloudMQTTRefreshRateLbl">
+   <widget class="QCheckBox" name="mCloudMQTTActivateBufferingChkBx">
     <property name="geometry">
      <rect>
-      <x>10</x>
-      <y>220</y>
-      <width>181</width>
+      <x>180</x>
+      <y>230</y>
+      <width>101</width>
       <height>20</height>
      </rect>
     </property>
-    <property name="font">
-     <font>
-      <pointsize>10</pointsize>
-     </font>
-    </property>
     <property name="text">
-     <string>Taux de rafraichissement (ms):</string>
-    </property>
-    <property name="alignment">
-     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     <string>Activer buffering</string>
     </property>
    </widget>
-   <widget class="QSpinBox" name="mCloudMQTTRefreshRateSpinBx">
+   <widget class="QCheckBox" name="mCloudMQTTActivateBrokerChkBx">
     <property name="geometry">
      <rect>
-      <x>200</x>
-      <y>220</y>
+      <x>50</x>
+      <y>230</y>
       <width>101</width>
-      <height>22</height>
+      <height>20</height>
      </rect>
     </property>
-    <property name="minimum">
-     <number>1000</number>
-    </property>
-    <property name="maximum">
-     <number>500000</number>
-    </property>
-    <property name="singleStep">
-     <number>1</number>
+    <property name="text">
+     <string>Broker actif</string>
     </property>
    </widget>
   </widget>
@@ -297,8 +283,8 @@
   <widget class="QPushButton" name="mChangeParamsBtn">
    <property name="geometry">
     <rect>
-     <x>430</x>
-     <y>380</y>
+     <x>410</x>
+     <y>370</y>
      <width>80</width>
      <height>22</height>
     </rect>
@@ -310,8 +296,8 @@
   <widget class="QPushButton" name="mCancelBtn">
    <property name="geometry">
     <rect>
-     <x>320</x>
-     <y>380</y>
+     <x>300</x>
+     <y>370</y>
      <width>80</width>
      <height>22</height>
     </rect>
@@ -1104,6 +1090,46 @@ et l'heure</string>
     <string>Ajouter</string>
    </property>
   </widget>
+  <widget class="QLabel" name="mCloudMQTTRefreshRateLbl">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>60</y>
+     <width>181</width>
+     <height>20</height>
+    </rect>
+   </property>
+   <property name="font">
+    <font>
+     <pointsize>10</pointsize>
+    </font>
+   </property>
+   <property name="text">
+    <string>Taux de rafraichissement (ms):</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+   </property>
+  </widget>
+  <widget class="QSpinBox" name="mCloudMQTTRefreshRateSpinBx">
+   <property name="geometry">
+    <rect>
+     <x>210</x>
+     <y>60</y>
+     <width>101</width>
+     <height>22</height>
+    </rect>
+   </property>
+   <property name="minimum">
+    <number>1000</number>
+   </property>
+   <property name="maximum">
+    <number>500000</number>
+   </property>
+   <property name="singleStep">
+    <number>1</number>
+   </property>
+  </widget>
  </widget>
  <resources/>
  <connections/>