Changeset 39184

Timestamp:

Nov 21, 2015, 3:17:25 PM (11 years ago)

Author:

eugene

Message:

move -ncolors to top-level arg parsing

Location:

branches/eam_branches/ipp-20151113/Ohana/src/kapa2

Files:

• include/constants.h (modified) (1 diff)
• include/globals.h (modified) (1 diff)
• src/CheckVisual.c (modified) (2 diffs)
• src/args.c (modified) (3 diffs)

branches/eam_branches/ipp-20151113/Ohana/src/kapa2/include/constants.h

@@ -11 +11 @@
 
 # define NCHANNELS 10
-# define NPIXELS_DYNAMIC 128
-
-// XXX for the moment, this is set to match the values in SetColorScale3D_CC
-# define NPIXELS_STATIC 128
-// # define NPIXELS_STATIC 4600 -- if we want fullcolor to work, need this
 
 # define PAD1  3

branches/eam_branches/ipp-20151113/Ohana/src/kapa2/include/globals.h

@@ -11 +11 @@
 int   NAN_GREEN;
 int   NAN_BLUE;
+
+int   NPIXELS_DYNAMIC;
+int   NPIXELS_STATIC;
 
 /* these should be absorbed into KapaImageWidget 

branches/eam_branches/ipp-20151113/Ohana/src/kapa2/src/CheckVisual.c

@@ -133 +133 @@
   if (graphic[0].dynamicColors) {
     Npixels = NPIXELS_DYNAMIC;
-    if ((N = get_argument (*argc, argv, "-ncolors"))) {
-      remove_argument(N, argc, argv);
-      Npixels = atoi (argv[N]);
-      remove_argument(N, argc, argv);
-    } 
 
     /* allocate color cells */
@@ -181 +176 @@
     }
   } else {
-    Npixels = NPIXELS_STATIC;
-    if ((N = get_argument (*argc, argv, "-ncolors"))) {
-      remove_argument(N, argc, argv);
-      Npixels = atoi (argv[N]);
-      remove_argument(N, argc, argv);
-    } 
-
     // XXX allocate the unsigned long *pixels here and above
     ALLOCATE (graphic[0].pixels, unsigned long, Npixels);

branches/eam_branches/ipp-20151113/Ohana/src/kapa2/src/args.c

@@ -1 +1 @@
 # include "Ximage.h"
+
+void help(void);
 
 int args (int *argc, char **argv) {
 
   int N;
+
+  if ((N = get_argument (*argc, argv, "-h"))) help();
+  if ((N = get_argument (*argc, argv, "-help"))) help();
+  if ((N = get_argument (*argc, argv, "--h"))) help();
+  if ((N = get_argument (*argc, argv, "--help"))) help();
 
   MAP_WINDOW = TRUE;
@@ -37 +44 @@
   }
 
+  NPIXELS_DYNAMIC = 128;
+  NPIXELS_STATIC = 128;
+  if ((N = get_argument (*argc, argv, "-ncolors"))) {
+    remove_argument(N, argc, argv);
+    NPIXELS_DYNAMIC = atoi (argv[N]);
+    NPIXELS_STATIC = NPIXELS_DYNAMIC;
+    remove_argument(N, argc, argv);
+  } 
+
   NAN_RED   = 0;
   NAN_GREEN = 0xffff;
@@ -56 +72 @@
   return (TRUE);
 }
+
+void help (void) {
+
+  fprintf (stderr, "USAGE: kapa [options]\n");
+  fprintf (stderr, "OPTIONS: \n");
+  fprintf (stderr, "-h, -help, --h, --help : this listing\n");
+  fprintf (stderr, "-nomap : use X but do not generate a window\n");
+  fprintf (stderr, "-name : name for the X window bar\n");
+  fprintf (stderr, "-noX : do not use an X window\n");
+  fprintf (stderr, "-debug : report debug info\n");
+  fprintf (stderr, "-fg : define the foreground color (X color style)\n");
+  fprintf (stderr, "-ncolors : set the number of colors (pixels) available (128 default)\n");
+  fprintf (stderr, "-nan (red) (green) (blue) : set NaN pixels to this color (hex values)\n");
+  exit (2);
+}