- Timestamp:
- 09/27/10 02:15:14 (14 years ago)
- Location:
- trunk/yao/src/interface
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yao/src/interface/Makefile
r428 r429 1 1 ############################################################################# 2 2 # Makefile for building: interface 3 # Generated by qmake (2.01a) (Qt 4.6.2) on: jeu. sept. 2 12:15:5920103 # Generated by qmake (2.01a) (Qt 4.6.2) on: sam. sept. 25 02:40:41 2010 4 4 # Project: interface.pro 5 5 # Template: app … … 12 12 CXX = g++ 13 13 DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED 14 CFLAGS = -pipe -O2 - g -pipe #-Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -fomit-frame-pointer -march=i586 -mtune=generic -fasynchronous-unwind-tables -Wall -W -D_REENTRANT $(DEFINES)15 CXXFLAGS = -pipe -O2 - g -pipe # -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -fomit-frame-pointer -march=i586 -mtune=generic -fasynchronous-unwind-tables -Wall -W -D_REENTRANT $(DEFINES)16 INCPATH = -I/usr/ lib/qt4/mkspecs/linux-g++ -I. -I/usr/lib/qt4/include/QtCore -I/usr/lib/qt4/include/QtGui -I/usr/lib/qt4/include-I. -Isrc/include -I../../share/antlr-2.7.7/lib/cpp/ -I../../share/boost_1_39_0 -I.14 CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) 15 CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) 16 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../../share/antlr-2.7.7/lib/cpp/ -I../../share/boost_1_39_0 -I. 17 17 LINK = g++ 18 LFLAGS = -Wl,- -as-needed -Wl,--no-undefined -Wl,-z,relro -Wl,-O1 -Wl,--build-id -Wl,-O119 LIBS = $(SUBLIBS) -L/usr/lib -lQtGui - L/usr/lib -lQtCore -lpthread18 LFLAGS = -Wl,-O1 19 LIBS = $(SUBLIBS) -L/usr/lib -lQtGui -lQtCore -lpthread 20 20 AR = ar cqs 21 21 RANLIB = … … 27 27 COPY_FILE = $(COPY) 28 28 COPY_DIR = $(COPY) -r 29 STRIP = 29 STRIP = strip 30 30 INSTALL_FILE = install -m 644 -p 31 31 INSTALL_DIR = $(COPY_DIR) … … 111 111 moc_SpaceWindow.o \ 112 112 moc_TrajectoryWindow.o 113 DIST = /usr/ lib/qt4/mkspecs/common/g++.conf \114 /usr/ lib/qt4/mkspecs/common/unix.conf \115 /usr/ lib/qt4/mkspecs/common/linux.conf \116 /usr/ lib/qt4/mkspecs/qconfig.pri \117 /usr/ lib/qt4/mkspecs/features/qt_functions.prf \118 /usr/ lib/qt4/mkspecs/features/qt_config.prf \119 /usr/ lib/qt4/mkspecs/features/exclusive_builds.prf \120 /usr/ lib/qt4/mkspecs/features/default_pre.prf \121 /usr/ lib/qt4/mkspecs/features/release.prf \122 /usr/ lib/qt4/mkspecs/features/default_post.prf \123 /usr/ lib/qt4/mkspecs/features/warn_on.prf \124 /usr/ lib/qt4/mkspecs/features/qt.prf \125 /usr/ lib/qt4/mkspecs/features/unix/thread.prf \126 /usr/ lib/qt4/mkspecs/features/moc.prf \127 /usr/ lib/qt4/mkspecs/features/resources.prf \128 /usr/ lib/qt4/mkspecs/features/uic.prf \129 /usr/ lib/qt4/mkspecs/features/yacc.prf \130 /usr/ lib/qt4/mkspecs/features/lex.prf \131 /usr/ lib/qt4/mkspecs/features/include_source_dir.prf \113 DIST = /usr/share/qt4/mkspecs/common/g++.conf \ 114 /usr/share/qt4/mkspecs/common/unix.conf \ 115 /usr/share/qt4/mkspecs/common/linux.conf \ 116 /usr/share/qt4/mkspecs/qconfig.pri \ 117 /usr/share/qt4/mkspecs/features/qt_functions.prf \ 118 /usr/share/qt4/mkspecs/features/qt_config.prf \ 119 /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ 120 /usr/share/qt4/mkspecs/features/default_pre.prf \ 121 /usr/share/qt4/mkspecs/features/release.prf \ 122 /usr/share/qt4/mkspecs/features/default_post.prf \ 123 /usr/share/qt4/mkspecs/features/warn_on.prf \ 124 /usr/share/qt4/mkspecs/features/qt.prf \ 125 /usr/share/qt4/mkspecs/features/unix/thread.prf \ 126 /usr/share/qt4/mkspecs/features/moc.prf \ 127 /usr/share/qt4/mkspecs/features/resources.prf \ 128 /usr/share/qt4/mkspecs/features/uic.prf \ 129 /usr/share/qt4/mkspecs/features/yacc.prf \ 130 /usr/share/qt4/mkspecs/features/lex.prf \ 131 /usr/share/qt4/mkspecs/features/include_source_dir.prf \ 132 132 interface.pro 133 133 QMAKE_TARGET = interface … … 162 162 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) 163 163 164 Makefile: interface.pro /usr/ lib/qt4/mkspecs/linux-g++/qmake.conf /usr/lib/qt4/mkspecs/common/g++.conf \165 /usr/ lib/qt4/mkspecs/common/unix.conf \166 /usr/ lib/qt4/mkspecs/common/linux.conf \167 /usr/ lib/qt4/mkspecs/qconfig.pri \168 /usr/ lib/qt4/mkspecs/features/qt_functions.prf \169 /usr/ lib/qt4/mkspecs/features/qt_config.prf \170 /usr/ lib/qt4/mkspecs/features/exclusive_builds.prf \171 /usr/ lib/qt4/mkspecs/features/default_pre.prf \172 /usr/ lib/qt4/mkspecs/features/release.prf \173 /usr/ lib/qt4/mkspecs/features/default_post.prf \174 /usr/ lib/qt4/mkspecs/features/warn_on.prf \175 /usr/ lib/qt4/mkspecs/features/qt.prf \176 /usr/ lib/qt4/mkspecs/features/unix/thread.prf \177 /usr/ lib/qt4/mkspecs/features/moc.prf \178 /usr/ lib/qt4/mkspecs/features/resources.prf \179 /usr/ lib/qt4/mkspecs/features/uic.prf \180 /usr/ lib/qt4/mkspecs/features/yacc.prf \181 /usr/ lib/qt4/mkspecs/features/lex.prf \182 /usr/ lib/qt4/mkspecs/features/include_source_dir.prf \164 Makefile: interface.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \ 165 /usr/share/qt4/mkspecs/common/unix.conf \ 166 /usr/share/qt4/mkspecs/common/linux.conf \ 167 /usr/share/qt4/mkspecs/qconfig.pri \ 168 /usr/share/qt4/mkspecs/features/qt_functions.prf \ 169 /usr/share/qt4/mkspecs/features/qt_config.prf \ 170 /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ 171 /usr/share/qt4/mkspecs/features/default_pre.prf \ 172 /usr/share/qt4/mkspecs/features/release.prf \ 173 /usr/share/qt4/mkspecs/features/default_post.prf \ 174 /usr/share/qt4/mkspecs/features/warn_on.prf \ 175 /usr/share/qt4/mkspecs/features/qt.prf \ 176 /usr/share/qt4/mkspecs/features/unix/thread.prf \ 177 /usr/share/qt4/mkspecs/features/moc.prf \ 178 /usr/share/qt4/mkspecs/features/resources.prf \ 179 /usr/share/qt4/mkspecs/features/uic.prf \ 180 /usr/share/qt4/mkspecs/features/yacc.prf \ 181 /usr/share/qt4/mkspecs/features/lex.prf \ 182 /usr/share/qt4/mkspecs/features/include_source_dir.prf \ 183 183 /usr/lib/libQtGui.prl \ 184 184 /usr/lib/libQtCore.prl 185 185 $(QMAKE) -unix -o Makefile interface.pro 186 /usr/ lib/qt4/mkspecs/common/g++.conf:187 /usr/ lib/qt4/mkspecs/common/unix.conf:188 /usr/ lib/qt4/mkspecs/common/linux.conf:189 /usr/ lib/qt4/mkspecs/qconfig.pri:190 /usr/ lib/qt4/mkspecs/features/qt_functions.prf:191 /usr/ lib/qt4/mkspecs/features/qt_config.prf:192 /usr/ lib/qt4/mkspecs/features/exclusive_builds.prf:193 /usr/ lib/qt4/mkspecs/features/default_pre.prf:194 /usr/ lib/qt4/mkspecs/features/release.prf:195 /usr/ lib/qt4/mkspecs/features/default_post.prf:196 /usr/ lib/qt4/mkspecs/features/warn_on.prf:197 /usr/ lib/qt4/mkspecs/features/qt.prf:198 /usr/ lib/qt4/mkspecs/features/unix/thread.prf:199 /usr/ lib/qt4/mkspecs/features/moc.prf:200 /usr/ lib/qt4/mkspecs/features/resources.prf:201 /usr/ lib/qt4/mkspecs/features/uic.prf:202 /usr/ lib/qt4/mkspecs/features/yacc.prf:203 /usr/ lib/qt4/mkspecs/features/lex.prf:204 /usr/ lib/qt4/mkspecs/features/include_source_dir.prf:186 /usr/share/qt4/mkspecs/common/g++.conf: 187 /usr/share/qt4/mkspecs/common/unix.conf: 188 /usr/share/qt4/mkspecs/common/linux.conf: 189 /usr/share/qt4/mkspecs/qconfig.pri: 190 /usr/share/qt4/mkspecs/features/qt_functions.prf: 191 /usr/share/qt4/mkspecs/features/qt_config.prf: 192 /usr/share/qt4/mkspecs/features/exclusive_builds.prf: 193 /usr/share/qt4/mkspecs/features/default_pre.prf: 194 /usr/share/qt4/mkspecs/features/release.prf: 195 /usr/share/qt4/mkspecs/features/default_post.prf: 196 /usr/share/qt4/mkspecs/features/warn_on.prf: 197 /usr/share/qt4/mkspecs/features/qt.prf: 198 /usr/share/qt4/mkspecs/features/unix/thread.prf: 199 /usr/share/qt4/mkspecs/features/moc.prf: 200 /usr/share/qt4/mkspecs/features/resources.prf: 201 /usr/share/qt4/mkspecs/features/uic.prf: 202 /usr/share/qt4/mkspecs/features/yacc.prf: 203 /usr/share/qt4/mkspecs/features/lex.prf: 204 /usr/share/qt4/mkspecs/features/include_source_dir.prf: 205 205 /usr/lib/libQtGui.prl: 206 206 /usr/lib/libQtCore.prl: … … 248 248 ../YAOObjects/Constant.hpp \ 249 249 src/include/ConnectionWindow.hpp 250 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/include/ConnectionWindow.hpp -o moc_ConnectionWindow.cpp250 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/include/ConnectionWindow.hpp -o moc_ConnectionWindow.cpp 251 251 252 252 moc_ConstantWindow.cpp: src/include/HatNameWindow.hpp \ … … 288 288 ui_constantwindow.h \ 289 289 src/include/ConstantWindow.hpp 290 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/include/ConstantWindow.hpp -o moc_ConstantWindow.cpp290 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/include/ConstantWindow.hpp -o moc_ConstantWindow.cpp 291 291 292 292 moc_ContextWindow.cpp: ui_contextwindow.h \ … … 328 328 ../YAOObjects/Order.hpp \ 329 329 src/include/ContextWindow.hpp 330 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/include/ContextWindow.hpp -o moc_ContextWindow.cpp330 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/include/ContextWindow.hpp -o moc_ContextWindow.cpp 331 331 332 332 moc_FilesViewer.cpp: src/include/FilesViewer.hpp 333 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/include/FilesViewer.hpp -o moc_FilesViewer.cpp333 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/include/FilesViewer.hpp -o moc_FilesViewer.cpp 334 334 335 335 moc_HatNameWindow.cpp: ../help/FilePath.hpp \ … … 340 340 ../YAOObjects/Table.hpp \ 341 341 src/include/HatNameWindow.hpp 342 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/include/HatNameWindow.hpp -o moc_HatNameWindow.cpp342 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/include/HatNameWindow.hpp -o moc_HatNameWindow.cpp 343 343 344 344 moc_InsertFCTWindow.cpp: ui_insertfctwindow.h \ … … 349 349 ../help/Enforcer.hpp \ 350 350 src/include/InsertFCTWindow.hpp 351 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/include/InsertFCTWindow.hpp -o moc_InsertFCTWindow.cpp351 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/include/InsertFCTWindow.hpp -o moc_InsertFCTWindow.cpp 352 352 353 353 moc_MainWindow.cpp: ../YAOObjects/Modul.hpp \ … … 396 396 ui_newprojectwindow.h \ 397 397 src/include/MainWindow.hpp 398 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/include/MainWindow.hpp -o moc_MainWindow.cpp398 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/include/MainWindow.hpp -o moc_MainWindow.cpp 399 399 400 400 moc_ModulWindow.cpp: src/include/MainWindowController.hpp \ … … 436 436 ui_modulwindow.h \ 437 437 src/include/ModulWindow.hpp 438 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/include/ModulWindow.hpp -o moc_ModulWindow.cpp438 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/include/ModulWindow.hpp -o moc_ModulWindow.cpp 439 439 440 440 moc_NetwardWindow.cpp: ../YAOObjects/Constant.hpp \ … … 446 446 ui_netwardwindow.h \ 447 447 src/include/NetwardWindow.hpp 448 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/include/NetwardWindow.hpp -o moc_NetwardWindow.cpp448 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/include/NetwardWindow.hpp -o moc_NetwardWindow.cpp 449 449 450 450 moc_NewProjectWindow.cpp: ui_newprojectwindow.h \ 451 451 src/include/NewProjectWindow.hpp 452 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/include/NewProjectWindow.hpp -o moc_NewProjectWindow.cpp452 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/include/NewProjectWindow.hpp -o moc_NewProjectWindow.cpp 453 453 454 454 moc_OperaWindow.cpp: ui_operawindow.h \ … … 464 464 ../YAOObjects/Identifier.hpp \ 465 465 src/include/OperaWindow.hpp 466 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/include/OperaWindow.hpp -o moc_OperaWindow.cpp466 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/include/OperaWindow.hpp -o moc_OperaWindow.cpp 467 467 468 468 moc_OrderWindow.cpp: ui_orderwindow.h \ … … 482 482 ../YAOObjects/Connection.hpp \ 483 483 src/include/OrderWindow.hpp 484 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/include/OrderWindow.hpp -o moc_OrderWindow.cpp484 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/include/OrderWindow.hpp -o moc_OrderWindow.cpp 485 485 486 486 moc_SpaceWindow.cpp: ui_spacewindow.h \ … … 496 496 ../YAOObjects/Identifier.hpp \ 497 497 src/include/SpaceWindow.hpp 498 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/include/SpaceWindow.hpp -o moc_SpaceWindow.cpp498 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/include/SpaceWindow.hpp -o moc_SpaceWindow.cpp 499 499 500 500 moc_TrajectoryWindow.cpp: ui_trajectorywindow.h \ … … 506 506 ../YAOObjects/Constant.hpp \ 507 507 src/include/TrajectoryWindow.hpp 508 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/include/TrajectoryWindow.hpp -o moc_TrajectoryWindow.cpp508 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/include/TrajectoryWindow.hpp -o moc_TrajectoryWindow.cpp 509 509 510 510 compiler_rcc_make_all: … … 519 519 -$(DEL_FILE) ui_connectionwindow.h ui_constantwindow.h ui_contextwindow.h ui_insertfctwindow.h ui_modulwindow.h ui_netwardwindow.h ui_newprojectwindow.h ui_operawindow.h ui_orderwindow.h ui_spacewindow.h ui_trajectorywindow.h 520 520 ui_connectionwindow.h: src/ui_/connectionwindow.ui 521 /usr/ lib/qt4/bin/uicsrc/ui_/connectionwindow.ui -o ui_connectionwindow.h521 /usr/bin/uic-qt4 src/ui_/connectionwindow.ui -o ui_connectionwindow.h 522 522 523 523 ui_constantwindow.h: src/ui_/constantwindow.ui 524 /usr/ lib/qt4/bin/uicsrc/ui_/constantwindow.ui -o ui_constantwindow.h524 /usr/bin/uic-qt4 src/ui_/constantwindow.ui -o ui_constantwindow.h 525 525 526 526 ui_contextwindow.h: src/ui_/contextwindow.ui 527 /usr/ lib/qt4/bin/uicsrc/ui_/contextwindow.ui -o ui_contextwindow.h527 /usr/bin/uic-qt4 src/ui_/contextwindow.ui -o ui_contextwindow.h 528 528 529 529 ui_insertfctwindow.h: src/ui_/insertfctwindow.ui 530 /usr/ lib/qt4/bin/uicsrc/ui_/insertfctwindow.ui -o ui_insertfctwindow.h530 /usr/bin/uic-qt4 src/ui_/insertfctwindow.ui -o ui_insertfctwindow.h 531 531 532 532 ui_modulwindow.h: src/ui_/modulwindow.ui 533 /usr/ lib/qt4/bin/uicsrc/ui_/modulwindow.ui -o ui_modulwindow.h533 /usr/bin/uic-qt4 src/ui_/modulwindow.ui -o ui_modulwindow.h 534 534 535 535 ui_netwardwindow.h: src/ui_/netwardwindow.ui 536 /usr/ lib/qt4/bin/uicsrc/ui_/netwardwindow.ui -o ui_netwardwindow.h536 /usr/bin/uic-qt4 src/ui_/netwardwindow.ui -o ui_netwardwindow.h 537 537 538 538 ui_newprojectwindow.h: src/ui_/newprojectwindow.ui 539 /usr/ lib/qt4/bin/uicsrc/ui_/newprojectwindow.ui -o ui_newprojectwindow.h539 /usr/bin/uic-qt4 src/ui_/newprojectwindow.ui -o ui_newprojectwindow.h 540 540 541 541 ui_operawindow.h: src/ui_/operawindow.ui 542 /usr/ lib/qt4/bin/uicsrc/ui_/operawindow.ui -o ui_operawindow.h542 /usr/bin/uic-qt4 src/ui_/operawindow.ui -o ui_operawindow.h 543 543 544 544 ui_orderwindow.h: src/ui_/orderwindow.ui 545 /usr/ lib/qt4/bin/uicsrc/ui_/orderwindow.ui -o ui_orderwindow.h545 /usr/bin/uic-qt4 src/ui_/orderwindow.ui -o ui_orderwindow.h 546 546 547 547 ui_spacewindow.h: src/ui_/spacewindow.ui 548 /usr/ lib/qt4/bin/uicsrc/ui_/spacewindow.ui -o ui_spacewindow.h548 /usr/bin/uic-qt4 src/ui_/spacewindow.ui -o ui_spacewindow.h 549 549 550 550 ui_trajectorywindow.h: src/ui_/trajectorywindow.ui 551 /usr/ lib/qt4/bin/uicsrc/ui_/trajectorywindow.ui -o ui_trajectorywindow.h551 /usr/bin/uic-qt4 src/ui_/trajectorywindow.ui -o ui_trajectorywindow.h 552 552 553 553 compiler_yacc_decl_make_all: -
trunk/yao/src/interface/src/ConstantWindow.cpp
r419 r429 92 92 m_defvalModel->setItem(m_defvalModel->rowCount()-1, 1, new QStandardItem(m_ligneValeur->text()));//Apres le 1er ajout, la ligne vaut i+1 93 93 94 emit rowIsAdded(); // signal emis lorsqu'une a été correctement rajoutée dans le tableau.94 emit rowIsAdded(); // signal emis lorsqu'une ligne a été correctement rajoutée dans le tableau. 95 95 // Il sera recupéré dans le mainwidow. 96 96 } … … 144 144 145 145 emit rowIsDeleted(element.toString()); // signal emis lorsqu'une ligne est retirée du tableau. 146 //cout << "voici le mot supprimé:" << element.toString().toStdString() << endl; 146 147 if(isConstantTableEmpty()) m_delButton->setDisabled(true); 147 148 } -
trunk/yao/src/interface/src/ContextWindow.cpp
r428 r429 19 19 //! \brief Implementation of the Context window for visual_YAO. 20 20 /******************************************************************************************************************************************************/ 21 ContextWindow::ContextWindow(Context *aContext, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent), localConstantTable(NULL) , m_contextModel(NULL), O_EXTOBJModele(NULL){21 ContextWindow::ContextWindow(Context *aContext, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent), localConstantTable(NULL) { 22 22 23 23 setupUi(this); -
trunk/yao/src/interface/src/HatNameWindow.cpp
r419 r429 189 189 } 190 190 } 191 192 /*********************************************** Implementation of the method deleteHatRow() ********************************************************/ 193 void HatNameWindow::deleteARow(string aString) { 194 195 unsigned int i; 196 for (i = 0; i < localHeaderList->size(); i++) { 197 string test = aString + ".h"; 198 if (localHeaderList->at(i) == test ) 199 { 200 m_hatnameModel->removeRows(hatView->currentIndex().row(), 1); 201 localHeaderList->erase(localHeaderList->begin() + i); 202 cout << "header: " << localHeaderList->at(i) << " string: " << aString << " range: " << i << endl; 203 //else 204 // cout << "cool2! " << i << endl; 205 } 206 } 207 208 209 } 210 191 211 /*********************************************** Implementation of the method deleteHatRow() ********************************************************/ 192 212 void HatNameWindow::deleteHatRow() { … … 197 217 if (!index.isValid()) 198 218 return; 199 200 QVariant element = m_hatnameModel->data(index, Qt::DisplayRole);//Récupération de la valeur de l'élément courant. 201 int r = index.row();// Récuperation de la ligne de l'élément courant. 202 if (selection->hasSelection()) // Evite certains effets indésirables: suppression de la derniere ligne aprÚs clic sur le vide. 203 { 204 m_hatnameModel->removeRows(hatView->currentIndex().row(), 1);// Le 2Úme parametre indique le nombre de ligne à supprimer 205 localHeaderList->erase(localHeaderList->begin() + r);//On met à jour la structure de données en supprimant aussi l'élement. 206 //m_tableView->resizeRowToContents(c - 1); // columnCountChanged(c , c-1); 207 if(isHeaderListEmpty()) m_delHatButton->setDisabled(true); 208 } 209 210 //cout << "In deleteRow method, my coodinate is " << x() << endl; 219 // if (!aString.empty()) { 220 QVariant element = m_hatnameModel->data(index, Qt::DisplayRole);//Récupération de la valeur de l'élément courant. 221 int r = index.row();// Récuperation de la ligne de l'élément courant. 222 if (selection->hasSelection()) // Evite certains effets indésirables: suppression de la derniere ligne aprÚs clic sur le vide. 223 { 224 m_hatnameModel->removeRows(hatView->currentIndex().row(), 1);// Le 2Úme parametre indique le nombre de ligne à supprimer 225 localHeaderList->erase(localHeaderList->begin() + r);//On met à jour la structure de données en supprimant aussi l'élement. 226 //m_tableView->resizeRowToContents(c - 1); // columnCountChanged(c , c-1); 227 if(isHeaderListEmpty()) m_delHatButton->setDisabled(true); 228 } 229 //} 230 /* else 231 { 232 unsigned int i; 233 for (i = 0; i < localHeaderList->size(); i++) { 234 235 if (localHeaderList->at(i) == aString) 236 cout << "cool! " << i << endl; 237 } 238 239 } 240 //cout << "In deleteRow method, my coodinate is " << x() << endl;*/ 211 241 } 212 242 -
trunk/yao/src/interface/src/MainWindow.cpp
r428 r429 320 320 connect(m_constantWindow, SIGNAL(rowIsAdded()), this, SLOT(hatUpdate())); 321 321 connect(m_constantWindow, SIGNAL(rowIsDeleted(QString )), this, SLOT(hatUpdate(QString ))); 322 connect(m_constantWindow, SIGNAL(rowIsAdded()), this, SLOT(contextUpdate())); 322 //connect(m_constantWindow, SIGNAL(rowIsAdded()), this, SLOT(trajUpdate())); 323 //connect(m_constantWindow, SIGNAL(rowIsAdded()), this, SLOT(contextUpdate())); 323 324 connect(m_constantWindow, SIGNAL(rowIsAdded()), this, SLOT(mainWindowIsModified())); 324 325 connect(m_constantWindow, SIGNAL(windowIsClosed(int )), this, SLOT(initializeWindow(int )));// The signal is in the ConstantWindow.hpp file. … … 500 501 void MainWindow::createNewProjectWindow() { // Affiche la fenetre nouveau projet lorsqu'elle est appelée. 501 502 503 clearAllStructures(); 504 espace.closeAllWindows(); 502 505 m_newProjectWindow = new NewProjectWindow(espace); 503 506 m_newProjectName = m_newProjectWindow->getProjectName(); … … 511 514 } 512 515 516 /*************************************** Implementation of the method clearAllStrutures() *********************************************************/ 517 void MainWindow::clearAllStructures() { 518 519 520 theConstantTable.clear(); 521 theHeaderList.clear(); 522 theTrajectoryTable.clear(); 523 theSpaceTable.clear(); 524 theOperaTable.clear(); 525 theNeuronTable.clear(); 526 theModulTable.clear(); 527 theConnectionTable.clear(); 528 theFunctionTable.clear(); 529 } 513 530 /**************************************** Implementation of the method mainWindowIsModified() (SLOT) ************************************************/ 514 531 void MainWindow::mainWindowIsModified() { … … 691 708 if (m_hatnameWindow != NULL) //Teste si l'objet n'est pas déjà crée. 692 709 { 693 delete m_hatnameWindow; 694 m_hatnameWindow = new HatNameWindow(&theHeaderList, &theConstantTable); //Crée un autre objet. 695 espace.addWindow(m_hatnameWindow)->move(350, 0); 696 m_hatnameWindow->show(); 697 espace.setActiveWindow(m_constantWindow); 698 699 connect(m_hatnameWindow, SIGNAL(hatWindowIsClosed(int)), this, SLOT(initializeWindow(int)));// The signal is in the HatNameWindow.hpp file. 710 m_hatnameWindow->deleteARow(choix.toStdString()); 711 //delete m_hatnameWindow; 712 //m_hatnameWindow = new HatNameWindow(&theHeaderList, &theConstantTable); //Crée un autre objet. 713 //espace.addWindow(m_hatnameWindow)->move(350, 0); 714 //m_hatnameWindow->show(); 715 //espace.setActiveWindow(m_constantWindow); 716 717 //connect(m_hatnameWindow, SIGNAL(hatWindowIsClosed(int)), this, SLOT(initializeWindow(int)));// The signal is in the HatNameWindow.hpp file. 700 718 } 701 719 else … … 704 722 705 723 /******************************************* Implementation of the method contextUpdate(QString choix) ************************************************/ 706 void MainWindow::contextUpdate() {724 /*void MainWindow::contextUpdate() { 707 725 708 726 if (m_contextWindow != NULL) //Teste si l'objet n'est pas déjà crée. … … 720 738 else 721 739 return; 722 } 723 740 }*/ 741 742 /******************************************* Implementation of the method trajUpdate() **************************************************/ 743 /*void MainWindow::trajUpdate() { 744 745 if (m_trajectoryWindow != NULL) //Teste si l'objet n'est pas déjà crée. 746 { 747 delete m_hatnameWindow; 748 m_hatnameWindow = new HatNameWindow(&theHeaderList, &theConstantTable); //Crée un autre objet. 749 espace.addWindow(m_hatnameWindow)->move(350, 0); 750 m_hatnameWindow->show(); 751 espace.setActiveWindow(m_constantWindow); 752 753 connect(m_hatnameWindow, SIGNAL(hatWindowIsClosed(int)), this, SLOT(initializeWindow(int)));// The signal is in the HatNameWindow.hpp file. 754 } 755 else 756 return; 757 }*/ 724 758 /***************************************** Implementation of the method montrerActionGenererD() ****************************************************/ 725 759 void MainWindow::montrerActionGenererD() { … … 801 835 description << endl; 802 836 } 803 if (contextTest) {837 /*if (contextTest) { 804 838 description << "#OPTION (optionAttribute)+ ---------------------------------------------------------------------" << endl; 805 839 description << m_contextWindow->getContextParameters() << endl; //"option " << it->toStdString() << endl; 806 840 // cout << m_contextWindow->getContextParameters() << endl; //"option " << it->toStdString() << endl; 807 841 description << endl; 808 } 842 }*/ 809 843 if (!theTrajectoryTable.empty()) { 810 844 description << "#TRAJ name type uptime offtime dtime steptime ------------------------------------------" << endl; -
trunk/yao/src/interface/src/include/HatNameWindow.hpp
r366 r429 63 63 64 64 void addHatRow(); /*!< This function is called to insert data in the model. */ 65 void deleteARow(string aString = ""); /*!< This function is called to delete data from the model. */ 65 66 void deleteHatRow(); /*!< This function is called to delete data from the model. */ 66 67 void eraseDataFromLineEdit(); /*!< This function is called to initialize the lineEdit. */ -
trunk/yao/src/interface/src/include/MainWindow.hpp
r428 r429 95 95 // ~MainWindow(); 96 96 protected : 97 void clearAllStructures(); 97 98 //void closeEvent(QCloseEvent *event); 98 99 //void generateDefaultHFile(); … … 139 140 void hatUpdate(); 140 141 void hatUpdate(QString choix ); 141 void contextUpdate();142 //void contextUpdate(); 142 143 void mainWindowIsModified(); 143 144 void saveAs();
Note: See TracChangeset
for help on using the changeset viewer.