Changeset 33476
- Timestamp:
- Mar 11, 2012, 5:35:44 AM (14 years ago)
- Location:
- branches/eam_branches/ipp-20111122/Ohana/src/opihi
- Files:
-
- 7 edited
-
cmd.basic/list.c (modified) (2 diffs)
-
cmd.data/init.c (modified) (3 diffs)
-
cmd.data/list_buffers.c (modified) (1 diff)
-
cmd.data/list_vectors.c (modified) (1 diff)
-
include/dvomath.h (modified) (2 diffs)
-
lib.shell/BufferOps.c (modified) (1 diff)
-
lib.shell/VectorOps.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.basic/list.c
r32827 r33476 19 19 remove_argument (N, &argc, argv); 20 20 RunCommand = TRUE; 21 } 22 23 if ((N = get_argument (argc, argv, "-vectors"))) { 24 remove_argument (N, &argc, argv); 25 if (argc != 2) { 26 gprint (GP_ERR, "USAGE: list (root) -vectors\n"); 27 return (FALSE); 28 } 29 ListVectorsToList (argv[1]); 30 return TRUE; 31 } 32 33 if ((N = get_argument (argc, argv, "-buffers"))) { 34 remove_argument (N, &argc, argv); 35 if (argc != 2) { 36 gprint (GP_ERR, "USAGE: list (root) -buffers\n"); 37 return (FALSE); 38 } 39 ListBuffersToList (argv[1]); 40 return TRUE; 21 41 } 22 42 … … 156 176 gprint (GP_ERR, "USAGE: list (root) : supply list data, terminate with 'END'\n"); 157 177 gprint (GP_ERR, "USAGE: list (root) -x (command) : create list from shell output\n"); 178 gprint (GP_ERR, "USAGE: list (root) -vectors : create list from vector names\n"); 179 gprint (GP_ERR, "USAGE: list (root) -buffers : create list from buffer names\n"); 158 180 gprint (GP_ERR, "USAGE: list (root) -split (words) : create list from words\n"); 159 181 gprint (GP_ERR, "USAGE: list (root) -splitbychar (char) (word) [(words)..] : create list from words\n"); -
branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.data/init.c
r31667 r33476 61 61 int header PROTO((int, char **)); 62 62 int list_vectors PROTO((int, char **)); 63 int vtype PROTO((int, char **)); 63 64 int load PROTO((int, char **)); 64 65 int lookup PROTO((int, char **)); … … 138 139 int zplot PROTO((int, char **)); 139 140 int zcplot PROTO((int, char **)); 141 142 // ??? 143 // int mtype PROTO((int, char **)); 144 // {1, "mtype", mtype, "return the type of the defined buffer"}, 140 145 141 146 static Command cmds[] = { … … 269 274 {1, "vclip", vclip, "clip values in a vector to be within a range"}, 270 275 {1, "vectors", list_vectors, "list vectors"}, 276 {1, "vtype", vtype, "return the vector type (FLT or INT)"}, 271 277 {1, "vgauss", vgauss, "fit a Gaussian to a vector"}, 272 278 {1, "vellipse", vellipse, "fit a Ellipse to a vector pair"}, -
branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.data/list_buffers.c
r2598 r33476 9 9 10 10 } 11 12 # if (0) 13 int mtype (int argc, char **argv) { 14 15 Variable = (char *) NULL; 16 if ((N = get_argument (argc, argv, "-var"))) { 17 remove_argument (N, &argc, argv); 18 Variable = strcreate (argv[N]); 19 remove_argument (N, &argc, argv); 20 } 21 22 if (argc != 2) { 23 gprint (GP_ERR, "USAGE: mtype (buffer) [-var out]\n"); 24 return (FALSE); 25 } 26 27 Buffer *buf = SelectBuffer (argv[1], OLDBUFFER, FALSE); 28 if (!buf) { 29 gprint (GP_ERR, "unknown buffer %s\n", argv[1]); 30 free (Variable); 31 return FALSE; 32 } 33 34 if (buf->type == OPIHI_FLT) { 35 if (Variable) { 36 set_str_variable (Variable, "FLT"); 37 } else { 38 gprint (GP_LOG, "%s : FLT\n", argv[1]); 39 } 40 } else { 41 if (Variable) { 42 set_str_variable (Variable, "INT"); 43 } else { 44 gprint (GP_LOG, "%s : INT\n", argv[1]); 45 } 46 } 47 if (Variable) free (Variable); 48 49 return (TRUE); 50 } 51 # endif -
branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.data/list_vectors.c
r2598 r33476 7 7 } 8 8 9 int vtype (int argc, char **argv) { 10 11 int N; 12 13 char *Variable = (char *) NULL; 14 if ((N = get_argument (argc, argv, "-var"))) { 15 remove_argument (N, &argc, argv); 16 Variable = strcreate (argv[N]); 17 remove_argument (N, &argc, argv); 18 } 19 20 if (argc != 2) { 21 gprint (GP_ERR, "USAGE: vtype (vector) [-var out]\n"); 22 return (FALSE); 23 } 24 25 Vector *vec = SelectVector (argv[1], OLDVECTOR, FALSE); 26 if (!vec) { 27 gprint (GP_ERR, "unknown vector %s\n", argv[1]); 28 free (Variable); 29 return FALSE; 30 } 31 32 if (vec->type == OPIHI_FLT) { 33 if (Variable) { 34 set_str_variable (Variable, "FLT"); 35 } else { 36 gprint (GP_LOG, "%s : FLT\n", argv[1]); 37 } 38 } else { 39 if (Variable) { 40 set_str_variable (Variable, "INT"); 41 } else { 42 gprint (GP_LOG, "%s : INT\n", argv[1]); 43 } 44 } 45 if (Variable) free (Variable); 46 47 return (TRUE); 48 } 49 -
branches/eam_branches/ipp-20111122/Ohana/src/opihi/include/dvomath.h
r33309 r33476 128 128 int IsVectorPtr PROTO((Vector *vec)); 129 129 int ListVectors PROTO((void)); 130 int ListVectorsToList PROTO((char *name)); 130 131 Vector *SelectVector PROTO((char *name, int mode, int verbose)); 131 132 int AssignVector PROTO((Vector *vec, char *name, int mode, int verbose)); … … 147 148 int IsBufferPtr PROTO((Buffer *buf)); 148 149 int PrintBuffers PROTO((int Long)); 150 int ListBuffersToList PROTO((char *name)); 149 151 int CreateBuffer PROTO((Buffer *buf, int Nx, int Ny, int bitpix, float bzero, float bscale)); 150 152 Buffer *SelectBuffer PROTO((char *name, int mode, int verbose)); -
branches/eam_branches/ipp-20111122/Ohana/src/opihi/lib.shell/BufferOps.c
r27435 r33476 256 256 return (TRUE); 257 257 } 258 259 int ListBuffersToList (char *name) { 260 261 int i; 262 char line[1024]; 263 264 for (i = 0; i < Nbuffers; i++) { 265 sprintf (line, "%s:%d", name, i); 266 set_str_variable (line, buffers[i][0].name); 267 } 268 sprintf (line, "%s:n", name); 269 set_int_variable (line, Nbuffers); 270 return (Nbuffers); 271 } -
branches/eam_branches/ipp-20111122/Ohana/src/opihi/lib.shell/VectorOps.c
r33313 r33476 324 324 return (TRUE); 325 325 } 326 327 int ListVectorsToList (char *name) { 328 329 int i; 330 char line[1024]; 331 332 for (i = 0; i < Nvectors; i++) { 333 sprintf (line, "%s:%d", name, i); 334 set_str_variable (line, vectors[i][0].name); 335 } 336 sprintf (line, "%s:n", name); 337 set_int_variable (line, Nvectors); 338 return (Nvectors); 339 }
Note:
See TracChangeset
for help on using the changeset viewer.
