Changeset 381 for trunk/yao

Timestamp:

07/07/10 16:46:56 (14 years ago)

Author:

yerima

Message:

update in the mainwindow.cpp

Location:

trunk/yao/src/interface

Files:

• src/ConnectionWindow.cpp (modified) (5 diffs)
• src/ConstantWindow.cpp (modified) (1 diff)
• src/MainWindow.cpp (modified) (4 diffs)
• src/ModulWindow.cpp (modified) (2 diffs)
• src/OperaWindow.cpp (modified) (1 diff)
• src/SpaceWindow.cpp (modified) (3 diffs)
• src/include/ConnectionWindow.hpp (modified) (2 diffs)
• src/include/MainWindow.hpp (modified) (3 diffs)
• src/include/OperaWindow.hpp (modified) (1 diff)
• src/include/SpaceWindow.hpp (modified) (1 diff)
• ui_newprojectwindow.h (modified) (1 diff)

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

@@ -21 +21 @@
 
 /************************************************* Implementation of the construtor *******************************************************************/
-ConnectionWindow::ConnectionWindow(Table <Modul> *aModulTable, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent), cpt(1) { /*!< The constructor. */
+ConnectionWindow::ConnectionWindow(Table <Connection> *aConnectionTable, Table <Modul> *aModulTable, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent), cpt(1) { /*!< The constructor. */
         setupUi(this);
     
@@ -28 +28 @@
         m_localModulTable       = aModulTable;  
         m_localConstantTable    = aConstantTable;       
+        m_localConnectionTable  = aConnectionTable;     
         
         m_ctinModulInCombo->insertItem(0, "");
@@ -92 +93 @@
         for (Table<Constant>::reverse_iterator it = m_localConstantTable->rbegin(); it != m_localConstantTable->rend(); it++) 
                 {
-                        //int row = m_ctinModel->rowCount();                          
-                        
                         m_ctinInCombo->insertItem(1, QString(it->getName().c_str()));
                         m_ctinIn2Combo->insertItem(1, QString(it->getName().c_str()));
@@ -110 +109 @@
                 }               
 
+        for (Table<Connection>::reverse_iterator it = m_localConnectionTable->rbegin(); it != m_localConnectionTable->rend(); it++) 
+                {
+                        int row = m_ctinModel->rowCount();
+
+                        m_ctinModel->setItem(row, 0, new QStandardItem(QString(it->getName().c_str()))); /*!< Gets the name.*/
+                }               
+
+        
+
         m_ctinInCombo->insertItem(cpt, "...");
         m_ctinOutCombo->insertItem(cpt, "...");
@@ -137 +145 @@
                                 in2      = m_ctinModulInCombo->currentText().toStdString(),
                                 in3      = m_ctinModulInCombo->currentText().toStdString(),
-                                modulOut = m_ctinModulOutCombo->currentText().toStdString();
+                                modulOut = m_ctinModulOutCombo->currentText().toStdString(),
+                                out      = m_ctinOutCombo->currentText().toStdString();
                 
                         if (!modulIn.empty() && !modulOut.empty()) 
                                 {
                                         m_ctinModel->setItem(row, 0, new QStandardItem(QString(modulIn.c_str())));
+                                        if(!in.empty()) m_ctinModel->setItem(row, 1, new QStandardItem(QString(in.c_str())));
                                         m_ctinModel->setItem(row, 2, new QStandardItem(QString(modulOut.c_str())));
+                                        if(!out.empty()) m_ctinModel->setItem(row, 3, new QStandardItem(QString(out.c_str())));
+                                        m_localConnection.setInModule(modulIn); 
+                                        m_localConnectionTable->push_back(m_localConnection);
                                 }       
 

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

@@ -77 +77 @@
                         m_delButton->setEnabled(true);                     
                         Constant localConstant (Nom.toStdString(), Val.toStdString());  
-                        m_localConstantTable->push_back(localConstant);
+                        for (Table<Constant>::iterator it = m_localConstantTable->begin(); it != m_localConstantTable->end(); it++)
+                                if (m_localConstantTable->size() == 0 )// it->getName().c_str() == "" /*Nom.toStdString()*/)
+                                        
+                                        {       
+                                                cout << it->getName() << endl;
+                                
+                        //      else {
+                        //              QMessageBox::critical(this, "Avertissement", "Cet élément existe déjà !");
+                        //              return; // Arrêt de la méthode
+                                        }
                 
+                                m_localConstantTable->push_back(localConstant);
                         m_defvalModel->setItem(m_defvalModel->rowCount(), 0, new QStandardItem(m_ligneNom->text()));
                         m_defvalModel->setItem(m_defvalModel->rowCount()-1, 1, new QStandardItem(m_ligneValeur->text()));//Apres le 1er ajout, la ligne vaut i+1

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

@@ -363 +363 @@
 
         connect(m_spaceWindow, SIGNAL(spaceWindowIsClosed(int)), this, SLOT(initializeWindow(int)));
+        connect(m_spaceWindow, SIGNAL(spaceRowIsAdded(bool)), m_modulButton, SLOT(setEnabled(bool)));
 }
 
@@ -375 +376 @@
 
         connect(m_operaWindow, SIGNAL(operaWindowIsClosed(int )), this, SLOT(initializeWindow(int )));
+        //connect(m_operaWindow, SIGNAL(operaRowIsAdded(bool)), m_modulButton, SLOT(setEnabled(bool)));
 }
 
@@ -406 +408 @@
 
         if (m_ctinWindow == NULL) { //to test if the object is already created.
-                m_ctinWindow = new ConnectionWindow(&theModulTable, &theConstantTable); //mwc.getCtin();
+                m_ctinWindow = new ConnectionWindow(&theConnectionTable, &theModulTable, &theConstantTable); //mwc.getCtin();
                 espace.addWindow(m_ctinWindow)->move(0, 0);
                 m_ctinWindow->show();
@@ -459 +461 @@
         m_operaButton->setEnabled(false);
         m_netwardButton->setEnabled(true);
-        m_modulButton->setEnabled(true);
+        m_modulButton->setEnabled(false);
         m_ctinButton->setEnabled(true);
         m_orderButton->setEnabled(true);

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

@@ -120 +120 @@
 try {
                 string  modulName       = m_modulNameLine->text().toStdString() ,
-                modulParent,
+                modulParent             = "",
                 input           = m_modulInputLine->text().toStdString(),
                 output          = m_modulOutputLine->text().toStdString(),
@@ -153 +153 @@
 
                         }
-
-
-
-        if (!(modulName.empty() && modulParent.empty())) 
+        // the modul parent must to be here.
+        if (modulParent.empty()) 
+                {
+                        QMessageBox::critical(this, "Erreur", "Veuillez renseigner la valeur du champ \"space or opera\".");
+                        return; // Arrêt de la méthode
+
+                }
+
+        if (!modulName.empty() && !modulParent.empty()) 
                 { // !(false) => true if there are data in the lineEDit.
         

trunk/yao/src/interface/src/OperaWindow.cpp

@@ -191 +191 @@
                 modeleOpera->setItem(row, 3, new QStandardItem(m_operaTrajname->currentText()));
                 
-                if (!(d1.empty() || d2.empty() || d3.empty())) {
+                if (!d1.empty()) {
                         //Operator Opera(name, localTrajectoryTable->find(traj), theShape);
                         //Operator::Type M;
                         localOperaTable->push_back(Operator(name, localTrajectoryTable->find(traj), theShape, Operator::M));    
+//                      emit operaRowIsAdded(true);
                 }
                 toInitialize();

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

@@ -115 +115 @@
                                 dim = localConstantTable->find(d1)->getText();  
                                 theShape.push_back(toInt(localConstantTable->find(d1)->getText()));
+                                
+                                //emit spaceRowIsAdded(true);
                 
                         }
@@ -131 +133 @@
                                 dim = d1;       
                                 theShape.push_back(toInt(d1));
+                                //emit spaceRowIsAdded(true);
 
                         }
@@ -198 +201 @@
                                                 modeleSpace->setItem(row, 2, new QStandardItem(m_spaceTrajname->currentText()));
                 
-                                                if (!(d1.empty() || d2.empty() || d3.empty())) {
+                                                if (!d1.empty()) {
                                                         Space espace(name, localTrajectoryTable->find(traj), theShape);
                                                         localSpaceTable->push_back(espace);     
+                                                        emit spaceRowIsAdded(true);
                                                 }
 

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

@@ -44 +44 @@
                         */
 
-                        ConnectionWindow(yao::Table <yao::Modul> *aModulTable,  yao::Table <yao::Constant> *aConstantTable, QWidget *parent=0);
+                        ConnectionWindow(yao::Table <yao::Connection> *aConnectionTable, yao::Table <yao::Modul> *aModulTable,  yao::Table <yao::Constant> *aConstantTable, QWidget *parent=0);
                         QStringList getDataCtin(); /*!< This function returns the connexion's data. */
                         void toInitialize();
@@ -70 +70 @@
                         QStringList CtinData;
                         QStandardItemModel *m_ctinModel;
+                        yao::Connection m_localConnection;
                         yao::Table <yao::Modul> *m_localModulTable;
+                        yao::Table <yao::Connection> *m_localConnectionTable;
                         yao::Table <yao::Constant> *m_localConstantTable;
                         int cpt;                    

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

@@ -22 +22 @@
 #include <QStringList>
 
-#include "ConnectionWindow.hpp"
 #include "HatNameWindow.hpp"
 #include "ConstantWindow.hpp"
@@ -35 +34 @@
 #include "ContextWindow.hpp"
 #include "OrderWindow.hpp"
+#include "ConnectionWindow.hpp"
 #include "NewProjectWindow.hpp"
 
@@ -236 +236 @@
                         std::string m_projectPath;
 
+                        // Yao structures are follow:
                         yao::Constant m_theConstant;
                         yao::Table <yao::Constant> theConstantTable;                    

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

@@ -58 +58 @@
                 void saveInYaoStructure();          /*!< This function is called to add data in the Yao model. */
                 void callOperaHelp();
+                //void operaRowIsAdded(bool);
 
         signals:

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

@@ -63 +63 @@
         signals:
                 void spaceWindowIsClosed(int anInt);
+                void spaceRowIsAdded(bool);
 
         protected:

trunk/yao/src/interface/ui_newprojectwindow.h

@@ -2 +2 @@
 ** Form generated from reading UI file 'newprojectwindow.ui'
 **
-** Created: Mon Jun 28 16:52:10 2010
+** Created: Tue Jul 6 16:37:01 2010
 **      by: Qt User Interface Compiler version 4.6.2
 **