Changeset 472 for trunk/yao/src/interface/src/ModinspaceWindow.cpp

Timestamp:

10/29/10 12:22:13 (14 years ago)

Author:

yerima

Message:

The common object witch is the "Order" is present present both in the modinspace window than in the spaceintraj one according to the grammar. So some updates are made in those three class (OrderWindow?, ModinspaceWindow? and SpaceintrajWindow?).Visual Yao

File:

• trunk/yao/src/interface/src/ModinspaceWindow.cpp (modified) (3 diffs)

trunk/yao/src/interface/src/ModinspaceWindow.cpp

@@ -22 +22 @@
 
 /*********************************************************************************************************************************/
-ModinspaceWindow::ModinspaceWindow(Table <Modul> *aModulTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Table <Order> *anOrderTable, QWidget *parent) : QWidget(parent), m_theLocalAxesTable(NULL), m_theLocalModulTable(NULL) {
+ModinspaceWindow::ModinspaceWindow(Table <Modul> *aModulTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Table <Order> *anOrderTable, Order *anOrder, QWidget *parent) : QWidget(parent), m_theLocalAxesTable(NULL), m_theLocalModulTable(NULL) {
+
 
         setupUi(this);
         
-        m_localModulTable               = aModulTable;
-        m_localSpaceTable            = aSpaceTable;
-        m_localOperaTable         = anOperatorTable;
+        m_localModulTable       = aModulTable;
+        m_localSpaceTable       = aSpaceTable;
+        m_localOperaTable       = anOperatorTable;
         m_localOrderTable       = anOrderTable;
-        
+        m_localOrder            = anOrder;      
+
         m_rightAxesButton->setIcon(QIcon("Images/icons/rightarrow2.png"));
         m_rightModulNameButton->setIcon(QIcon("Images/icons/rightarrow2.png"));
@@ -161 +163 @@
         if (!cpt) {
                 
-                //Order ord(&m_localModulTable)
+                Order ord(m_localModulTable);
                         
                 m_outlineModel->setItem(row0, 0, new QStandardItem("order")); 
@@ -168 +170 @@
                 m_outlineModel->setItem(row1, 1, new QStandardItem("order")); 
         
-                if(m_localSpaceTable->find(commonName))
+                if(m_localSpaceTable->find(commonName)) {
+                        if(m_localSpaceTable->find(commonName)->isCounterOrderHeader()==false)
+                                {
+                                        QMessageBox::critical(this, "Avis", "Ce nom d'espace a été déjà inséré.");
+                                        return;
+                                }
                         m_localSpaceTable->find(commonName)->setCounterOrderHeader(true);
-                else
+                        
+                }
+                else {
+                        if(m_localOperaTable->find(commonName)->isCounterOrderHeader()==false)
+                                {
+                                        QMessageBox::critical(this, "Avis", "Ce nom d'operateur a été déjà inséré.");
+                                        return;
+                                }
+
                         m_localOperaTable->find(commonName)->setCounterOrderHeader(true);
-                
+                }
+                
+                ord.setOrderPhase(1);   
                 cpt++;