Merge remote-tracking branch 'origin/remote/origin/banig/ScopeChanges' into next

ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.cpp

@@ -114,6 +114,7 @@ QWidget* ScopeGadgetOptionsPage::createPage(QWidget *parent)
     connect(options_page->btnRemoveCurve, SIGNAL(clicked()), this, SLOT(on_btnRemoveCurve_clicked()));
     connect(options_page->lstCurves, SIGNAL(currentRowChanged(int)), this, SLOT(on_lstCurves_currentRowChanged(int)));
     connect(options_page->btnColor, SIGNAL(clicked()), this, SLOT(on_btnColor_clicked()));
+    connect(options_page->spnRefreshInterval, SIGNAL(valueChanged(int )), this, SLOT(on_spnRefreshInterval_valueChanged(int)));
 
     setYAxisWidgetFromPlotCurve();
 
@@ -349,3 +350,34 @@ void ScopeGadgetOptionsPage::on_loggingEnable_clicked()
     options_page->LoggingLabel->setEnabled(en);
 
  }
+
+void ScopeGadgetOptionsPage::on_spnRefreshInterval_valueChanged(int )
+{
+    validateRefreshInterval();
+}
+
+void ScopeGadgetOptionsPage::validateRefreshInterval()
+{
+    ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
+    UAVObjectManager *objManager = pm->getObject<UAVObjectManager>();
+    for(int iIndex = 0; iIndex < options_page->lstCurves->count();iIndex++) {
+        QListWidgetItem* listItem = options_page->lstCurves->item(iIndex);
+
+        QString uavObject = listItem->data(Qt::UserRole + 0).toString();
+
+        UAVDataObject* obj = dynamic_cast<UAVDataObject*>(objManager->getObject((uavObject)));
+        if(!obj) {
+            qDebug() << "Object  " << uavObject << " is missing";
+            continue;
+        }
+
+        if(options_page->spnRefreshInterval->value() < obj->getMetadata().flightTelemetryUpdatePeriod)
+        {
+            options_page->lblWarnings->setText("The refresh interval is faster than some or all telemetry objects.");
+            return;
+        }
+    }
+
+    options_page->lblWarnings->setText("");
+}
+

ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.h

@@ -70,8 +70,10 @@ private:
     void setCurvePlotProperties(QListWidgetItem *listWidgetItem, QString uavObject, QString uavField, int scale, int interpolation, QVariant varColor);
     void setYAxisWidgetFromPlotCurve();
     void setButtonColor(const QColor &color);
+    void validateRefreshInterval();
 
 private slots:
+    void on_spnRefreshInterval_valueChanged(int );
     void on_lstCurves_currentRowChanged(int currentRow);
     void on_btnRemoveCurve_clicked();
     void on_btnAddCurve_clicked();

ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.ui

@@ -6,14 +6,68 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>550</width>
+    <width>544</width>
-    <height>405</height>
+    <height>342</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_6">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QLabel" name="lblWarnings">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="palette">
+        <palette>
+         <active>
+          <colorrole role="WindowText">
+           <brush brushstyle="SolidPattern">
+            <color alpha="255">
+             <red>255</red>
+             <green>0</green>
+             <blue>0</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="WindowText">
+           <brush brushstyle="SolidPattern">
+            <color alpha="255">
+             <red>255</red>
+             <green>0</green>
+             <blue>0</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="WindowText">
+           <brush brushstyle="SolidPattern">
+            <color alpha="255">
+             <red>120</red>
+             <green>120</green>
+             <blue>120</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="lineWidth">
+        <number>1</number>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <property name="sizeConstraint">