Modify validation functions and when called

EdgeTX · Jan 23, 2025 · 575d379 · 575d379
1 parent 1c0202e
commit 575d379
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 24 deletions.
diff --git a/companion/src/firmwares/modeldata.cpp b/companion/src/firmwares/modeldata.cpp
@@ -1927,36 +1927,29 @@ int ModelData::getCustomScreensCount() const
   return cnt;
 }
 
-bool ModelData::isValid(QWidget * parent)
+void ModelData::validate()
 {
-  int inputerrors = 0;
+  modelErrors = false;
+
   for (int i = 0; i < CPN_MAX_INPUTS; i++) {
     if (!expoData[i].isEmpty() && expoData[i].srcRaw == SOURCE_TYPE_NONE)
-      inputerrors++;
+      modelErrors = true;
+      return;
   }
 
   int mixerrors = 0;
   for (int i = 0; i < CPN_MAX_MIXERS; i++) {
     if (!mixData[i].isEmpty() && mixData[i].srcRaw == SOURCE_TYPE_NONE)
-      mixerrors++;
-  }
-
-  if (inputerrors > 0 || mixerrors > 0) {
-    QString msg = tr("Model %1 has the following errors:").arg(name) % "\n\n";
-    if (inputerrors > 0)
-      msg.append(tr("- %1 inputs with no source").arg(inputerrors) % "\n");
-    if (mixerrors > 0)
-      msg.append(tr("- %1 mixes with no source").arg(mixerrors));
-
-    QMessageBox::information(parent, CPN_STR_APP_NAME, msg);
-    return false;
+      modelErrors = true;
+      return;
   }
-
-  return true;
 }
 
 void ModelData::fixErrors()
 {
+  if (!modelErrors)
+    return;
+
   for (int i = 0; i < CPN_MAX_INPUTS; i++) {
     if (!expoData[i].isEmpty() && expoData[i].srcRaw == SOURCE_TYPE_NONE) {
       //  delete input line and fix up anything else then update refs
@@ -1969,5 +1962,4 @@ void ModelData::fixErrors()
       //  delete mixer line and fix up anything like numbering??
     }
   }
-
 }
diff --git a/companion/src/firmwares/modeldata.h b/companion/src/firmwares/modeldata.h
@@ -131,6 +131,7 @@ class ModelData {
     char      labels[100];
     int       modelIndex;      // Companion only, temporary index position managed by data model.
     bool      modelUpdated;    // Companion only, used to highlight if changed in models list
+    bool      modelErrors;     // Companion only, used to highlight if data errors in models list
 
     TimerData timers[CPN_MAX_TIMERS];
     bool      noGlobalFunctions;
@@ -355,8 +356,10 @@ class ModelData {
     static AbstractStaticItemModel * funcSwitchStartItemModel();
 
     int getCustomScreensCount() const;
-    bool isValid(QWidget * parent = nullptr);
     void fixErrors();
+    bool hasErrors() { return modelErrors; }
+    bool isValid() { return !hasErrors(); }
+    void validate();
 
   protected:
     void removeGlobalVar(int & var);

diff --git a/companion/src/firmwares/radiodata.cpp b/companion/src/firmwares/radiodata.cpp
@@ -344,12 +344,18 @@ AbstractStaticItemModel * RadioData::modelSortOrderItemModel()
   return mdl;
 }
 
-int RadioData::invalidModels(QWidget * parent)
+void RadioData::validateModels()
+{
+  for(auto &model: models)
+    model.validate();
+}
+
+int RadioData::invalidModels()
 {
   int cnt = 0;
 
   for(auto &model: models)
-    cnt += model.isValid(parent) ? 0 : 1;
+    cnt += model.isValid() ? 0 : 1;
 
   return cnt;
 }

diff --git a/companion/src/firmwares/radiodata.h b/companion/src/firmwares/radiodata.h
@@ -66,7 +66,8 @@ class RadioData {
     void setCurrentModel(unsigned int index);
     void fixModelFilenames();
     QString getNextModelFilename();
-    int invalidModels(QWidget * parent = nullptr);
+    void validateModels();
+    int invalidModels();
     void fixInvalidModels();
 
     static QString modelSortOrderToString(int value);

diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp
@@ -1295,6 +1295,8 @@ bool MdiChild::loadFile(const QString & filename, bool resetCurrentFile)
     refresh();
   }
 
+  radioData.validateModels();
+
   return true;
 }
 
@@ -1331,7 +1333,8 @@ bool MdiChild::saveAs(bool isNew)
 
 bool MdiChild::saveFile(const QString & filename, bool setCurrent)
 {
-  int cnt = radioData.invalidModels(this);
+  //  do not check for etx files as we accept errors
+  int cnt = radioData.invalidModels();
   if (cnt) {
     if (askQuestion(tr("%1 models have errors. Repair?").arg(cnt), QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel) == QMessageBox::Yes) {
       radioData.fixInvalidModels();
@@ -1353,8 +1356,10 @@ bool MdiChild::saveFile(const QString & filename, bool setCurrent)
   g.eepromDir(QFileInfo(filename).dir().absolutePath());
 
   for (int i = 0; i < (int)radioData.models.size(); i++) {
-    if (!radioData.models[i].isEmpty())
+    if (!radioData.models[i].isEmpty()) {
       radioData.models[i].modelUpdated = false;
+      radioData.models[i].validate();
+    }
   }
 
   refresh();

diff --git a/companion/src/modelslist.cpp b/companion/src/modelslist.cpp
@@ -186,6 +186,12 @@ QVariant ModelsListModel::data(const QModelIndex & index, int role) const
   }
 
   if (role == Qt::ForegroundRole && item->isModel()) {
+    if (index.column() == (hasLabels ? 0 : 1) && radioData->models[item->getModelIndex()].modelErrors) {
+      QBrush brush;
+      brush.setColor(Qt::red);
+      return brush;
+    }
+
     int col = item->columnCount() - 1;
     if(hasLabels)
         col --;