Changeset 1324

Timestamp:

May 19, 2008, 2:58:22 PM (17 years ago)

Author:

landauf

Message:

Added a command-history to the console. you can scroll through all previously entered commands by pressing [up] key.
The history is stored in orxonox.ini in the section [Shell]. You can configure the maximal amount of stored commands (default: 100).
This allows you to use the history after orxonox was restarted.
The history uses a cyclic vector (with the configured size), meaning the newest command will overwrite the oldest entry (if the maximal size was reached).

additionally I fixed some bugs in ConfigValueContainer and added a mod-function to Math.h, that does basically the same as %, but without returning a negative value in case of a negative input.

-1 % 10 = -1
-11 % 10 = -1

mod(-1, 10) = 9
mod(-11, 10) = 9

Location:

code/branches/console/src

Files:

• core/ConfigValueContainer.cc (modified) (6 diffs)
• core/ConfigValueContainer.h (modified) (1 diff)
• core/ConfigValueIncludes.h (modified) (1 diff)
• core/Shell.cc (modified) (6 diffs)
• util/Math.h (modified) (1 diff)

code/branches/console/src/core/ConfigValueContainer.cc

@@ -107 +107 @@
         if (this->bIsVector_)
         {
-            return this->callFunctionWithIndex(&ConfigValueContainer::set, input.getString());
+            return this->callFunctionWithIndex(&ConfigValueContainer::set, input.toString());
         }
         else
@@ -113 +113 @@
             if (this->tset(input))
             {
-                ConfigFileManager::getSingleton()->setValue(this->type_, this->sectionname_, this->varname_, input.getString(), this->value_.isA(MT_string));
+                ConfigFileManager::getSingleton()->setValue(this->type_, this->sectionname_, this->varname_, input.toString(), this->value_.isA(MT_string));
                 return true;
             }
@@ -132 +132 @@
             if (this->tset(index, input))
             {
-                ConfigFileManager::getSingleton()->setValue(this->type_, this->sectionname_, this->varname_, index, input.getString(), this->value_.isA(MT_string));
+                ConfigFileManager::getSingleton()->setValue(this->type_, this->sectionname_, this->varname_, index, input.toString(), this->value_.isA(MT_string));
                 return true;
             }
@@ -152 +152 @@
         if (this->bIsVector_)
         {
-            return this->callFunctionWithIndex(&ConfigValueContainer::tset, input.getString());
+            return this->callFunctionWithIndex(&ConfigValueContainer::tset, input.toString());
         }
         else
@@ -160 +160 @@
             {
                 this->value_ = temp;
-
                 if (this->identifier_)
                     this->identifier_->updateConfigValues();
@@ -191 +190 @@
                 {
                     this->valueVector_.push_back(MultiTypeMath());
-                    ConfigFileManager::getSingleton()->setValue(this->type_, this->sectionname_, this->varname_, i, this->valueVector_[i], this->value_.isA(MT_string));
                 }
             }
 
-            MultiTypeMath temp = this->valueVector_[index];
+            MultiTypeMath temp = this->value_;
             if (temp.assimilate(input))
             {

code/branches/console/src/core/ConfigValueContainer.h

@@ -90 +90 @@
             }
 
+            template <typename T>
+            inline void setVectorType(const std::vector<T>& value)
+            {
+                this->value_ = T();
+            }
+
             inline const std::string& getName() const
                 { return this->varname_; }

code/branches/console/src/core/ConfigValueIncludes.h

@@ -69 +69 @@
             temp.push_back(MultiTypeMath(defvalue[i])); \
         container##varname = new orxonox::ConfigValueContainer(CFT_Settings, this->getIdentifier(), #varname, temp); \
+        container##varname->setVectorType(varname); \
         this->getIdentifier()->addConfigValueContainer(#varname, container##varname); \
     } \

code/branches/console/src/core/Shell.cc

@@ -80 +80 @@
         SetConfigValue(maxHistoryLength_, 100);
         SetConfigValue(historyOffset_, 0);
-        SetConfigValueVector(commandHistory_, std::vector<std::string>());
-
-std::cout << "gaga1: " << this->commandHistory_[this->historyOffset_] << std::endl;
+        SetConfigValueVector(commandHistory_, std::vector<std::string>(1, ""));
 
         if (this->historyOffset_ >= this->maxHistoryLength_)
@@ -93 +91 @@
             ModifyConfigValue(commandHistory_, remove, index);
         }
-
-std::cout << "gaga2: " << this->commandHistory_[this->historyOffset_] << std::endl;
     }
 
@@ -163 +159 @@
     void Shell::addToHistory(const std::string& command)
     {
-std::cout << "command: " << command << std::endl;
-std::cout << "offset: " << this->historyOffset_ << std::endl;
         ModifyConfigValue(commandHistory_, set, this->historyOffset_, command);
-//        this->commandHistory_[this->historyOffset_] = command;
         this->historyPosition_ = 0;
-std::cout << "gaga3: " << this->commandHistory_[this->historyOffset_] << std::endl;
         ModifyConfigValue(historyOffset_, set, (this->historyOffset_ + 1) % this->maxHistoryLength_);
-std::cout << "offset new: " << this->historyOffset_ << std::endl;
     }
 
     std::string Shell::getFromHistory() const
     {
-        return this->commandHistory_[(this->historyOffset_ - this->historyPosition_) % this->maxHistoryLength_];
+        unsigned int index = mod(((int)this->historyOffset_) - ((int)this->historyPosition_), this->maxHistoryLength_);
+        if (index < this->commandHistory_.size() && this->historyPosition_ != 0)
+            return this->commandHistory_[index];
+        else
+            return "";
     }
 
@@ -219 +214 @@
     void Shell::execute()
     {
-//        this->addToHistory(this->inputBuffer_.get());
+        this->addToHistory(this->inputBuffer_.get());
         this->addLine(this->inputBuffer_.get(), 0);
 
@@ -252 +247 @@
     {
         this->inputBuffer_.clear();
+        this->historyPosition_ = 0;
         SHELL_UPDATE_LISTENERS(inputChanged);
         SHELL_UPDATE_LISTENERS(cursorChanged);
@@ -282 +278 @@
     void Shell::history_up()
     {
-        if (this->historyPosition_ < (this->commandHistory_.size() - 1))
+        if (this->historyPosition_ < this->commandHistory_.size())
         {
             this->historyPosition_++;

code/branches/console/src/util/Math.h

@@ -121 +121 @@
 
 template <typename T>
+inline int mod(T x, int max)
+{
+    if (x >= 0)
+        return (x % max);
+    else
+        return ((x % max) + max);
+}
+
+template <typename T>
 T interpolate(float time, const T& start, const T& end)
 {