Changeset 452 for trunk/yao

Timestamp:

10/15/10 17:55:07 (14 years ago)

Author:

yerima

Message:

Correct version of the .i file generating.

Location:

trunk/yao/src/interface/src

Files:

• InstructionWindow.cpp (modified) (2 diffs)
• MainWindow.cpp (modified) (2 diffs)
• include/InstructionWindow.hpp (modified) (2 diffs)
• include/MainWindow.hpp (modified) (1 diff)

trunk/yao/src/interface/src/InstructionWindow.cpp

@@ -22 +22 @@
 
 /*********************************************************************************************************************************/
-InstructionWindow::InstructionWindow(Table <Function> *aFunctionTable, QWidget *parent) : QWidget(parent), savedData(" ") {
+InstructionWindow::InstructionWindow(vector <string> *anInstructionData, Table <Function> *aFunctionTable, QWidget *parent) : QWidget(parent), savedData(" ") {
 
         setupUi(this);
         
         localFunctionTable      = aFunctionTable;       
+        m_localInstructionData  = anInstructionData;    
 
         m_rightButton->setIcon(QIcon("Images/icons/rightarrow2.png"));
@@ -164 +165 @@
                                 
                                 //savedData.push_back(nom+" "+val);
-                                savedData  << nom+" "+val;//=  (QStringList() << str1 << str2 << str3);
+                                m_localInstructionData->push_back(nom.toStdString()+" "+val.toStdString());//=  (QStringList() << str1 << str2 << str3);
                                 
                                 emit activeTheIAction();

trunk/yao/src/interface/src/MainWindow.cpp

@@ -942 +942 @@
                         instruction << "#-------------------------------------------------------------------------------------------------" << endl;
                         
-                        //if (!iw->getInstruction().isEmpty()) {
+                        if (!iw->getInstruction().isEmpty()) {
                         
-                        //for (QStringList::iterator it = iw->getInstruction().begin(); it != iw->getInstruction().end(); it++)
-
-                        //      instruction << it->toStdString() << endl;
+                        for (vector <string>::iterator it = theInstructionData.begin(); it != theInstructionData.end(); it++)
+
+                                instruction << it->c_str() << endl;
                         
                                 instruction << endl;
                                 
                                 //emit activeTheIAction();
-                        //}
+                        }
                         instruction.close();
 
@@ -970 +970 @@
 
         
-        iw = new InstructionWindow(&theFunctionTable) ;
+        iw = new InstructionWindow(&theInstructionData, &theFunctionTable) ;
         espace.addWindow(iw)->move(0, 0); 
         iw->show();     

trunk/yao/src/interface/src/include/InstructionWindow.hpp

@@ -23 +23 @@
 
         public :
-                InstructionWindow(yao::Table <yao::Function> *aFunctionTable, QWidget *parent=0);
+                InstructionWindow(std::vector <std::string> *anInstructionData, yao::Table <yao::Function> *aFunctionTable, QWidget *parent=0);
                 QStringList getInstruction(); 
 
@@ -48 +48 @@
                 
                 QStringList savedData;
-
-                yao::Table <yao::Function>  *localFunctionTable;
+                std::vector <std::string> *m_localInstructionData;
+                yao::Table <yao::Function> *localFunctionTable;
                  //QStandardItemModel *m_orderModel;
 };

trunk/yao/src/interface/src/include/MainWindow.hpp

@@ -265 +265 @@
                         //yao::Table <yao::Order> theOrderTable;
                         yao::Table <yao::Function> theFunctionTable;    
+
+                        std::vector <std::string> theInstructionData;
+
                         bool m_activeProject;