Index: trunk/Ohana/src/opihi/cmd.data/erase.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/erase.c	(revision 4689)
+++ trunk/Ohana/src/opihi/cmd.data/erase.c	(revision 5846)
@@ -3,5 +3,5 @@
 int erase (int argc, char **argv) {
   
-  int i, n, N;
+  int i, N;
   int Ximage, Nimage;
   
@@ -21,27 +21,16 @@
 
   for (i = 1; i < argc; i++) {
-    if (strcmp (argv[i], "0")   && strcmp (argv[i], "1")     && strcmp (argv[i], "2")   && strcmp (argv[i], "3") &&
-	strcmp (argv[i], "red") && strcmp (argv[i], "green") && strcmp (argv[i], "blue") && strcmp (argv[i], "yellow") &&
-	strcmp (argv[i], "all") && strcmp (argv[i], "tick") ) {
+    if (!(strcasecmp (argv[i], "all"))) {
+      KiiEraseOverlay (Ximage, "red");
+      KiiEraseOverlay (Ximage, "green");
+      KiiEraseOverlay (Ximage, "blue");
+      KiiEraseOverlay (Ximage, "yellow");
+      continue;
+    }
+    if (!KiiSelectOverlay (argv[i], &N)) {
       fprintf (stderr, "%s is not a valid overlay\n", argv[i]);
       return (FALSE);
     }
-    n = atof (argv[i]);
-    if (!(strcmp (argv[i], "all"))) {
-      for (n = 0; n < 4; n++) {
-	SendGraphCommand (Ximage, 4, "ERAS");
-	SendGraphCommand (Ximage, 16, "OVERLAY %7d ", n);
-      }
-      return (TRUE);
-    }
-    
-    if (!(strcmp (argv[i], "red"))) n = 0;
-    if (!(strcmp (argv[i], "green"))) n = 1;
-    if (!(strcmp (argv[i], "blue"))) n = 2;
-    if (!(strcmp (argv[i], "yellow"))) n = 3;
-    if (!(strcmp (argv[i], "tick"))) n = 4;
-    
-    SendGraphCommand (Ximage, 4, "ERAS");
-    SendGraphCommand (Ximage, 16, "OVERLAY %7d ", n);
+    KiiEraseOverlay (Ximage, argv[i]);
   }
   return (TRUE);