neighbour list must obey object list selection

pchev · Nov 3, 2019 · c034943 · c034943
1 parent 2ab57b4
commit c034943
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/skychart/fu_chart.pas b/skychart/fu_chart.pas
@@ -359,7 +359,7 @@   Tf_chart = class(TFrame)
     procedure IdentSearchResult(num, stype: string; itype: integer;
       ar1, de1: double; sr: string = ''; sn: string = ''; sd: string = '');
     procedure Identdetail(X, Y: integer);
-    function ListXY(X, Y: integer; r: integer = 12): boolean;
+    function ListXY(X, Y: integer; r: integer = 12; allobj:boolean=true): boolean;
     procedure rotation(rot: double);
     procedure GetSunImage;
     procedure CKeyDown(Key: word; Shift: TShiftState);
@@ -3034,7 +3034,7 @@ procedure Tf_chart.IdentSearchResult(num, stype: string; itype: integer;
     Fshowinfo(sc.cfgsc.FindDesc, Caption, True, self, sc.cfgsc.FindDesc2, sc.cfgsc.FindDesc2000);
 end;
 
-function Tf_chart.ListXY(X, Y: integer; r: integer = 12): boolean;
+function Tf_chart.ListXY(X, Y: integer; r: integer = 12; allobj:boolean=true): boolean;
 var
   ra, Dec, a, h, l, b, le, be, dx: double;
   buf, msg: string;
@@ -3045,8 +3045,8 @@ function Tf_chart.ListXY(X, Y: integer; r: integer = 12): boolean;
   sc.GetCoord(x, y, ra, Dec, a, h, l, b, le, be);
   ra := rmod(ra + pi2, pi2);
   dx := abs(r / sc.cfgsc.BxGlb); // search a 12 pixel radius by default
-  sc.Findlist(ra, Dec, dx, dx, buf, msg, False, True, True);
-  msg := msg + blank + rsSearch + ':' + IntToStr(r) + blank + rsPixels;
+  sc.Findlist(ra, Dec, dx, dx, buf, msg, False, allobj, True);
+  msg := msg + blank + rsSearchRadius + ': ' + DEToStrShort(rad2deg*dx, 0);
   if assigned(FListInfo) then
     FListInfo(buf, msg);
 end;

diff --git a/skychart/pu_main.pas b/skychart/pu_main.pas
@@ -10926,7 +10926,7 @@ procedure Tf_main.NeighborObj(chart: string);
         begin
           projection(sc.cfgsc.FindRa, sc.cfgsc.FindDec, x1, y1, True, sc.cfgsc);
           WindowXY(x1, y1, x, y, sc.cfgsc);
-          ListXY(round(x), round(y), 50);
+          ListXY(round(x), round(y), 50, false);
           break;
         end;
 end;

diff --git a/skychart/u_translation.pas b/skychart/u_translation.pas
@@ -1541,6 +1541,7 @@ function Translate(lang: string = ''): string;
   rsSlewComplete = 'Slew complete';
   rsPleaseWait = 'Please wait...';
   rsFlipNSMoveme = 'Flip N/S movement';
+  rsSearchRadius = 'Search radius';
 
 // also update upsi_translation