Changeset 19840

Timestamp:

Oct 2, 2008, 10:46:11 AM (18 years ago)

Author:

eugene

Message:

set dx and dy indep

File:

• trunk/Ohana/src/opihi/cmd.data/vload.c (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.data/vload.c

@@ -6 +6 @@
   int kapa, type;
   char *name;
-  double dx, dy, size;
+  double dx, dy, size, angle;
   KiiOverlay *overlay;
   Vector *vecx, *vecy;
@@ -30 +30 @@
   }
 
-  size = 1.0;
+  if (get_argument (argc, argv, "-size") && get_argument (argc, argv, "-dx")) {
+      gprint (GP_ERR, "only specify one of -size, -dx, -dy\n");
+      return (FALSE);
+  }
+
+  dx = dy = 1.0;
   if ((N = get_argument (argc, argv, "-size"))) {
     remove_argument (N, &argc, argv);
-    size = fabs(atof (argv[N]));
+    dx = dy = fabs(atof (argv[N]));
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-dx"))) {
+    remove_argument (N, &argc, argv);
+    dx = fabs(atof (argv[N]));
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-dy"))) {
+    remove_argument (N, &argc, argv);
+    dy = fabs(atof (argv[N]));
+    remove_argument (N, &argc, argv);
+  }
+
+  angle = 0.0;
+  if ((N = get_argument (argc, argv, "-angle"))) {
+    remove_argument (N, &argc, argv);
+    angle = fabs(atof (argv[N]));
     remove_argument (N, &argc, argv);
   }
 
   if (argc != 4) {
-    gprint (GP_ERR, "USAGE: vload (overlay) (xvec) (yvec) [-n]\n");
+    gprint (GP_ERR, "USAGE: vload (overlay) (xvec) (yvec) [-n] [-type] [-size] [-dx] [-dy]\n");
     return (FALSE);
   }
   
   if (type == KII_OVERLAY_CIRCLE) {
-    dx = dy = size / 2;
-  } else {
-    dx = dy = size;
+      dx /= 2.0;
+      dy /= 2.0;
   }    
 
@@ -65 +86 @@
     overlay[i].dx = dx;
     overlay[i].dy = dy;
-    overlay[i].angle = 0.0;
+    overlay[i].angle = angle;
   }