parameter for setting the title name in vglog

Author: ManiAm

.cproject

@@ -20,7 +20,7 @@
 					<folderInfo id="org.omnetpp.cdt.gnu.config.debug.1181511094." name="/" resourcePath="">
 						<toolChain id="org.omnetpp.cdt.gnu.toolchain.debug.1458356819" name="C++ Toolchain for OMNeT++" superClass="org.omnetpp.cdt.gnu.toolchain.debug">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.MachO64;org.eclipse.cdt.core.PE" id="org.omnetpp.cdt.targetPlatform.1593072366" isAbstract="false" name="Windows, Linux, Mac" osList="win32,linux,macosx" superClass="org.omnetpp.cdt.targetPlatform"/>
-							<builder id="org.omnetpp.cdt.gnu.builder.debug.1834363135" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="OMNeT++ Make Builder (opp_makemake)" parallelBuildOn="true" parallelizationNumber="4" superClass="org.omnetpp.cdt.gnu.builder.debug"/>
+							<builder id="org.omnetpp.cdt.gnu.builder.debug.1834363135" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="OMNeT++ Make Builder (opp_makemake)" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.omnetpp.cdt.gnu.builder.debug"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.319999884" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.13888097" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1647669064" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>

README.md

@@ -15,6 +15,8 @@ VENTOS is an open-source VANET C++ simulator for studying vehicular traffic flow
 + using shorter relative path for sumoConfig
 + gnuplot has its own class now
 + vehicle equilibrium is now working for emulated cars
++ enable parallel build
++ loggingWindowTitle sets the vglog window title name
 + updating the manual
 + various small improvements
 

src/logging/modules.ned

@@ -28,6 +28,7 @@ simple vglog extends vlog
 
         // relative path to mainWindow
         string loggingWindowPath = default("src/loggingWindow/mainWindow");  
+        string loggingWindowTitle = default("Log window"); 
 
         bool syntaxHighlighting = default(true);
         string syntaxHighlightingExpression = default("");              

src/logging/vglog.cc

@@ -74,6 +74,13 @@ void vglog::initialize(int stage)
     if(stage == 0)
     {
         loggingWindowPath = par("loggingWindowPath").stringValue();
+        if(loggingWindowPath == "")
+            throw omnetpp::cRuntimeError("loggingWindowPath parameter is invalid");
+
+        loggingWindowTitle = par("loggingWindowTitle").stringValue();
+        if(loggingWindowTitle == "")
+            throw omnetpp::cRuntimeError("loggingWindowTitle parameter is invalid");
+
         syntaxHighlighting = par("syntaxHighlighting").boolValue();
 
         if(syntaxHighlighting)
@@ -230,9 +237,12 @@ void vglog::openLogWindow()
         // make the child process ignore the SIGINT signal
         signal(SIGINT, SIG_IGN);
 
+        std::ostringstream cmd;
+        cmd << boost::format("%s \"%s\"") % loggingWindowPath % loggingWindowTitle;
+
         // run 'logWindow' inside this child process
         // if execution is successful then child will be blocked at this line
-        int r = system(loggingWindowPath.c_str());
+        int r = system(cmd.str().c_str());
 
         if (r == -1)
             throw omnetpp::cRuntimeError("Running logWindow failed during system()");

src/logging/vglog.h

@@ -44,6 +44,7 @@ class vglog : public vlog
 
     // NED variables
     std::string loggingWindowPath = "";
+    std::string loggingWindowTitle = "";
     bool syntaxHighlighting;
     std::string syntaxHighlightingExpression = "";
 

src/loggingWindow/main.cc

@@ -33,12 +33,12 @@ int main(int argc, char* argv[])
 {
     try
     {
-        auto app = Gtk::Application::create(argc, argv, "org.gtkmm.example");
+        auto app = Gtk::Application::create("VENTOS.vglog");
 
-        VENTOS::mainWindow logWindow(argv[0]);
+        VENTOS::mainWindow logWindow(argv[0] /*path to mainWindow file*/, argv[1] /*window title*/);
 
         // Shows the window and returns when it is closed
-        return app->run(logWindow, argc, argv);
+        return app->run(logWindow);
     }
     catch(const Glib::Exception& ex)
     {

src/loggingWindow/mainWindow.cc

@@ -44,12 +44,12 @@
 
 namespace VENTOS {
 
-mainWindow::mainWindow(std::string filePath)
+mainWindow::mainWindow(std::string filePath, std::string title)
 {
     boost::filesystem::path full_path(filePath);
     std::string logoPath = (full_path.parent_path() / "log_128.png").string();
 
-    set_title("Log window");
+    set_title(title.c_str());
     set_border_width(1);
     set_default_size(1200, 550 /*height*/);
     set_icon_from_file(logoPath.c_str());

src/loggingWindow/mainWindow.h

@@ -57,7 +57,7 @@ class mainWindow : public Gtk::Window
 {
 
 public:
-    mainWindow(std::string filePath);
+    mainWindow(std::string filePath, std::string title);
     virtual ~mainWindow();
 
 protected: