Changeset 465

Timestamp:

10/25/10 08:18:39 (14 years ago)

Author:

yerima

Message:

The configure file.

Location:

trunk/yao/src/interface

Files:

• configure (added)
• src/ModinspaceWindow.cpp (modified) (4 diffs)
• src/include/ModinspaceWindow.hpp (modified) (1 diff)

trunk/yao/src/interface/src/ModinspaceWindow.cpp

@@ -22 +22 @@
 
 /*********************************************************************************************************************************/
-ModinspaceWindow::ModinspaceWindow(Table <Modul> *aModulTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, QWidget *parent) : QWidget(parent) {
+ModinspaceWindow::ModinspaceWindow(Table <Modul> *aModulTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, QWidget *parent) : QWidget(parent), m_theLocalAxesTable(NULL), m_theLocalModulTable(NULL) {
 
         setupUi(this);
@@ -94 +94 @@
 void ModinspaceWindow::addTheAxesRow() {
         
+        QString theAxe = m_axesComboBox->currentText(); //
+        int row0 = m_outlineModel->rowCount();
+        int row1 = m_outlineModel->rowCount() + 1;
+        
+        if (theAxe.isEmpty()) return; //If the axes combobox is not empty, the space combobox will be verified.
+
         if (m_spaceOrOperaNameComboBox->currentText().isEmpty()) {
         
@@ -99 +105 @@
                 return;
         }
-
-        QString theAxe = m_axesComboBox->currentText();
-
-        if (theAxe.isEmpty()) return;
         
+        QString spaceOrOpera = m_spaceOrOperaNameComboBox->currentText();
+                
         m_axesModel->setItem(m_axesModel->rowCount(), 0, new QStandardItem(theAxe));    
         m_axesComboBox->setCurrentIndex(0);
+
+        m_outlineModel->setItem(row0, 0, new QStandardItem("order")); 
+                //m_theLocalModulTable->push_back();
+        m_outlineModel->setItem(row0, 1, new QStandardItem("modinpace")); 
+        m_outlineModel->setItem(row0, 2, new QStandardItem(spaceOrOpera)); 
+        m_outlineModel->setItem(row1, 1, new QStandardItem("order")); 
+        m_outlineModel->setItem(row1, 2, new QStandardItem(theAxe)); 
+                //m_theLocalAxesTable->push_back(theAxe.toStdString());
+        //m_outlineModel->setItem(row1, 1, new QStandardItem("order")); 
+
+        //for (vector <string>::iterator it = m_theLocalAxesTable->begin(); it != m_theLocalAxesTable->end(); it++)
+                //m_outlineModel->setItem(row1, m_outlineModel->columnCount(), new QStandardItem(QString(it->c_str()))); 
+                //m_outlineModel->setItem(row1, m_outlineModel->columnCount(), new QStandardItem(QString(theAxe))); 
+        //m_outlineModel->setItem(row1, 2, new QStandardItem("order")); 
+        
+        
+        //if (m_blocEndCheckBox->isChecked())
+        //      ;
 }
 
@@ -112 +134 @@
 
         QString theModul = m_modulNameComboBox->currentText();
+        
+        if (theModul.isEmpty()) return;
 
-        if (theModul.isEmpty()) return;
-        
         m_modulNameModel->setItem(m_modulNameModel->rowCount(), 0, new QStandardItem(theModul));        
         m_modulNameComboBox->setCurrentIndex(0);
 
 }
+
 /******************************* Implementation of the deleteModulRow(const QModelIndex &index) method ****************************************/  
 void ModinspaceWindow::deleteAxesRow() {
         
-                
         //QStandardItem *item = m_axesModel->itemFromIndex(index);      
 

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

@@ -50 +50 @@
                 QModelIndex indexForAxes; 
                 QModelIndex indexForModul; 
-                /*QStandardItemModel *m_instructionLeftModel;
-                QStandardItemModel *m_instructionRightModel;
-                QStandardItem *initialisation;
-                QStandardItem *minimisation; 
-                QStandardItem *input_output; 
-                QStandardItem *test; 
-                QStandardItem *execution; 
-                QStandardItem *user_functions; 
-                 //QStandardItemModel *m_orderModel;
-                */
+                
+                std::vector <std::string> *m_theLocalAxesTable;
+                std::vector <std::string> *m_theLocalModulTable;
 };
 #endif // MODINSPACEwINDOW_HPP