Changeset 363 for trunk/yao

Timestamp:

06/27/10 11:34:40 (14 years ago)

Author:

yerima

Message:

Control with try {...} catch(...) in some methods like addTrajWindow(), deleteTrajWindow... To be continued.

Location:

trunk/yao/src/interface

Files:

• Main.cpp (modified) (1 diff)
• src/ConstantWindow.cpp (modified) (4 diffs)
• src/ContextWindow.cpp (modified) (2 diffs)
• src/HatNameWindow.cpp (modified) (2 diffs)
• src/MainWindow.cpp (modified) (5 diffs)
• src/ModulWindow.cpp (modified) (2 diffs)
• src/NewProjectWindow.cpp (modified) (4 diffs)
• src/SpaceWindow.cpp (modified) (3 diffs)
• src/TrajectoryWindow.cpp (modified) (9 diffs)
• src/include/TrajectoryWindow.hpp (modified) (1 diff)
• src/ui_/newprojectwindow.ui (modified) (6 diffs)
• ui_newprojectwindow.h (modified) (7 diffs)

trunk/yao/src/interface/Main.cpp

@@ -40 +40 @@
         QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 
-                //MainWindowController *fen1 = new MainWindowController; //fen1->show();
-                //MainWindowController m_mwc ;//= MainWindowController::getInstance(); 
-//      try {
+        try {
                 MainWindow fen1;//  = new MainWindow(&m_mwc); //fen1->show();
-                /*int a=2, b=3;
-                double c=4.65 , d= 3.14;
-                cout << "int, le plus petit est:" << m_mwc.Min(a,b) << endl;
-                cout << "double, le plus petit est: " << m_mwc.Min(c,d) << endl;
-                */
-                //m_mwc.isStringLiteral("tes-");
                 fen1.show();
 
-                //m_mwc.show();
-                //BaseWindow bw;
-                //bw.show();
-                //TrajWindow tj;
-                //tj.show();
-//      }
-//      catch (...) { cout << " Dans le main.cpp"; throw;}
                 return app.exec();
 
                 //fen1->~MainWindow();
                 //m_mwc.~MainWindowController();
+
+        }           
+        catch(...) 
+        {
+   
+           cout << "exception dans le main" << endl;
+        }
 }
 

trunk/yao/src/interface/src/ConstantWindow.cpp

@@ -62 +62 @@
 /****************************************************************** addRowInTable() method *************************************************************/
 void ConstantWindow::addRowInTable() {
-  
+try {  
         QString Nom  = m_ligneNom->text();
         QString Val  = m_ligneValeur->text();
@@ -121 +121 @@
 
         eraseDataFromLineEdit();
+  }
+  catch (...) {
+        
+        QMessageBox::critical(this, "Erreur", "Erreur dans la méthode addDefvalRow()");
+        }
  }
 
@@ -126 +131 @@
 /******************************************************************* delete Row() method ***************************************************************/
 void ConstantWindow::deleteRow() {
-
+try {
         //int c = m_tableView->currentIndex().row();//renvoie le numero de la ligne selectionnée.
         QItemSelectionModel *selection = m_tableView->selectionModel();
@@ -147 +152 @@
                 if(isConstantTableEmpty()) m_delButton->setDisabled(true);
         }
-        
+   }
+   catch(...) {
+
+        QMessageBox::critical(this, "Erreur", "erreur dans la suppression d'une ligne dans deleteDefvalRow().");
+        }       
 }
  

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

@@ -39 +39 @@
 
                 m_comboContextO_EXTOBJ->insertItem(0, ""); 
-for (Table<Constant>::reverse_iterator it = localConstantTable->rbegin(); it != localConstantTable->rend(); it++)  {
-                m_comboContextO_PARALLEL->insertItem(2, QString(it->getName().c_str()));
-                m_comboContextO_NETWARD->insertItem(1, QString(it->getName().c_str()));
-                m_comboContextO_EXTOBJ->insertItem(1, QString(it->getName().c_str())); 
+
+        for (Table<Constant>::reverse_iterator it = localConstantTable->rbegin(); it != localConstantTable->rend(); it++) 
+                {
+                        m_comboContextO_PARALLEL->insertItem(2, QString(it->getName().c_str()));
+                        m_comboContextO_NETWARD->insertItem(1, QString(it->getName().c_str()));
+                        m_comboContextO_EXTOBJ->insertItem(1, QString(it->getName().c_str())); 
                 }
 
@@ -79 +81 @@
 void ContextWindow::addContextRow() {
 
-        /*m_comboContextO_REAL->setCurrentIndex(0); 
-        m_comboContextO_MQN->setCurrentIndex(0); 
-        m_comboContextO_PARALLEL->setCurrentIndex(0);
-        m_comboContextO_NETWARD->setCurrentIndex(0); 
-        m_comboContextO_EXTOBJ->setCurrentIndex(0);
-        m_checkBoxO_GRADTEST->setChecked(false);        
-        m_checkBoxO_VARINCR->setChecked(false);
-        m_checkBoxO_DBG_NANF->setChecked(false);
-        m_checkBoxO_DBG_TING->setChecked(false);
-        m_checkBoxO_DBG_BETA->setChecked(false);
-        m_checkBoxO_DBG_TRC_FWARD->setChecked(false);
-        m_checkBoxO_DBG_TRC_BWARD->setChecked(false);
-        m_checkBoxO_DBG_TRC_LWARD->setChecked(false);
-        m_checkBoxO_DBG_TRC_AWARD
-        */
-        //filesList.append(m_comboContextO_REAL->currentText());
-        //filesListModele->setStringList(filesList);
-        //testContenu(compteur);
-        
-        int row = m_contextModel->rowCount();
-        /*if (!localMwc->isIntegerLiteral(m_comboContextO_PARALLEL->currentText().toStdString())) { 
+        try {
+                        /*m_comboContextO_REAL->setCurrentIndex(0); 
+                        m_comboContextO_MQN->setCurrentIndex(0); 
+                        m_comboContextO_PARALLEL->setCurrentIndex(0);
+                        m_comboContextO_NETWARD->setCurrentIndex(0); 
+                        m_comboContextO_EXTOBJ->setCurrentIndex(0);
+                        m_checkBoxO_GRADTEST->setChecked(false);        
+                        m_checkBoxO_VARINCR->setChecked(false);
+                        m_checkBoxO_DBG_NANF->setChecked(false);
+                        m_checkBoxO_DBG_TING->setChecked(false);
+                        m_checkBoxO_DBG_BETA->setChecked(false);
+                        m_checkBoxO_DBG_TRC_FWARD->setChecked(false);
+                        m_checkBoxO_DBG_TRC_BWARD->setChecked(false);
+                        m_checkBoxO_DBG_TRC_LWARD->setChecked(false);
+                        m_checkBoxO_DBG_TRC_AWARD
+                        */
+                        //filesList.append(m_comboContextO_REAL->currentText());
+                        //filesListModele->setStringList(filesList);
+                        //testContenu(compteur);
                 
-                 QMessageBox::critical(this, "Avertissement", "CaractÚre(s) non permis dans le champ \"O_PARALLEL\".");
-                 return; // Arrêt de la méthode
-        }*/
-        m_contextModel->setItem(row, 0, new QStandardItem(m_comboContextO_REAL->currentText()));  
-        m_contextModel->setItem(row, 1, new QStandardItem(m_comboContextO_MQN->currentText()));  
-        m_contextModel->setItem(row, 2, new QStandardItem(m_comboContextO_PARALLEL->currentText()));  
-        m_contextModel->setItem(row, 3, new QStandardItem(m_comboContextO_NETWARD->currentText()));  
-        
-        m_contextModel->setItem(row, 4, new QStandardItem(m_comboContextO_EXTOBJ->currentText()));  
-        //if (m_checkBoxO_GRADTEST->isChecked())
-   m_checkBoxO_GRADTEST->isChecked()?m_contextModel->setItem(row, 5, new QStandardItem("oui")):m_contextModel->setItem(row, 5, new QStandardItem("non"));
-   m_checkBoxO_VARINCR->isChecked() ?m_contextModel->setItem(row, 6, new QStandardItem("oui")):m_contextModel->setItem(row, 6, new QStandardItem("non"));
-   m_checkBoxO_DBG_NANF->isChecked()?m_contextModel->setItem(row, 7, new QStandardItem("oui")):m_contextModel->setItem(row, 7, new QStandardItem("non"));
-   m_checkBoxO_DBG_TING->isChecked()?m_contextModel->setItem(row, 8, new QStandardItem("oui")):m_contextModel->setItem(row, 8, new QStandardItem("non"));  
-   m_checkBoxO_DBG_BETA->isChecked()?m_contextModel->setItem(row, 9, new QStandardItem("oui")):m_contextModel->setItem(row, 9, new QStandardItem("non"));  
-   m_checkBoxO_DBG_TRC_FWARD->isChecked()?m_contextModel->setItem(row, 10, new QStandardItem("oui")):m_contextModel->setItem(row, 10, new QStandardItem("non"));
-   m_checkBoxO_DBG_TRC_BWARD->isChecked()?m_contextModel->setItem(row, 11, new QStandardItem("oui")):m_contextModel->setItem(row, 11, new QStandardItem("non"));
-   m_checkBoxO_DBG_TRC_LWARD->isChecked()?m_contextModel->setItem(row, 12, new QStandardItem("oui")):m_contextModel->setItem(row, 12, new QStandardItem("non"));  
-   m_checkBoxO_DBG_TRC_AWARD->isChecked()?m_contextModel->setItem(row, 13, new QStandardItem("oui")):m_contextModel->setItem(row, 13, new QStandardItem("non"));  
-
-        eraseDataFromLineEdit();
-        if (!isContextListEmpty()) m_contextDelButton->setEnabled(true);
-        
-}
+                        int row = m_contextModel->rowCount();
+                        /*if (!localMwc->isIntegerLiteral(m_comboContextO_PARALLEL->currentText().toStdString())) { 
+                        
+                        QMessageBox::critical(this, "Avertissement", "CaractÚre(s) non permis dans le champ \"O_PARALLEL\".");
+                        return; // Arrêt de la méthode
+                        }*/
+                        m_contextModel->setItem(row, 0, new QStandardItem(m_comboContextO_REAL->currentText()));  
+                        m_contextModel->setItem(row, 1, new QStandardItem(m_comboContextO_MQN->currentText()));  
+                        m_contextModel->setItem(row, 2, new QStandardItem(m_comboContextO_PARALLEL->currentText()));  
+                        m_contextModel->setItem(row, 3, new QStandardItem(m_comboContextO_NETWARD->currentText()));  
+                
+                        m_contextModel->setItem(row, 4, new QStandardItem(m_comboContextO_EXTOBJ->currentText()));  
+                        //if (m_checkBoxO_GRADTEST->isChecked())
+                        m_checkBoxO_GRADTEST->isChecked()?m_contextModel->setItem(row, 5, new QStandardItem("oui")):m_contextModel->setItem(row, 5, new QStandardItem("non"));
+                        m_checkBoxO_VARINCR->isChecked() ?m_contextModel->setItem(row, 6, new QStandardItem("oui")):m_contextModel->setItem(row, 6, new QStandardItem("non"));
+                        m_checkBoxO_DBG_NANF->isChecked()?m_contextModel->setItem(row, 7, new QStandardItem("oui")):m_contextModel->setItem(row, 7, new QStandardItem("non"));
+                        m_checkBoxO_DBG_TING->isChecked()?m_contextModel->setItem(row, 8, new QStandardItem("oui")):m_contextModel->setItem(row, 8, new QStandardItem("non"));  
+                        m_checkBoxO_DBG_BETA->isChecked()?m_contextModel->setItem(row, 9, new QStandardItem("oui")):m_contextModel->setItem(row, 9, new QStandardItem("non"));  
+                        m_checkBoxO_DBG_TRC_FWARD->isChecked()?m_contextModel->setItem(row, 10, new QStandardItem("oui")):m_contextModel->setItem(row, 10, new QStandardItem("non"));
+                        m_checkBoxO_DBG_TRC_BWARD->isChecked()?m_contextModel->setItem(row, 11, new QStandardItem("oui")):m_contextModel->setItem(row, 11, new QStandardItem("non"));
+                        m_checkBoxO_DBG_TRC_LWARD->isChecked()?m_contextModel->setItem(row, 12, new QStandardItem("oui")):m_contextModel->setItem(row, 12, new QStandardItem("non"));  
+                        m_checkBoxO_DBG_TRC_AWARD->isChecked()?m_contextModel->setItem(row, 13, new QStandardItem("oui")):m_contextModel->setItem(row, 13, new QStandardItem("non"));  
+
+                        eraseDataFromLineEdit();
+                        if (!isContextListEmpty()) m_contextDelButton->setEnabled(true);
+        }
+
+        catch(...)
+                {
+                        QMessageBox::critical(this, "Erreur", "Erreur dans la methode addContextRow()");
+                }
+}
+
 /**************************************** 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);
-}
-
+        try 
+                {
+                        O_EXTOBJModele->appendRow(new QStandardItem(m_comboContextO_EXTOBJ->currentText())); 
+                        m_comboContextO_EXTOBJ->setCurrentIndex(0);
+                }
+                catch(...) 
+                        {
+                                QMessageBox::critical(this, "Erreur", "Erreur dans la methode addO_EXTOBJRow()");
+                        }
+}
 /********************************************************************/
 bool ContextWindow::isContextListEmpty() {

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

@@ -114 +114 @@
 /*************************************** Implementation of the method addHatRow()  ********************************************************************/
 void HatNameWindow::addHatRow() {
-
-hatFile = getNomFichierHat();//Est prévu dans yao pour gerer les chaines de caractÚres.
-
-Constant *c; //Nous créons d'abord un pointeur de constante.
-
-c = localConstantTable->find(hatFile); //Ensuite on passe au pointeur le resultat de la recherche de la chaine en utilisant find.
-
-if (c != NULL) { //C'est alors une constante.
-        string constantValue = localConstantTable->find(hatFile)->getText(); //"getText()" returns the constant value.
-                constantValue.append(".h");
-        m_hatnameModel->setItem(m_hatnameModel->rowCount(), new QStandardItem(QString(hatFile.c_str())));//QStandardItem(QString(constantValue.c_str())));
-        localHeaderList->push_back(hatFile);
-        eraseDataFromLineEdit();
-        m_delHatButton->setEnabled(true);
-        //cout << "In addrow method, my coodinate is " << x() << endl;
-    }         
-
-else { //Ce n'est pas une constante. 
-
-        for(unsigned int i=0; i < hatFile.size(); i++) {
-            // stringLiteral of the YAO grammar:
-            // (' ' | '\t')* ( 'a'..'z' | 'A'..'Z' | '/' | '_' | '-' | '.'| '0'..'9' )+ (' ' | '\t')*
-            if(!((hatFile[i] >= 'a' && hatFile[i] <= 'z') || (hatFile[i] >= 'A' && hatFile[i] <= 'Z') ||
-                (hatFile[i] >= '0' && hatFile[i] <= '9') || (hatFile[i] == '/')  ||
-                (hatFile[i] == '_')  || (hatFile[i] == '.')  || (hatFile[i] == ' ') )){
-
-                    QMessageBox::about(this, tr("Erreur de saisie!"),
-                               tr("<p>Vous avez saisi au moins un caractere non conforme!<p> Cliquer sur <b>ok</b> pour fermer cette fenetre."));
-                     return;
-                }
-        }
-
-extension = static_cast<FilePath>(hatFile).getExtension();
-
-if ((extension != ".h")){
-    if (extension == "")
-    {
-        if (hatFile.length() != 0) {
-            hatFile.append(".h");
-            QString fichier = hatFile.c_str();
+        try {
+                hatFile = getNomFichierHat();//Est prévu dans yao pour gerer les chaines de caractÚres.
+
+                Constant *c; //Nous créons d'abord un pointeur de constante.
+
+                        c = localConstantTable->find(hatFile); //Ensuite on passe au pointeur le resultat de la recherche de la chaine en utilisant find.
+
+                if (c != NULL) { //C'est alors une constante.
+                        string constantValue = localConstantTable->find(hatFile)->getText(); //"getText()" returns the constant value.
+                        constantValue.append(".h");
+                        m_hatnameModel->setItem(m_hatnameModel->rowCount(), new QStandardItem(QString(hatFile.c_str())));
+                        localHeaderList->push_back(hatFile);
+                        eraseDataFromLineEdit();
+                        m_delHatButton->setEnabled(true);
+                        //cout << "In addrow method, my coodinate is " << x() << endl;
+                    }         
+
+                else { //Ce n'est pas une constante. 
+
+                        for(unsigned int i=0; i < hatFile.size(); i++) {
+                                // stringLiteral of the YAO grammar:
+                                // (' ' | '\t')* ( 'a'..'z' | 'A'..'Z' | '/' | '_' | '-' | '.'| '0'..'9' )+ (' ' | '\t')*
+                                if(!((hatFile[i] >= 'a' && hatFile[i] <= 'z') || (hatFile[i] >= 'A' && hatFile[i] <= 'Z') ||
+                                        (hatFile[i] >= '0' && hatFile[i] <= '9') || (hatFile[i] == '/')  ||
+                                        (hatFile[i] == '_')  || (hatFile[i] == '.')  || (hatFile[i] == ' ') )){
+
+                                        QMessageBox::about(this, tr("Erreur de saisie!"),
+                                               tr("<p>Vous avez saisi au moins un caractere non conforme!<p> Cliquer sur <b>ok</b> pour fermer cette fenetre."));
+
+                                        return;
+                                }
+                        }
+
+        extension = static_cast<FilePath>(hatFile).getExtension();
+
+        if ((extension != ".h")){
+            if (extension == "")
+                {
+                        if (hatFile.length() != 0) {
+                            hatFile.append(".h");
+                            QString fichier = hatFile.c_str();
             
-            listeFichiers.append(fichier);
+                            listeFichiers.append(fichier);
             
-            localHeaderList->push_back(hatFile); 
-            m_hatnameModel->setItem(m_hatnameModel->rowCount(), new QStandardItem(QString(hatFile.c_str()))); 
-            eraseDataFromLineEdit();
-        }
-
-        return;
-
-        }
+                            localHeaderList->push_back(hatFile); 
+                            m_hatnameModel->setItem(m_hatnameModel->rowCount(), new QStandardItem(QString(hatFile.c_str()))); 
+                            eraseDataFromLineEdit();
+                        }
+
+                        return;
+
+                }
     else
         QMessageBox::about(this, tr("Bad extension"),
@@ -188 +189 @@
 
         }
+  }
+  catch(...) {
+        
+        QMessageBox::critical(this, "Erreur", "Erreur dans la methode addHatRow.");
+
+        }       
 }
 /***********************************************  Implementation of the method deleteHatRow() ********************************************************/

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

@@ -70 +70 @@
         connect(this, SIGNAL(WindowTitleChanged()), this, SLOT(setTitle()));
         this->showMaximized(); // Maximise toujours la fenetre principale.
-
+                
+        
 }
 /******************************************* Implementation of the method setTitle() *****************************************************************/
@@ -477 +478 @@
         m_newProjectWindow = new NewProjectWindow(espace);
         //m_newProjectWindow->show();
-        /*newProjectWindow = new QDialog(pt_espace); // L'objet sera affiché dans "espace".
+/*      newProjectWindow = new QDialog(pt_espace); // L'objet sera affiché dans "espace".
         //newProjectWindow->setWindowTitle("Création d'un nouveau projet.");
 
@@ -526 +527 @@
         //instance ++; //Permet de compter le nombre de "Nouveau Projet" crées. 
   connect(this, SIGNAL(newProjectIsCreated()), newProjectWindow, SLOT(close())); //Fermeture automatique de la fenetre lorsqu'un nouveau projet est crée
-  connect(m_buttonPath, SIGNAL(clicked()), this, SLOT(openPathWindow()));
+  //connect(m_buttonPath, SIGNAL(clicked()), this, SLOT(openPathWindow()));
   connect(m_buttonQuitProjet, SIGNAL(clicked()), newProjectWindow, SLOT(close()));// Pour la fermeture de fenetre.
-  connect(m_buttonHelp, SIGNAL(clicked()), this, SLOT(helpMessage()));// Pour la fermeture de fenetre.
+  //connect(m_buttonHelp, SIGNAL(clicked()), this, SLOT(helpMessage()));// Pour la fermeture de fenetre.
 
         newProjectWindow->exec();
-        */
+*/      
 }
 
@@ -744 +745 @@
 
 /**************************************** Implementation of the method generateDFile() (SLOT) ****************************************************/
-void MainWindow::generateDFile()
-{
+void MainWindow::generateDFile() {
+try {
     filename = getProjectName();
     filepath = "projects/" + filename + "/" + filename + ".d"; //"projects/test/test.d";
@@ -829 +830 @@
         }
     description.close();
-}
-
+  }
+  catch (...) {
+
+                QMessageBox::critical(this, "Erreur", "Erreur dans la generation du fichier .d");
+        }
+}
 
 /*************************************** Implementation of the method generateDefaultHFile() ******************************************************/

trunk/yao/src/interface/src/ModulWindow.cpp

@@ -112 +112 @@
 /**************************************** Implémentation de la méthode addModulRow *****************************************************************/
 void ModulWindow::addModulRow() {
-
+try {
         /*m_modulSpaceComboName->setCurrentIndex(0); 
         m_modulOperaComboName->setCurrentIndex(0); 
@@ -182 +182 @@
         eraseDataFromLineEdit();
         if (!isModulTableEmpty()) m_modulDelButton->setEnabled(true);   
-        
+  }
+        catch (...) {
+                
+                cout << "Erreur dans la methode addModulRow" << endl;
+        }       
 }
 /**************************************** Implémentation de la méthode addLoperaRow() **************************************************************/

trunk/yao/src/interface/src/NewProjectWindow.cpp

@@ -26 +26 @@
         setupUi(this);
 
-        m_buttonPath->setIcon(QIcon("Images/icons/openfile.png"));
+        m_newProjectPathButton->setIcon(QIcon("Images/icons/openfile.png"));
         m_linePath->setText(QDir::currentPath() + "/projects");
         //setFixedWidth(baseSize().width() + 765);
@@ -32 +32 @@
         //m_orderModel  = new QStandardItemModel(0, 5);
 
-        connect(m_buttonQuitProjet, SIGNAL(clicked()), this, SLOT(close()));// Pour la fermeture de fenetre.
-        connect(m_buttonPath, SIGNAL(clicked()), this, SLOT(openPathWindow()));
-        connect(m_buttonHelp, SIGNAL(clicked()), this, SLOT(helpMessage()));// Pour la fermeture de fenetre.
+        connect(m_newProjectQuitButton, SIGNAL(clicked()), this, SLOT(close()));// Pour la fermeture de fenetre.
+        connect(m_newProjectPathButton, SIGNAL(clicked()), this, SLOT(openPathWindow()));
+        connect(m_newProjectHelpButton, SIGNAL(clicked()), this, SLOT(helpMessage()));// Pour la fermeture de fenetre.
 
-        connect(m_buttonCreateNewProject, SIGNAL(clicked()), this, SLOT(createProjectDirectory())); //Pour la création du répertoire. 
-        //m_buttonHelp->setShortcut(tr("Ctrl+A"));
+        connect(m_newProjectCreateButton, SIGNAL(clicked()), this, SLOT(createProjectDirectory())); //Pour la création du répertoire. 
+        //m_newProjectHelpButton->setShortcut(tr("Ctrl+A"));
         
          this->exec();
@@ -67 +67 @@
  }
 
-
-
 /***********************************************************************/
 void NewProjectWindow::createProjectDirectory() {
-
+try {
       /*  setProjectName(m_lineDirName->text().toStdString()); //Fonction permettant d'initialiser le nom du projet.
         setProjectPath(m_linePath->text().toStdString()); //Fonction permettant d'initialiser le chemin du projet.
@@ -151 +149 @@
        // emit newProjectIsCreated();
        // emit WindowTitleChanged();
- }
+  }
+  catch (...)
+        {
+                QMessageBox::critical(this, "Erreur", "Erreur dans la creation d'un nouveau projet.");
+        }
+}
 
 

trunk/yao/src/interface/src/SpaceWindow.cpp

@@ -22 +22 @@
 
 /******************************************* Contructeur ***************************************************/
-SpaceWindow::SpaceWindow(Table <Space> *aSpaceTable, Table <Trajectory> *aTrajectory, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent), localTrajectoryTable(NULL), localSpaceTable(NULL) {       /*!< The constructor. */
+SpaceWindow::SpaceWindow(Table <Space> *aSpaceTable, Table <Trajectory> *aTrajectory, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent), localTrajectoryTable(NULL), localSpaceTable(NULL) 
+{       /*!< The constructor. */
 
         setupUi(this);
@@ -45 +46 @@
 
         for (Table<Constant>::reverse_iterator it = localConstantTable->rbegin(); it != localConstantTable->rend(); it++) {
+
                 m_spaceD1->insertItem(1, QString(it->getName().c_str()));
                 m_spaceD2->insertItem(1, QString(it->getName().c_str()));
@@ -50 +52 @@
           }
 
-                m_spaceTrajname->insertItem(0, "");
+        m_spaceTrajname->insertItem(0, "");
         for (Table<Trajectory>::reverse_iterator it = localTrajectoryTable->rbegin(); it != localTrajectoryTable->rend(); it++) 
                 m_spaceTrajname->insertItem(1, QString(it->getName().c_str()));

trunk/yao/src/interface/src/TrajectoryWindow.cpp

@@ -13 +13 @@
 
 /****************************************** Implementation of the constructor TrajectoryWindow() ***************************************************/
-TrajectoryWindow::TrajectoryWindow(Table <Trajectory> *aTrajectoryTable, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent), localTrajectoryTable(NULL), m_trajModel(NULL), localConstantTable(NULL) {  /*!< The constructor. */
-    
+TrajectoryWindow::TrajectoryWindow(Table <Trajectory> *aTrajectoryTable, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent), localTrajectoryTable(NULL), m_trajModel(NULL), localConstantTable(NULL), Trajectory() {  /*!< The constructor. */
+try {    
         setupUi(this); // See ui_trajectorywindow.h for more.   
 
@@ -80 +80 @@
                 
         setFixedWidth(baseSize().width() + 525);
+ }
+        catch(std::runtime_error) {
+                
+                cout << "Erreur dans traj" << endl;
+        }
 }
 
@@ -195 +200 @@
           }
 
-                //upTime = <static_cast> QString(boot).c_str();
-                //upTime = localConstantTable->find(upTime.toStdString())->getName();
-                //constantValue.append(".h");
-                //modeleHatName->setItem(modeleHatName->rowCount(), new QStandardItem(QString(constantValue.c_str())));
-                //localHeaderList->push_back(hatFile);
-                //eraseDataFromLineEdit();
-                //m_delHatButton->setEnabled(true);
-         //cout << "In addrow method, my coodinate is " << x() << endl;
      }
 
-                
-        //if (upTime == QString(localConstantTable->find(upTime.toStdString())->getName().c_str()))
-                //{
-                //upTime = QString(localConstantTable->find(upTime.toStdString())->getText().c_str());
-                //boot = toInt(upTime.toStdString());
-                //}
-        /*if (dTime == QString(localConstantTable->find(dTime.toStdString())->getName().c_str()))
-                {
-                dTime = QString(localConstantTable->find(dTime.toStdString())->getText().c_str());
-                step = toInt(dTime.toStdString());
-                }*/
-//              m_comboDtimeTraj->setEditText(QString(localConstantTable->find(dTime.toStdString())->getText().c_str()));
-        /*if (offTime == QString(localConstantTable->find(offTime.toStdString())->getName().c_str()))
-                {
-                offTime = QString(localConstantTable->find(upTime.toStdString())->getText().c_str());
-                offset = toInt(offTime.toStdString());
-                }*/
-        
-                //string constantValue = localConstantTable->find(upTime.toStdString())->getText();
-        //string constantValue = localConstantTable->find(upTime.toStdString())->getText();
-
-                /*m_trajModel->setItem(row, 0, new QStandardItem(trajName)); 
-                m_trajModel->setItem(m_trajModel->rowCount(), 1, new QStandardItem(QString(constantValue.c_str())));
-                m_trajModel->setItem(row, 2, new QStandardItem(upTime)); 
-                m_trajModel->setItem(row, 3, new QStandardItem(offTime)); 
-                m_trajModel->setItem(row, 4, new QStandardItem(dTime)); 
-                m_trajModel->setItem(row, 5, new QStandardItem(stepTime));
-                 //hatHeaderList->push_back(hatFile);
-                initialiserChamps();*/
-          //   }
-
-        //      cout << "boot ou steptime < 0 (1)" << endl;
         if (boot < 0) {
-        //      cout << "boot ou steptime < 0 (2)" << endl;
                 QMessageBox::critical(this, "Erreur", "Le pas de temps (uptime) doit-être supérieur ou égal à 0");
                 return; // Arrêt de la méthode 
         }       
-        //      cout << "boot ou steptime < 0 (3)" << endl;
 
         if (size < 0) {
@@ -249 +212 @@
                 return; // Arrêt de la méthode 
         }
-        //else
         
         if (size < boot) {
@@ -322 +284 @@
         }
 
-      /*for(int t1 = 0; t1<stepTime.size(); t1++)
-              if(!((stepTime.at(t1) >= QChar('0')&& stepTime.at(t1) <= QChar('9')) || (stepTime.at(t1) == QChar('+')) || (stepTime.at(t1) == QChar('-'))
-       || (stepTime.at(t1) == QChar('E')) || (stepTime.at(t1) == QChar('e')))) {
-
-                QMessageBox::critical(this, "Erreur", "stepTime doit-être une valeur entiÚre.");
-
-                return; // Arrêt de la méthode 
-        }*/
 
            if (m_trajNameLine->text().isEmpty()) {
@@ -349 +303 @@
                         }
                         else {
-                                
+                         try {  
                                 Trajectory localTrajectory(trajName.toStdString(), boot, size, step, offset, 'M');//Trajectory object.
                                 localTrajectoryTable->push_back(localTrajectory); //Trajectory vector (contents many objects)   
@@ -360 +314 @@
                                 m_trajModel->setItem(row, 5, new QStandardItem(stepTime)); 
 
-        if(!isTrajectoryTableEmpty()) emit trajRowIsAdded(true);
+                                if(!isTrajectoryTableEmpty()) emit trajRowIsAdded(true);
+                            }
+                                catch(std::runtime_error) {
+                                
+                                        QMessageBox::critical(this, "Erreur", "theBoot doit être supérieur à theSize");
+                                
+                                }
+                                catch(...) {
+
+                                        cout << "Erreur dans la méthode addTrajRow." << endl;
+                                }
                         }
 
@@ -370 +334 @@
 /***************************************** Implementation of the method deleteRow() ***********************************************/
 void TrajectoryWindow::deleteTrajRow() {
-
+try {
                  //vueTraj->removeRow(vueTraj->currentRow());
         QItemSelectionModel *selection = vueTraj->selectionModel();
@@ -393 +357 @@
         if(isTrajectoryTableEmpty()) m_trajDelButton->setEnabled(false);
          }
-
+   }
+   catch(...) {
+        
+                QMessageBox::critical(this, "Erreur", "Erreur dans la suppression d'une ligne de trajectoire.");        
+        }
 
  }

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

@@ -28 +28 @@
 
 
-class TrajectoryWindow : public QWidget, public Ui::TrajectoryWindow {
+class TrajectoryWindow : public QWidget, public Ui::TrajectoryWindow, public yao::Trajectory {
            
         Q_OBJECT

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

@@ -100 +100 @@
           </item>
           <item>
-           <widget class="QPushButton" name="m_buttonPath">
+           <widget class="QPushButton" name="m_newProjectPathButton">
             <property name="text">
              <string/>
@@ -160 +160 @@
     <property name="geometry">
      <rect>
-      <x>20</x>
+      <x>10</x>
       <y>330</y>
-      <width>611</width>
+      <width>631</width>
       <height>29</height>
      </rect>
@@ -168 +168 @@
     <layout class="QHBoxLayout" name="horizontalLayout_6">
      <item>
-      <widget class="QPushButton" name="m_buttonHelp">
+      <widget class="QPushButton" name="m_newProjectHelpButton">
        <property name="text">
         <string>&amp;Aide</string>
@@ -191 +191 @@
      </item>
      <item>
-      <widget class="QPushButton" name="m_buttonCreateNewProject">
+      <widget class="QPushButton" name="m_newProjectCreateButton">
        <property name="text">
         <string>&amp;Créer</string>
@@ -204 +204 @@
      </item>
      <item>
-      <widget class="QPushButton" name="m_buttonQuitProjet">
+      <widget class="QPushButton" name="m_newProjectQuitButton">
        <property name="text">
         <string>A&amp;nnuler</string>
@@ -220 +220 @@
   <tabstop>m_lineDirName</tabstop>
   <tabstop>m_linePath</tabstop>
-  <tabstop>m_buttonPath</tabstop>
-  <tabstop>m_buttonCreateNewProject</tabstop>
-  <tabstop>m_buttonHelp</tabstop>
+  <tabstop>m_newProjectPathButton</tabstop>
+  <tabstop>m_newProjectCreateButton</tabstop>
+  <tabstop>m_newProjectHelpButton</tabstop>
   <tabstop>ligneInfos</tabstop>
-  <tabstop>m_buttonQuitProjet</tabstop>
+  <tabstop>m_newProjectQuitButton</tabstop>
  </tabstops>
  <resources/>

trunk/yao/src/interface/ui_newprojectwindow.h

@@ -2 +2 @@
 ** Form generated from reading UI file 'newprojectwindow.ui'
 **
-** Created: Fri Jun 25 16:23:14 2010
+** Created: Sun Jun 27 08:21:33 2010
 **      by: Qt User Interface Compiler version 4.6.2
 **
@@ -45 +45 @@
     QHBoxLayout *horizontalLayout;
     QLineEdit *m_linePath;
-    QPushButton *m_buttonPath;
+    QPushButton *m_newProjectPathButton;
     QFrame *frame;
     QWidget *layoutWidget1;
@@ -53 +53 @@
     QWidget *layoutWidget2;
     QHBoxLayout *horizontalLayout_6;
-    QPushButton *m_buttonHelp;
+    QPushButton *m_newProjectHelpButton;
     QSpacerItem *horizontalSpacer_2;
-    QPushButton *m_buttonCreateNewProject;
-    QPushButton *m_buttonQuitProjet;
+    QPushButton *m_newProjectCreateButton;
+    QPushButton *m_newProjectQuitButton;
 
     void setupUi(QDialog *NewProjectWindow)
@@ -117 +117 @@
         horizontalLayout->addWidget(m_linePath);
 
-        m_buttonPath = new QPushButton(layoutWidget);
-        m_buttonPath->setObjectName(QString::fromUtf8("m_buttonPath"));
-        m_buttonPath->setIconSize(QSize(24, 15));
-
-        horizontalLayout->addWidget(m_buttonPath);
+        m_newProjectPathButton = new QPushButton(layoutWidget);
+        m_newProjectPathButton->setObjectName(QString::fromUtf8("m_newProjectPathButton"));
+        m_newProjectPathButton->setIconSize(QSize(24, 15));
+
+        horizontalLayout->addWidget(m_newProjectPathButton);
 
 
@@ -152 +152 @@
         layoutWidget2 = new QWidget(frame_3);
         layoutWidget2->setObjectName(QString::fromUtf8("layoutWidget2"));
-        layoutWidget2->setGeometry(QRect(20, 330, 611, 29));
+        layoutWidget2->setGeometry(QRect(10, 330, 631, 29));
         horizontalLayout_6 = new QHBoxLayout(layoutWidget2);
         horizontalLayout_6->setObjectName(QString::fromUtf8("horizontalLayout_6"));
         horizontalLayout_6->setContentsMargins(0, 0, 0, 0);
-        m_buttonHelp = new QPushButton(layoutWidget2);
-        m_buttonHelp->setObjectName(QString::fromUtf8("m_buttonHelp"));
-        m_buttonHelp->setAutoDefault(false);
-
-        horizontalLayout_6->addWidget(m_buttonHelp);
+        m_newProjectHelpButton = new QPushButton(layoutWidget2);
+        m_newProjectHelpButton->setObjectName(QString::fromUtf8("m_newProjectHelpButton"));
+        m_newProjectHelpButton->setAutoDefault(false);
+
+        horizontalLayout_6->addWidget(m_newProjectHelpButton);
 
         horizontalSpacer_2 = new QSpacerItem(298, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -166 +166 @@
         horizontalLayout_6->addItem(horizontalSpacer_2);
 
-        m_buttonCreateNewProject = new QPushButton(layoutWidget2);
-        m_buttonCreateNewProject->setObjectName(QString::fromUtf8("m_buttonCreateNewProject"));
-        m_buttonCreateNewProject->setAutoDefault(false);
-        m_buttonCreateNewProject->setDefault(true);
-
-        horizontalLayout_6->addWidget(m_buttonCreateNewProject);
-
-        m_buttonQuitProjet = new QPushButton(layoutWidget2);
-        m_buttonQuitProjet->setObjectName(QString::fromUtf8("m_buttonQuitProjet"));
-        m_buttonQuitProjet->setAutoDefault(false);
-
-        horizontalLayout_6->addWidget(m_buttonQuitProjet);
+        m_newProjectCreateButton = new QPushButton(layoutWidget2);
+        m_newProjectCreateButton->setObjectName(QString::fromUtf8("m_newProjectCreateButton"));
+        m_newProjectCreateButton->setAutoDefault(false);
+        m_newProjectCreateButton->setDefault(true);
+
+        horizontalLayout_6->addWidget(m_newProjectCreateButton);
+
+        m_newProjectQuitButton = new QPushButton(layoutWidget2);
+        m_newProjectQuitButton->setObjectName(QString::fromUtf8("m_newProjectQuitButton"));
+        m_newProjectQuitButton->setAutoDefault(false);
+
+        horizontalLayout_6->addWidget(m_newProjectQuitButton);
 
         QWidget::setTabOrder(m_lineDirName, m_linePath);
-        QWidget::setTabOrder(m_linePath, m_buttonPath);
-        QWidget::setTabOrder(m_buttonPath, m_buttonCreateNewProject);
-        QWidget::setTabOrder(m_buttonCreateNewProject, m_buttonHelp);
-        QWidget::setTabOrder(m_buttonHelp, ligneInfos);
-        QWidget::setTabOrder(ligneInfos, m_buttonQuitProjet);
+        QWidget::setTabOrder(m_linePath, m_newProjectPathButton);
+        QWidget::setTabOrder(m_newProjectPathButton, m_newProjectCreateButton);
+        QWidget::setTabOrder(m_newProjectCreateButton, m_newProjectHelpButton);
+        QWidget::setTabOrder(m_newProjectHelpButton, ligneInfos);
+        QWidget::setTabOrder(ligneInfos, m_newProjectQuitButton);
 
         retranslateUi(NewProjectWindow);
@@ -196 +196 @@
         m_newProjectNameLabel->setText(QApplication::translate("NewProjectWindow", "Nom du projet: ", 0, QApplication::UnicodeUTF8));
         m_newProjectPathLabel->setText(QApplication::translate("NewProjectWindow", "Chemin d'acc\303\250s: ", 0, QApplication::UnicodeUTF8));
-        m_buttonPath->setText(QString());
+        m_newProjectPathButton->setText(QString());
         m_labelProjetDescription->setText(QApplication::translate("NewProjectWindow", "Br\303\250ve description du projet", 0, QApplication::UnicodeUTF8));
-        m_buttonHelp->setText(QApplication::translate("NewProjectWindow", "&Aide", 0, QApplication::UnicodeUTF8));
-        m_buttonCreateNewProject->setText(QApplication::translate("NewProjectWindow", "&Cr\303\251er", 0, QApplication::UnicodeUTF8));
-        m_buttonQuitProjet->setText(QApplication::translate("NewProjectWindow", "A&nnuler", 0, QApplication::UnicodeUTF8));
+        m_newProjectHelpButton->setText(QApplication::translate("NewProjectWindow", "&Aide", 0, QApplication::UnicodeUTF8));
+        m_newProjectCreateButton->setText(QApplication::translate("NewProjectWindow", "&Cr\303\251er", 0, QApplication::UnicodeUTF8));
+        m_newProjectQuitButton->setText(QApplication::translate("NewProjectWindow", "A&nnuler", 0, QApplication::UnicodeUTF8));
     } // retranslateUi