Changeset 3667 for trunk/stac/src/shiftSize.c

Timestamp:

Apr 5, 2005, 12:13:28 PM (21 years ago)

Author:

Paul Price

Message:

Cleaning up stac.c to work with TESTING. shiftSize now working. Added stacWriteMaps.

File:

• trunk/stac/src/shiftSize.c (modified) (5 diffs)

trunk/stac/src/shiftSize.c

@@ -14 +14 @@
 #include "stac.h"
 
+void help(const char *name)
+{
+    fprintf (stderr, "shiftSize: Calculate size for output combined image\n"
+             "Usage: %s [-h] [-v] IN1 IN2...\n"
+             "where\n"
+             "\t-h           Help (this info)\n"
+             "\t-v           Increase verbosity level\n"
+             "\tIN1, IN2...  Input images, which have associated .map files.\n",
+             name
+        );
+}
+
+
 int main(int argc, char *argv[])
 {
@@ -20 +33 @@
 #ifdef TESTING
     psTraceSetLevel("stac.checkMemory",10);
-    psTraceSetLevel("stac.config",10);
     psTraceSetLevel("stac.read",10);
     psTraceSetLevel("stac.size",10);
@@ -28 +40 @@
     psLogSetLevel(9);
 
+
+    int verbose = 0;                    // Verbosity level
+
     // Parse command line
-    stacConfig *config = stacConfigAlloc(); // Configuration values
     const char *programName = argv[0];  // Program name
-
-    float saturated = 65535.0;          // Saturation level
-    float bad = 0.0;                    // Bad level
-
     /* Variables for getopt */
     int opt;   /* Option, from getopt */
@@ -47 +57 @@
             exit(EXIT_SUCCESS);
           case 'v':
-            config->verbose++;
+            verbose++;
             break;
           default:
@@ -62 +72 @@
     }
 
-    // Get the input files
-    config->inputs = psArrayAlloc(argc);
+    psArray *inputs = psArrayAlloc(argc); // Input filenames
     for (int i = 0; i < argc; i++) {
-        config->inputs->data[i] = psAlloc(strlen(argv[i]));
-        strncpy(config->inputs->data[i], argv[i], strlen(argv[i]));
+        inputs->data[i] = psAlloc(strlen(argv[i]));
+        strncpy(inputs->data[i], argv[i], strlen(argv[i]));
     }
 
-
     // Read input files
-    psArray *inputs = stacReadImages(config);
+    psArray *images = stacReadImages(inputs);
 
     // Read maps
-    psArray *maps = stacReadMaps(config);
+    psArray *maps = stacReadMaps(inputs);
 
     // Get size
-    stacSize(config, inputs, maps);
+    int outnx, outny;                   // Size of combined image
+    float xMapDiff, yMapDiff;           // Difference to apply to maps
+    stacSize(&outnx, &outny, &xMapDiff, &yMapDiff, images, maps);
 
-    printf("%d %d\n", config->outnx, config->outny);
+    printf("%d %d\n", outnx, outny);
 
     // Write out altered maps
-    stacWriteMaps(maps, config);
+    stacWriteMaps(inputs, maps);
 
-    psFree(config);
     psFree(inputs);
+    psFree(images);
     psFree(maps);