Merge branch 'master' into devel

hmatuschek · Oct 14, 2023 · 1f5374e · 1f5374e
2 parents 2cbfba6 + 31a5135
commit 1f5374e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/lib/radiolimits.cc b/lib/radiolimits.cc
@@ -795,7 +795,7 @@ RadioLimitRefList::verify(const ConfigItem *item, const QMetaProperty &prop, Rad
 
   if ((0 <= _maxSize) && (_maxSize < plist->count())) {
     auto &msg = context.newMessage(RadioLimitIssue::Warning);
-    msg << "List '" << prop.name() << "' takes at most " << _minSize
+    msg << "List '" << prop.name() << "' takes at most " << _maxSize
         << " elements, " << plist->count() << " elements found.";
     return false;
   }
@@ -855,7 +855,7 @@ RadioLimitGroupCallRefList::verify(const ConfigItem *item, const QMetaProperty &
 
   if ((0 <= _maxSize) && (_maxSize < plist->count())) {
     auto &msg = context.newMessage(RadioLimitIssue::Warning);
-    msg << "List '" << prop.name() << "' takes at most " << _minSize
+    msg << "List '" << prop.name() << "' takes at most " << _maxSize
         << " elements, " << plist->count() << " elements found.";
     return false;
   }

diff --git a/lib/roamingzone.cc b/lib/roamingzone.cc
@@ -44,6 +44,14 @@ RoamingZone::clear() {
   _channel.clear();
 }
 
+bool
+RoamingZone::contains(const RoamingChannel *ch) const {
+  for (int i=0; i<count(); i++)
+    if (ch == channel(i))
+      return true;
+  return false;
+}
+
 RoamingChannel*
 RoamingZone::channel(int idx) const {
   if ((idx < 0) || (idx >= count()))

diff --git a/lib/roamingzone.hh b/lib/roamingzone.hh
@@ -40,6 +40,8 @@ public:
   /** Clears the zone list. */
   void clear();
 
+  /** Returns @c true, if the given roaming channel is member of this zone. */
+  bool contains(const RoamingChannel *ch) const;
   /** Returns the roaming channel, which is the member at index @c idx (0-based).
    * @param idx Specifies the index of the member channel. */
   RoamingChannel *channel(int idx) const;

diff --git a/src/configitemwrapper.cc b/src/configitemwrapper.cc
@@ -497,7 +497,7 @@ RoamingChannelListWrapper::RoamingChannelListWrapper(RoamingChannelList *list, Q
 int
 RoamingChannelListWrapper::columnCount(const QModelIndex &index) const {
   Q_UNUSED(index);
-  return 5;
+  return 6;
 }
 
 QVariant
@@ -524,6 +524,16 @@ RoamingChannelListWrapper::data(const QModelIndex &index, int role) const {
       }
     }
     return tr("[Selected]");
+  case 5: {
+      QStringList zones;
+      for(int i=0;i<ch->config()->roamingZones()->count(); i++) {
+        RoamingZone *zone = ch->config()->roamingZones()->zone(i);
+        if (zone->contains(ch))
+          zones.append(zone->name());
+      }
+      return zones.join(", ");
+    } break;
+
   default: break;
   }
 
@@ -540,6 +550,7 @@ RoamingChannelListWrapper::headerData(int section, Qt::Orientation orientation,
   case 2: return tr("TX Frequency");
   case 3: return tr("CC");
   case 4: return tr("TS");
+  case 5: return tr("Zones");
   default: break;
   }
   return QVariant();