IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Apr 28, 2010, 10:27:33 AM (16 years ago)
Author:
eugene
Message:

updates from dev branch Ohana.20100407: improvements to kapa label and tick control, creation of setphot program

Location:
trunk/Ohana
Files:
2 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

  • trunk/Ohana/src/opihi/cmd.basic/opihi.c

    r27255 r27790  
    33int opihi_setmode (int argc, char **argv) {
    44
    5   int value;
     5  OpihiVerboseMode value;
    66
    77  if (argc < 2) {
    8     gprint (GP_ERR, "USAGE: opihi (verbose) [on/off]\n");
     8    gprint (GP_ERR, "USAGE: opihi (verbose) [on/off/error]\n");
    99    return (FALSE);
    1010  }
    … …  
    1313      if (argc == 2) {
    1414          value = get_verbose_shell();
    15           if (value) {
    16             gprint (GP_ERR, "opihi verbose mode: on\n");
    17           } else {
    18             gprint (GP_ERR, "opihi verbose mode: off\n");
    19           }
     15          switch (value) {
     16            case OPIHI_VERBOSE_OFF:
     17              gprint (GP_ERR, "opihi verbose mode: off\n");
     18              break;
     19            case OPIHI_VERBOSE_ON:
     20              gprint (GP_ERR, "opihi verbose mode: on\n");
     21              break;
     22            case OPIHI_VERBOSE_ERROR:
     23              gprint (GP_ERR, "opihi verbose mode: error\n");
     24              break;
     25            default:
     26              fprintf (stderr, "impossible condition\n");
     27              abort();
     28          }
    2029          return (TRUE);
    2130      }
    2231      if (!strcasecmp(argv[2], "on")) {
    23         set_verbose_shell (TRUE);
     32        set_verbose_shell (OPIHI_VERBOSE_ON);
    2433        return (TRUE);
    2534      }
    2635      if (!strcasecmp(argv[2], "off")) {
    27         set_verbose_shell (FALSE);
     36        set_verbose_shell (OPIHI_VERBOSE_OFF);
     37        return (TRUE);
     38      }
     39      if (!strcasecmp(argv[2], "error")) {
     40        set_verbose_shell (OPIHI_VERBOSE_ERROR);
    2841        return (TRUE);
    2942      }

  • trunk/Ohana/src/opihi/cmd.data/box.c

    r19839 r27790  
    2525  }
    2626
    27   graphmode.lweight = 1;
     27  // graphmode.lweight = 1;
    2828  if ((N = get_argument (argc, argv, "-lw"))) {
    2929    remove_argument (N, &argc, argv);
    … …  
    3232  }
    3333
    34   graphmode.color = KapaColorByName ("black");
     34  // graphmode.color = KapaColorByName ("black");
    3535  if ((N = get_argument (argc, argv, "-c"))) {
    3636    remove_argument (N, &argc, argv);
    … …  
    4040  }
    4141
    42   strcpy (graphmode.ticks, "2222");
     42  // XXX need to get the current values from kapa
     43  // strcpy (graphmode.ticks, "2222");
    4344  if ((N = get_argument (argc, argv, "-ticks"))) {
    4445    remove_argument (N, &argc, argv);
    … …  
    5152  }
    5253 
    53   strcpy (graphmode.labels, "2222");
     54  // strcpy (graphmode.labels, "2222");
    5455  if ((N = get_argument (argc, argv, "-labels"))) {
    5556    remove_argument (N, &argc, argv);
    … …  
    6263  }
    6364
    64   strcpy (graphmode.axis, "2222");
     65  // strcpy (graphmode.axis, "2222");
    6566  if ((N = get_argument (argc, argv, "-axis"))) {
    6667    remove_argument (N, &argc, argv);
    … …  
    7172      if ((graphmode.axis[i] != '0') && (graphmode.axis[i] != '1') && (graphmode.axis[i] != '2')) { goto usage; }
    7273    }
     74  }
     75
     76  if ((N = get_argument (argc, argv, "-tickpad"))) {
     77    remove_argument (N, &argc, argv);
     78    graphmode.ticktextPad = atof(argv[N]);
     79    remove_argument (N, &argc, argv);
     80  }
     81
     82  if ((N = get_argument (argc, argv, "-labelpadx"))) {
     83    remove_argument (N, &argc, argv);
     84    graphmode.labelPadXm = atof(argv[N]);
     85    remove_argument (N, &argc, argv);
     86  }
     87
     88  if ((N = get_argument (argc, argv, "-labelpady"))) {
     89    remove_argument (N, &argc, argv);
     90    graphmode.labelPadYm = atof(argv[N]);
     91    remove_argument (N, &argc, argv);
     92  }
     93
     94  if ((N = get_argument (argc, argv, "+labelpadx"))) {
     95    remove_argument (N, &argc, argv);
     96    graphmode.labelPadXp = atof(argv[N]);
     97    remove_argument (N, &argc, argv);
     98  }
     99
     100  if ((N = get_argument (argc, argv, "+labelpady"))) {
     101    remove_argument (N, &argc, argv);
     102    graphmode.labelPadYp = atof(argv[N]);
     103    remove_argument (N, &argc, argv);
     104  }
     105
     106  if ((N = get_argument (argc, argv, "-labelpad"))) {
     107    remove_argument (N, &argc, argv);
     108    graphmode.labelPadXm = atof(argv[N]);
     109    graphmode.labelPadXp = atof(argv[N]);
     110    graphmode.labelPadYm = atof(argv[N]);
     111    graphmode.labelPadYp = atof(argv[N]);
     112    remove_argument (N, &argc, argv);
     113  }
     114
     115  if ((N = get_argument (argc, argv, "-pad"))) {
     116    remove_argument (N, &argc, argv);
     117    graphmode.padXm = atof(argv[N]);
     118    graphmode.padXp = atof(argv[N]);
     119    graphmode.padYm = atof(argv[N]);
     120    graphmode.padYp = atof(argv[N]);
     121    remove_argument (N, &argc, argv);
     122  }
     123  if ((N = get_argument (argc, argv, "-xpad"))) {
     124    remove_argument (N, &argc, argv);
     125    graphmode.padXm = atof(argv[N]);
     126    remove_argument (N, &argc, argv);
     127  }
     128  if ((N = get_argument (argc, argv, "+xpad"))) {
     129    remove_argument (N, &argc, argv);
     130    graphmode.padXp = atof(argv[N]);
     131    remove_argument (N, &argc, argv);
     132  }
     133  if ((N = get_argument (argc, argv, "-ypad"))) {
     134    remove_argument (N, &argc, argv);
     135    graphmode.padYm = atof(argv[N]);
     136    remove_argument (N, &argc, argv);
     137  }
     138  if ((N = get_argument (argc, argv, "+ypad"))) {
     139    remove_argument (N, &argc, argv);
     140    graphmode.padYp = atof(argv[N]);
     141    remove_argument (N, &argc, argv);
    73142  }
    74143

  • trunk/Ohana/src/opihi/cmd.data/section.c

    r27491 r27790  
    11# include "data.h"
    22
    3 enum {NONE, LIST, UP, DOWN, TOP, BOTTOM, TOOL};
     3enum {NONE, LIST, UP, DOWN, TOP, BOTTOM, TOOL, BG};
    44
    55int section (int argc, char **argv) {
    66 
    7   int N, action, kapa;
     7  int N, action, kapa, background;
    88  Graphdata graphmode;
    99  KapaSection section;
    … …  
    3737    location = argv[N];
    3838    remove_argument (N, &argc, argv);
     39  }
     40
     41  background = -1; // invisible
     42  if ((N = get_argument (argc, argv, "-bg"))) {
     43    remove_argument (N, &argc, argv);
     44    if (!strcasecmp (argv[N], "NONE")) {
     45      background = -1;
     46    } else {
     47      background = KapaColorByName(argv[N]);
     48    }
     49    remove_argument (N, &argc, argv);
     50    action = BG;
    3951  }
    4052
    … …  
    8294        break;
    8395
     96      case BG:
     97        KapaSectionBG (kapa, argv[1], background);
     98        break;
     99
    84100      case TOOL:
    85101        if (!strcmp(location, "-x")) {
    … …  
    121137    section.dx = atof (argv[4]);
    122138    section.dy = atof (argv[5]);
     139    section.bg = background;
    123140    KapaSetSection (kapa, &section);
    124141    return (TRUE);

  • trunk/Ohana/src/opihi/include/shell.h

    r27435 r27790  
    1515typedef enum {GP_FILE, GP_BUFF} gpMode;
    1616typedef enum {GP_LOG, GP_ERR} gpDest;
     17typedef enum {OPIHI_VERBOSE_OFF, OPIHI_VERBOSE_ON, OPIHI_VERBOSE_ERROR} OpihiVerboseMode;
    1718
    1819typedef int CommandF (int argc, char **argv);

  • trunk/Ohana/src/opihi/lib.shell/command.c

    r27255 r27790  
    22# define DEBUG 0
    33
    4 static int VERBOSE_SHELL = FALSE;
     4static int VERBOSE_SHELL = OPIHI_VERBOSE_OFF;
    55
    66int command (char *line, char **outline, int VERBOSE) {
    … …  
    1010  Command *cmd;
    1111
    12   rawline = NULL;
    13   // rawline = strcreate (line);
     12  // rawline = NULL;
     13  rawline = strcreate (line);
    1414
    1515  /* force a space between ! and first word: !ls becomes ! ls */
    … …  
    2424  /* expand anything of the form fred[N] */
    2525  line = expand_vectors (line);  /* line is freed here, new one allocated */
     26
     27  // print the line with the variables and vectors expanded, but before evaluating
     28  // any in-line math expression
     29  if (VERBOSE_SHELL == OPIHI_VERBOSE_ON) gprint (GP_ERR, "opihi: %s\n", line);
     30
    2631  /* solve math expresions, assign variable, if needed */
    2732  line = parse (line);        /* line is freed here, new one allocated */
    … …  
    3136  *outline = line;
    3237 
    33   if (VERBOSE_SHELL) gprint (GP_ERR, "opihi: %s\n", line);
    34 
    3538  argv = parse_commands (line, &argc);
    3639  if (argc == 0) {
    … …  
    6063    msg = get_variable_ptr ("ERRORMSG");
    6164    if (msg != (char *) NULL) gprint (GP_ERR, "%s\n", msg);
    62     if (VERBOSE_SHELL) gprint (GP_ERR, "error on line: %s\n", rawline);
     65    if (VERBOSE_SHELL != OPIHI_VERBOSE_OFF) gprint (GP_ERR, "error on line: %s\n", rawline);
    6366  }
    6467
Note: See TracChangeset for help on using the changeset viewer.