Changeset 7424

Timestamp:

Sep 12, 2010, 2:48:11 PM (14 years ago)

Author:

rgrieder

Message:

Added CommandlineParser again and adjusted it to work with QVariant instead of MultiType.
Also removed obsolete Game class.

Location:

sandbox_qt

Files:

• doc/api/CMakeLists.txt (modified) (1 diff)
• src/libraries/core/CMakeLists.txt (modified) (1 diff)
• src/libraries/core/CommandLineParser.cc (copied) (copied from sandbox_qt/src/libraries/core/CommandLineParser.cc) (4 diffs)
• src/libraries/core/CommandLineParser.h (copied) (copied from sandbox_qt/src/libraries/core/CommandLineParser.h) (7 diffs)
• src/libraries/core/Core.cc (modified) (5 diffs)
• src/libraries/core/Core.h (modified) (1 diff)
• src/libraries/core/Game.cc (deleted)
• src/libraries/core/Game.h (deleted)
• src/orxonox/Main.cc (modified) (2 diffs)

sandbox_qt/doc/api/CMakeLists.txt

@@ -55 +55 @@
     OUTPUT ${INTERNAL_DOCFILE}
     COMMAND orxonox-main
-    ARGS --noIOConsole --generateDoc ${INTERNAL_DOCFILE}
+    ARGS --generateDoc ${INTERNAL_DOCFILE}
     WORKING_DIRECTORY ${_working_dir}
     COMMENT "Generating additional Doxygen documentation from Orxonox executable"

sandbox_qt/src/libraries/core/CMakeLists.txt

@@ -19 +19 @@
 
 SET_SOURCE_FILES(CORE_SRC_FILES
+  CommandlineParser.cc
   Core.cc
-  Game.cc
   PathConfig.cc
 )

sandbox_qt/src/libraries/core/CommandLineParser.cc

@@ -32 +32 @@
 #include <sstream>
 
-#include "util/Convert.h"
+//#include "util/Convert.h"
 #include "util/Debug.h"
 #include "util/Exception.h"
@@ -54 +54 @@
         if (bParsingFile && this->bCommandLineOnly_)
             ThrowException(Argument, "Command line argument '" + getName() + "' is not allowed in files.");
-        if (value_.getType() == MT_Type::Bool)
-        {
-            // simulate command line switch
-            bool temp;
-            if (convertValue(&temp, value))
+        if (value_.type() == QVariant::Bool)
+        {
+            // Command line switch activated
+            this->bHasDefaultValue_ = false;
+            this->value_ = true;
+        }
+        else
+        {
+            QVariant temp(QString::fromStdString(value));
+            if (!temp.convert(value_.type()))
+                ThrowException(Argument, "Could not read command line argument '" + getName() + "'.");
+            else
             {
                 this->bHasDefaultValue_ = false;
                 this->value_ = temp;
             }
-            else if (value.empty())
-            {
-                this->bHasDefaultValue_ = false;
-                this->value_ = true;
-            }
-            else
-                ThrowException(Argument, "Could not read command line argument '" + getName() + "'.");
-        }
-        else
-        {
-            if (!value_.setValue(value))
-            {
-                value_.setValue(defaultValue_);
-                ThrowException(Argument, "Could not read command line argument '" + getName() + "'.");
-            }
-            else
-                this->bHasDefaultValue_ = false;
         }
     }
@@ -302 +292 @@
                 infoStr << "      ";
             infoStr << "--" << it->second->getName() << ' ';
-            if (it->second->getValue().getType() != MT_Type::Bool)
+            if (it->second->getValue().type() != QVariant::Bool)
                 infoStr << "ARG ";
             else
@@ -362 +352 @@
     void CommandLineParser::_parseFile()
     {
-        const std::string& filename = CommandLineParser::getValue("optionsFile").getString();
+        const std::string& filename = CommandLineParser::getValue("optionsFile").toString().toStdString();
 
         // look for additional arguments in given file or start.ini as default

sandbox_qt/src/libraries/core/CommandLineParser.h

@@ -46 +46 @@
 #include <fstream>
 #include <map>
+#include <QVariant>
 #include "util/OrxAssert.h"
-#include "util/MultiType.h"
 
 #define SetCommandLineArgument(name, defaultValue) \
@@ -67 +67 @@
     /**
     @brief
-        Container class for a command line argument of any type supported by MultiType.
+        Container class for a command line argument of any type supported by QVariant.
 
         Whenever you want to have an option specified by a command line switch,
@@ -106 +106 @@
 
         //! Returns the actual value of the argument. Can be equal to default value.
-        MultiType getValue() const { return value_; }
+        QVariant getValue() const { return value_; }
         //! Returns the given default value as type T.
-        MultiType getDefaultValue() const { return defaultValue_; }
+        QVariant getDefaultValue() const { return defaultValue_; }
 
     private:
         //! Constructor initialises both value_ and defaultValue_ with defaultValue.
-        CommandLineArgument(const std::string& name, const MultiType& defaultValue, bool bCommandLineOnly)
+        CommandLineArgument(const std::string& name, const QVariant& defaultValue, bool bCommandLineOnly)
             : bHasDefaultValue_(true)
             , name_(name)
@@ -135 +135 @@
         std::string usageInformation_; //!< Tells about the usage of this parameter
 
-        MultiType   value_;            //!< The actual value
-        MultiType   defaultValue_;     //!< Default value. Should not be changed.
+        QVariant    value_;            //!< The actual value
+        QVariant    defaultValue_;     //!< Default value. Should not be changed.
         bool        bCommandLineOnly_; //!< Whether you cannot specify the value in a text file
     };
@@ -165 +165 @@
         static void getValue(const std::string& name, T* value)
         { *value = (T)(getArgument(name)->getValue()); }
-        static MultiType getValue(const std::string& name)
+        static QVariant getValue(const std::string& name)
         { return getArgument(name)->getValue(); }
         template <class T>
@@ -211 +211 @@
     inline void CommandLineParser::getValue<std::string>(const std::string& name, std::string* value)
     {
-        *value = getArgument(name)->getValue().getString();
+        *value = getArgument(name)->getValue().toString().toStdString();
     }
 
@@ -230 +230 @@
         OrxAssert(!_getInstance().existsArgument(name),
             "Cannot add a command line argument with name '" + name + "' twice.");
-        OrxAssert(MultiType(defaultValue).getType() != MT_Type::Bool || MultiType(defaultValue).getBool() != true,
+        OrxAssert(QVariant(defaultValue).type() != QVariant::Bool || QVariant(defaultValue).toBool() != true,
                "Boolean command line arguments with positive default values are not supported." << std::endl
             << "Please use SetCommandLineSwitch and adjust your argument: " << name);

sandbox_qt/src/libraries/core/Core.cc

@@ -53 +53 @@
 #include "util/Exception.h"
 #include "PathConfig.h"
+#include "CommandLineParser.h"
 
 namespace orxonox
@@ -59 +60 @@
     Core* Core::singletonPtr_s  = 0;
 
+    SetCommandLineArgument(settingsFile, "orxonox.ini").information("THE configuration file");
+
+#ifdef ORXONOX_PLATFORM_WINDOWS
+    SetCommandLineArgument(limitToCPU, 1).information("Limits the program to one CPU/core (1, 2, 3, etc.). Default is the first core (faster than off)");
+#endif
+
     Core::Core(const std::string& cmdLine)
     {
         // Set the hard coded fixed paths
         this->pathConfig_.reset(new PathConfig());
+
+        // Parse command line arguments
+        CommandLineParser::parseCommandLine(cmdLine);
 
         // Set configurable paths like log, config and media
@@ -70 +80 @@
         OutputHandler::getInstance().setLogPath(PathConfig::getLogPathString());
 
+        // Parse additional options file now that we know its path
+        CommandLineParser::parseFile();
+
 #ifdef ORXONOX_PLATFORM_WINDOWS
         // limit the main thread to the first core so that QueryPerformanceCounter doesn't jump
-        int limitToCPU = 0;//CommandLineParser::getValue("limitToCPU");
+        int limitToCPU = CommandLineParser::getValue("limitToCPU").toInt();
         if (limitToCPU > 0)
             setThreadAffinity(static_cast<unsigned int>(limitToCPU));
@@ -78 +91 @@
 
         // Generate documentation instead of normal run?
-        std::string docFilename;
-        //CommandLineParser::getValue("generateDoc", &docFilename);
+        std::string docFilename = CommandLineParser::getValue("generateDoc").toString().toStdString();
         if (!docFilename.empty())
         {
@@ -85 +97 @@
             if (docFile.is_open())
             {
-                //CommandLineParser::generateDoc(docFile);
+                CommandLineParser::generateDoc(docFile);
                 docFile.close();
             }

sandbox_qt/src/libraries/core/Core.h

@@ -83 +83 @@
             void initRandomNumberGenerator();
 
-            void update() {}
-
             void setThreadAffinity(int limitToCPU);
             // MANAGED SINGLETONS/OBJECTS

sandbox_qt/src/orxonox/Main.cc

@@ -39 +39 @@
 #include <QCoreApplication>
 
-#include "core/Game.h"
+#include "util/Debug.h"
+#include "core/CommandlineParser.h"
+#include "core/Core.h"
 #include "Main.h"
 
 namespace orxonox
 {
+    SetCommandLineArgument(generateDoc, "")
+        .information("Generates a Doxygen file from things like SetConsoleCommand");
+
     /**
     @brief
@@ -52 +57 @@
         QApplication app(argc, argv);
 
+        QStringList arguments = QCoreApplication::arguments();
+        if (!arguments.value(0).isEmpty() && arguments.value(0)[0] != '-')
+            arguments.pop_front(); // Remove application path
+        Core core(arguments.join(" ").toStdString());
+
         QCoreApplication::setOrganizationName("");
         QCoreApplication::setOrganizationDomain("");
         QCoreApplication::setApplicationName("");
 
-        //if (CommandLineParser::getValue("generateDoc").getString().empty())
-
-        return app.exec();
-        //return 0;
+        if (CommandLineParser::getValue("generateDoc").toString().isEmpty())
+            return app.exec();
+        else
+            return 0;
     }
 }