Changeset 11611 for code/branches

Timestamp:

Nov 30, 2017, 9:33:27 AM (7 years ago)

Author:

kuchlert

Message:

fixed addQuestion and addAnswer in Dialog

Location:

code/branches/Dialog_HS17/src/modules/dialog

Files:

• Answer.cc (modified) (1 diff)
• Answer.h (modified) (2 diffs)
• AnswerId.cc (modified) (3 diffs)
• AnswerId.h (modified) (1 diff)
• CMakeLists.txt (modified) (1 diff)
• Dialog.cc (modified) (5 diffs)
• Dialog.h (modified) (4 diffs)
• DialogManager.cc (modified) (1 diff)
• DialogManager.h (modified) (4 diffs)
• DialogPrereqs.h (added)
• Question.cc (modified) (1 diff)
• Question.h (modified) (2 diffs)

code/branches/Dialog_HS17/src/modules/dialog/Answer.cc

@@ -1 +1 @@
 #include "Answer.h"
+#include "core/CoreIncludes.h"
 
 

code/branches/Dialog_HS17/src/modules/dialog/Answer.h

@@ -3 +3 @@
 
 #include "core/BaseObject.h"
+#include "DialogPrereqs.h"
 #include "core/XMLPort.h"
 #include "core/CoreIncludes.h"
@@ -10 +11 @@
 {
         
-        class Answer : public BaseObject
+        class _DialogExport Answer : public BaseObject
         {
                 public:
                         Answer(Context* context);
-                //      virtual ~Answer();
+                        
                         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 

code/branches/Dialog_HS17/src/modules/dialog/AnswerId.cc

@@ -1 +1 @@
 #include "AnswerId.h"
+#include "core/CoreIncludes.h"
 
 
@@ -10 +11 @@
                 RegisterObject(AnswerId);
         }
+
         void AnswerId::XMLPort(Element& xmlelement, XMLPort::Mode mode)
         {
@@ -17 +19 @@
         }
 
-        void AnswerId::setId(std::string Id){
-                this->Id_ = Id;
+        void AnswerId::setId(std::string id)
+        {
+                this->id_ = id;
         }
-        std::string AnswerId::getId(){
-                return this->Id_;
+        
+        std::string AnswerId::getId()
+        {
+                return this->id_;
         }
 }

code/branches/Dialog_HS17/src/modules/dialog/AnswerId.h

@@ -13 +13 @@
                 public:
                         AnswerId(Context* context);
-                //      virtual ~AnswerId();
+                        
                         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-                        void setId(std::string Id);
-                        std::string getId();
+            void setId(std::string Id);
+            std::string getId();
 
                 private: 
-                        std::string Id_;
+                        std::string id_;
         };
 }

code/branches/Dialog_HS17/src/modules/dialog/CMakeLists.txt

@@ -11 +11 @@
   FIND_HEADER_FILES
    TOLUA_FILES
+   DialogManager.h
   LINK_LIBRARIES
     orxonox

code/branches/Dialog_HS17/src/modules/dialog/Dialog.cc

@@ -5 +5 @@
 #include "Dialog.h"
 #include "Question.h"
+
 
 namespace orxonox
@@ -57 +58 @@
         void Dialog::addQuestion(Question* question) //fuegt Question der Map hinzu
         {
-                //questions_.emplace(question->getQuestionId(), question->getQuestion());
+                this->questions_.insert(make_pair(question->getQuestionId(), question));
         }
 
         void Dialog::addAnswer(Answer* answer) //fuegt Answer der Map hinzu
         {
-                //answers_.emplace(std::make_pair(answer->getAnswerId(), answer->getAnswer()));
+                this->answers_.insert(make_pair(answer->getAnswerId(), answer));
         }
 
@@ -72 +73 @@
         }
 
-        Answer* Dialog::getAnswer(unsigned int index) const//tolua_export               //returned sting der Antwort zur Id.
+        Answer* Dialog::getAnswer(unsigned int index) const     //returned sting der Antwort zur Id.
         {
                 return nullptr;
@@ -81 +82 @@
         {
 
-                Question question = (questions_.find(this->currentQuestionId_))->second;
-                std::vector<std::string> answers = question.getAnswerIds();
+                Question* question = (this->questions_.find(this->currentQuestionId_))->second;
+                std::vector<std::string> answers = question->getAnswerIds();
                 return answers;
         } 
@@ -98 +99 @@
     void Dialog::update(std::string givenAnswer)
     {
-        Answer answer = (answers_.find(givenAnswer))->second;
-        this->currentQuestionId_ = answer.getNextQuestion();
+        Answer* answer = (answers_.find(givenAnswer))->second;
+        this->currentQuestionId_ = answer->getNextQuestion();
     }
 
-    bool Dialog::ending() //tolua_export        //retruned true wenn die Id der Antwort end ist oder keine Antworten auf die frage eingetragen sind
+    bool Dialog::ending() //retruned true wenn die Id der Antwort end ist oder keine Antworten auf die frage eingetragen sind
     {
         bool end = false;
         if (this->currentQuestionId_ == "end"){
                 end = true;
-        } else if ((questions_.find(this->currentQuestionId_)->second).getAnswerIds().empty()){
+        } else if ((this->questions_.find(this->currentQuestionId_)->second)->getAnswerIds().empty()){
                 end = true;
         }       

code/branches/Dialog_HS17/src/modules/dialog/Dialog.h

@@ -3 +3 @@
 
 #include "core/BaseObject.h"
+#include "DialogPrereqs.h"
 #include "Question.h"
 #include "Answer.h"
@@ -9 +10 @@
 #include "overlays/OrxonoxOverlay.h"
 
+#include <map>
+#include <vector>
 #include <string>
 
 namespace orxonox
 {
-        class Dialog : public BaseObject
+        class _DialogExport Dialog : public BaseObject
         {
                 public:
                         Dialog(Context* context);
-                        // virtual ~Dialog();
+
                         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
                         virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
@@ -30 +33 @@
                         void addAnswer(Answer* answer); //fuegt Answer der Map hinzu
 
-                        Question* getQuestion(unsigned int index) const; //tolua_export // returned string der momentanen Frage
-                        Answer* getAnswer(unsigned int index) const; //tolua_export     // returned string der momentanen Frage
-                        std::vector<std::string> getAnswers(); //tolua_export   // returned vector mit allen momentanen AntwortenIds
+                        Question* getQuestion(unsigned int index) const; // returned string der momentanen Frage
+                        Answer* getAnswer(unsigned int index) const; // returned string der momentanen Frage
+                        std::vector<std::string> getAnswers();  // returned vector mit allen momentanen AntwortenIds
 
                         bool execute(bool bTriggered, BaseObject* trigger);
 
-                        void update(std::string givenAnswer);   //tolua_export
+                        void update(std::string givenAnswer);
 
-                        bool ending(); //tolua_export   //retruned true wenn die Id der Antwort end ist oder keine Antworten auf die frage eingetragen sind
+                        bool ending(); //retruned true wenn die Id der Antwort end ist oder keine Antworten auf die frage eingetragen sind
 
 
@@ -44 +47 @@
                         std::string name_;
                         std::string currentQuestionId_;
-                        std::map<std::string, Question> questions_;
-                        std::map<std::string, Answer> answers_;
+                        std::map<std::string, Question*> questions_;
+                        std::map<std::string, Answer*> answers_;
         };
 }

code/branches/Dialog_HS17/src/modules/dialog/DialogManager.cc

@@ -38 +38 @@
         } 
 }
-/*#include "core/CoreIncludes.h"
-#include "core/LuaState.h"
-#include "core/GUIManager.h"
-#include "core/class/Identifier.h"
-#include "core/singleton/ScopedSingletonIncludes.h"
-#include "network/Host.h"
-#include "network/NetworkFunctionIncludes.h"
-#include "DialogManager.h"
-#include <vector>
-#include <string>
-#include "core/XMLPort.h"
-#include "Dialog.h"
-
-
-
-namespace orxonox {
-
-        ManageScopedSingleton(DialogManager, ScopeID::ROOT, false);
-
-
-        DialogManager::DialogManager()
-        {
-                this->currentTalk_ = NULL;
-        }
-
-        void DialogManager::setDialog(Dialog* dialog)
-        {
-                this->currentTalk_ = dialog;    
-        }
-
-        const Dialog& getCurrentDialog()
-        {
-                return this->currentTalk_;
-        }
-        
-        bool DialogManager::empty()
-        {
-                if(this->currentTalk_ == NULL)
-                {
-                        return true;
-                }
-                else 
-                {
-                        return false;
-                }
-        } 
-} */

code/branches/Dialog_HS17/src/modules/dialog/DialogManager.h

@@ -1 @@
-/*
 #ifndef _DialogManager_H__
 #define _DialogManager_H__
 
-#include "core/CoreIncludes.h"
-#include "core/LuaState.h"
-#include "core/GUIManager.h"
-#include "core/class/Identifier.h"
-#include "core/singleton/ScopedSingletonIncludes.h"
-#include "network/Host.h"
-#include "network/NetworkFunctionIncludes.h"
-#include "util/Singleton.h"
-#include <string>
-#include <vector>
-#include "core/config/Configurable.h"
-#include "core/XMLPort.h"
-#include "core/EventIncludes.h"
-#include "Dialog.h"
-
-
-
-
-
-namespace orxonox //tolua_export
-
-{//tolua_export
-        class _OrxonoxExport DialogManager //tolua_export
-        : public Singleton<DialogManager>
-        {//tolua_export
-                friend class Singleton<DialogManager>;
-        
-                public:
-                
-                DialogManager();
-                
-
-                static DialogManager& getInstance() { return Singleton<DialogManager>::getInstance(); } //tolua_export
-                
-
-                void setDialog(Dialog* dialog); //tolua_export  // the triggered dialog sets it self so the lua can get to it.
-                const Dialog& getCurrentDialog();       //tolua_export
-                bool empty(); //tolua_export //returns true if no dialog is set.
-
-private:
-        Dialog* currentTalk_; //Dialog which is currently set.
-        static DialogManager* singletonPtr_s;
-
-        };//tolua_export
-}//tolua_export
-#endif
- */
-
-#ifndef _DialogManager_H__
-#define _DialogManager_H__
-
+#include "DialogPrereqs.h"
 #include "util/Singleton.h"
 #include "core/object/Listable.h"
@@ -60 +9 @@
 namespace orxonox
 {
-    class DialogManager : public Singleton<DialogManager>, public Listable
+    class _DialogExport DialogManager : public Singleton<DialogManager>, public Listable
     {
         friend class Singleton<DialogManager>;
@@ -67 +16 @@
             DialogManager();
 
-            int getValue() const
-                { return this->value_; }
+           // int getValue() const { return this->value_; }
 
-                static DialogManager& getInstance() { return Singleton<DialogManager>::getInstance(); }
+                static DialogManager& getInstance() { return Singleton<DialogManager>::getInstance(); } //toloa_export
 
                 void setDialog(Dialog* dialog);
@@ -76 +24 @@
                 bool empty();
 
+            //form here on all lua functionality used in lua scrips is declared
+
+
         private:
                 Dialog* currentTalk_;
-            int value_;
+            //int value_;
 
             static DialogManager* singletonPtr_s;

code/branches/Dialog_HS17/src/modules/dialog/Question.cc

@@ -1 +1 @@
 #include "Question.h"
-
+#include "core/CoreIncludes.h"
 
 namespace orxonox

code/branches/Dialog_HS17/src/modules/dialog/Question.h

@@ -3 +3 @@
 
 #include "core/BaseObject.h"
+#include "DialogPrereqs.h"
 #include "AnswerId.h"
 #include "core/XMLPort.h"
 #include "core/CoreIncludes.h"
+
 
 #include <string>
@@ -11 +13 @@
 namespace orxonox
 {
-        class Question : public BaseObject
+        class _DialogExport Question : public BaseObject
         {
                 public:
                         Question(Context* context);
-                //      virtual ~Question();
+
                         virtual void XMLPort(Element& xmelement, XMLPort::Mode mode);