Changeset 5331 in orxonox.OLD

Timestamp:

Oct 8, 2005, 11:26:53 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: inition is our motto, so now the debug function of the ClassList really looks greate and is easy to use.

Location:

trunk/src

Files:

• defs/functor_list.h (modified) (1 diff)
• lib/lang/class_list.cc (modified) (2 diffs)
• lib/lang/class_list.h (modified) (1 diff)
• lib/util/helper_functions.cc (modified) (5 diffs)

trunk/src/defs/functor_list.h

@@ -150 +150 @@
   FUNCTOR_LIST(2)(l_STRING, l_FLOAT);
   FUNCTOR_LIST(2)(l_UINT, l_LONG);
+  FUNCTOR_LIST(2)(l_STRING, l_UINT);
 #endif /* FUNCTOR_LIST */
-

trunk/src/lib/lang/class_list.cc

@@ -28 +28 @@
 using namespace std;
 
-SHELL_COMMAND_STATIC(debug, ClassList, ClassList::debug);
+SHELL_COMMAND_STATIC(debug, ClassList, ClassList::debugS)
+    ->describe("Shows all registered classes, if param1: is a valid ClassName only values of this class are shown. param2: how much output")
+    ->defaultValues(2, NULL, 1);
 
 /**
@@ -379 +381 @@
   PRINT(0)("=======================CL=\n");
 }
+
+/**
+ * Print out some very nice debug information
+ * @param debugLevel the level of verbosity
+ * @param className the class that should be displayed.
+ * @see ClassList::debug
+ */
+void ClassList::debugS(const char* className, unsigned int debugLevel)
+{
+  ClassList::debug(debugLevel, ClassList::StringToID(className));
+}

trunk/src/lib/lang/class_list.h

@@ -49 +49 @@
     static long                     StringToID(const char* className);
     static void                     debug(unsigned int debugLevel = 0, long classID = CL_NULL);
+    static void                     debugS(const char* className = 0x0, unsigned int debugLevel = 0);
 
 

trunk/src/lib/util/helper_functions.cc

@@ -22 +22 @@
 
 /**
- * checks if the input was a Bool
- * @param BOOL a String that holds a bool: must be one of those: 1,0,true,false,TRUE,FALSE
+ * checks if the input was a bool
+ * @param BOOL a String that holds a bool: must be one of those: 1,0,true,false(case-insensitive)
  * @param defaultValue a default value that is set, if BOOL is corrupt
  * @return returns the bool, if BOOL was correct otherwise defaultValue
@@ -31 +31 @@
   if (BOOL == NULL)
     return defaultValue;
-  if(!strcmp(BOOL, "1") || !strcmp( BOOL,"true") || !strcmp(BOOL,"TRUE"))
+  if(!strcmp(BOOL, "1") || !strcasecmp( BOOL, "true") )
     return true;
-  else if (!strcmp(BOOL, "0") || !strcmp( BOOL,"false") || !strcmp(BOOL,"FALSE"))
+  else if (!strcmp(BOOL, "0") || !strcasecmp( BOOL, "false"))
     return false;
   else
@@ -40 +40 @@
 }
 
+
+/**
+ * checks if the input was a int
+ * @param INT a String that holds an int.
+ * @param defaultValue a default value that is set, if INT is corrupt
+ * @return returns the contained int, if INT was correct otherwise defaultValue
+ */
 int isInt(const char* INT, int defaultValue)
 {
@@ -54 +61 @@
 }
 
+
+/**
+ * checks if the input was a float
+ * @param FLOAT a String that holds an float.
+ * @param defaultValue a default value that is set, if FLOAT is corrupt
+ * @return returns the contained float, if FLOAT was correct otherwise defaultValue
+ */
 float isFloat(const char* FLOAT, float defaultValue)
 {
@@ -68 +82 @@
 
 
+/**
+ * checks if the input was a string
+ * @param STING a String(char-array) that holds an string.
+ * @param defaultValue a default value that is set, if STRING is corrupt
+ * @return returns the contained string (char-array), if STRING was correct otherwise defaultValue
+ */
 const char* isString(const char* STRING, const char* defaultValue)
 {