- Timestamp:
- 10/28/10 23:56:02 (14 years ago)
- Location:
- trunk/yao/src/interface/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yao/src/interface/src/MainWindow.cpp
r470 r471 457 457 458 458 if (m_orderWindow == NULL) { //to test if the object is already created. 459 m_orderWindow = new OrderWindow(&theTrajectoryTable, &theSpaceTable, &theOperaTable, &theModulTable ); //mwc.getOrder();459 m_orderWindow = new OrderWindow(&theTrajectoryTable, &theSpaceTable, &theOperaTable, &theModulTable, &theOrderTable); //mwc.getOrder(); 460 460 espace.addWindow(m_orderWindow)->move(2, 0); 461 461 m_orderWindow->show(); -
trunk/yao/src/interface/src/ModinspaceWindow.cpp
r469 r471 22 22 23 23 /*********************************************************************************************************************************/ 24 ModinspaceWindow::ModinspaceWindow(Table <Modul> *aModulTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, 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, QWidget *parent) : QWidget(parent), m_theLocalAxesTable(NULL), m_theLocalModulTable(NULL) { 25 25 26 26 setupUi(this); 27 27 28 m_modulTable = aModulTable; 29 m_spaceTable = aSpaceTable; 30 m_operatorTable = anOperatorTable; 28 m_localModulTable = aModulTable; 29 m_localSpaceTable = aSpaceTable; 30 m_localOperaTable = anOperatorTable; 31 m_localOrderTable = anOrderTable; 31 32 32 33 m_rightAxesButton->setIcon(QIcon("Images/icons/rightarrow2.png")); … … 45 46 46 47 //For adding operaname in the combobox 47 if (!m_ operatorTable->empty())48 for (Table<Operator>::reverse_iterator it = m_ operatorTable->rbegin(); it != m_operatorTable->rend(); it++) {48 if (!m_localOperaTable->empty()) 49 for (Table<Operator>::reverse_iterator it = m_localOperaTable->rbegin(); it != m_localOperaTable->rend(); it++) { 49 50 50 51 m_spaceOrOperaNameComboBox->insertItem(1, QString(it->getName().c_str())); 51 52 } 52 53 //For adding space name in the combobox 53 if (!m_ spaceTable->empty())54 for (Table<Space>::reverse_iterator it = m_ spaceTable->rbegin(); it != m_spaceTable->rend(); it++) {54 if (!m_localSpaceTable->empty()) 55 for (Table<Space>::reverse_iterator it = m_localSpaceTable->rbegin(); it != m_localSpaceTable->rend(); it++) { 55 56 56 57 m_spaceOrOperaNameComboBox->insertItem(1, QString(it->getName().c_str())); 57 58 } 58 59 //For adding modul names in the combobox 59 if (!m_ modulTable->empty())60 for (Table<Modul>::reverse_iterator it = m_ modulTable->rbegin(); it != m_modulTable->rend(); it++) {60 if (!m_localModulTable->empty()) 61 for (Table<Modul>::reverse_iterator it = m_localModulTable->rbegin(); it != m_localModulTable->rend(); it++) { 61 62 62 63 m_modulNameComboBox->insertItem(1, QString(it->getName().c_str())); … … 141 142 142 143 QString theAxe = m_axesComboBox->currentText(); // 144 string commonName; 143 145 int row0 = m_outlineModel->rowCount(); 144 146 int row1 = m_outlineModel->rowCount() + 1; … … 158 160 159 161 if (!cpt) { 160 162 163 //Order ord(&m_localModulTable) 164 161 165 m_outlineModel->setItem(row0, 0, new QStandardItem("order")); 162 166 m_outlineModel->setItem(row0, 1, new QStandardItem("modinpace")); 163 167 m_outlineModel->setItem(row0, 2, new QStandardItem(spaceOrOpera)); 164 168 m_outlineModel->setItem(row1, 1, new QStandardItem("order")); 169 170 if(m_localSpaceTable->find(commonName)) 171 m_localSpaceTable->find(commonName)->setCounterOrderHeader(true); 172 else 173 m_localOperaTable->find(commonName)->setCounterOrderHeader(true); 174 165 175 cpt++; 166 176 -
trunk/yao/src/interface/src/OrderWindow.cpp
r469 r471 20 20 21 21 /***************************************** Implementation of the Construtor OrderWindow() *************************************************/ 22 OrderWindow::OrderWindow(Table <Trajectory> *aTrajectoryTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Table <Modul> *aModulTable, 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) { 23 23 24 24 setupUi(this); 25 25 26 m_trajectoryTable = aTrajectoryTable; 27 m_spaceTable = aSpaceTable; 28 m_operatorTable = anOperatorTable; 29 m_modulTable = aModulTable; 26 m_localTrajectoryTable = aTrajectoryTable; 27 m_localSpaceTable = aSpaceTable; 28 m_localOperaTable = anOperatorTable; 29 m_localModulTable = aModulTable; 30 m_localOrderTable = anOrderTable; 30 31 /* 31 32 setFixedWidth(baseSize().width() + 765); 32 33 m_comboTrajName->insertItem(0, ""); 33 34 34 for (Table<Trajectory>::iterator it = m_ trajectoryTable->begin(); it != m_trajectoryTable->end(); it++) {35 for (Table<Trajectory>::iterator it = m_localTrajectoryTable->begin(); it != m_localTrajectoryTable->end(); it++) { 35 36 m_comboTrajName->insertItem(1, QString(it->getName().c_str())); 36 37 } 37 38 38 for (Table<Space>::iterator it = m_ spaceTable->begin(); it != m_spaceTable->end(); it++) {39 for (Table<Space>::iterator it = m_localSpaceTable->begin(); it != m_localSpaceTable->end(); it++) { 39 40 40 41 m_comboSpaceOrOperaName->insertItem(1, QString(it->getName().c_str())); … … 50 51 //m_modinspaceRadioButton = new QRadioButton("modinspace"); 51 52 //m_spaceintrajRadioButton = new QRadioButton("spaceintraj"); 52 ModinspaceWindow *misw = new ModinspaceWindow(m_ modulTable, m_spaceTable, m_operatorTable);53 SpaceintrajWindow *sitw = new SpaceintrajWindow(m_ trajectoryTable, m_spaceTable, m_operatorTable);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 55 //sitw->show(); 55 56 -
trunk/yao/src/interface/src/include/MainWindow.hpp
r470 r471 267 267 yao::Table <yao::Modul> theModulTable; 268 268 yao::Table <yao::Connection> theConnectionTable; 269 //yao::Table <yao::Order> theOrderTable;269 yao::Table <yao::Order> theOrderTable; 270 270 yao::Table <yao::Function> theFunctionTable; 271 271 -
trunk/yao/src/interface/src/include/ModinspaceWindow.hpp
r469 r471 16 16 #include "../../../YAOObjects/Operator.hpp" 17 17 #include "../../../YAOObjects/Modul.hpp" 18 #include "../../../YAOObjects/Order.hpp" 18 19 19 20 … … 23 24 24 25 public : 25 ModinspaceWindow(yao::Table <yao::Modul> *aModulTable, yao::Table <yao::Space> *aSpaceTable, yao::Table <yao::Operator> *anOperatorTable, 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, QWidget *parent=0); 26 27 27 28 private slots: … … 42 43 43 44 private : 44 yao::Table <yao::Modul> *m_modulTable; 45 yao::Table <yao::Space> *m_spaceTable; 46 yao::Table <yao::Operator> *m_operatorTable; 45 yao::Table <yao::Modul> *m_localModulTable; 46 yao::Table <yao::Space> *m_localSpaceTable; 47 yao::Table <yao::Operator> *m_localOperaTable; 48 yao::Table <yao::Order> *m_localOrderTable; 47 49 48 50 QStandardItemModel *m_axesModel; -
trunk/yao/src/interface/src/include/OrderWindow.hpp
r459 r471 30 30 31 31 public : 32 OrderWindow(yao::Table <yao::Trajectory> *aTrajectoryTable, yao::Table <yao::Space> *aSpaceTable, yao::Table <yao::Operator> *anOperatorTable, yao::Table <yao::Modul> *aModulTable, QWidget *parent=0);32 OrderWindow(yao::Table <yao::Trajectory> *aTrajectoryTable, yao::Table <yao::Space> *aSpaceTable, yao::Table <yao::Operator> *anOperatorTable, yao::Table <yao::Modul> *aModulTable, yao::Table <yao::Order> *anOrderTable, QWidget *parent=0); 33 33 34 34 private slots: … … 54 54 //QComboBox *m_choiceComboBox; 55 55 bool stateOfSpaceintrajEndCheckBox; 56 yao::Table <yao::Trajectory> *m_ trajectoryTable;57 yao::Table <yao::Space> *m_ spaceTable;58 yao::Table <yao::Operator> *m_ operatorTable;59 yao::Table <yao::Modul> *m_ modulTable;60 56 yao::Table <yao::Trajectory> *m_localTrajectoryTable; 57 yao::Table <yao::Space> *m_localSpaceTable; 58 yao::Table <yao::Operator> *m_localOperaTable; 59 yao::Table <yao::Modul> *m_localModulTable; 60 yao::Table <yao::Order> *m_localOrderTable; 61 61 }; 62 62 #endif // ORDERWINDOW_HPP
Note: See TracChangeset
for help on using the changeset viewer.