refractor: pass cfg struct from executable to library instead of usin…

…g setter functions

src/executable/helperExec.cpp

@@ -46,6 +46,7 @@ void printHelpMessage()
  * @return int error code
  */
 int parseArgs(int argc, char **argv, config &settings) {
+
     bool foundFile = false, setOutputName = false;
     char defaultPath[]="";
     settings.outputName = defaultPath;    

src/executable/libImports.h

@@ -10,11 +10,16 @@
 #ifndef EXPORT_H
 #define EXPORT_H
 
-#include<string>
+#include <string>
 #include "settingsExec.h"
 
-
-
+//use struct from lib instead.
+struct r_config{
+    bool silentMode = false;
+    char* filename;
+    char* outputName;
+    char *xmlSchemeLocation;
+};
 
 
 extern "C" void setFileName(char* file);
@@ -24,6 +29,8 @@ extern "C" int executePipeline(char* file);
 extern "C" void setOutputName(char* file);
 extern "C" void setSilentMode(bool sMode);
 extern "C" void setXMLSchemaLocation(char* file);
+extern "C"  int executePipelineCfg(r_config cfg);
+
 
 
 #endif

src/executable/main.cpp

@@ -22,6 +22,8 @@
 using namespace std;
 std::string _logfile = "log.txt";
 
+r_config cfg;
+
 
 /**
  * @brief main function that calls the roadgeneration library functions
@@ -39,12 +41,16 @@ int main(int argc, char** argv){
     if (parseArgs(argc, argv, settings)){
         return -1;
     }
-
-    setFileName(settings.filename);
-    setXMLSchemaLocation(&schemaLocation[0]);
-    setOutputName(settings.outputName);
-    setSilentMode(settings.silentMode);
-    execPipeline();
+    cfg.silentMode = settings.silentMode;
+    cfg.filename = settings.filename;
+    cfg.xmlSchemeLocation = &schemaLocation[0];
+    cfg.outputName = settings.outputName;
+    cout << cfg.outputName << endl;
+    //setFileName(settings.filename);
+    //setXMLSchemaLocation(&schemaLocation[0]);
+    //setOutputName(settings.outputName);
+    //setSilentMode(settings.silentMode);
+    executePipelineCfg(cfg);
 
     return 0;
 }

src/libfiles/export.cpp

@@ -77,13 +77,24 @@ EXPORTED void setXMLSchemaLocation(char* file){
 EXPORTED int executePipeline(char* file)
 {
 
-	char dt[100];//stores timestamp as string
-
 	if (file == NULL){
 		cout << "ERR: no file has been provided!" << endl;
 		return -1;
 	}
 
+
+	// --- initialization ------------------------------------------------------
+
+	xmlTree inputxml;
+	roadNetwork data;
+	string outputFile = setting.outname;
+	char dt[100];//stores timestamp as string
+
+	data.outputFile = outputFile.substr(0, outputFile.find(".xml"));
+    data.outputFile = data.outputFile.substr(0, outputFile.find(".xodr"));
+
+	setting.warnings = 0;
+
 	if(!setting.outputNameSet){
 		setting.outname = file;
 	}
@@ -104,16 +115,6 @@ EXPORTED int executePipeline(char* file)
 		printLogo();
 	}
 
-	// --- initialization ------------------------------------------------------
-
-	xmlTree inputxml;
-
-	roadNetwork data;
-	string outputFile = setting.outname;
-	data.outputFile = outputFile.substr(0, outputFile.find(".xml"));
-    data.outputFile = data.outputFile.substr(0, outputFile.find(".xodr"));
-
-	setting.warnings = 0;
 
 	// --- pipeline ------------------------------------------------------------
 
@@ -140,8 +141,6 @@ EXPORTED int executePipeline(char* file)
 		return -1;
 	}
 
-	//resolveLaneLinkConflicts(data);
-
 	if (createXMLXercesC(data))
 	{
 		cerr << "ERR: error during createXML" << endl;
@@ -154,7 +153,7 @@ EXPORTED int executePipeline(char* file)
 		return -1;
 	}
 
-	//warning handling
+	//handle warnings
 	if(!setting.silentMode)
 	{
 		if(setting.warnings > 0)
@@ -174,11 +173,10 @@ EXPORTED int executePipeline(char* file)
 
 EXPORTED int executePipelineCfg(r_config cfg)
 {
+	setOutputName(cfg.outputName);
 	setting.silentMode = cfg.silentMode;
 	setting.xmlSchemaLocation = cfg.xmlSchemeLocation;
 	setFileName(cfg.filename);
-	//if(cfg.outputName != "")
-	//	setOutputName(cfg.outputName);
 	execPipeline();
 	return 0;
 }

src/libfiles/export.h

@@ -25,17 +25,15 @@
 
 #include<string>
 
+
+
 struct r_config{
     bool silentMode = false;
     char* filename;
     char* outputName;
     char *xmlSchemeLocation;
 };
 
-
-
-
-
 /**
  * @brief Sets the filename of the input file
  * @param file file name *