Changeset 2101 for code/branches/objecthierarchy/src/util

Timestamp:

Nov 2, 2008, 12:09:55 AM (16 years ago)

Author:

rgrieder

Message:

Finally managed to have a master InputState which enables:

• Console always opens
• Debug overlay toggles visibility in gui mode too

Had to change several other code:

• ConfigFileManager uses special class instead of enum for ConfigFileType
• You can add an arbitrary config file and get the ConfigFileType
• ConfigFileManager is an Ogre singleton too. Created in Main.cc
• CommandLineArgument "optionsFile" specifies another file for command line arguments
• CommandLineArgument "settingsFile" declares the file used for settings (orxonox.ini)
• changed all fileNames to filenames
• "Loaded config file blah" now uses COUT(3) instead of COUT(0)
• fixed a bug in ConfigFileManager::load() that cause orxonox.ini to double its size after every call

Location:

code/branches/objecthierarchy/src/util

Files:

• Exception.cc (modified) (3 diffs)
• Exception.h (modified) (3 diffs)
• SignalHandler.cc (modified) (3 diffs)
• SignalHandler.h (modified) (3 diffs)

code/branches/objecthierarchy/src/util/Exception.cc

@@ -38 +38 @@
 {
     Exception::Exception(const std::string& description, int lineNumber,
-                         const char* fileName, const char* functionName)
+                         const char* filename, const char* functionName)
         : description_(description)
         , lineNumber_(lineNumber)
         , functionName_(functionName)
-        , fileName_(fileName)
+        , filename_(filename)
     { }
 
@@ -49 +49 @@
         , lineNumber_(0)
         , functionName_("")
-        , fileName_("")
+        , filename_("")
     { }
 
@@ -60 +60 @@
             fullDesc << this->getTypeName() << "_EXCEPTION";
 
-            if (this->fileName_ != "")
+            if (this->filename_ != "")
             {
-                fullDesc << " in " << this->fileName_;
+                fullDesc << " in " << this->filename_;
                 if (this->lineNumber_)
                     fullDesc << "(" << this->lineNumber_ << ")";

code/branches/objecthierarchy/src/util/Exception.h

@@ -67 +67 @@
 
         Exception(const std::string& description, int lineNumber,
-                  const char* fileName, const char* functionName);
+                  const char* filename, const char* functionName);
         Exception(const std::string& description);
 
@@ -87 +87 @@
         int lineNumber_;
         std::string functionName_;
-        std::string fileName_;
+        std::string filename_;
         // mutable because "what()" is a const method
         mutable std::string fullDescription_;
@@ -98 +98 @@
     public:
         SpecificException(const std::string& description, int lineNumber,
-                  const char* fileName, const char* functionName)
-                  : Exception(description, lineNumber, fileName, functionName)
+                  const char* filename, const char* functionName)
+                  : Exception(description, lineNumber, filename, functionName)
         {
             // let the catcher decide whether to display the message below level 4

code/branches/objecthierarchy/src/util/SignalHandler.cc

@@ -58 +58 @@
  * register signal handlers for SIGSEGV and SIGABRT
  * @param appName path to executable eg argv[0]
- * @param fileName filename to append backtrace to
- */
-void SignalHandler::doCatch( const std::string & appName, const std::string & fileName )
+ * @param filename filename to append backtrace to
+ */
+void SignalHandler::doCatch( const std::string & appName, const std::string & filename )
 {
   this->appName = appName;
-  this->fileName = fileName;
+  this->filename = filename;
 
   // prepare for restoring XAutoKeyRepeat
@@ -326 +326 @@
   bt.insert(0, timeString);
 
-  FILE * f = fopen( getInstance()->fileName.c_str(), "a" );
+  FILE * f = fopen( getInstance()->filename.c_str(), "a" );
 
   if ( !f )
   {
-    perror( ( std::string( "could not append to " ) + getInstance()->fileName ).c_str() );
+    perror( ( std::string( "could not append to " ) + getInstance()->filename ).c_str() );
     exit(EXIT_FAILURE);
   }
@@ -336 +336 @@
   if ( fwrite( bt.c_str(), 1, bt.length(), f ) != bt.length() )
   {
-    COUT(0) << "could not write " << bt.length() << " byte to " << getInstance()->fileName << std::endl;
+    COUT(0) << "could not write " << bt.length() << " byte to " << getInstance()->filename << std::endl;
     exit(EXIT_FAILURE);
   }

code/branches/objecthierarchy/src/util/SignalHandler.h

@@ -71 +71 @@
     void registerCallback( SignalCallback cb, void * someData );
 
-    void doCatch( const std::string & appName, const std::string & fileName );
+    void doCatch( const std::string & appName, const std::string & filename );
     void dontCatch();
 
@@ -85 +85 @@
 
     std::string appName;
-    std::string fileName;
+    std::string filename;
 
     // used to turn on KeyAutoRepeat if OIS crashes
@@ -97 +97 @@
   public:
     inline static SignalHandler* getInstance() { if (!SignalHandler::singletonRef) SignalHandler::singletonRef = new SignalHandler(); return SignalHandler::singletonRef; };
-    void doCatch( const std::string & appName, const std::string & fileName ) {};
+    void doCatch( const std::string & appName, const std::string & filename ) {};
     void dontCatch() {};
     void registerCallback( SignalCallback cb, void * someData ) {};