Changes in src/builder_init.cpp [748fc7:15e197]

File:

• src/builder_init.cpp (modified) (2 diffs)

src/builder_init.cpp

@@ -126 +126 @@
   // if we have python, autoexecute a molecuilder script in current folder
 #ifdef HAVE_PYTHON
-  const std::string pythonfilename_string("./molecuilder.py");
-  executePythonScript(pythonfilename_string);
+  const boost::filesystem::path pythonfilename("./molecuilder.py");
+  executePythonScriptFile(pythonfilename);
 #endif
 
   // handle remaining arguments by CommandLineParser
-  if (argc>1) {
+  // first argument of "--test" initializes special molecuilder gui test mode
+  if ((argc>1)
+#ifdef USE_GUI_QT
+      && !QtUIFactory::isTestMode(argv[1])
+#endif
+  ) {
     LOG(0, "Setting UI to CommandLine.");
     CommandLineParser::getInstance().InitializeCommandArguments();
@@ -139 +144 @@
   } else {
     // In the interactive mode, we can leave the user the choice in case of error
-    ASSERT_DO(Assert::Ask);
     #ifdef USE_GUI_QT
+    if ((argc>1) && (QtUIFactory::isTestMode(argv[1])))
+      ASSERT_DO(Assert::Abort);
+    else
+      ASSERT_DO(Assert::Ask);
       LOG(0, "Setting UI to Qt4.");
-      UIFactory::registerFactory(new QtUIFactory::description());
+      UIFactory::registerFactory(new QtUIFactory::description(argc, argv));
       UIFactory::makeUserInterface("Qt4");
     #else
+      ASSERT_DO(Assert::Ask);
       LOG(0, "Setting UI to Text.");
       cout << MOLECUILDERVERSION << endl;