Changeset 443 for trunk/yao

Timestamp:

10/08/10 13:48:30 (14 years ago)

Author:

yerima

Message:

In the InsertFCTWindow, data are restaured in the view after closing the window. Some controls are implemented in the InstructionWindow?'s class like as clicking on only the name of the functions (sub-menu).

Location:

trunk/yao/src/interface

Files:

• src/InsertFCTWindow.cpp (modified) (2 diffs)
• src/InstructionWindow.cpp (modified) (8 diffs)
• src/MainWindow.cpp (modified) (1 diff)
• src/include/InstructionWindow.hpp (modified) (3 diffs)
• src/ui_/modinspace.ui (modified) (9 diffs)
• src/ui_/orderwindow.ui (modified) (3 diffs)
• src/ui_/spaceintraj.ui (modified) (7 diffs)
• ui_newprojectwindow.h (modified) (1 diff)

trunk/yao/src/interface/src/InsertFCTWindow.cpp

@@ -16 +16 @@
         localFunctionTable      = aFunctionTable;
         
+        
         QRegExp regExp("[A-Za-z_][A-Za-z0-9_]*");
         m_insertFCTNameLine->setValidator(new QRegExpValidator(regExp, this));
@@ -28 +29 @@
         m_insertFCTTableView->resizeColumnsToContents();
                         
-      
+        for (Table<Function>::iterator it = localFunctionTable->begin(); it != localFunctionTable->end(); it++) {
+                m_insertFCTModel->setItem(m_insertFCTModel->rowCount(), 0, new QStandardItem(QString(it->getName().c_str())));  
+                it->isParameterized()? m_insertFCTModel->setItem(m_insertFCTModel->rowCount()-1, 1, new QStandardItem(QString("oui"))) : m_insertFCTModel->setItem(m_insertFCTModel->rowCount()-1, 1, new QStandardItem(QString("non")));
+        }
+
+        
+        
         connect(m_insertFCTAddButton, SIGNAL(clicked()), this, SLOT(addInsertRow())); /*!< To add rows in the tableview after clicking on the button "Add"*/
         connect(m_insertFCTDelButton, SIGNAL(clicked()), this, SLOT(deleteRowFCT())); /*!< This slot delete a row after a click on the button "Supprimer" */

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

@@ -15 +15 @@
 
 using namespace std;
-//using namespace yao;
+using namespace yao;
 
 
@@ -22 +22 @@
 
 /*********************************************************************************************************************************/
-InstructionWindow::InstructionWindow(/*yao::Table <yao::Function> *aFunctionTable,*/ QWidget *parent) : QWidget(parent) {
+InstructionWindow::InstructionWindow(Table <Function> *aFunctionTable, QWidget *parent) : QWidget(parent) {
 
         setupUi(this);
+        
+        localFunctionTable      = aFunctionTable;       
+
         m_rightButton->setIcon(QIcon("Images/icons/rightarrow2.png"));
         m_instructionLeftModel = new QStandardItemModel(0, 1);//Model in one column whitch contained the possibles functions used in the process of generation of the instruction file. 
@@ -81 +84 @@
         user_functions = new QStandardItem("Fonction(s) de l'utilisateur.");
                 m_instructionLeftModel->appendRow(user_functions);
-                for (int i = 0; i< 4; i++)
-                user_functions->appendRow(new QStandardItem("Par défaut"));
+                for (Table<Function>::iterator it = localFunctionTable->begin(); it != localFunctionTable->end(); it++) {
+                        user_functions->appendRow(new QStandardItem(QString(it->getName().c_str())));
+                }
+
 
         m_instructionLeftModel->setHorizontalHeaderLabels(QStringList() << "Fonctions proposées");
@@ -91 +96 @@
         m_choosedParametersTableView->setModel(m_instructionRightModel);        
         m_choosedParametersTableView->resizeColumnsToContents();
+        
         connect(m_proposedParametersListView, SIGNAL(clicked(QModelIndex )), this, SLOT(selectedFunction(QModelIndex )));
         connect(m_rightButton, SIGNAL(clicked()), this, SLOT(addInstructionRow()));
@@ -97 +103 @@
 /********************************* Implementation of the selectedFunction(QModelIndex index) method  ***********************************/
 void InstructionWindow::selectedFunction(QModelIndex index) {
+        
+        QString tampon;
 
         QItemSelectionModel *selection = m_proposedParametersListView->selectionModel();
@@ -102 +110 @@
         QVariant element = m_instructionLeftModel->data(index, Qt::DisplayRole);
         QString chaine = element.toString();//.toStdString();
-        m_fonctionNameLineEdit->setText(chaine);
+
+        for (int i = 0; i < 8 ; i++) {
+           
+                 tampon.append(chaine.at(i));// To extract the nine first characteres from the string (which will be compared with "Fonctions").    
+                 
+         }
+        
+        if (tampon.compare("Fonction", Qt::CaseSensitive) == 0) 
+                return;
+        else {
+                
+                m_fonctionNameLineEdit->setText(chaine);
+        }
+                        
+
         //QMessageBox::about(this, "Avis", chaine);
         //int r = index.row();
@@ -114 +136 @@
         QString val  = m_fonctionParameterLineEdit->text();
         
+        /*QString tampon;
+        
+        for (int i = 0; i < 8 ; i++) {
+                
+                tampon.append(nom.at(i));// To extract the nine first characteres from the string (which will be compared with "Fonctions").    
+                                
+        }*/
         if (nom.isEmpty()){ 
   
@@ -125 +154 @@
                     //      Constant localConstant (Nom.toStdString(), Val.toStdString());
                     //              m_localConstantTable->push_back(localConstant);
-                        m_instructionRightModel->setItem(m_instructionRightModel->rowCount(), 0, new QStandardItem(nom));
-                        m_instructionRightModel->setItem(m_instructionRightModel->rowCount()-1, 1, new QStandardItem(val));
+                        
+                                m_instructionRightModel->setItem(m_instructionRightModel->rowCount(), 0, new QStandardItem(nom));
+                                m_instructionRightModel->setItem(m_instructionRightModel->rowCount()-1, 1, new QStandardItem(val));
                                 
-                        m_fonctionNameLineEdit->setText("");
-                        m_fonctionParameterLineEdit->setText("");
+                                m_fonctionNameLineEdit->setText("");
+                                m_fonctionParameterLineEdit->setText("");
                   }
 

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

@@ -928 +928 @@
 
         
-        InstructionWindow *iw = new InstructionWindow(/*&theFunctionTable*/) ;
+        InstructionWindow *iw = new InstructionWindow(&theFunctionTable) ;
         espace.addWindow(iw)->move(0, 0); 
         iw->show();     

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

@@ -13 +13 @@
 #include <QMessageBox> 
 #include "../../ui_instructionwindow.h"
+#include "../../../YAOObjects/Table.hpp"
 #include "../../../YAOObjects/Function.hpp"
 
@@ -22 +23 @@
 
         public :
-                InstructionWindow(/*yao::Table <yao::Function> *aFunctionTable,*/ QWidget *parent=0);
+                InstructionWindow(yao::Table <yao::Function> *aFunctionTable, QWidget *parent=0);
 
         private slots:
@@ -43 +44 @@
                 QStandardItem *execution; 
                 QStandardItem *user_functions; 
+                
+                yao::Table <yao::Function>  *localFunctionTable;
                  //QStandardItemModel *m_orderModel;
 };

trunk/yao/src/interface/src/ui_/modinspace.ui

@@ -8 +8 @@
     <y>0</y>
     <width>620</width>
-    <height>458</height>
+    <height>419</height>
    </rect>
   </property>
@@ -20 +20 @@
      <y>50</y>
      <width>321</width>
-     <height>401</height>
+     <height>361</height>
     </rect>
    </property>
@@ -47 +47 @@
       <x>20</x>
       <y>90</y>
-      <width>78</width>
+      <width>91</width>
       <height>27</height>
      </rect>
@@ -69 +69 @@
      <rect>
       <x>20</x>
-      <y>200</y>
+      <y>190</y>
       <width>59</width>
       <height>17</height>
@@ -82 +82 @@
      <rect>
       <x>20</x>
-      <y>290</y>
-      <width>78</width>
+      <y>260</y>
+      <width>91</width>
       <height>27</height>
      </rect>
@@ -91 +91 @@
     <property name="geometry">
      <rect>
-      <x>120</x>
-      <y>290</y>
+      <x>130</x>
+      <y>260</y>
       <width>26</width>
       <height>25</height>
@@ -120 +120 @@
       <y>30</y>
       <width>131</width>
-      <height>361</height>
+      <height>321</height>
      </rect>
     </property>
@@ -152 +152 @@
      <y>10</y>
      <width>271</width>
-     <height>441</height>
+     <height>401</height>
     </rect>
    </property>
@@ -167 +167 @@
       <y>40</y>
       <width>251</width>
-      <height>391</height>
+      <height>351</height>
      </rect>
     </property>

trunk/yao/src/interface/src/ui_/orderwindow.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>649</width>
-    <height>578</height>
+    <width>639</width>
+    <height>536</height>
    </rect>
   </property>
@@ -19 +19 @@
      <x>10</x>
      <y>60</y>
-     <width>631</width>
-     <height>461</height>
+     <width>621</width>
+     <height>431</height>
     </rect>
    </property>
@@ -56 +56 @@
     <rect>
      <x>10</x>
-     <y>530</y>
-     <width>631</width>
+     <y>500</y>
+     <width>621</width>
      <height>29</height>
     </rect>

trunk/yao/src/interface/src/ui_/spaceintraj.ui

@@ -8 +8 @@
     <y>0</y>
     <width>618</width>
-    <height>460</height>
+    <height>417</height>
    </rect>
   </property>
@@ -20 +20 @@
      <y>80</y>
      <width>301</width>
-     <height>371</height>
+     <height>331</height>
     </rect>
    </property>
@@ -33 +33 @@
      <rect>
       <x>10</x>
-      <y>170</y>
-      <width>91</width>
+      <y>160</y>
+      <width>101</width>
       <height>27</height>
      </rect>
@@ -43 +43 @@
      <rect>
       <x>120</x>
-      <y>170</y>
+      <y>160</y>
       <width>26</width>
       <height>25</height>
@@ -56 +56 @@
      <rect>
       <x>160</x>
-      <y>10</y>
+      <y>90</y>
       <width>131</width>
-      <height>341</height>
+      <height>171</height>
      </rect>
     </property>
@@ -69 +69 @@
      <y>10</y>
      <width>291</width>
-     <height>441</height>
+     <height>401</height>
     </rect>
    </property>
@@ -84 +84 @@
       <y>40</y>
       <width>271</width>
-      <height>391</height>
+      <height>351</height>
      </rect>
     </property>

trunk/yao/src/interface/ui_newprojectwindow.h

@@ -2 +2 @@
 ** Form generated from reading UI file 'newprojectwindow.ui'
 **
-** Created: Thu Oct 7 14:11:53 2010
+** Created: Thu Oct 7 18:17:25 2010
 **      by: Qt User Interface Compiler version 4.6.3
 **