222 - don't display dx station's Entity string when same as users. (#223

) Fix #222.
w7sst · Jan 20, 2024 · a0dfaba · a0dfaba
2 parents f64dbfa + 6769444
commit a0dfaba
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/CWSST.pas b/CWSST.pas
@@ -296,7 +296,8 @@ function TCWSST.GetStationInfo(const ACallsign: string) : string;
       // return userText. If empty, return DXCC Continent/Entity info.
       userText := cwopsrec.UserText;
       if userText.IsEmpty and
-         gDXCCList.FindRec(dxrec, ACallsign) then
+         gDXCCList.FindRec(dxrec, ACallsign) and
+         (dxrec.Entity <> Me.MyEntity) then
         userText := dxRec.Continent + '/' + dxRec.Entity;
 
       if not userText.IsEmpty then

diff --git a/MyStn.pas b/MyStn.pas
@@ -17,6 +17,7 @@   TMyStation = class(TStation)
     procedure AddToPieces(AMsg: string);
     procedure SendNextPiece;
   public
+    MyEntity : String;
     constructor CreateStation;
     destructor Destroy; override;
     procedure Init;
@@ -32,7 +33,7 @@   TMyStation = class(TStation)
 implementation
 
 uses
-  SysUtils, RndFunc, Ini, MorseKey, Contest, Main;
+  SysUtils, RndFunc, Ini, MorseKey, Contest, Main, ARRL;
 
 { TMyStation }
 
@@ -52,9 +53,13 @@ destructor TMyStation.Destroy;
 
 
 procedure TMyStation.Init;
+var
+  dxrec : TDXCCRec;
 begin
   inherited Init;
 
+  dxrec := nil;
+
   MyCall := Ini.Call;
   NR := 1;
   RST := 599;
@@ -71,6 +76,11 @@ procedure TMyStation.Init;
   OpName := HamName;
   Exch1 := '3A';
   Exch2 := 'OR';
+
+  // load my Entity string; used to filter user-text status messages
+  MyEntity := '';
+  if gDXCCList.FindRec(dxrec, MyCall) then
+    MyEntity := dxrec.Entity;
 end;