Changeset 205 for trunk

Timestamp:

02/18/10 17:10:23 (14 years ago)

Author:

yerima

Message:

DefvalWindow? herits from BaseWindow? in visual Yao.

Location:

trunk/yao/src/interface/src

Files:

• BaseWindow.cpp (modified) (5 diffs)
• DefvalWindow.cpp (modified) (2 diffs)
• Include/BaseWindow.hpp (modified) (4 diffs)
• Include/DefvalWindow.hpp (modified) (1 diff)
• MainWindow.cpp (modified) (3 diffs)

trunk/yao/src/interface/src/BaseWindow.cpp

@@ -4 +4 @@
         
         this->setWindowTitle("Directive  .");     /*!< To set the window's title. */
-        //isCalled = false;
+                isCalled = false;
                 // Instanciation des classes.
                 // Déclaration des boutons et champs de saisie de texte.
-
-                //compteur                      = 0;
+                compteur                = 0;
                 
                 m_nameLabel             = new QLabel("Entrée 1: ");    /*!< QLabel for Nom de la constante . */
@@ -48 +47 @@
         //index = m_tableView ->currentIndex();
 
-        //m_modeleListeNoms                     = new QStringListModel(m_listeNoms);
+        m_modeleListeNoms                       = new QStringListModel(m_listeNoms);
 
         this->setLayout(m_layoutGrid); //Activation du gestionnaire principal.
 
         // Gestion des connexions entre les widgets.
-        connect(m_quitButton , SIGNAL(clicked()), this, SLOT(close()));  /*!< slot for the close this windows*/
-        //connect(m_delButton , SIGNAL(clicked()), this, SLOT(delete Row())); /*!< To delete the object selected in the view*/
-        //connect(m_addButton , SIGNAL(clicked()), this, SLOT(add Row()));  /*!< This slot add the object in the view */
-        //connect(m_HelpButton, SIGNAL(clicked()), this, SLOT(call Help())); /*!< This slot opens the help window */
-        //connect(m_saveButton, SIGNAL(clicked()), this, SLOT(save Data())); /*!< This slot save data in structure */
+        connect(m_quitButton, SIGNAL(clicked()), this, SLOT(close()));  /*!< slot for the close this windows*/
+        connect(m_addButton, SIGNAL(clicked()), this, SLOT(addRowInTable()));  /*!< This slot add the object in the view */
+        connect(m_delButton, SIGNAL(clicked()), this, SLOT(deleteRow())); /*!< To delete the object selected in the view*/
+        connect(m_saveButton, SIGNAL(clicked()), this, SLOT(saveData())); /*!< This slot save data in structure */
 
         this->setFixedWidth(baseSize().width() + 410);
 }
-/****************************************** add Row() method **********************************************/
-/*void BaseWindow::add Row() {
+/****************************************** addRowInTable() method **********************************************/
+void BaseWindow::addRowInTable() {
 
         addRow();                               // Permet de créer une nouvelle dans le tableau d'affichage.
@@ -71 +69 @@
     static int i = 1;
     static int j = 1;
-        QString Nom  = m_ligneNom ->text();
-        QString Val  = m_ligneValeur ->text();
-
-
-        for(int i1 = 0; i1 < Nom .size(); i1++)
-                if(!((Nom .at(i1) >= QChar('a')&& Nom .at(i1) <= QChar('z')) || (Nom .at(i1) >= QChar('A')&& Nom .at(i1) <= QChar('Z')) //--------
-                || (Nom .at(i1) >= QChar('0')&& Nom .at(i1) <= QChar('9')) || (Nom .at(i1) == QChar('_')))) //|| (line1.isEmpty())
+        QString Nom  = m_ligneNom->text();
+        QString Val  = m_ligneValeur->text();
+
+
+        for(int i1 = 0; i1 < Nom.size(); i1++)
+                if(!((Nom .at(i1) >= QChar('a')&& Nom .at(i1) <= QChar('z')) || (Nom .at(i1) >= QChar('A')&& Nom .at(i1) <= QChar('Z'))
+                        || (Nom .at(i1) >= QChar('0')&& Nom .at(i1) <= QChar('9')) || (Nom .at(i1) == QChar('_')))) //|| (line1.isEmpty())
                         {
                                 QMessageBox::critical(this, "Erreur", "Veuillez entrer une valeur exacte du nom de la constante.");
                                 return; // Arrêt de la méthode
                         }
-        for(int i2 = 0; i2 < Val .size(); i2++)
+        for(int i2 = 0; i2 < Val.size(); i2++)
                 if(!((Val .at(i2) >= QChar('a') && Val .at(i2) <= QChar('z')) || (Val .at(i2) >= QChar('A')&& Val .at(i2) <= QChar('Z')) 
-                ||(Val .at(i2) >= QChar('0') && Val .at(i2) <= QChar('9')) || (Val .at(i2) == QChar('_')) || (Val .at(i2) == QChar('-')) || (Val .at(i2) == QChar('E')) || (Val .at(i2) == QChar('e')) || (Val .at(i2) == QChar('+')) || (Val .at(i2) == QChar('.')))) //|| (line1.isEmpty())
-                        {
+                        ||(Val .at(i2) >= QChar('0') && Val .at(i2) <= QChar('9')) || (Val .at(i2) == QChar('_')) || (Val .at(i2) == QChar('-')) 
+                        || (Val .at(i2) == QChar('E')) || (Val .at(i2) == QChar('e')) || (Val .at(i2) == QChar('+')) || (Val .at(i2) == QChar('.')))) {
+
                                 QMessageBox::critical(this, "Erreur", "Veuillez entrer une valeur correcte pour la constante.");
                                 return; // Arrêt de la méthode
                         }
-        if ( m_ligneNom ->text().isEmpty())
+        if (m_ligneNom->text().isEmpty())
                 {
-                QMessageBox::critical(this, "Erreur", "Le champ du nom de la constante est vide: entrer un nom SVP!");
-                return; // Arrêt de la méthode
+                        QMessageBox::critical(this, "Erreur", "Le champ du nom de la constante est vide: entrer un nom SVP!");
+                        return; // Arrêt de la méthode
                 }
 
@@ -98 +97 @@
                 if (isCalled) {--i ; isCalled = false; }
 
-        addNameInTable(i, j, m_ligneNom ->text());
-        m_listeNoms .append(m_ligneNom ->text() + " " + m_ligneValeur ->text());
-        addValueInTable(i, j, m_ligneValeur ->text());
-
+        addNameInTable(i, j, m_ligneNom->text());
+        m_listeNoms.append(m_ligneNom->text() + " " + m_ligneValeur->text());
+        addValueInTable(i, j, m_ligneValeur->text());
         i++;
         }
 
         initialiserChamps();
-}*/
+}
+/************************************ addRow() method ****************************************************/
+void BaseWindow::addRow() {
+
+        int row = m_tableView->rowCount();
+        m_tableView->insertRow(row);
+        compteur ++;
+}
+
 /************************************ delete Row() method ****************************************************/
-/*void BaseWindow::delete Row() {
-
-        m_tableView ->removeRow(m_tableView ->currentRow());
+void BaseWindow::deleteRow() {
+
+        m_tableView->removeRow(m_tableView->currentRow());
         isCalled = true;
         -- compteur;
         testContenu(compteur);
-}*/
+}
 
 /****************************************************************************************/
-/*void BaseWindow::addNameInTable(int ligne, int colonne, QString nom ) {
+void BaseWindow::addNameInTable(int ligne, int colonne, QString nom ) {
 
         QTableWidgetItem *chaine = new QTableWidgetItem;
                 chaine->setText(nom );
 
-        m_tableView ->setItem(ligne-1, colonne-1, new QTableWidgetItem(nom ));
-}*/
+        m_tableView->setItem(ligne-1, colonne-1, new QTableWidgetItem(nom ));
+}
 
 /****************************************************************************************/
-/*void BaseWindow::addValueInTable(int ligne, int colonne, QString valeur ) {
+void BaseWindow::addValueInTable(int ligne, int colonne, QString valeur ) {
 
         QTableWidgetItem *chaine = new QTableWidgetItem;
                 chaine->setText(valeur );
 
-        m_tableView ->setItem(ligne - 1, colonne, chaine);
-}*/
-
-/****************************************************************************************/
-/*void BaseWindow::addRow() {
-
-        int row = m_tableView ->rowCount();
-        m_tableView ->insertRow(row);
-        compteur ++;
-}*/
-/****************************************************************************************/
-/*void BaseWindow::save Data() {
+        m_tableView->setItem(ligne - 1, colonne, chaine);
+}
+
+/*****************************************************************************************************************************************************/
+void BaseWindow::saveData() {
 
         QTableWidgetItem *cell1 = new QTableWidgetItem;
         QTableWidgetItem *cell2 = new QTableWidgetItem; 
         
-        for (int i = 0; i < m_tableView ->rowCount() ; i++) {
-                        cell1 = m_tableView ->item(i,0);
-                        cell2 = m_tableView ->item(i,1);
+        for (int i = 0; i < m_tableView->rowCount() ; i++) {
+
+                        cell1 = m_tableView->item(i, 0);
+                        cell2 = m_tableView->item(i, 1);
                                 
-                         Data.push_back(cell1->text() + " " + cell2->text());
+                        m_savedData.push_back(cell1->text() + " " + cell2->text());
 
         }
         //for (QStringList::iterator it =  Data.begin(); it !=  Data.end(); it++)
         //cout << "Voici les valeurs ajoutées: " << it->toStdString() <<endl;
-        m_quitButton ->setEnabled(true);
-}*/
-/****************************************************************************************/
-//void BaseWindow::initialiserChamps() {
-
-//      m_ligneNom ->setText("");
-//      m_ligneValeur ->setText("");
-//}
-
-/************************************ Implémentation de la méthode callHelp  ****************************************/
-//void BaseWindow::call Help()
-//{
-//      QMessageBox::about(this, tr("Aide sur la directive  ."),("<p> La directive   permet d'associer un nom symbolique à une valeur."
-    //                                                              "<p><u>Exemple 1</u>:   szx 12 <p><u>Exemple 2</u>:   szy \"chaine\"<p> <u>Exemple 3</u>:   szz szx"
-  //                                                                "<p> Pour plus d'informations sur  , <a href=\"help/ _aide.html\">cliquez ici.</a>"));
-//}
-
-/****************************************************************************************/
-
-/****************************************************************************************************************************/
-//QStringList BaseWindow::getData () {
-
-//      return  Data;
-//}
+        m_quitButton->setEnabled(true);
+}
+/*****************************************************************************************************************************************************/
+void BaseWindow::initialiserChamps() {
+
+        m_ligneNom->setText("");
+        m_ligneValeur->setText("");
+}
+
+
 
 /************************************ testContenu() ***************************************************/
-/*bool BaseWindow::testContenu(int anInt) {
+bool BaseWindow::testContenu(int anInt) {
 
         if (anInt != 0) {
-                m_delButton ->setEnabled(true);
-                m_save Button->setEnabled(true);
+                m_delButton->setEnabled(true);
+                m_saveButton->setEnabled(true);
         }
         else
         {
-                m_delButton ->setDisabled(true);
-                m_save Button->setDisabled(true);
-        }
-}*/
-
+                m_delButton->setDisabled(true);
+                m_saveButton->setDisabled(true);
+        }
+}
+/****************************************************************************************************************************/
+QStringList BaseWindow::getData () {
+
+        return  m_savedData;
+}
 /****************************************************************************************/
-//void BaseWindow::closeEvent(QCloseEvent *event) {
-        
+void BaseWindow::closeEvent(QCloseEvent *event) {
+
+                //QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+        QMessageBox msgBox;
+                msgBox.setText("Le document a été modifié.");
+                msgBox.setInformativeText("Voulez-vous sauvegarder les modifications apportées?");
+                msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
+                msgBox.setDefaultButton(QMessageBox::Yes);
+        int ret = msgBox.exec();
+
+        if (ret == QMessageBox::Yes)
+                event->accept();
+        else event->ignore();
+        
+        //QMessageBox::warning(this, tr("Application"), tr("Le document a été modifié.\n Voulez-vous sauvegarder les modifications apportées?"),
+          //              QMessageBox::Yes | QMessageBox::Default,
+            //            QMessageBox::No,
+              //          QMessageBox::Cancel | QMessageBox::Escape);
+ 
   //    if (maybeSave()) {
             //writeSettings();
@@ -205 +212 @@
           //  event->ignore();
       
-//}
+}
 /***************************************************************************************************************/
 /*bool BaseWindow::maybeSave()

trunk/yao/src/interface/src/DefvalWindow.cpp

@@ -23 +23 @@
 DefvalWindow::DefvalWindow(BaseWindow *parent): BaseWindow(parent) {  /*!< The constructor. */
         
-        //this->setWindowTitle("Directive Defval.");     /*!< To set the window's title. */
-        QPushButton *b = new QPushButton("Test");
-        m_layoutGrid->addWidget(b , 4, 5);
-//      isCalled = false;
-                // Instanciation des classes.
-                // Déclaration des boutons et champs de saisie de texte.
+        setWindowTitle("Directive Defval.");     /*!< To set the window's title. */
+        m_nameLabel->setText("Constante: ");
+        m_valueLabel->setText("Valeur: ");
+        connect(m_helpButton, SIGNAL(clicked()), this, SLOT(callDefvalHelp()));
+
 }
+/********************************************************************************/
+//QStringList DefvalWindow::getDataDefval() {
+//QStringList test;
+//      return test;//defvalData;
+//}
+/******************************************************************************************************************************************************/
+void DefvalWindow::callDefvalHelp()
+{
+        QMessageBox::about(this, tr("Aide sur la directive defval."),
+                        ("<p> La directive defval permet d'associer un nom symbolique à une valeur."
+                         "<p><u>Exemple 1</u>: defval szx 12 <p><u>Exemple 2</u>: defval szy \"chaine\"<p> <u>Exemple 3</u>: defval szz szx"
+                         "<p> Pour plus d'informations sur defval, <a href=\"help/defval_aide.html\">cliquez ici.</a>"));
+}
+/******************************************************************************************************************************************************/
 /****************************************************************************************/
 /*void DefvalWindow::closeEvent(QCloseEvent *event) {
@@ -66 +79 @@
         return tar;
 }*/
-/********************************************************************************/
-QStringList DefvalWindow::getDataDefval() {
-QStringList test;
-        return test;//defvalData;
-}
 
-

trunk/yao/src/interface/src/Include/BaseWindow.hpp

@@ -7 +7 @@
 #include <QLineEdit>
 #include <QLabel>
-//#include <QTextStream>
+#include <QTextCodec>
 #include <QGridLayout>
 //#include <QStandardItemModel>
 //#include <QString>
 //#include <QFileDialog>
-//#include <QStringListModel>
+#include <QStringListModel>
 //#include <QStringList>
 //#include <QIODevice>
-//#include <QMessageBox>
-//#include <QCloseEvent>
+#include <QMessageBox>
+#include <QCloseEvent>
 #include <iostream>
 #include <QHBoxLayout>
@@ -27 +27 @@
         public :
                 BaseWindow(QWidget *parent=0); 
+                QStringList getData();
 
-                QGridLayout *m_layoutGrid;              
-        private:        
-        
+        protected slots:
+                void addRowInTable();
+                void deleteRow();
+                void saveData();
+                 
+        protected:      
+                //The functions
+                void addRow();
+                bool testContenu(int anInt);
+                void addNameInTable(int ligne, int colonne, QString nom); 
+                void addValueInTable(int ligne, int colonne, QString valeur);
+                void initialiserChamps();
+                void closeEvent(QCloseEvent *event);
+
+                // Variables    
                 QLabel  *m_nameLabel;
                 QLabel  *m_valueLabel;                  
@@ -43 +56 @@
                 QPushButton *m_helpButton;
 
+                QGridLayout *m_layoutGrid;              
                 QHBoxLayout *m_layoutH1;
                 
@@ -52 +66 @@
 
                 //QString lstF;
-                //QStringList m_listeNomsDefval;
+                QStringList m_listeNoms;
                 //QStringList m_listeValeursDefval;
-                //QStringListModel *m_modeleListeNoms;
-                //QStringList defvalData;
+                QStringListModel *m_modeleListeNoms;
+                QStringList m_savedData;
 
-                //bool isCalled;
+                bool isCalled;
                 
-                //int compteur;
+                int compteur;
+
+
 };      
 

trunk/yao/src/interface/src/Include/DefvalWindow.hpp

@@ -26 +26 @@
          
                 DefvalWindow(BaseWindow *parent=0);   /*!< This function returns the constante's data. */
-                QStringList getDataDefval();    
+                //QStringList getDataDefval();  
         protected :
 //                   void closeEvent(QCloseEvent *event);                
         
         public slots :        /*!< Functions called after a click. */
-
+                void callDefvalHelp();
 };
 #endif

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

@@ -23 +23 @@
 
 */
-
 
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
@@ -66 +65 @@
     //horizontalLayout->addWidget(tabWidget);
                 tabWidget->setCurrentIndex(1);
-
+        //connect(espace, SIGNAL(windowActivated(QWidget * w)), this, SLOT(setActiveWindow(QWidget * w)));
 
 
@@ -481 +480 @@
          description << "#DEFVAL pour definir des directives  ------------------------------------------DEFVAL" << endl;
 
-       for (QStringList::iterator it = m_defvalCopy->getDataDefval().begin(); it != m_defvalCopy->getDataDefval().end(); it++)
+       for (QStringList::iterator it = m_defvalCopy->getData().begin(); it != m_defvalCopy->getData().end(); it++)
             description << "defval " << it->toStdString() << endl;
             description << endl;