- Timestamp:
- 10/29/10 12:22:13 (14 years ago)
- Location:
- trunk/yao/src/interface
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yao/src/interface/configure
r465 r472 1 1 #!/bin/bash 2 make && ./interface 2 echo "Phase 1: Compilation de la grammaire de Yao." 3 cd .. 4 make 5 echo "Compilation de la grammaire terminée." 6 cp Yao9Generator interface/ 7 8 echo "export VYAO=$HOME/Documents/Depot_Yao/svn/trunk/yao/src/interface/" > $HOME/.bashrc 9 echo "export PATH=$PATH:$VYAO" > $HOME/.bashrc 10 11 cd - 12 echo "Retour dans le répertoire interface" 13 echo "Phase 2: Compilation de Visual Yao." 14 qmake -project && qmake && make 15 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 16 make && echo "Compilation terminée" && ./interface 17 echo "Phase 3: Compilation de Visual Yao." 18 #make -
trunk/yao/src/interface/src/ModinspaceWindow.cpp
r471 r472 22 22 23 23 /*********************************************************************************************************************************/ 24 ModinspaceWindow::ModinspaceWindow(Table <Modul> *aModulTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Table <Order> *anOrderTable, QWidget *parent) : QWidget(parent), m_theLocalAxesTable(NULL), m_theLocalModulTable(NULL) { 24 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) { 25 25 26 26 27 setupUi(this); 27 28 28 m_localModulTable 29 m_localSpaceTable 30 m_localOperaTable 29 m_localModulTable = aModulTable; 30 m_localSpaceTable = aSpaceTable; 31 m_localOperaTable = anOperatorTable; 31 32 m_localOrderTable = anOrderTable; 32 33 m_localOrder = anOrder; 34 33 35 m_rightAxesButton->setIcon(QIcon("Images/icons/rightarrow2.png")); 34 36 m_rightModulNameButton->setIcon(QIcon("Images/icons/rightarrow2.png")); … … 161 163 if (!cpt) { 162 164 163 //Order ord(&m_localModulTable)165 Order ord(m_localModulTable); 164 166 165 167 m_outlineModel->setItem(row0, 0, new QStandardItem("order")); … … 168 170 m_outlineModel->setItem(row1, 1, new QStandardItem("order")); 169 171 170 if(m_localSpaceTable->find(commonName)) 172 if(m_localSpaceTable->find(commonName)) { 173 if(m_localSpaceTable->find(commonName)->isCounterOrderHeader()==false) 174 { 175 QMessageBox::critical(this, "Avis", "Ce nom d'espace a été déjà inséré."); 176 return; 177 } 171 178 m_localSpaceTable->find(commonName)->setCounterOrderHeader(true); 172 else 179 180 } 181 else { 182 if(m_localOperaTable->find(commonName)->isCounterOrderHeader()==false) 183 { 184 QMessageBox::critical(this, "Avis", "Ce nom d'operateur a été déjà inséré."); 185 return; 186 } 187 173 188 m_localOperaTable->find(commonName)->setCounterOrderHeader(true); 174 189 } 190 191 ord.setOrderPhase(1); 175 192 cpt++; 176 193 -
trunk/yao/src/interface/src/OrderWindow.cpp
r471 r472 20 20 21 21 /***************************************** Implementation of the Construtor OrderWindow() *************************************************/ 22 OrderWindow::OrderWindow(Table <Trajectory> *aTrajectoryTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Table <Modul> *aModulTable, Table <Order> *anOrderTable, QWidget *parent) : stateOfSpaceintrajEndCheckBox(false), QWidget(parent) {22 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) { 23 23 24 24 setupUi(this); … … 29 29 m_localModulTable = aModulTable; 30 30 m_localOrderTable = anOrderTable; 31 31 32 /* 32 33 setFixedWidth(baseSize().width() + 765); … … 51 52 //m_modinspaceRadioButton = new QRadioButton("modinspace"); 52 53 //m_spaceintrajRadioButton = new QRadioButton("spaceintraj"); 53 ModinspaceWindow *misw = new ModinspaceWindow(m_localModulTable, m_localSpaceTable, m_localOperaTable, m_localOrderTable );54 SpaceintrajWindow *sitw = new SpaceintrajWindow(m_localTrajectoryTable, m_localSpaceTable, m_localOperaTable );54 ModinspaceWindow *misw = new ModinspaceWindow(m_localModulTable, m_localSpaceTable, m_localOperaTable, m_localOrderTable, &m_localOrder); 55 SpaceintrajWindow *sitw = new SpaceintrajWindow(m_localTrajectoryTable, m_localSpaceTable, m_localOperaTable, &m_localOrder); 55 56 //sitw->show(); 56 57 -
trunk/yao/src/interface/src/SpaceintrajWindow.cpp
r460 r472 1 1 //! \file SpaceintrajWindow.cpp 2 2 //! \brief Implementation of the instructions file's window for visual_YAO. 3 //! \version 2010/10/2 2(yyyy/mm/dd)3 //! \version 2010/10/29 (yyyy/mm/dd) 4 4 //! \author MAYAKI Abdouramane. 5 5 … … 22 22 23 23 /*********************************************************************************************************************************/ 24 SpaceintrajWindow::SpaceintrajWindow(Table <Trajectory> *aTrajectoryTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, QWidget *parent) : QWidget(parent) {24 SpaceintrajWindow::SpaceintrajWindow(Table <Trajectory> *aTrajectoryTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Order *anOrder, QWidget *parent) : QWidget(parent) { 25 25 26 26 setupUi(this); … … 31 31 m_spaceTable = aSpaceTable; 32 32 m_operatorTable = anOperatorTable; 33 33 m_localOrder = anOrder; 34 34 35 35 for (Table<Trajectory>::reverse_iterator it = m_trajectoryTable->rbegin(); it != m_trajectoryTable->rend(); it++) { -
trunk/yao/src/interface/src/include/ModinspaceWindow.hpp
r471 r472 24 24 25 25 public : 26 ModinspaceWindow(yao::Table <yao::Modul> *aModulTable, yao::Table <yao::Space> *aSpaceTable, yao::Table <yao::Operator> *anOperatorTable, yao::Table <yao::Order> *anOrderTable, QWidget *parent=0);26 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); 27 27 28 28 private slots: … … 47 47 yao::Table <yao::Operator> *m_localOperaTable; 48 48 yao::Table <yao::Order> *m_localOrderTable; 49 yao::Order *m_localOrder; 49 50 50 51 QStandardItemModel *m_axesModel; -
trunk/yao/src/interface/src/include/OrderWindow.hpp
r471 r472 59 59 yao::Table <yao::Modul> *m_localModulTable; 60 60 yao::Table <yao::Order> *m_localOrderTable; 61 yao::Order m_localOrder; 61 62 }; 62 63 #endif // ORDERWINDOW_HPP -
trunk/yao/src/interface/src/include/SpaceintrajWindow.hpp
r459 r472 16 16 #include "../../../YAOObjects/Operator.hpp" 17 17 #include "../../../YAOObjects/Trajectory.hpp" 18 #include "../../../YAOObjects/Order.hpp" 18 19 19 20 … … 24 25 25 26 public : 26 SpaceintrajWindow(yao::Table <yao::Trajectory> *aTrajectoryTable, yao::Table <yao::Space> *aSpaceTable, yao::Table <yao::Operator> *anOperatorTable, QWidget *parent=0);27 SpaceintrajWindow(yao::Table <yao::Trajectory> *aTrajectoryTable, yao::Table <yao::Space> *aSpaceTable, yao::Table <yao::Operator> *anOperatorTable, yao::Order *anOrder, QWidget *parent=0); 27 28 28 29 private slots: … … 45 46 QStandardItemModel *m_spaceOrOperanameModel; 46 47 QStandardItemModel *m_outlineModel2; 48 yao::Order *m_localOrder; 47 49 }; 48 50 #endif // SPACEINTRAJWINDOW_HPP
Note: See TracChangeset
for help on using the changeset viewer.