Changeset 25022 for branches/eam_branches/20090715/ppMerge/src/ppMergeArguments.c

Timestamp:

Aug 7, 2009, 12:45:24 PM (17 years ago)

Author:

eugene

Message:

update from mainline

Location:

branches/eam_branches/20090715

Files:

• . (modified) (1 prop)
• ppMerge/src/ppMergeArguments.c (modified) (6 diffs)

branches/eam_branches/20090715/ppMerge/src/ppMergeArguments.c

@@ -170 +170 @@
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-fringe-xsmooth", 0, "Number of smoothing regions in x", 0);
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-fringe-ysmooth", 0, "Number of smoothing regions in y", 0);
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-fringe-smooth", 0, "Smooth output image", false);
+    psMetadataAddF32(arguments, PS_LIST_TAIL, "-fringe-smooth-sigma", 0, "Size of smoothing Gaussian", NAN);
 
     /** CTEMASK construction parameters */
@@ -201 +203 @@
         psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CELL_SELECTIONS", PS_DATA_STRING, "", argv[argnum]);
         psArgumentRemove (argnum, &argc, argv);
+    }
+
+    if ((argnum = psArgumentGet (argc, argv, "-visual"))) {
+        psArgumentRemove (argnum, &argc, argv);
+        pmVisualSetVisual(true);
     }
 
@@ -324 +331 @@
     VALUE_ARG_RECIPE_INT("-fringe-xsmooth", "FRINGE.XSMOOTH", S32, 0);
     VALUE_ARG_RECIPE_INT("-fringe-ysmooth", "FRINGE.YSMOOTH", S32, 0);
+    VALUE_ARG_RECIPE_BOOL("-fringe-smooth", "FRINGE.SMOOTH");
+    VALUE_ARG_RECIPE_FLOAT("-fringe-smooth-sigma", "FRINGE.SMOOTH.SIGMA", F32);
 
     /** CTEMASK construction parameters */
@@ -371 +380 @@
             bool scale = false;         ///< Scale values?
             float min = NAN, max = NAN; ///< Minimum and maximum values for scaling
+            char *rule = NULL;
             switch (item->type) {
               case PS_TYPE_S32:
@@ -381 +391 @@
                 min = psMetadataLookupF32(&mdok, item->data.md, "MIN");
                 max = psMetadataLookupF32(&mdok, item->data.md, "MAX");
+                rule = psMetadataLookupStr(&mdok, item->data.md, "RULE");
                 break;
               default:
@@ -398 +409 @@
             ord->min = min;
             ord->max = max;
+            ord->rule = psStringCopy(rule);
             psArrayAdd(translated, translated->n, ord);
             psFree(ord);