Changeset 400
- Timestamp:
- 08/05/10 10:59:05 (14 years ago)
- Location:
- trunk/yao/src/interface/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yao/src/interface/src/MainWindow.cpp
r399 r400 264 264 265 265 m_constantButton = new QPushButton(tr("Defval"), this); 266 m_constantButton->setToolTip("Bouton désactivé. Vous devez d'abord creer un nouveau projet ou en ouvrir un.");266 //m_constantButton->setToolTip("Bouton désactivé. Vous devez d'abord creer un nouveau projet ou en ouvrir un."); 267 267 268 268 connect(m_constantButton, SIGNAL(clicked()), this, SLOT(createDefvalWindow())); … … 433 433 434 434 if (m_orderWindow == NULL) { //to test if the object is already created. 435 m_orderWindow = new OrderWindow ; //mwc.getOrder();435 m_orderWindow = new OrderWindow(&theTrajectoryTable, &theSpaceTable, &theOperaTable, &theModulTable); //mwc.getOrder(); 436 436 espace.addWindow(m_orderWindow)->move(2, 0); 437 437 m_orderWindow->show(); … … 806 806 if (!theModulTable.empty()){ 807 807 description << "#MODUL name parent ( modulAttribute )* --------------------------------------------------------" << endl; 808 for (Table<Modul>::iterator it = theModulTable.begin(); it != theModulTable.end(); it++) 809 description << "modul " << it->getName() << " " << it->getSpaceOrOperator() << " " << "input "<< it->getInput() << " " << "output "<< it->getOutput() << " " << "target " << it->getTarget()<< endl; 808 for (Table<Modul>::iterator it = theModulTable.begin(); it != theModulTable.end(); it++) { 809 string parentType = it->isSpaceOrOperator()? "space " : "operator "; 810 description << "modul " << it->getName() << " " << parentType << it->getSpaceOrOperator() << " " << "input "<< it->getInput() << " " << "output "<< it->getOutput() << " " << "target " << it->getTarget()<< endl; 811 } 810 812 description << endl; 811 813 } -
trunk/yao/src/interface/src/MainWindowController.cpp
r374 r400 210 210 OrderWindow *MainWindowController::getOrder() { 211 211 212 return m_order = new OrderWindow;212 //return m_order = new OrderWindow; 213 213 } 214 214 /**************************************************************** getInsertFCT() ********************************************************/ -
trunk/yao/src/interface/src/OrderWindow.cpp
r357 r400 14 14 #include "include/OrderWindow.hpp" 15 15 16 using namespace std; 17 using namespace yao; 16 18 //! \class OrderWindow(QWidget *parent) : QWidget(parent) 17 19 //! \brief Implementation of the Order window for visual_YAO. 18 20 19 /***************************************** ******************************/20 OrderWindow::OrderWindow( QWidget *parent) : QWidget(parent) {21 /***************************************** Implementation of the Construtor OrderWindow() *************************************************/ 22 OrderWindow::OrderWindow(Table <Trajectory> *aTrajectoryTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Table <Modul> *aModulTable, QWidget *parent) : QWidget(parent) { 21 23 22 24 setupUi(this); 25 26 m_trajectoryTable = aTrajectoryTable; 27 m_spaceTable = aSpaceTable; 28 m_operatorTable = anOperatorTable; 29 m_modulTable = aModulTable; 23 30 24 31 setFixedWidth(baseSize().width() + 765); … … 27 34 } 28 35 29 /**************************************************** *******************/36 /**************************************************** Implementation of cloveEvent() method. ***********************************************/ 30 37 void OrderWindow::closeEvent(QCloseEvent *event) { 31 38 -
trunk/yao/src/interface/src/include/OrderWindow.hpp
r386 r400 13 13 #include "../../ui_orderwindow.h" 14 14 #include "../../../YAOObjects/Table.hpp" 15 #include "../../../YAOObjects/Operator.hpp" 16 #include "../../../YAOObjects/Trajectory.hpp" 15 17 #include "../../../YAOObjects/Order.hpp" 16 18 #include <QStandardItemModel> … … 21 23 22 24 public : 23 OrderWindow( QWidget *parent=0);25 OrderWindow(yao::Table <yao::Trajectory> *aTrajectoryTable, yao::Table <yao::Space> *aSpaceTable, yao::Table <yao::Operator> *anOperatorTable, yao::Table <yao::Modul> *aModulTable, QWidget *parent=0); 24 26 25 27 private slots: … … 32 34 33 35 private : 34 QStandardItemModel *m_orderModel; 36 QStandardItemModel *m_orderModel; 37 yao::Table <yao::Trajectory> *m_trajectoryTable; 38 yao::Table <yao::Space> *m_spaceTable; 39 yao::Table <yao::Operator> *m_operatorTable; 40 yao::Table <yao::Modul> *m_modulTable; 41 35 42 }; 36 43 #endif // ORDERWINDOW_HPP -
trunk/yao/src/interface/src/ui_/orderwindow.ui
r362 r400 260 260 </item> 261 261 <item> 262 <widget class="QComboBox" name="comboBox_2"/> 262 <widget class="QComboBox" name="comboBox_2"> 263 <item> 264 <property name="text"> 265 <string/> 266 </property> 267 </item> 268 <item> 269 <property name="text"> 270 <string>YA1</string> 271 </property> 272 </item> 273 <item> 274 <property name="text"> 275 <string>YA2</string> 276 </property> 277 </item> 278 <item> 279 <property name="text"> 280 <string>YA3</string> 281 </property> 282 </item> 283 <item> 284 <property name="text"> 285 <string>YB1</string> 286 </property> 287 </item> 288 <item> 289 <property name="text"> 290 <string>YB2</string> 291 </property> 292 </item> 293 <item> 294 <property name="text"> 295 <string>YB3</string> 296 </property> 297 </item> 298 </widget> 263 299 </item> 264 300 <item>
Note: See TracChangeset
for help on using the changeset viewer.