Changes in src/builder.cpp [da3024:980dd6]

File:

• src/builder.cpp (modified) (10 diffs)

src/builder.cpp

@@ -47 +47 @@
  */
 
-#include "Helpers/MemDebug.hpp"
 
 #include <boost/bind.hpp>
@@ -74 +73 @@
 #include "periodentafel.hpp"
 #include "UIElements/UIFactory.hpp"
-#include "UIElements/TextUI/TextUIFactory.hpp"
-#include "UIElements/CommandLineUI/CommandLineUIFactory.hpp"
 #include "UIElements/MainWindow.hpp"
 #include "UIElements/Dialog.hpp"
@@ -87 +84 @@
 #include "version.h"
 #include "World.hpp"
-
+#include "Helpers/MemDebug.hpp"
 
 /********************************************* Subsubmenu routine ************************************/
@@ -1358 +1355 @@
 };
 
+#endif
 
 /** Tries given filename or standard on saving the config file.
@@ -1483 +1481 @@
 };
 
-#endif
-
 /** Parses the command line options.
  * Note that this function is from now on transitional. All commands that are not passed
@@ -1502 +1498 @@
 {
   Vector x,y,z,n;  // coordinates for absolute point in cell volume
+  double *factor; // unit factor if desired
   ifstream test;
   ofstream output;
   string line;
+  atom *first;
   bool SaveFlag = false;
   int ExitFlag = 0;
@@ -1510 +1508 @@
   double volume = 0.;
   enum ConfigStatus configPresent = absent;
+  clock_t start,end;
+  double MaxDistance = -1;
   int argptr;
   molecule *mol = NULL;
   string BondGraphFileName("\n");
+  bool DatabasePathGiven = false;
 
   if (argc > 1) { // config file specified as option
@@ -2189 +2190 @@
   ActionRegistry::purgeInstance();
   ActionHistory::purgeInstance();
-#ifdef LOG_OBSERVER
-  cout << observerLog().getLog();
-#endif
   Memory::getState();
 }
@@ -2197 +2195 @@
 int main(int argc, char **argv)
 {
+    config *configuration = World::getInstance().getConfig();
     // while we are non interactive, we want to abort from asserts
     //ASSERT_DO(Assert::Abort);
+    molecule *mol = NULL;
     Vector x, y, z, n;
     ifstream test;
@@ -2255 +2255 @@
       if (!CommandLineParser::getInstance().isEmpty()) {
         DoLog(0) && (Log() << Verbose(0) << "Setting UI to CommandLine." << endl);
-        UIFactory::registerFactory(new CommandLineUIFactory::description());
-        UIFactory::makeUserInterface("CommandLine");
+        UIFactory::makeUserInterface(UIFactory::CommandLine);
       } else {
         DoLog(0) && (Log() << Verbose(0) << "Setting UI to Text." << endl);
-        UIFactory::registerFactory(new TextUIFactory::description());
-        UIFactory::makeUserInterface("Text");
+        UIFactory::makeUserInterface(UIFactory::Text);
       }
     }