Changeset a71ad8 for molecuilder

Timestamp:

May 8, 2010, 7:14:29 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

4d2636

Parents:

3bbc59

git-author:

Frederik Heber <heber@…> (05/08/10 18:40:49)

git-committer:

Frederik Heber <heber@…> (05/08/10 19:14:29)

Message:

Begin of Refactoring of ParseCommandLineOptions().

• new singleton class CommandLineParser which wraps boost's program_options
• main() uses the new CommandLineParser and calls UIFactory with CommandLine specizliation if commands detected.
• files added toe Makefile.am
• BOOST_PROGRAM_OPTIONS added to configure.ac
• BOOST_PROGRAM_OPTIONS_LIB added to molecuilder/src/Makefile.am

Signed-off-by: Frederik Heber <heber@…>

Location:

molecuilder

Files:

• configure.ac (modified) (1 diff)
• src/CommandLineParser.cpp (added)
• src/CommandLineParser.hpp (added)
• src/Makefile.am (modified) (3 diffs)
• src/builder.cpp (modified) (5 diffs)

molecuilder/configure.ac

@@ -28 +28 @@
 # Boost libraries
 AX_BOOST_BASE([1.33.1])
-#AX_BOOST_PROGRAM_OPTIONS
+AX_BOOST_PROGRAM_OPTIONS
 #AX_BOOST_FOREACH
 #AX_BOOST_FILESYSTEM

molecuilder/src/Makefile.am

@@ -241 +241 @@
   bondgraph.cpp \
   boundary.cpp \
+  CommandLineParser.cpp \
   config.cpp \
   element.cpp \
@@ -284 +285 @@
   bondgraph.hpp \
   boundary.hpp \
+  CommandLineParser.hpp \
   config.hpp \
   defs.hpp \
@@ -324 +326 @@
 molecuilder_LDFLAGS = $(BOOST_LDFLAGS)
 molecuilder_SOURCES = builder.cpp
-molecuilder_LDADD = libmolecuilder.a libgslwrapper.a $(BOOST_LIB) ${BOOST_THREAD_LIB}
+molecuilder_LDADD = libmolecuilder.a libgslwrapper.a $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
 joiner_SOURCES = joiner.cpp datacreator.cpp parser.cpp datacreator.hpp helpers.hpp parser.hpp periodentafel.hpp
 joiner_LDADD = libmolecuilder.a $(BOOST_LIB) ${BOOST_THREAD_LIB}

molecuilder/src/builder.cpp

@@ -60 +60 @@
 #include "bondgraph.hpp"
 #include "boundary.hpp"
+#include "CommandLineParser.hpp"
 #include "config.hpp"
 #include "element.hpp"
@@ -2549 +2550 @@
   logger::purgeInstance();
   errorLogger::purgeInstance();
+  CommandLineParser::purgeInstance();
   ActionRegistry::purgeInstance();
   ActionHistory::purgeInstance();
@@ -2555 +2557 @@
 int main(int argc, char **argv)
 {
-    molecule *mol = NULL;
     config *configuration = new config;
     Vector x, y, z, n;
@@ -2562 +2563 @@
     string line;
     char *ConfigFileName = NULL;
-    int j;
 
     cout << ESPACKVersion << endl;
@@ -2569 +2569 @@
     // need to init the history before any action is created
     ActionHistory::init();
-    /* structure of ParseCommandLineOptions will be refactored later */
-    j = ParseCommandLineOptions(argc, argv,  World::getInstance().getMolecules(), World::getInstance().getPeriode(), *configuration, ConfigFileName);
-    switch (j){
-        case 255:
-        case 2:
-        case 1:
-            cleanUp(configuration);
-            return (j == 1 ? 0 : j);
-        default:
-            break;
+
+    {
+      // Parse command line options and if present create respective UI
+      CommandLineParser::getInstance().generic.add_options()
+          ("help,h", "produce help message")
+          ("parse-xyz,p", po::value< vector<string> >(), "parse xyz file into World")
+          ;
+      CommandLineParser::getInstance().Run(argc,argv);
+      if (!CommandLineParser::getInstance().isEmpty())
+        UIFactory::makeUserInterface(UIFactory::CommandLine);
+      else
+        UIFactory::makeUserInterface(UIFactory::Text);
     }
-    if(World::getInstance().numMolecules() == 0){
-        mol = World::getInstance().createMolecule();
-        World::getInstance().getMolecules()->insert(mol);
-        cout << "Molecule created" << endl;
-        if(World::getInstance().getDomain()[0] == 0.){
-            Log() << Verbose(0) << "enter lower tridiagonal form of basis matrix" << endl << endl;
-            for(int i = 0;i < 6;i++){
-                Log() << Verbose(1) << "Cell size" << i << ": ";
-                cin >> World::getInstance().getDomain()[i];
-            }
-        }
-        mol->ActiveFlag = true;
-    }
 
     {
-      cout << ESPACKVersion << endl;
-
-      setVerbosity(0);
-
       menuPopulaters populaters;
       populaters.MakeEditMoleculesMenu = populateEditMoleculesMenu;
 
-      UIFactory::makeUserInterface(UIFactory::Text);
       MainWindow *mainWindow = UIFactory::getInstance().makeMainWindow(populaters,World::getInstance().getMolecules(), configuration, World::getInstance().getPeriode(), ConfigFileName);
       mainWindow->display();