Changeset 356 for trunk/yao

Timestamp:

06/21/10 19:19:39 (14 years ago)

Author:

yerima

Message:

Horizontal header + model declaration in the modul and the connection window. Visual Yao.

Location:

trunk/yao/src/interface/src

Files:

• ConnectionWindow.cpp (modified) (2 diffs)
• InsertFCTWindow.cpp (modified) (2 diffs)
• MainWindow.cpp (modified) (8 diffs)
• ModulWindow.cpp (modified) (2 diffs)
• OrderWindow.cpp (modified) (3 diffs)
• TrajectoryWindow.cpp (modified) (1 diff)
• include/ConnectionWindow.hpp (modified) (2 diffs)
• include/MainWindow.hpp (modified) (1 diff)
• include/ModulWindow.hpp (modified) (2 diffs)
• include/TrajectoryWindow.hpp (modified) (3 diffs)
• ui_/connectionwindow.ui (modified) (8 diffs)
• ui_/modulwindow.ui (modified) (13 diffs)

trunk/yao/src/interface/src/ConnectionWindow.cpp

@@ -1 +1 @@
 //! \file    ConnectionWindow.cpp
 //! \brief   Implementation of the Ctin window.
-//! \version 2010/06/16 (yyyy/mm/dd)
+//! \version 2010/06/21 (yyyy/mm/dd)
 //! \author  MAYAKI Abdouramane.
 
@@ -20 +20 @@
 ConnectionWindow::ConnectionWindow(QWidget *parent) : QWidget(parent) { /*!< The constructor. */
         setupUi(this);
-    QStringList horizontalHeaders;
-        horizontalHeaders << "Entree" << "Nbre Entrees" << "Sortie" << "Nbre Sorties" << "i" << "j" << "k" << "t"; /*!< added Nom Netward Entrees and sorties in table */
     
+        m_ctinModel     = new QStandardItemModel(0, 10);        
         
+        m_ctinModel->setHorizontalHeaderLabels(QStringList() << "Entree" << "Nbre Entrees" << "Sortie" << "Nbre Sorties" << "i" << "j" << "k" << "t");
+
+        m_ctinTableView->setModel(m_ctinModel); 
+        m_ctinTableView->setEditTriggers(QAbstractItemView::NoEditTriggers);
+        m_ctinTableView->setShowGrid(false);
+        m_ctinTableView->setSelectionBehavior(QAbstractItemView::SelectRows);
+        m_ctinTableView->resizeColumnsToContents();
+
 //      connect(pushButtonctin2, SIGNAL(clicked()), this, SLOT(appelSupp()));  /*!< slot  for the delete the object selected in the view*/
 //      connect(m_AjoutCtin, SIGNAL(clicked()), this, SLOT(appelAjoutCtin())); /*!< This slot add the object in the view */ 

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

@@ -1 +1 @@
 //! \file    InsertFCTWindow.cpp
 //! \brief   Implementation of the Defval window for visual_YAO.
-//! \version 2010/06/18 (yyyy/mm/dd)
+//! \version 2010/06/21 (yyyy/mm/dd)
 //! \author  MAYAKI Abdouramane.
 
@@ -8 +8 @@
 InsertFCTWindow::InsertFCTWindow(QWidget *parent) : QWidget(parent) { /*!< The constructor. */
         setupUi(this);
-        
-//              compteur                                        = 0;
 
-                
-
-//              QStringList horizontalHeaders;
-//              horizontalHeaders  << "Nom Fonction" << "Argument"; /*!< displays Nom Fonction and Argument in the QTableWidget */
+        QStringList horizontalHeaders;
+                horizontalHeaders  << "Nom " << "Argument"; /*!< displays Nom Fonction and Argument in the QTableWidget */
         
 //              tableWidgetfct->setEditTriggers(QAbstractItemView::NoEditTriggers);

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

@@ -7 +7 @@
   Nom de classe: MainWindow
   Role: Outre son role de fichier d'implémentation des méthodes, ce fichier gÚre toutes les fenêtres graphiques.
-  Nombre de methodes: 40
-  Nombre d'attributs:
+  Nombre de methodes: 50
+  Nombre d'attributs: 81
   */
 
@@ -66 +66 @@
         tabWidget->addTab(page2, "                 Exécution          ");
 
-        
 
         connect(this, SIGNAL(WindowTitleChanged()), this, SLOT(setTitle()));
@@ -435 +434 @@
         
 }
-/********************************************* Implementation of the method initializeWindow(int anInt) *********************************************/
-void MainWindow::initializeWindow(int anInt) {
-
-        switch (anInt) {
-        
-                case 1: { 
-                                m_constantWindow = NULL; 
-                                break;
-                        }
-                case 2: { 
-                                m_hatnameWindow = NULL; 
-                                break;
-                        }
-                case 3: { 
-                                m_contextWindow  = NULL; 
-                                break;
-                        }
-                case 4: { 
-                                m_trajectoryWindow = NULL; 
-                                break;
-                        }
-                case 5: { 
-                                m_spaceWindow = NULL; 
-                                break;
-                        }
-                case 6: { 
-                                m_operaWindow = NULL; 
-                        }       break;
-                case 7: {               
-                                m_netwardWindow = NULL; 
-                                break;
-                        }
-                case 8: { 
-                                m_modulWindow = NULL; 
-                                break;
-                        }
-                case 9: { 
-                                m_ctinWindow = NULL; 
-                                break;
-                        }
-                case 10: { 
-                                m_orderWindow = NULL; 
-                                break;
-                        }
-                case 11: { 
-                                m_insertFCTWindow = NULL; 
-                                break;
-                        }
-                default:  m_constantWindow = NULL;  m_hatnameWindow = NULL;  m_contextWindow  = NULL; m_trajectoryWindow = NULL;  m_spaceWindow = NULL;m_spaceWindow = NULL; m_operaWindow = NULL;  m_netwardWindow = NULL;   m_modulWindow = NULL;   m_ctinWindow = NULL;  m_orderWindow = NULL; m_insertFCTWindow = NULL; 
-        }
-        
-}
+
 /*********************************** Implementation of the method activateToolBarButtons() *********************************************************/
 
@@ -524 +472 @@
 void MainWindow::createNewProjectWindow()       { // Affiche la fenetre nouveau projet lorsqu'elle est appelée.
 
-    // Initilization of the lexer and lexing (wrapped from the object tokenizer)
-    //Tokenizer tokenizer("projects/test_00/test_00.d");
-    // Initialization of the parser and parsing (wrapped from the object tokenizer)
-    //Translator translator(tokenizer);
-    // Code generation of the files Y1ProjectName.h and Y2ProjectName.h
- //     translator.descriptionVisualYAO();
-
-//translator.theConstantTable
-//for (Table<Constant>::iterator it = translator.theConstantTable.begin(); it != translator.theConstantTable.end(); it++)
-//                       cout << "defval " << it->getName() << " " << it->getText() << endl;
-                //cout << &m_constantWindow << endl;
-        //if (m_constantWindow != NULL)
-          //      {
-        //      cout << "--------------------" << endl;
-        //      cout << "Pointeur non Nul!" << endl;
-        //      cout << "--------------------" << endl;
-        //      m_constantWindow = NULL;
-        //      cout << "Pointeur initialisé à NULL!" << endl;
-        //      cout << "--------------------" << endl;
-        //      }
-        //if (m_constantWindow == NULL)
-        //      cout << "Pointeur Nul!" << endl;
-        //      cout << "--------------------" << endl;
         newProjectWindow = new QDialog(espace); // L'objet sera affiché dans "espace".
         newProjectWindow->setWindowTitle("Création d'un nouveau projet.");
@@ -561 +486 @@
         QFormLayout *m_layoutF                = new QFormLayout;
         QPushButton *m_buttonPath             = new QPushButton;
-                //m_buttonPath->setMaximumSize(30, 25); // Permet de fixer les dimensions du bouton.
                 m_buttonPath->setIcon(QIcon("Images/icons/openfile.png"));
         ligneInfos                 = new QTextEdit;              // Le champ de saisie des infos relatives à un projet.
@@ -811 +735 @@
      h_file.close();
    }
+
+/**************************************** Implementation of the method generateDFile() (SLOT) ****************************************************/
+void MainWindow::generateDFile()
+{
+    filename = getProjectName();
+    filepath = "projects/" + filename + "/" + filename + ".d"; //"projects/test/test.d";
+    ofstream description(filepath.c_str(), ios::out | ios::binary | ios::trunc);
+        if(!description.is_open())
+                throw ofstream::failure("couldn't create " + filename);
+//try {
+//      throw 8;
+//      }
+//catch (int &i) 
+// {
+//      i++;
+//      throw;
+//}
+try {
+       description << "//DEFVAL name value -------------------------------------------------------" << endl;
+         for (Table<Constant>::iterator it = theConstantTable.begin(); it != theConstantTable.end(); it++)
+                         description << "defval " << it->getName() << " " << it->getText() << endl;///*<< dynamic_cast <string>(*it)*/ << endl;
+                         description << endl;
+
+       description << "//HATNAME  --------------------------------------------------------------------------" << endl;
+        for(vector <string>::iterator it = theHeaderList.begin(); it != theHeaderList.end(); it++)
+                description << "hat_name \"" << it->c_str() << "\"" << endl;
+         description << endl;
+        //description << "//Contexts  ----------------------------------------------------------------------" << endl;
+        
+        //for(QStringList::iterator it = m_contextWindow->getContextData().begin(); it != m_contextWindow->getContextData().end(); it++)
+          //     description << "option " << it->toStdString() << endl;
+            //       description << endl;
+
+               description << "//TRAJECTOIRES name type uptime offtime dtime steptime -------------" << endl;
+
+/*      for(vector <string>::iterator it = m_contextWindow->getContextData().begin(); it != m_contextWindow->getContextData().end(); it++)
+               description << "option " << it->toStdString() << endl;
+                   description << endl;
+*/
+ 
+       for (Table<Trajectory>::iterator it = theTrajectoryTable.begin(); it != theTrajectoryTable.end(); it++)
+           description << "traj " << it->getName() << " " << it->getType() << " " << it->getBoot() << " "  << it->getOffset() << " " << it->getStep() << " " << it->getSize()<< " " << endl;
+            description << endl;
+          description << "//SPACE name type dim1 [[dim2]---[dim3]] traj------------------" << endl; 
+
+        for (Table<Space>::iterator it = theSpaceTable.begin(); it != theSpaceTable.end(); it++)
+           description << "space " << it->getProperty(0) << " " << it->getProperty(1) << " " << it->getProperty(2) << endl;//<< " " << it->getBoot() << " " << it->getSize() << " " << it->getStep() << " " << it->getOffset() << " " << it->getType() << endl;
+            description << endl;
+          description << "//DIMENSION ---------------------------------------------" << endl; 
+
+
+      // for (QStringList::iterator it = m_spaceWindow->getData().begin(); it != m_spaceWindow->getData().end(); it++)
+        //    description << "space " << it->toStdString() << endl;
+          //  description << endl;
+           
+        //description << "//NETWARD ---------------------------------------------------------------------------" << endl;
+
+       /*for (QStringList::iterator it = m_netwardWindow->getDataNetward().begin(); it != m_netwardWindow->getDataNetward().end(); it++)
+            description << "netward " << it->toStdString() << endl;
+            description << endl;*/
+           // description << "//MODUL --------------------------------------------------------------------------" << endl;
+   
+     /*  for (QStringList::iterator it = m_modulWindow->getDataModul().begin(); it != m_modulWindow->getDataModul().end(); it++)
+           description << "modul " << it->toStdString() << endl;
+           description << endl;*/
+           //description << "//CONNECTIONS----------------------------------------------------------------------" << endl;
+
+      /* for (QStringList::iterator it = m_ctinWindow->getDataCtin().begin(); it != m_ctinWindow->getDataCtin().end(); it++)
+           description << "ctin " << it->toStdString() << endl; */
+          // description << "//USER FUNCTIONS   ----------------------------------------------------------------" << endl;
+            //description << endl;
+
+   /*    for (QStringList::iterator it = m_insertFCTWindow->getDataFCT().begin(); it != m_insertFCTWindow->getDataFCT().end(); it++)
+           description << "insert_fct " << it->toStdString() << endl;
+            description << endl;
+    //genererConstant();
+    //genererHat();
+*/
+        }
+
+        catch (...) {
+                
+                cout << "Sortie du programme!" << endl;
+                throw;
+                
+        }
+    description.close();
+}
+
 
 /*************************************** Implementation of the method generateDefaultHFile() ******************************************************/
@@ -885 +898 @@
  }
 
-/****************************************************************************************************************************/
-/*void MainWindow::callHatModel(){
-        //mwc.setFileListController("wwww.h");
-        MainWindowController & mwc2 = MainWindowController::getInstance(); 
-        m_hatnameWindow = mwc2.getHatName();
-        espace->addWindow(m_hatnameWindow);
-
-        m_hatnameWindow->show();
-
-}
-
-*/
-
-
-/*********************************** Implementation of the method sauvegardeProjet() *****************************************/
-
-/*bool MainWindow::sauvegarderProjet() {
-
-
-    statusBar()->showMessage(tr("Projet sauvegarde"), 2000);
-    return true;
-
-}*/
-
-
-/*********************************** Implementation of the method okToContinue() ********************************************/
- /*bool MainWindow::okToContinue() {
- 
-         if (this->isWindowModified()) {
-                int r = QMessageBox::warning(this, tr("Visual Yao"), tr("Le document a été modifié. \n "
-                                                "Voulez-vous enregistrer les changements apportés?"),
-                                                QMessageBox::Yes | QMessageBox::Default,
-                                                QMessageBox::No,
-                                                QMessageBox::Cancel | QMessageBox::Escape);
-                if (r == QMessageBox::Yes) 
-                        return true;
-                else 
-                        if (r == QMessageBox::Cancel)
-                                return false; 
-                }
-        
-        return true;
- }*/
-
-
-/*************************************** Implementation of the method maybeSave() *******************************************************************/
-/*bool MainWindow::maybeSave()
-{
-      if (espace->activeWindow()) {
-            int ret = QMessageBox::warning(this, tr("Application"),
-                        tr("Aucun projet n'a été lancé!\n"
-                        "Êtes-vous sûr de vouloir quitter?"),
-                        QMessageBox::Yes | QMessageBox::Default,
-                        //QMessageBox::No,
-                        QMessageBox::Cancel | QMessageBox::Escape);
-            if (ret == QMessageBox::Yes)
-              return true;//return save();
-            else if (ret == QMessageBox::Cancel)
-            return false;
-      }
-      return true;
-}*/     
+/********************************************* Implementation of the method initializeWindow(int anInt) *********************************************/
+void MainWindow::initializeWindow(int anInt) {
+
+        switch (anInt) {
+        
+                case 1: { 
+                                m_constantWindow = NULL; 
+                                break;
+                        }
+                case 2: { 
+                                m_hatnameWindow = NULL; 
+                                break;
+                        }
+                case 3: { 
+                                m_contextWindow  = NULL; 
+                                break;
+                        }
+                case 4: { 
+                                m_trajectoryWindow = NULL; 
+                                break;
+                        }
+                case 5: { 
+                                m_spaceWindow = NULL; 
+                                break;
+                        }
+                case 6: { 
+                                m_operaWindow = NULL; 
+                        }       break;
+                case 7: {               
+                                m_netwardWindow = NULL; 
+                                break;
+                        }
+                case 8: { 
+                                m_modulWindow = NULL; 
+                                break;
+                        }
+                case 9: { 
+                                m_ctinWindow = NULL; 
+                                break;
+                        }
+                case 10: { 
+                                m_orderWindow = NULL; 
+                                break;
+                        }
+                case 11: { 
+                                m_insertFCTWindow = NULL; 
+                                break;
+                        }
+                default:  m_constantWindow = NULL;  m_hatnameWindow = NULL;  m_contextWindow  = NULL; m_trajectoryWindow = NULL;  m_spaceWindow = NULL;m_spaceWindow = NULL; m_operaWindow = NULL;  m_netwardWindow = NULL;   m_modulWindow = NULL;   m_ctinWindow = NULL;  m_orderWindow = NULL; m_insertFCTWindow = NULL; 
+        }
+        
+}
 
 /*********************************** Implementation of the method changeButtonColor() (SLOT) ********************************************************/
@@ -1026 +1029 @@
 
 }
-
-/**************************************** Implementation of the method generateDFile() (SLOT) ****************************************************/
-void MainWindow::generateDFile()
-{
-    filename = getProjectName();
-    filepath = "projects/" + filename + "/" + filename + ".d"; //"projects/test/test.d";
-    ofstream description(filepath.c_str(), ios::out | ios::binary | ios::trunc);
-        if(!description.is_open())
-                throw ofstream::failure("couldn't create " + filename);
-//try {
-//      throw 8;
-//      }
-//catch (int &i) 
-// {
-//      i++;
-//      throw;
-//}
-try {
-       description << "//DEFVAL name value -------------------------------------------------------" << endl;
-         for (Table<Constant>::iterator it = theConstantTable.begin(); it != theConstantTable.end(); it++)
-                         description << "defval " << it->getName() << " " << it->getText() << endl;///*<< dynamic_cast <string>(*it)*/ << endl;
-                         description << endl;
-
-       description << "//HATNAME  --------------------------------------------------------------------------" << endl;
-        for(vector <string>::iterator it = theHeaderList.begin(); it != theHeaderList.end(); it++)
-                description << "hat_name \"" << it->c_str() << "\"" << endl;
-         description << endl;
-        //description << "//Contexts  ----------------------------------------------------------------------" << endl;
-        
-        //for(QStringList::iterator it = m_contextWindow->getContextData().begin(); it != m_contextWindow->getContextData().end(); it++)
-          //     description << "option " << it->toStdString() << endl;
-            //       description << endl;
-
-               description << "//TRAJECTOIRES name type uptime offtime dtime steptime -------------" << endl;
-
-/*      for(vector <string>::iterator it = m_contextWindow->getContextData().begin(); it != m_contextWindow->getContextData().end(); it++)
-               description << "option " << it->toStdString() << endl;
-                   description << endl;
-*/
- 
-       for (Table<Trajectory>::iterator it = theTrajectoryTable.begin(); it != theTrajectoryTable.end(); it++)
-           description << "traj " << it->getName() << " " << it->getType() << " " << it->getBoot() << " "  << it->getOffset() << " " << it->getStep() << " " << it->getSize()<< " " << endl;
-            description << endl;
-          description << "//SPACE name type dim1 [[dim2]---[dim3]] traj------------------" << endl; 
-
-        for (Table<Space>::iterator it = theSpaceTable.begin(); it != theSpaceTable.end(); it++)
-           description << "space " << it->getProperty(0) << " " << it->getProperty(1) << " " << it->getProperty(2) << endl;//<< " " << it->getBoot() << " " << it->getSize() << " " << it->getStep() << " " << it->getOffset() << " " << it->getType() << endl;
-            description << endl;
-          description << "//DIMENSION ---------------------------------------------" << endl; 
-
-
-      // for (QStringList::iterator it = m_spaceWindow->getData().begin(); it != m_spaceWindow->getData().end(); it++)
-        //    description << "space " << it->toStdString() << endl;
-          //  description << endl;
-           
-        //description << "//NETWARD ---------------------------------------------------------------------------" << endl;
-
-       /*for (QStringList::iterator it = m_netwardWindow->getDataNetward().begin(); it != m_netwardWindow->getDataNetward().end(); it++)
-            description << "netward " << it->toStdString() << endl;
-            description << endl;*/
-           // description << "//MODUL --------------------------------------------------------------------------" << endl;
-   
-     /*  for (QStringList::iterator it = m_modulWindow->getDataModul().begin(); it != m_modulWindow->getDataModul().end(); it++)
-           description << "modul " << it->toStdString() << endl;
-           description << endl;*/
-           //description << "//CONNECTIONS----------------------------------------------------------------------" << endl;
-
-      /* for (QStringList::iterator it = m_ctinWindow->getDataCtin().begin(); it != m_ctinWindow->getDataCtin().end(); it++)
-           description << "ctin " << it->toStdString() << endl; */
-          // description << "//USER FUNCTIONS   ----------------------------------------------------------------" << endl;
-            //description << endl;
-
-   /*    for (QStringList::iterator it = m_insertFCTWindow->getDataFCT().begin(); it != m_insertFCTWindow->getDataFCT().end(); it++)
-           description << "insert_fct " << it->toStdString() << endl;
-            description << endl;
-    //genererConstant();
-    //genererHat();
-*/
-        }
-
-        catch (...) {
-                
-                cout << "Sortie du programme!" << endl;
-                throw;
-                
-        }
-    description.close();
-}
-
 
 /*********************************** Implementation of the virtual method closeEvent() ************************************************************/

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

@@ -34 +34 @@
         m_comboModulTarget->insertItem(3, "alltime");
 
+        m_comboModulInter2->setDisabled(true);
+        m_comboModulInter3->setDisabled(true);
+        //m_checkBoxModulArray->setDisabled(true);
 //      for (Table<Constant>::reverse_iterator it = localConstantTable->rbegin(); it != localConstantTable->rend(); it++)  {
 //                              cout << it->getName().c_str() << endl;
@@ -41 +44 @@
 //              m_comboModulLopera->insertItem(1, QString(it->getName().c_str())); 
         //      }
-
-
+        ModulModele     = new QStandardItemModel(0, 11);
+                ModulModele->setHorizontalHeaderLabels(QStringList() << "Nom" << "space/opera" << "input" << "output" << "target" << "noward" << "autonet" << "netward" << "cout" << "lopera" << "tempo");
+                        
+                m_modulTableView->setModel(ModulModele);
+                m_modulTableView->setEditTriggers(QAbstractItemView::NoEditTriggers);
+                m_modulTableView->setShowGrid(false);
+                m_modulTableView->setSelectionBehavior(QAbstractItemView::SelectRows);
+                m_modulTableView->resizeColumnsToContents();
+                //m_modulTableView->
+
+        if (m_lineModulInput->text().isEmpty())
+                m_checkBoxModulArray->setDisabled(true);
+                //cout << "vide! cooool" << endl; 
+        //connect(m_lineModulInput, SIGNAL(textEdited(QString )), this, SLOT(close()));
         
         connect(m_buttonModulQuit, SIGNAL(clicked()), this, SLOT(close()));

trunk/yao/src/interface/src/OrderWindow.cpp

@@ -17 +17 @@
 //! \brief Implementation of the Order window for visual_YAO.
 
+/***********************************************************************/
 OrderWindow::OrderWindow(QWidget *parent) : QWidget(parent) {
 
@@ -22 +23 @@
         setFixedWidth(baseSize().width() + 765);
 }
+
 /***********************************************************************/
 void OrderWindow::closeEvent(QCloseEvent *event) {
@@ -27 +29 @@
         emit orderWindowIsClosed(10);
 }
+
+/***********************************************************************/

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

@@ -357 +357 @@
                                 modeleTraj->setItem(row, 4, new QStandardItem(dTime)); 
                                 modeleTraj->setItem(row, 5, new QStandardItem(stepTime)); 
+
+        emit trajRowIsAdded();
                         }
 

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

@@ -2 +2 @@
  * \file    ConnectionWindow.hpp
  * \brief   Ctin class for visual_YAO.
- * \version 2010/06/16 (yyyy/mm/dd)
+ * \version 2010/06/21 (yyyy/mm/dd)
  * \author  MAYAKI Abdouramane.
  */
@@ -54 +54 @@
 
                     QStringList CtinData;
+                QStandardItemModel *m_ctinModel;
                    
                     

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

@@ -80 +80 @@
                          }*/
 
-                        // void creerRepertoire();
-                        // void genererConstant();
-                        // void genererHat();
-                        // void genererSpace();
-                        // void genererCtin();
-                        // bool okToContinue();
-                        // bool maybeSave();
                         // ~MainWindow();
         protected :

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

@@ -34 +34 @@
         signals:
                 void modulWindowIsClosed(int anInt); 
+        
+        protected:
+                void closeEvent(QCloseEvent *event);
 
         private:
@@ -46 +49 @@
                 int compteur;
 
-        protected:
-                void closeEvent(QCloseEvent *event);
 };
 

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

@@ -2 +2 @@
  * \file    TrajWindow.hpp
  * \brief   Traj class for visual_YAO.
- * \version 2010/06/16 (yyyy/mm/dd)
+ * \version 2010/06/21 (yyyy/mm/dd)
  * \author  MAYAKI Abdouramane.
  */
@@ -44 +44 @@
                 const int toInt(const std::string& s);
                 const double toDouble(const std::string& s);
-                //QStringList getTrajName();
-                //void ajouterNomDansTableau(int ligne, int colonne, QString trajName);
-                //void ajouterValeurDansTableau1(int ligne, int colonne, QString valeurTraj);
-                //void writefile();
-                //QStringList getDataTraj();  /*!< This function returns the Trajectory's data. */
-         
 
         private slots:    /*!< Functions called after a click. */
@@ -56 +50 @@
                 void deleteTrajRow();   /*!< This function is called to delete row from the Yao model. */
                 void callTrajHelp();  /*!< This function is called to an help window. */
-                //void ecrireFichierTraj();
-                //void enregistrerTraj();
-                //void ouvrirProjetExistantTraj();
-                //void ecrireFichier();  /*!< This function is called to add data in the Yao model. */
-                //void saveTrajData();  /*!< This function is called to add data in the Yao model. */
-
+        
+        signals:
+                void trajRowIsAdded();
         private :
                 
                 int compteur;    
-                /*QLabel *m_nameLabel;
-                QLabel *m_typeLabel;
-                QLabel *m_labelTrajNbuptime;
-                QLabel *m_labelTrajOfftime;
-                QLabel *m_labelTrajNDtime;
-                QLabel *m_labelTrajNbsteptime;
- //     
-                QPushButton *m_quitTraj;        
-                QPushButton *m_addButton;
-                QPushButton *m_helpButton;
-                QPushButton *m_delButton;
-*/
-                //QLineEdit *m_lignetrajName;  /*!< Name of the QLineEdit. */
-                //QLineEdit *m_ligneTypeTraj;  /*!< Type of the QLineEdit. */
-                //QLineEdit *m_ligneValeurTraj;    /*!< value of the Trajectory. */
-
-                //QLineEdit *m_comboOfftimeTraj;     /*!< Offtime of the QComboBox. */
-                //QLineEdit *m_comboSteptimeTraj;  /*!< Nbsteptime of the QComboBox. */
- //
-            
-                //QComboBox *m_comboNbuptimeTraj; /*!< Nbuptime of the Trajectory. */
-                //QComboBox *m_comboDtimeTraj;    /*!< Dtime of the Trajectory. */
-                //QComboBox *m_comboSteptimeTraj;   /*!< Nbsteptime of the Trajectory. */
-                //QComboBox *m_comboOfftimeTraj;   /*!< m_ligneOffimetraj QComboBox. */
-
-
-                //QGridLayout *m_layoutGTraj;   /*!< The form Layout's name. */
-                //QHBoxLayout *m_layoutHTraj;   /*!< The horizontal Layout's name. */
-            
                 QStandardItemModel *modeleTraj;
                 QModelIndex index;
-                //QTableView *vueTraj;   /*!< Name of the QTableWidget's object in whitch the objects are listed for the viewer. */
                 yao::Table <yao::Trajectory> *localTrajectoryTable;
                 yao::Table <yao::Constant> *localConstantTable;
-                //QFileDialog *projetTraj;
-                //QString m_cheminProjetTraj;
 
-                //  QFileDialog *fd2;
                 //QModelIndex index2;
                 // QString lstF2;
 
-                //int boot;
-                //int size;
-                //double step;
-                //double offset;
-                //char type;
-                //int compteur;         
         protected: 
                 void closeEvent(QCloseEvent *event); 

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

@@ -32 +32 @@
     <enum>QFrame::Raised</enum>
    </property>
-   <widget class="QTableView" name="tableView">
+   <widget class="QTableView" name="m_ctinTableView">
     <property name="geometry">
      <rect>
@@ -53 +53 @@
     <layout class="QVBoxLayout" name="verticalLayout_6">
      <item>
-      <widget class="QPushButton" name="pushButton">
+      <widget class="QPushButton" name="m_ctinAddButton">
        <property name="text">
         <string>Ajouter</string>
@@ -60 +60 @@
      </item>
      <item>
-      <widget class="QPushButton" name="pushButton_2">
+      <widget class="QPushButton" name="m_ctinDelButton">
        <property name="text">
         <string>Supprimer</string>
@@ -67 +67 @@
      </item>
      <item>
-      <widget class="QPushButton" name="pushButton_3">
+      <widget class="QPushButton" name="m_ctinQuitButton">
        <property name="text">
         <string>Quitter</string>
@@ -75 +75 @@
     </layout>
    </widget>
-   <widget class="QPushButton" name="pushButton_4">
+   <widget class="QPushButton" name="m_ctinHelpButton">
     <property name="geometry">
      <rect>
@@ -109 +109 @@
       <x>10</x>
       <y>10</y>
-      <width>581</width>
+      <width>571</width>
       <height>101</height>
      </rect>
@@ -137 +137 @@
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
-          <widget class="QComboBox" name="comboBox"/>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_2"/>
+          <widget class="QComboBox" name="m_ctinComboModulIn"/>
+         </item>
+         <item>
+          <widget class="QComboBox" name="m_ctinComboModulOut"/>
          </item>
         </layout>
@@ -519 +519 @@
  <connections>
   <connection>
-   <sender>pushButton_3</sender>
+   <sender>m_ctinQuitButton</sender>
    <signal>clicked()</signal>
    <receiver>ConnectionWindow</receiver>

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

@@ -72 +72 @@
          </property>
          <property name="buddy">
-          <cstring>lineModulInput</cstring>
+          <cstring>m_lineModulInput</cstring>
          </property>
         </widget>
@@ -90 +90 @@
        </item>
        <item>
-        <widget class="QLineEdit" name="lineModulInput"/>
+        <widget class="QLineEdit" name="m_lineModulInput"/>
        </item>
       </layout>
@@ -129 +129 @@
         <widget class="QLabel" name="label_4">
          <property name="text">
-          <string>Target</string>
+          <string>target</string>
          </property>
          <property name="buddy">
@@ -143 +143 @@
     </layout>
    </widget>
-   <widget class="QCheckBox" name="checkBoxModulArray">
+   <widget class="QCheckBox" name="m_checkBoxModulArray">
     <property name="geometry">
      <rect>
@@ -153 +153 @@
     </property>
     <property name="text">
-     <string>Array</string>
+     <string>array</string>
     </property>
    </widget>
@@ -176 +176 @@
        <x>10</x>
        <y>10</y>
-       <width>111</width>
+       <width>113</width>
        <height>261</height>
       </rect>
@@ -264 +264 @@
         </property>
         <property name="buddy">
-         <cstring>comboModulInter1</cstring>
+         <cstring>m_comboModulInter1</cstring>
         </property>
        </widget>
@@ -271 +271 @@
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
-         <widget class="QComboBox" name="comboModulInter1"/>
+         <widget class="QComboBox" name="m_comboModulInter1"/>
         </item>
         <item>
-         <widget class="QComboBox" name="comboModulInter2"/>
+         <widget class="QComboBox" name="m_comboModulInter2"/>
         </item>
         <item>
-         <widget class="QComboBox" name="comboModulInter3"/>
+         <widget class="QComboBox" name="m_comboModulInter3"/>
         </item>
        </layout>
@@ -465 +465 @@
     </widget>
    </widget>
-   <widget class="QWidget" name="">
+   <widget class="QWidget" name="layoutWidget">
     <property name="geometry">
      <rect>
@@ -478 +478 @@
       <widget class="QRadioButton" name="m_spaceRadioButton">
        <property name="text">
-        <string>Space</string>
+        <string>space</string>
        </property>
        <property name="checked">
@@ -491 +491 @@
       <widget class="QRadioButton" name="m_operaRadioButton">
        <property name="text">
-        <string>Opera</string>
+        <string>opera</string>
        </property>
       </widget>
@@ -580 +580 @@
   <tabstop>m_lineModulName</tabstop>
   <tabstop>m_operaRadioButton</tabstop>
-  <tabstop>lineModulInput</tabstop>
-  <tabstop>checkBoxModulArray</tabstop>
+  <tabstop>m_lineModulInput</tabstop>
+  <tabstop>m_checkBoxModulArray</tabstop>
   <tabstop>lineModulOutput</tabstop>
   <tabstop>m_comboModulTarget</tabstop>
@@ -591 +591 @@
   <tabstop>checkBoxModulHidjac</tabstop>
   <tabstop>checkBoxModulManage</tabstop>
-  <tabstop>comboModulInter1</tabstop>
-  <tabstop>comboModulInter2</tabstop>
-  <tabstop>comboModulInter3</tabstop>
+  <tabstop>m_comboModulInter1</tabstop>
+  <tabstop>m_comboModulInter2</tabstop>
+  <tabstop>m_comboModulInter3</tabstop>
   <tabstop>m_comboModulAutonet</tabstop>
   <tabstop>comboModulClonol</tabstop>