Changeset 339

Timestamp:

06/03/10 14:07:34 (14 years ago)

Author:

yerima

Message:

Adding and deleting buttons are ok in the O_EXTOBJ's widget. Visual Yao.

Location:

trunk/yao/src/interface/src

Files:

• ContextWindow.cpp (modified) (8 diffs)
• HatNameWindow.cpp (modified) (6 diffs)
• MainWindow.cpp (modified) (1 diff)
• include/ContextWindow.hpp (modified) (4 diffs)
• include/HatNameWindow.hpp (modified) (2 diffs)
• include/MainWindow.hpp (modified) (5 diffs)

trunk/yao/src/interface/src/ContextWindow.cpp

@@ -19 +19 @@
 //! \brief Implementation of the Context window for visual_YAO.
 
-ContextWindow::ContextWindow(Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent) {
+ContextWindow::ContextWindow(Context *aContext, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent) {
 
    this->setWindowTitle("Directive Option.");
@@ -25 +25 @@
         compteur        = 0;
         localConstantTable = aConstantTable;
+        m_localContext  =       aContext;
         m_ContextLayoutH1        = new QHBoxLayout;
         m_ContextLayoutH2        = new QHBoxLayout;
@@ -60 +61 @@
                 }
 
-
-
         m_checkBoxO_GRADTEST    = new QCheckBox("O_GRADTEST") ;
         m_checkBoxO_VARINCR     = new QCheckBox("O_VARINCR") ;
@@ -86 +85 @@
 
         m_contextTableView = new QTableView ;   
-        
+
         m_contextTableView->setModel(contextModele);
                   m_contextTableView->setEditTriggers(QAbstractItemView::NoEditTriggers); /*!< this ligne give no edit mode*/
@@ -93 +92 @@
                   m_contextTableView->resizeColumnsToContents();
 
+        O_EXTOBJModele = new QStandardItemModel(0, 1) ;         
+
         m_O_EXTOBJListView = new QListView ;   
-
+                m_O_EXTOBJListView->setModel(O_EXTOBJModele); 
         m_O_DBGLayoutG  = new QGridLayout;
                 m_O_DBGLayoutG->addWidget(m_checkBoxO_DBG_NANF, 0, 0);
@@ -144 +145 @@
         connect(m_ContextHelpButton, SIGNAL(clicked()), this, SLOT(callContextHelp()));
         
+        
+        connect(m_addButtonO_EXTOBJ, SIGNAL(clicked()), this, SLOT(addO_EXTOBJRow()));
+        
+        connect(m_delButtonO_EXTOBJ, SIGNAL(clicked()), this, SLOT(deleteO_EXTOBJRow()));
+
         setLayout(m_layoutGContext);
         setFixedWidth(baseSize().width() + 645);
@@ -158 +164 @@
         
 }
-
+/**************************************** Implémentation de la méthode addO_EXTOBJRow() *****************************************************************/
+void ContextWindow::addO_EXTOBJRow() {
+
+        O_EXTOBJModele->appendRow(new QStandardItem(m_comboContextO_EXTOBJ->currentText())); 
+        m_comboContextO_EXTOBJ->setCurrentIndex(0);
+}
+
+/**************************************** Implémentation de la méthode deleteO_EXTOBJRow() *****************************************************************/
+void ContextWindow::deleteO_EXTOBJRow() {
+
+        QItemSelectionModel *selection = m_O_EXTOBJListView->selectionModel(); 
+        O_EXTOBJIndex = selection->currentIndex(); 
+         if (!O_EXTOBJIndex.isValid()) 
+                return; 
+        QVariant element = O_EXTOBJModele->data(O_EXTOBJIndex, Qt::DisplayRole);
+        int r = O_EXTOBJIndex.row();
+        if (selection->hasSelection()) {
+         O_EXTOBJModele->removeRows(m_O_EXTOBJListView->currentIndex().row(), 1); 
+        //localHeaderList->erase(localHeaderList->begin() + r);
+        //if(isHeaderListEmpty()) m_delHatButton->setDisabled(true);
+        }
+        //cout << "Salut" << endl;
+}
 /*************************************** Implémentation de la méthode eraseDataFromLineEdit() ****************************************************************/
 void ContextWindow::eraseDataFromLineEdit() {
@@ -176 +204 @@
         m_checkBoxO_DBG_TRC_LWARD->setChecked(false);
         m_checkBoxO_DBG_TRC_AWARD->setChecked(false);
-
-
                 
 }

trunk/yao/src/interface/src/HatNameWindow.cpp

@@ -14 +14 @@
 /***************************************   The class constructor: HatNameWindow()  ********************************************************************/
 HatNameWindow::HatNameWindow(vector <string> *aHeaderList, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent), modeleFichiers(NULL), 
-vueFichiers(NULL), modeleHatName(NULL), localHeaderList(NULL), localConstantTable(NULL)
+hatView(NULL), modeleHatName(NULL), localHeaderList(NULL), localConstantTable(NULL)
 
 {
@@ -46 +46 @@
         for (vector <string>::iterator it = localHeaderList->begin(); it != localHeaderList->end(); it++)
                 modeleHatName->appendRow(new QStandardItem(it->c_str()));
-        vueFichiers = new QListView;
-        vueFichiers->setModel(modeleHatName);
+        hatView = new QListView;
+        hatView->setModel(modeleHatName);
 
         m_boutonouvrir->setIcon(QIcon("Images/icons/openfile.png")); //Affichage d'une image sur le bouton "ouvrir"
@@ -57 +57 @@
                 m_layoutGHatName->addWidget(m_boutonouvrir, 0, 3, Qt::AlignLeft);       
                 
-                m_layoutGHatName->addWidget(vueFichiers, 2, 1, 7, 2);
+                m_layoutGHatName->addWidget(hatView, 2, 1, 7, 2);
 
                 m_layoutGHatName->addWidget(m_boutonAjouter, 3, 3);
@@ -193 +193 @@
 void HatNameWindow::deleteHatRow() {
 
-         QItemSelectionModel *selection = vueFichiers->selectionModel(); //Un ensemble sur les éléments selectionnés
+         QItemSelectionModel *selection = hatView->selectionModel(); //Un ensemble sur les éléments selectionnés
          index = selection->currentIndex(); //Précision de l'élément courant selectionné
         
@@ -203 +203 @@
          if (selection->hasSelection()) // Evite certains effets indésirables: suppression de la derniere ligne aprÚs clic sur le vide.
           {
-                 modeleHatName->removeRows(vueFichiers->currentIndex().row(), 1);// Le 2Úme parametre indique le nombre de ligne à supprimer
+                 modeleHatName->removeRows(hatView->currentIndex().row(), 1);// Le 2Úme parametre indique le nombre de ligne à supprimer
                  localHeaderList->erase(localHeaderList->begin() + r);//On met à jour la structure de données en supprimant aussi l'élement.
                  //m_tableView->resizeRowToContents(c - 1); // columnCountChanged(c , c-1);
@@ -292 +292 @@
 HatNameWindow::~HatNameWindow() {
 
-//      delete vueFichiers;
+//      delete hatView;
 }
 /****************************************************************************************************************************************************/

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

@@ -342 +342 @@
         if (m_ContextCopy == NULL) { //to test if the object is already created.
 
-        m_ContextCopy = new ContextWindow(&theConstantTable); //mwc.getContext();
+        m_ContextCopy = new ContextWindow(&theContext, &theConstantTable); //mwc.getContext();
         espace->addWindow(m_ContextCopy)->move(5, 0);
         m_ContextCopy->show();

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

@@ -18 +18 @@
 #include <QGroupBox> 
 #include <QStandardItemModel> 
+#include <QItemSelectionModel> 
 #include <QModelIndex> 
 #include <QFileDialog>
@@ -37 +38 @@
 
     public :
-                ContextWindow(yao::Table <yao::Constant> *aConstantTable, QWidget *parent=0);
+                ContextWindow(yao::Context *aContext, yao::Table <yao::Constant> *aConstantTable, QWidget *parent=0);
                 QStringList getContextData();
                 bool testContenu(int anInt);
@@ -47 +48 @@
                 void saveContextData();
                 void addContextRow();
+                void addO_EXTOBJRow();
+                void deleteO_EXTOBJRow();
                 void deleteContextRow();
                 void callContextHelp();         
@@ -101 +104 @@
 
                 QStandardItemModel *contextModele;
+                QStandardItemModel *O_EXTOBJModele;
                 QModelIndex index;
+                QModelIndex O_EXTOBJIndex;
 
                 QTableView *m_contextTableView;
                 QListView *m_O_EXTOBJListView ;
 
-                yao::Context *m_theContext;
+                yao::Context *m_localContext;
                 std::vector<std::string> anVector;
                 yao::Table <yao::Constant> *localConstantTable;

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

@@ -119 +119 @@
                 QStringList listeFichiers;
                 QStringListModel *modeleFichiers;
-                QListView *vueFichiers;
+                QListView *hatView;
 
                 QStandardItemModel *modeleHatName;
@@ -131 +131 @@
                 std::string localProjectName;
                 yao::Table <yao::Constant> *localConstantTable;
-                int i;
 };
 #endif

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

@@ -8 +8 @@
 //#include "../Translator.hpp"
 
-
 #include "MainWindowController.hpp"
 #include "../help/Enforcer.hpp"
 #include "../help/FilePath.hpp"
-
+#include "../YAOObjects/Modul.hpp"
 
 #include <QtGui>
 #include <QMainWindow>
 #include <QWorkspace>
-#include <QPushButton>
-#include <QTabWidget>
-#include <QWidget>
-#include <QCloseEvent>
-
 
 #include "ConnectionWindow.hpp"
@@ -36 +30 @@
 #include "ContextWindow.hpp"
 #include "OrderWindow.hpp"
-
-#include "../YAOObjects/Table.hpp"
-#include "../YAOObjects/Constant.hpp"
-#include "../YAOObjects/Trajectory.hpp"
-#include "../YAOObjects/Operator.hpp"
-#include "../YAOObjects/Modul.hpp"
 
 /*!
@@ -93 +81 @@
                         void createNewProjectWindow();
                         void helpMessage();
-                        //void callHatModel();
                         void createDefvalWindow();
                         void createHatNameWindow();
@@ -115 +102 @@
                         void openPathWindow();
                         void setTitle();
-                        //void setWindowTitle(const QString &title);
                         void hatUpdate();
                         void hatUpdate(QString choix );
@@ -227 +213 @@
                         yao::Table <yao::Constant> theConstantTable;                    
                         std::vector <string> theHeaderList;
+                        yao::Context theContext;
                         yao::Table <yao::Trajectory> theTrajectoryTable;
                         yao::Table <yao::Space> theSpaceTable;