Changeset 440 for trunk/yao

Timestamp:

10/04/10 03:37:44 (14 years ago)

Author:

yerima

Message:

The instruction's window is ready at 80%.

Location:

trunk/yao/src/interface

Files:

• src/InstructionWindow.cpp (modified) (5 diffs)
• src/include/ConstantWindow.hpp (modified) (1 diff)
• src/include/InstructionWindow.hpp (modified) (2 diffs)
• ui_newprojectwindow.h (modified) (1 diff)

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

@@ -24 +24 @@
 InstructionWindow::InstructionWindow(QWidget *parent) : QWidget(parent) {
 
-        //QFrame *slk = new QFrame;
         setupUi(this);
-        //pushButton->setText("->");
         m_rightButton->setIcon(QIcon("Images/icons/rightarrow2.png"));
-        m_instructionModel = new QStandardItemModel(0, 1);//Model in one line whitch contained the possibles functions used in the process of generation of the instruction file. 
+        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. 
+        m_instructionRightModel = new QStandardItemModel(0, 2);//Model in two columns whitch contained the selected functions used in the process of generation of the instruction file. 
 
-        QStandardItem *initialisation = new QStandardItem("Fonctions d'initialisation");//Declaration of the first main line.
+        initialisation = new QStandardItem("Fonctions d'initialisation");//Declaration of the first main line.
 
-        m_instructionModel->appendRow(initialisation);//Insertion of the first main line. 
+        m_instructionLeftModel->appendRow(initialisation);//Insertion of the first main line. 
         initialisation->appendRow(new QStandardItem("set_modeltime"));//Insertion of a sub-line.
         initialisation->appendRow(new QStandardItem("setstate"));//Insertion of a sub-line.
@@ -39 +38 @@
         initialisation->appendRow(new QStandardItem("set_pcoef"));//Insertion of a sub-line.
 
-        QStandardItem *minimisation = new QStandardItem("Fonctions de minimisation");//Declaration of the 2nde main line.
+        minimisation = new QStandardItem("Fonctions de minimisation");//Declaration of the 2nde main line.
 
-        m_instructionModel->appendRow(minimisation); //Insertion of the main line.
+        m_instructionLeftModel->appendRow(minimisation); //Insertion of the main line.
         minimisation->appendRow(new QStandardItem("setm_impres"));//Insertion of a sub-line.
         minimisation->appendRow(new QStandardItem("setm_io"));//Insertion of a sub-line.
@@ -55 +54 @@
 
         
-        QStandardItem *input_output = new QStandardItem("Fonctions d'entrée/sortie");
+        input_output = new QStandardItem("Fonctions d'entrée/sortie");
 
-                m_instructionModel->appendRow(input_output);
+                m_instructionLeftModel->appendRow(input_output);
                 input_output->appendRow(new QStandardItem("loadobs"));
                 input_output->appendRow(new QStandardItem("loadstate"));
@@ -66 +65 @@
                 input_output->appendRow(new QStandardItem("print_cost"));
 
-        QStandardItem *test = new QStandardItem("Fonctions de test");
-                m_instructionModel->appendRow(test);
+        test = new QStandardItem("Fonctions de test");
+                m_instructionLeftModel->appendRow(test);
                 test->appendRow(new QStandardItem("testdf"));
                 test->appendRow(new QStandardItem("testad"));
 
-        QStandardItem *execution = new QStandardItem("Fonctions d'exécution");
-                m_instructionModel->appendRow(execution);
+        execution = new QStandardItem("Fonctions d'exécution");
+                m_instructionLeftModel->appendRow(execution);
                 execution->appendRow(new QStandardItem("forward"));
                 execution->appendRow(new QStandardItem("backward"));
@@ -80 +79 @@
                 execution->appendRow(new QStandardItem("runim"));
         
-        QStandardItem *user_functions = new QStandardItem("Fonction(s) de l'utilisateur.");
-                m_instructionModel->appendRow(user_functions);
+        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"));
 
-        m_proposedParametersListView->setModel(m_instructionModel);     
-                
+        m_instructionLeftModel->setHorizontalHeaderLabels(QStringList() << "Fonctions proposées");
+        m_instructionRightModel->setHorizontalHeaderLabels(QStringList() << "Fonctions choisies" << "ParamÚtres");
+
+
+        m_proposedParametersListView->setModel(m_instructionLeftModel); 
+        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()));
 }
-/*********************************************************************************************************************************/
-/***********************************************************************/
+
+/********************************* Implementation of the selectedFunction(QModelIndex index) method  ***********************************/
+void InstructionWindow::selectedFunction(QModelIndex index) {
+
+        QItemSelectionModel *selection = m_proposedParametersListView->selectionModel();
+        //index = selection->currentIndex();
+        QVariant element = m_instructionLeftModel->data(index, Qt::DisplayRole);
+        QString chaine = element.toString();//.toStdString();
+        m_fonctionNameLineEdit->setText(chaine);
+        //QMessageBox::about(this, "Avis", chaine);
+        //int r = index.row();
+        
+}
+
+/********************************* Implementation of the addInstructionRow()  method *************************************************/
+void InstructionWindow::addInstructionRow() {
+
+        QString nom  = m_fonctionNameLineEdit->text();
+        QString val  = m_fonctionParameterLineEdit->text();
+        
+        if (nom.isEmpty()){ 
+  
+                            QMessageBox::critical(this, "Avertissement", "Le champ \"<I>Nom de la fonction<I>\" est obligatoire! Veuillez sélectionner une fonction parmi celles qui sont proposées dans la partie gauche de la fenêtre.");
+                            return; // Arrêt de la méthode
+                    }
+  
+          else {
+                  //if (!(m_ligneNom->text().isEmpty()) || (m_ligneValeur->text().isEmpty())) {
+                    //      m_delButton->setEnabled(true);
+                    //      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_fonctionNameLineEdit->setText("");
+                        m_fonctionParameterLineEdit->setText("");
+                  }
+
+}
+
+/***********************************************************************************************************************/
+/***************************************************** End of file *****************************************************/
+/***********************************************************************************************************************/

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

@@ -15 +15 @@
 class ConstantWindow : public QWidget, Ui::ConstantWindow {
 
-        Q_OBJECT;
+        Q_OBJECT
 
         public :

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

@@ -9 +9 @@
 #ifndef INSTRUCTIONWINDOW_HPP
 #define INSTRUCTIONWINDOW_HPP
-
+#include <QStandardItemModel> 
+#include <QModelIndex> 
+#include <QMessageBox> 
 #include "../../ui_instructionwindow.h"
-#include <QStandardItemModel> 
 
 class InstructionWindow: public QWidget, public Ui::InstructionWindow {
 
-        //Q_OBJECT
+        Q_OBJECT
 
         public :
                 InstructionWindow(QWidget *parent=0);
 
-        //private slots:
-
+        private slots:
+                void addInstructionRow();       
+                void selectedFunction(QModelIndex index);
                 
         //signals:
@@ -30 +32 @@
 
         private :
-                QStandardItemModel *m_instructionModel;
+                QStandardItemModel *m_instructionLeftModel;
+                QStandardItemModel *m_instructionRightModel;
+                QStandardItem *initialisation;
+                QStandardItem *minimisation; 
+                QStandardItem *input_output; 
+                QStandardItem *test; 
+                QStandardItem *execution; 
+                QStandardItem *user_functions; 
                  //QStandardItemModel *m_orderModel;
 };

trunk/yao/src/interface/ui_newprojectwindow.h

@@ -2 +2 @@
 ** Form generated from reading UI file 'newprojectwindow.ui'
 **
-** Created: Sun Oct 3 13:46:54 2010
+** Created: Sun Oct 3 16:42:34 2010
 **      by: Qt User Interface Compiler version 4.6.2
 **