Changeset 36627 for branches/eam_branches/ipp-20140206/ippTools/src/detselectConfig.c

Timestamp:

Apr 1, 2014, 11:03:38 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20140206

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/detselectConfig.c (modified) (2 diffs)

branches/eam_branches/ipp-20140206/ippTools/src

@@ -48 +48 @@
 releasetool
 fftool
+remotetool
+

@@ -48 +48 @@
 releasetool
 fftool
+remotetool
+

branches/eam_branches/ipp-20140206/ippTools/src/detselectConfig.c

@@ -65 +65 @@
     psMetadataAddStr(selectArgs, PS_LIST_TAIL, "-class_id", 0,                     "search by class ID", NULL);
     psMetadataAddBool(selectArgs, PS_LIST_TAIL, "-simple",  0,                      "use the simple output format", false);
+
+    // -show
+    psMetadata *showArgs = psMetadataAlloc();
+    psMetadataAddStr(showArgs, PS_LIST_TAIL, "-inst",       0,       "search by camera", NULL);
+    psMetadataAddStr(showArgs, PS_LIST_TAIL, "-telescope",  0,       "search by telescope", NULL);
+    psMetadataAddStr(showArgs, PS_LIST_TAIL, "-det_type",   0,       "search by detrend type", NULL);
+    psMetadataAddStr(showArgs, PS_LIST_TAIL, "-type",       0,       "search by detrend type (alias for -det_type)", NULL);
+    psMetadataAddBool(showArgs, PS_LIST_TAIL, "-simple",     0,       "use the simple output format", false);
     
     psMetadata *argSets = psMetadataAlloc();
@@ -71 +79 @@
     PXOPT_ADD_MODE("-search",  "search for an appropriate detrend", DETSELECT_MODE_SEARCH, searchArgs);
     PXOPT_ADD_MODE("-select",  "retreive detrend information", DETSELECT_MODE_SELECT, selectArgs);
+    PXOPT_ADD_MODE("-show",    "show all active detrends of this type with constraints", DETSELECT_MODE_SHOW, showArgs);
 
     if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {

@@ -48 +48 @@
 releasetool
 fftool
+remotetool
+