Changeset 7676 for trunk/psModules/src/config/pmConfig.h

Timestamp:

Jun 23, 2006, 5:25:14 PM (20 years ago)

Author:

Paul Price

Message:

Fixing up pmConfigReadRecipes to get recipes from the command-line. Also pushed argc and argv into pmConfig.

File:

• trunk/psModules/src/config/pmConfig.h (modified) (6 diffs)

trunk/psModules/src/config/pmConfig.h

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-17 01:50:43 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-24 03:25:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
     psMetadata *camera;                 // Camera specification
     psMetadata *recipes;                // Recipes for processing
-    psMetadata *arguments;              // Command-line arguments
+    psMetadata *arguments;              // Processed command-line arguments
     psMetadata *files;                  // pmFPAfiles used for analysis
-    //    psMetadata *format;   // camera format for primary image
     psDB *database;                     // Database handle
+    int argc;                           // Number of command-line arguments
+    char **argv;                        // Command-line arguments (raw version)
 }
 pmConfig;
 
-pmConfig *pmConfigAlloc(void);
+pmConfig *pmConfigAlloc(int argc,       // Number of command-line arguments
+                        char **argv     // Command-line arguments
+                       );
 
 void pmConfigSet(const char *path); // set the configPath
@@ -51 +54 @@
  */
 pmConfig *pmConfigRead(
-    int *argc,
+    int argc,
     char **argv);
 
@@ -90 +93 @@
 psMetadata *pmConfigCameraByName(
     pmConfig *config,                   // The configuration
-    const char *cameraName   // The camera name header
+    const char *cameraName                      // The camera name header
 );
 
@@ -99 +102 @@
  *
  */
-bool pmConfigReadRecipes(
-    pmConfig *config
-);
+bool pmConfigReadRecipes(pmConfig *config // Configuration
+                        );
 
 /** pmConfigDB
@@ -123 +125 @@
 
 
-psArray *pmConfigFileSets (int *argc, char **argv, char *file, char *list);
-bool pmConfigFileSetsMD (psMetadata *metadata, int *argc, char **argv, char *name, char *file, char *list);
+psArray *pmConfigFileSets(pmConfig *config, char *file, char *list);
+bool pmConfigFileSetsMD (psMetadata *metadata, pmConfig *config, char *name, char *file, char *list);