Merge 2813f95e39 into fa954f2a31

scripts/st_delobs.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Take into account that for this script to work as expected it should be run as ". st_delobs.sh" with
+# a dot at the beginning of the command line
+
+OBSTIME=`pwd | awk -F"/" '{print $(NF)}'`
+DATE=`pwd | awk -F"/" '{print $(NF-1)}'`
+
+echo $OBSTIME
+echo $DATE
+
+cd .. | sh
+
+if [ ! -d $ST_OBSDIR/deleted ]; then
+	mkdir $ST_OBSDIR/deleted
+fi
+
+if [ ! -d $ST_OBSDIR/deleted/$DATE ]; then
+	mkdir $ST_OBSDIR/deleted/$DATE
+fi
+
+cd ..
+mv $OBSTIME $ST_OBSDIR/deleted/$DATE
+

scripts/st_storeobs.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Take into account that for this script to work as expected it should be run as ". st_storeobs.sh" with
+# a dot at the beginning of the command line
+
+OBSTIME=`pwd | awk -F"/" '{print $(NF)}'`
+DATE=`pwd | awk -F"/" '{print $(NF-1)}'`
+
+echo $OBSTIME
+echo $DATE
+
+cd .. | sh
+
+if [ ! -d $ST_OBSDIR/stored ]; then
+	mkdir $ST_OBSDIR/stored
+fi
+
+if [ ! -d $ST_OBSDIR/stored/$DATE ]; then
+	mkdir $ST_OBSDIR/stored/$DATE
+fi
+
+cd ..
+mv $OBSTIME $ST_OBSDIR/stored/$DATE
+

skymap.c

@@ -1615,6 +1615,8 @@ void skymap_plotsatellite(char *filename,int satno,double mjd0,double dt)
       continue;
     if (m.leoflag==4 && strcmp(type,"GTO")!=0)
       continue;
+    if (m.leoflag==5 && strcmp(type,"GEO")==0)
+      continue;
 
     sprintf(norad," %ld",Isat);
 
@@ -2359,6 +2361,8 @@ int plot_skymap(void)
 	    sprintf(text,"GEO");
 	  else if (m.leoflag==4)
 	    sprintf(text,"GTO");
+	  else if (m.leoflag==5)
+	    sprintf(text,"AllButGEO");
 	} else if (Isatsel>0) {
 	  sprintf(text,"%05d",(int) Isatsel);
 	} else {
@@ -2610,7 +2614,7 @@ int plot_skymap(void)
     if (c=='L') {
       if (Isatsel==0) {
 	m.leoflag++;
-	if (m.leoflag>4)
+	if (m.leoflag>5)
 	  m.leoflag=-1;
 	redraw=1;
       } else {