Changeset 472

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

Location:

trunk/yao/src/interface

Files:

• configure (modified) (1 diff)
• src/ModinspaceWindow.cpp (modified) (3 diffs)
• src/OrderWindow.cpp (modified) (3 diffs)
• src/SpaceintrajWindow.cpp (modified) (3 diffs)
• src/include/ModinspaceWindow.hpp (modified) (2 diffs)
• src/include/OrderWindow.hpp (modified) (1 diff)
• src/include/SpaceintrajWindow.hpp (modified) (3 diffs)

trunk/yao/src/interface/configure

@@ -1 +1 @@
 #!/bin/bash
-make && ./interface
+echo "Phase 1: Compilation de la grammaire de Yao."
+cd ..
+make
+echo "Compilation de la grammaire terminée."
+cp Yao9Generator interface/
+
+echo "export VYAO=$HOME/Documents/Depot_Yao/svn/trunk/yao/src/interface/" > $HOME/.bashrc
+echo "export PATH=$PATH:$VYAO" > $HOME/.bashrc
+
+cd -
+echo "Retour dans le répertoire interface"
+echo "Phase 2: Compilation de Visual Yao."
+qmake -project && qmake && make
+sed -i -e '16c INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I. -Isrc/include -I. -I../../share/antlr-2.7.7/lib/cpp/ -I../../share/boost_1_39_0/ -I.' Makefile
+make && echo "Compilation terminée" && ./interface
+echo "Phase 3: Compilation de Visual Yao."
+#make 

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++;
 

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

@@ -20 +20 @@
 
 /***************************************** Implementation of the Construtor OrderWindow() *************************************************/
-OrderWindow::OrderWindow(Table <Trajectory> *aTrajectoryTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Table <Modul> *aModulTable,  Table <Order> *anOrderTable, QWidget *parent) : stateOfSpaceintrajEndCheckBox(false), QWidget(parent) {
+OrderWindow::OrderWindow(Table <Trajectory> *aTrajectoryTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Table <Modul> *aModulTable,  Table <Order> *anOrderTable, QWidget *parent) : stateOfSpaceintrajEndCheckBox(false), QWidget(parent), m_localOrder(m_localModulTable) {
 
         setupUi(this);
@@ -29 +29 @@
         m_localModulTable               = aModulTable;
         m_localOrderTable               = anOrderTable;
+        
         /*
         setFixedWidth(baseSize().width() + 765);
@@ -51 +52 @@
         //m_modinspaceRadioButton               = new QRadioButton("modinspace");
         //m_spaceintrajRadioButton      = new QRadioButton("spaceintraj");      
-        ModinspaceWindow *misw          = new ModinspaceWindow(m_localModulTable, m_localSpaceTable, m_localOperaTable, m_localOrderTable); 
-        SpaceintrajWindow *sitw         = new SpaceintrajWindow(m_localTrajectoryTable, m_localSpaceTable, m_localOperaTable);
+        ModinspaceWindow *misw          = new ModinspaceWindow(m_localModulTable, m_localSpaceTable, m_localOperaTable, m_localOrderTable, &m_localOrder); 
+        SpaceintrajWindow *sitw         = new SpaceintrajWindow(m_localTrajectoryTable, m_localSpaceTable, m_localOperaTable, &m_localOrder);
                 //sitw->show(); 
         

trunk/yao/src/interface/src/SpaceintrajWindow.cpp

@@ -1 +1 @@
 //! \file    SpaceintrajWindow.cpp
 //! \brief   Implementation of the instructions file's window for visual_YAO.
-//! \version 2010/10/22 (yyyy/mm/dd)
+//! \version 2010/10/29 (yyyy/mm/dd)
 //! \author  MAYAKI Abdouramane.
 
@@ -22 +22 @@
 
 /*********************************************************************************************************************************/
-SpaceintrajWindow::SpaceintrajWindow(Table <Trajectory> *aTrajectoryTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, QWidget *parent) : QWidget(parent) {
+SpaceintrajWindow::SpaceintrajWindow(Table <Trajectory> *aTrajectoryTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Order *anOrder,  QWidget *parent) : QWidget(parent) {
 
         setupUi(this);
@@ -31 +31 @@
         m_spaceTable            = aSpaceTable;
         m_operatorTable         = anOperatorTable;
-
+        m_localOrder            = anOrder;
 
         for (Table<Trajectory>::reverse_iterator it = m_trajectoryTable->rbegin(); it != m_trajectoryTable->rend(); it++) {

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

@@ -24 +24 @@
 
         public :
-                ModinspaceWindow(yao::Table <yao::Modul> *aModulTable, yao::Table <yao::Space> *aSpaceTable, yao::Table <yao::Operator> *anOperatorTable, yao::Table <yao::Order> *anOrderTable, QWidget *parent=0);
+                ModinspaceWindow(yao::Table <yao::Modul> *aModulTable, yao::Table <yao::Space> *aSpaceTable, yao::Table <yao::Operator> *anOperatorTable, yao::Table <yao::Order> *anOrderTable, yao::Order *anOrder, QWidget *parent=0);
 
         private slots:
@@ -47 +47 @@
                 yao::Table <yao::Operator> *m_localOperaTable;
                 yao::Table <yao::Order> *m_localOrderTable;
+                yao::Order *m_localOrder;
                 
                 QStandardItemModel *m_axesModel;

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

@@ -59 +59 @@
                 yao::Table <yao::Modul> *m_localModulTable;
                 yao::Table <yao::Order> *m_localOrderTable;
+                yao::Order m_localOrder;
 };
 #endif // ORDERWINDOW_HPP

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

@@ -16 +16 @@
 #include "../../../YAOObjects/Operator.hpp"
 #include "../../../YAOObjects/Trajectory.hpp"
+#include "../../../YAOObjects/Order.hpp"
 
 
@@ -24 +25 @@
 
         public :
-                SpaceintrajWindow(yao::Table <yao::Trajectory> *aTrajectoryTable, yao::Table <yao::Space> *aSpaceTable, yao::Table <yao::Operator> *anOperatorTable, QWidget *parent=0);
+                SpaceintrajWindow(yao::Table <yao::Trajectory> *aTrajectoryTable, yao::Table <yao::Space> *aSpaceTable, yao::Table <yao::Operator> *anOperatorTable, yao::Order *anOrder, QWidget *parent=0);
 
         private slots:
@@ -45 +46 @@
                 QStandardItemModel *m_spaceOrOperanameModel;
                 QStandardItemModel *m_outlineModel2;
+                yao::Order *m_localOrder;
 };
 #endif // SPACEINTRAJWINDOW_HPP