Changeset 367 for trunk/yao/src/interface/src/MainWindow.cpp
- Timestamp:
- 06/29/10 23:22:38 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yao/src/interface/src/MainWindow.cpp
r366 r367 309 309 connect(m_constantWindow, SIGNAL(rowIsAdded()), this, SLOT(hatUpdate())); 310 310 connect(m_constantWindow, SIGNAL(rowIsDeleted(QString )), this, SLOT(hatUpdate(QString ))); 311 connect(m_constantWindow, SIGNAL(rowIsAdded()), this, SLOT(contextUpdate())); 311 312 connect(m_constantWindow, SIGNAL(windowIsClosed(int )), this, SLOT(initializeWindow(int )));// The signal is in the ConstantWindow.hpp file. 312 313 … … 393 394 if (m_modulWindow == NULL) { //to test if the object is already created. 394 395 m_modulWindow = new ModulWindow(&theModulTable, &theSpaceTable, &theOperaTable, &theConstantTable, &the_mwc); //mwc.getModul(); 395 espace.addWindow(m_modulWindow);396 396 espace.addWindow(m_modulWindow)->move(30, 15); 397 397 m_modulWindow->show(); … … 499 499 500 500 //m_hatnameWindow->repaint();//update(); 501 theConstantTable;501 //theConstantTable; 502 502 if (m_hatnameWindow != NULL) //Teste si l'objet n'est pas déjà crée. S'il n'est pas 503 503 { 504 //delete m_hatnameWindow;504 delete m_hatnameWindow; 505 505 m_hatnameWindow = new HatNameWindow(&theHeaderList, &theConstantTable); //Crée un autre objet. 506 506 espace.addWindow(m_hatnameWindow)->move(350, 0); 507 507 m_hatnameWindow->show(); 508 508 espace.setActiveWindow(m_constantWindow); 509 m_hatnameWindow->update(); 509 //m_hatnameWindow->update(); 510 511 connect(m_hatnameWindow, SIGNAL(hatWindowIsClosed(int)), this, SLOT(initializeWindow(int)));// The signal is in the HatNameWindow.hpp file. 510 512 } 513 511 514 else 512 515 return; … … 519 522 if (m_hatnameWindow != NULL) //Teste si l'objet n'est pas déjà crée. 520 523 { 521 //delete m_hatnameWindow;524 delete m_hatnameWindow; 522 525 m_hatnameWindow = new HatNameWindow(&theHeaderList, &theConstantTable); //Crée un autre objet. 523 526 espace.addWindow(m_hatnameWindow)->move(350, 0); 524 527 m_hatnameWindow->show(); 525 528 espace.setActiveWindow(m_constantWindow); 529 530 connect(m_hatnameWindow, SIGNAL(hatWindowIsClosed(int)), this, SLOT(initializeWindow(int)));// The signal is in the HatNameWindow.hpp file. 531 } 532 else 533 return; 534 } 535 /******************************************* Implementation of the method contextUpdate(QString choix) ************************************************/ 536 void MainWindow::contextUpdate() { 537 538 if (m_contextWindow != NULL) //Teste si l'objet n'est pas déjà crée. 539 { 540 delete m_contextWindow ; 541 m_contextWindow = new ContextWindow(&theContext, &theConstantTable, &the_mwc); //mwc.getContext(); 542 espace.addWindow(m_contextWindow)->move(350, 0); 543 m_contextWindow->show(); 544 espace.setActiveWindow(m_constantWindow); 545 //m_contextWindow->update(); 546 547 connect(m_contextWindow, SIGNAL(contextWindowIsClosed(int)), this, SLOT(initializeWindow(int))); 548 526 549 } 527 550 else
Note: See TracChangeset
for help on using the changeset viewer.