Merge branch 'master' of https://github.com/cbassa/sattools

data/sites.txt

@@ -26,6 +26,8 @@
 2751 BM   51.3440   -1.9849    125    Bruce MacDonald
 2756 AK   56.0907   -3.1623     25    Andy Kirkham
 4353 ML   52.1541    4.4908      0    Marco Langbroek
+4354 ML   52.1168    4.5602     -2    Marco Langbroek
+4355 ML   52.1388    4.4994     -2    Marco Langbroek   
 4541 AR   41.9639   12.4531     80    Alberto Rango
 4542 AR   41.9683   12.4545     80    Alberto Rango 
 4641 AR   41.1060   16.9010     70    Alberto Rango

measure.c

@@ -467,7 +467,7 @@ int main(int argc,char *argv[])
 
   // Number of images
   nimg=argc;
-
+  
   // Allocate
   img=(struct image *) malloc(sizeof(struct image)*nimg);
 
@@ -516,8 +516,9 @@ int main(int argc,char *argv[])
 
   // Forever loop
   for (;;) {
-    if (redraw==1) {
-      cpgeras();
+    if (redraw!=0) {
+      if (redraw==1) 
+	cpgeras();
       cpgsci(1);
       
       cpgsvp(0.1,0.9,0.1,0.85);
@@ -630,7 +631,10 @@ int main(int argc,char *argv[])
       iimg++;
       if (iimg>=nimg-1)
 	iimg=0;
-      redraw=1;
+      if (c==']')
+	redraw=2;
+      else
+	redraw=1;
       continue;
     }
 
@@ -639,7 +643,10 @@ int main(int argc,char *argv[])
       iimg--;
       if (iimg<0)
 	iimg=nimg-2;
-      redraw=1;
+      if (c=='[')
+	redraw=2;
+      else
+	redraw=1;
       continue;
     }
 

satfit.c

@@ -176,7 +176,7 @@ int revsearch(void)
 
   // Step 4: Loop over eccentricity
   for (rev=revmin;rev<revmax;rev+=drev) {
-    orb.satno=satno;
+    orb.satno=satno++;
     orb.rev=rev;
     
     // Set parameters