Changeset 351 for trunk/yao

Timestamp:

06/18/10 18:39:07 (14 years ago)

Author:

yerima

Message:

The instance of Connection, Order and InsertFCT's windows are controlled.

Location:

trunk/yao/src/interface/src

Files:

• ConnectionWindow.cpp (modified) (1 diff)
• InsertFCTWindow.cpp (modified) (1 diff)
• MainWindow.cpp (modified) (2 diffs)
• OrderWindow.cpp (modified) (1 diff)
• include/ConnectionWindow.hpp (modified) (3 diffs)
• include/InsertFCTWindow.hpp (modified) (1 diff)
• include/MainWindow.hpp (modified) (1 diff)
• include/OrderWindow.hpp (modified) (1 diff)

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

@@ -164 +164 @@
 
 /****************************************************************************************/
+void ConnectionWindow::closeEvent(QCloseEvent *event) {
+
+        emit ctinWindowIsClosed(9);
+}

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

@@ -146 +146 @@
         
 }*/
+/*********************************************************************/
+void InsertFCTWindow::closeEvent(QCloseEvent *event) {
+
+        emit insertFCTWindowIsClosed(11);
+
+}
+/******************************* End of file. ****************************************/

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

@@ -274 +274 @@
        connect(m_modulButton, SIGNAL(clicked()), this, SLOT(changeColorModulButton()));
      m_ctinButton      = new QPushButton(tr("Connection"), this);
-        m_ctinWindow = new ConnectionWindow; //mwc.getCtin();
-        espace->addWindow(m_ctinWindow);
-        m_ctinWindow->hide();
-        connect(m_ctinButton, SIGNAL(clicked()), m_ctinWindow, SLOT(show()));
+        connect(m_ctinButton, SIGNAL(clicked()), this, SLOT(createCtinWindow()));
         connect(m_ctinButton, SIGNAL(clicked()), this, SLOT(changeColorCtinButton()));
      m_orderButton     = new QPushButton(tr("Order"), this);
-        m_orderWindow = new OrderWindow; //mwc.getOrder();
-        espace->addWindow(m_orderWindow);
-        m_orderWindow->hide();
-        connect(m_orderButton, SIGNAL(clicked()), m_orderWindow, SLOT(show()));
+        connect(m_orderButton, SIGNAL(clicked()), this, SLOT(createOrderWindow()));
         connect(m_orderButton, SIGNAL(clicked()), this, SLOT(changeColorOrderButton()));
 
      m_insertFCTButton = new QPushButton(tr("Insert_fct"), this);
-       m_insertFCTWindow = new InsertFCTWindow; //mwc.getInsertFCT();
-        espace->addWindow(m_insertFCTWindow);
-        m_insertFCTWindow->hide();
-        connect(m_insertFCTButton, SIGNAL(clicked()), m_insertFCTWindow, SLOT(show()));
+        connect(m_insertFCTButton, SIGNAL(clicked()), this, SLOT(createInsertFCTWindow()));
         connect(m_insertFCTButton, SIGNAL(clicked()), this, SLOT(changeColorInsertFCTButton()));
 
@@ -389 +380 @@
 
         if (m_modulWindow == NULL) { //to test if the object is already created.
-        //ModulWindow::ModulWindow(Table <Modul> *aModulTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, QWidget *parent)
-        //connect(m_modulButton, SIGNAL(clicked()), m_modulWindow, SLOT(show()));
-  
-        m_modulWindow = new ModulWindow(&theModulTable, &theSpaceTable, &theOperaTable, &theConstantTable, &the_mwc); //mwc.getModul();
-        espace->addWindow(m_modulWindow);
-        espace->addWindow(m_modulWindow)->move(30, 20);
-        m_modulWindow->show(); 
+                m_modulWindow = new ModulWindow(&theModulTable, &theSpaceTable, &theOperaTable, &theConstantTable, &the_mwc); //mwc.getModul();
+                espace->addWindow(m_modulWindow);
+                espace->addWindow(m_modulWindow)->move(30, 15);
+                m_modulWindow->show(); 
         }
 
         connect(m_modulWindow, SIGNAL(modulWindowIsClosed(int)), this, SLOT(initializeWindow(int)));
+
+}
+
+/********************************************* Implementation of the method createCtinWindow() ************************************************/
+void MainWindow::createCtinWindow() {
+
+        if (m_ctinWindow == NULL) { //to test if the object is already created.
+                m_ctinWindow = new ConnectionWindow; //mwc.getCtin();
+                espace->addWindow(m_ctinWindow)->move(0, 0);
+                m_ctinWindow->show();
+        }
+
+        connect(m_ctinWindow, SIGNAL(ctinWindowIsClosed(int)), this, SLOT(initializeWindow(int)));
+      
+
+}
+/********************************************* Implementation of the method createOrderWindow() ************************************************/
+void MainWindow::createOrderWindow() {
+
+        if (m_orderWindow == NULL) { //to test if the object is already created.
+                m_orderWindow = new OrderWindow; //mwc.getOrder();
+                espace->addWindow(m_orderWindow)->move(2, 0);
+                m_orderWindow->show();
+        }
+
+        connect(m_orderWindow, SIGNAL(orderWindowIsClosed(int)), this, SLOT(initializeWindow(int)));
+
+}
+/********************************************* Implementation of the method createInsertFCTWindow() ************************************************/
+void MainWindow::createInsertFCTWindow() {
+
+        if (m_insertFCTWindow == NULL) { //to test if the object is already created.
+                m_insertFCTWindow = new InsertFCTWindow; //mwc.getInsertFCT();
+                espace->addWindow(m_insertFCTWindow)->move(30, 20);
+                m_insertFCTWindow->show();
+        }
+
+        connect(m_insertFCTWindow, SIGNAL(insertFCTWindowIsClosed(int)), this, SLOT(initializeWindow(int)));
+      
 
 }

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

@@ -22 +22 @@
         setFixedWidth(baseSize().width() + 765);
 }
+/***********************************************************************/
+void OrderWindow::closeEvent(QCloseEvent *event) {
+
+        emit orderWindowIsClosed(10);
+}

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

@@ -5 +5 @@
  * \author  MAYAKI Abdouramane.
  */
-
 
 #ifndef CTIN_HPP
@@ -36 +35 @@
    /*!
         *  \brief Constructor
-        *
         *  Constructor of the class ConnectionWindow
-        *
         *  \param parent : initialized at zero.
         */
             ConnectionWindow(QWidget *parent=0);
-            //void writefileCtin();
              QStringList getDataCtin(); /*!< This function returns the connexion's data. */
              void initialiseCtin();  
@@ -48 +44 @@
     private slots:       /*!< Functions called after a click. */
            
-            //void appelAjoutCtin();   /*!< This function is called to add row in the visual window model. */
-            //void appelSupp();  /*!< This function is called to delete row from the Yao model. */
-            //void callCtinHelp();
 
-    private :
+        signals:
+                void ctinWindowIsClosed(int anInt);             
 
-                   
-                  /*  QPushButton *m_quitButtonCtin;
-                    QPushButton *pushButtonctin2;
-                        QPushButton *pushButtonctin3;
-                    QPushButton *m_AjoutCtin;
-                    QPushButton *m_AideCtin;
-                */      
-                  //  QComboBox *comboBoxctin1;              /*!< ComboBox for the Modul of entred */
-                   // QComboBox *comboBoxctin2;  /*!< Input */
-                    /*QComboBox *comboBoxctin3;
-                    QComboBox *comboBoxctin4;
-                    QComboBox *comboNbOutCtin;
-                    QComboBox *comboIntCtin;
-                    QComboBox *fontComboBoxctin1;
-                    QComboBox *fontComboBoxctin2;
-                    QComboBox *comboBoxFrom; 
-                    QComboBox *comboBoxctin_i;
-                    QComboBox *comboBoxctin_j; 
-                    QComboBox *comboBoxctin_k;
-                    QComboBox *comboBoxctin_t; 
+        protected:
+                void closeEvent(QCloseEvent *event);
 
-                    QRadioButton *radioButtonctin1;
-                    QRadioButton *radioButtonctin2;
-                    QRadioButton *radioButtonctin3;
-                    QRadioButton *radioButtonctin4; 
-                        */
+        private :
+
                     QStringList CtinData;
                    
-                //    QTableWidget *tableWidgetctin1;
-                    
-                //      QGridLayout *formLayoutGctin;
-                //    QHBoxLayout *horizontalLayoutctin1;
                     
 };

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

@@ -14 +14 @@
 
 class InsertFCTWindow : public QWidget, public Ui::InsertFCTWindow {
+
     Q_OBJECT
 
-    public :
+        public :
             InsertFCTWindow(QWidget *parent=0); /*!< Constructeur */
-            //QStringList getDataFCT();   /*!< This function returns the function's data. */
             //void initialiserChampsfct();
             
 
-    public slots:         /*!< Functions called after a click. */
-             //void addInsertRow();
-    private :
+        public slots:         /*!< Functions called after a click. */
+        
+
+        signals:
+                void insertFCTWindowIsClosed(int );
+
+        private :
             
+        
+        protected:
+                void closeEvent(QCloseEvent *event);
             
-            //int compteur;
 
 };

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

@@ -111 +111 @@
                         void createNetwardWindow();
                         void createModulWindow();
+                        void createCtinWindow();
+                        void createOrderWindow();
+                        void createInsertFCTWindow();
                         void initializeWindow(int anInt);
                         void changeButtonColor(QPushButton *aButton); 

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

@@ -15 +15 @@
 class OrderWindow : public QWidget, public Ui::OrderWindow {
 
-    public :
+        Q_OBJECT
+
+        public :
             OrderWindow(QWidget *parent=0);
 
-    private :
+        private :
+        
+        private slots:
+
+        signals:
+                void orderWindowIsClosed(int );
+
+        protected:
+                void closeEvent(QCloseEvent *event);
 
 };