Changeset 25e34b for molecuilder/src/config.hpp

Timestamp:

Oct 17, 2009, 4:47:06 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

921097

Parents:

e72287

Message:

LoadMolecule externalized from Load()

• new function PrepareFileBuffer()
• ParseCommandLine() is no more part of class config
• Load() now uses LoadMolecule and PrepareFileBuffer()
• note that this is used to allow for the loading of a second molecule from a config file without the actual configuration. This is needed for the CorrelationToSurface routine (the second molecule gives the surface).

File:

• molecuilder/src/config.hpp (modified) (2 diffs)

molecuilder/src/config.hpp

@@ -126 +126 @@
 
 
-  int ParseForParameter(int verbose, ifstream *file, const char *name, int sequential, int const xth, int const yth, int type, void *value, int repetition, int critical);
-  int ParseForParameter(int verbose, struct ConfigFileBuffer *FileBuffer, const char *name, int sequential, int const xth, int const yth, int type, void *value, int repetition, int critical);
-
   public:
   config();
@@ -146 +143 @@
 };
 
+int ParseForParameter(int verbose, ifstream *file, const char *name, int sequential, int const xth, int const yth, int type, void *value, int repetition, int critical);
+int ParseForParameter(int verbose, struct ConfigFileBuffer *FileBuffer, const char *name, int sequential, int const xth, int const yth, int type, void *value, int repetition, int critical);
+void LoadMolecule(molecule *&mol, struct ConfigFileBuffer *&FileBuffer, periodentafel *periode, bool FastParsing);
+void PrepareFileBuffer(char *filename, struct ConfigFileBuffer *&FileBuffer);
+
 #endif /* CONFIG_HPP_ */