Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5141 in orxonox.OLD for trunk/src/util


Ignore:
Timestamp:
Aug 26, 2005, 4:04:53 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: moved helper-functions to helper-functions.cc

Location:
trunk/src/util
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/util/loading/load_param.cc

    r5115 r5141  
    112112  }
    113113}
    114 
    115 /**
    116  * checks if the input was a Bool
    117  * @param BOOL a String that holds a bool: must be one of those: 1,0,true,false,TRUE,FALSE
    118  * @param defaultValue a default value that is set, if BOOL is corrupt
    119  * @return returns the bool, if BOOL was correct otherwise defaultValue
    120  */
    121 bool isBool(const char* BOOL, bool defaultValue)
    122 {
    123   if(!strcmp(BOOL, "1") || !strcmp( BOOL,"true") || !strcmp(BOOL,"TRUE"))
    124     return true;
    125   else if (!strcmp(BOOL, "0") || !strcmp( BOOL,"false") || !strcmp(BOOL,"FALSE"))
    126     return false;
    127   else
    128     return defaultValue;
    129 
    130 }
    131 
    132 int isInt(const char* INT, int defaultValue)
    133 {
    134   char* endPtr = NULL;
    135   int result = strtol(INT, &endPtr, 10);
    136 
    137   if ( endPtr >= INT && endPtr < INT + strlen(INT))
    138     return defaultValue;
    139   else
    140     return result;
    141 }
    142 
    143 float isFloat(const char* FLOAT, float defaultValue)
    144 {
    145   char* endPtr = NULL;
    146   double result = strtod(FLOAT, &endPtr);
    147 
    148   if ( endPtr >= FLOAT && endPtr < FLOAT + strlen(FLOAT))
    149     return defaultValue;
    150   else
    151     return result;
    152 }
    153 
    154 const Vector& isVector(const char* VECTOR, const Vector& defaultValue)
    155 {
    156 
    157 
    158 }
    159 
    160 const char* isString(const char* STRING, const char* defaultValue)
    161 {
    162   if (STRING != NULL)
    163     return STRING;
    164   else
    165     return defaultValue;
    166 }
    167 
    168114
    169115/**
  • trunk/src/util/loading/load_param.h

    r5137 r5141  
    2828#include "substring.h"
    2929#include "tinyxml.h"
     30#include "helper_functions.h"
    3031
    3132// Forward Declaration //
     
    216217        PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName()); \
    217218}
    218 
    219 
    220 /***********************
    221 *** HELPER FUNCTIONS ***
    222 ***********************/
    223 bool          isBool(const char* BOOL, bool defaultValue);
    224 int           isInt(const char* INT, int defaultValue);
    225 float         isFloat(const char* FLOAT, float defaultValue);
    226 //const Vector& isVector(const char* VECTOR, const Vector& defaultValue);
    227 const char*   isString(const char* STRING, const char* defaultValue);
    228 
    229 //TiXmlEmlemnt* isXmlElem(const)
    230 
    231219
    232220/************************
  • trunk/src/util/shell.cc

    r5137 r5141  
    494494  if (event.bPressed)
    495495  {
    496     PRINTF(4)("Shell received command %s\n", SDLKToKeyname(event.type));
     496    PRINTF(5)("Shell received command %s\n", SDLKToKeyname(event.type));
    497497    if (event.type == SDLK_BACKQUOTE)
    498498    {
  • trunk/src/util/shell.h

    r5130 r5141  
    1616// FORWARD DECLARATION
    1717class Text;
     18class ShellCommandBase;
    1819template<class T> class tList;
    1920template<class T> class tIterator;
     
    8586    const tList<const char>* createCompleteList(const tList<const char>* inputList, const char* classNameBegin);
    8687    const tList<const char>* createCompleteList(const tList<BaseObject>* inputList, const char* classNameBegin);
     88    const tList<const char>* createCompleteList(const tList<ShellCommandBase>* inputList, const char* classNameBegin);
    8789
    8890    // helpers //
  • trunk/src/util/shell_command.cc

    r5140 r5141  
    3030ShellCommandBase::ShellCommandBase(const char* commandName, ClassID classID, unsigned int paramCount, ...)
    3131{
     32  this->setClassID(CL_SHELL_COMMAND, "ShellCommand");
     33  this->setName(commandName);
     34
    3235  va_list parameters;
    3336  va_start(parameters, paramCount);
    3437
    3538  this->classID = classID;
     39  this->className = ClassList::IDToString(classID);
     40
    3641  if (classID & CL_MASK_SINGLETON == CL_MASK_SINGLETON)
    3742    this->isSingleton = true;
    3843  else
    3944    this->isSingleton = false;
    40 
    41   this->commandName = new char[strlen(commandName)+1];
    42   strcpy(this->commandName, commandName);
    4345
    4446  // handling parameters, and storing them:
     
    5557ShellCommandBase::~ShellCommandBase()
    5658{
    57   delete[] this->commandName;
    5859  delete[] this->parameters;
    5960}
     
    7879  while(elem != NULL)
    7980  {
    80     if (classID == elem->classID && !strcmp(commandName, elem->commandName))
     81    if (classID == elem->classID && !strcmp(commandName, elem->getName()))
    8182    {
    8283      PRINTF(2)("Command already registered\n");
     
    104105  while(elem != NULL)
    105106  {
    106     printf("%s\n", elem->commandName);
    107     if (!strncmp(executionString, elem->commandName, strlen(elem->commandName)))
     107    printf("%s\n", elem->getName());
     108    if (!strncmp(executionString, elem->getName(), strlen(elem->getName())))
    108109    {
    109110      elem->executeCommand(commandEnd);
     
    116117  return true;
    117118}
    118 
  • trunk/src/util/shell_command.h

    r5140 r5141  
    88
    99#include "base_object.h"
     10
     11#include "helper_functions.h"
    1012
    1113#include <stdarg.h>
     
    4446
    4547
     48
    4649////////////////
    4750// BASE CLASS //
     
    5356    static bool execute (const char* executionString);
    5457
    55     virtual void executeCommand (const char* parameters) = NULL;
     58    static const tList<ShellCommandBase>* getCommandList() { return ShellCommandBase::commandList; };
     59
    5660
    5761  protected:
     
    6064
    6165    static bool isRegistered(const char* commandName, ClassID classID, unsigned int paramCount, ...);
     66
     67  private:
     68    virtual void executeCommand (const char* parameters) = NULL;
    6269
    6370  protected:
     
    6875
    6976  private:
    70     char*                            commandName;         //!< The name of the Command when executed
    71     long                             classID;             //!< The ID of the Class asociated to this Command
     77    long                             classID;             //!< The ID of the Class associated to this Command
     78    const char*                      className;           //!< The Name of the Class associated to this Command
    7279
    7380    // STATIC MEMBERS
     
    133140#define FUNCTOR_LIST(x) ShellCommand ## x
    134141//#include "functor_list.h"
    135 //ShellCommand2(l_INT, l_INT);
     142//FUNCTOR_LIST(2)(l_INT, l_INT);
    136143#undef FUNCTOR_LIST
    137144
    138   private:
    139 //    T*                   objectPointer;       //!< The pointer to the object to apply this function to (NULL if classID == CL_NULL )
    140145};
    141146
Note: See TracChangeset for help on using the changeset viewer.