wsjtx: fix 'calling me' spot never firing (#5823)

DxClusterCallsign was the only source for myCall; operators without a
DX cluster login configured got an empty string, so isCallingMe was
always false and red spots never appeared on the pan.

Fall back to m_radioModel.callsign() when DxClusterCallsign is empty.
Also made the comparison case-insensitive and strip angle-bracket hash
notation and /P suffixes before comparing so portable/hashed calls match.

Candidate 2 of #5823; does not close the issue.

Squashed-from: #5841
Co-authored-by: rah501xx <279323019+WA8PAM@users.noreply.github.com>

Author: WA8PAM

src/gui/DxClusterDialog.cpp

@@ -58,6 +58,20 @@ QColor getColorForLiveParent(const QColor& initial, DxClusterDialog* parent,
     return parentGuard ? color : QColor();
 }
 
+// Normalizes a callsign before a "calling me?" comparison — same logic as
+// MainWindow_Spots.cpp. Applied to both the message token and the configured
+// callsign so /P-style suffixes and <hash> calls match on both sides (#5823).
+QString normalizeCallForMatch(QString c)
+{
+    c = c.trimmed();
+    if (c.size() > 2 && c.startsWith(QLatin1Char('<')) && c.endsWith(QLatin1Char('>')))
+        c = c.mid(1, c.size() - 2);
+    const int slash = c.indexOf(QLatin1Char('/'));
+    if (slash > 0)
+        c = c.left(slash);
+    return c;
+}
+
 } // namespace
 
 // GuardedSlider variant that resets to a stored default on left
@@ -509,10 +523,13 @@ DxClusterDialog::DxClusterDialog(DxClusterClient* clusterClient, DxClusterClient
         bool isPOTA = msg.contains("CQ POTA");
         bool isCallingMe = false;
         {
-            QString myCall = as.value("DxClusterCallsign").toString();
+            // Same fallback and normalization as MainWindow_Spots.cpp (#5823).
+            QString myCall = normalizeCallForMatch(
+                as.value("DxClusterCallsign").toString());
             if (!myCall.isEmpty()) {
                 QStringList parts = msg.split(' ', Qt::SkipEmptyParts);
-                if (parts.size() >= 2 && parts[0] == myCall)
+                if (parts.size() >= 2 &&
+                    normalizeCallForMatch(parts[0]).compare(myCall, Qt::CaseInsensitive) == 0)
                     isCallingMe = true;
             }
         }

src/gui/MainWindow_Spots.cpp

@@ -47,6 +47,24 @@
 #include <cmath>
 #include <memory>
 
+namespace {
+// Normalizes a callsign before a "calling me?" comparison. Applied to BOTH
+// the message token and the configured/radio callsign so portable suffixes
+// (/P, /QRP, /M …) and angle-bracket hashed calls (<K1ABC>) match correctly
+// on both sides. Without this, a configured callsign like VE3ABC/P would stop
+// matching after stripping only the message side (#5823 review blocker).
+QString normalizeCallForMatch(QString c)
+{
+    c = c.trimmed();
+    if (c.size() > 2 && c.startsWith(QLatin1Char('<')) && c.endsWith(QLatin1Char('>')))
+        c = c.mid(1, c.size() - 2);
+    const int slash = c.indexOf(QLatin1Char('/'));
+    if (slash > 0)
+        c = c.left(slash);
+    return c;
+}
+} // namespace
+
 namespace AetherSDR {
 
 void MainWindow::wireSpotSubsystem()
@@ -695,10 +713,21 @@ void MainWindow::wireSpotSubsystem()
         bool isPOTA = msg.contains("CQ POTA");
         bool isCallingMe = false;
         {
-            QString myCall = as.value("DxClusterCallsign").toString();
+            // Prefer the explicit cluster login callsign; fall back to the
+            // radio's own callsign so operators who never configure a DX
+            // cluster login still get "calling me" spots (#5823).
+            // RadioModel::callsign() already trims, so no .trimmed() needed.
+            QString myCall = as.value("DxClusterCallsign").toString().trimmed();
+            if (myCall.isEmpty())
+                myCall = m_radioModel.callsign();
+            // Normalize BOTH sides through the same helper before comparing so
+            // a configured call like VE3ABC/P matches the stripped message token
+            // VE3ABC, and a hashed <K1ABC> in the decode matches K1ABC on file.
+            myCall = normalizeCallForMatch(myCall);
             if (!myCall.isEmpty()) {
                 QStringList parts = msg.split(' ', Qt::SkipEmptyParts);
-                if (parts.size() >= 2 && parts[0] == myCall)
+                if (parts.size() >= 2 &&
+                    normalizeCallForMatch(parts[0]).compare(myCall, Qt::CaseInsensitive) == 0)
                     isCallingMe = true;
             }
         }