- Timestamp:
- 05/05/10 10:06:50 (14 years ago)
- Location:
- trunk/yao/src/interface
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yao/src/interface/Main.cpp
r266 r314 16 16 #include <QApplication> 17 17 #include <QTextCodec> 18 #include "src/Include/MainWindowController.hpp" 18 #include "src/Include/MainWindow.hpp" 19 //#include "src/Include/MainWindowController.hpp" 19 20 //#include "BasicWindow.hpp" 20 21 //#include <iostream> … … 31 32 //MainWindowController *fen1 = new MainWindowController; fen1->show(); 32 33 MainWindowController m_mwc ;//= MainWindowController::getInstance(); 34 MainWindow *fen1 = new MainWindow(&m_mwc); //fen1->show(); 35 36 fen1->show(); 37 33 38 //m_mwc.show(); 34 39 //BaseWindow bw; -
trunk/yao/src/interface/Makefile
r309 r314 1 1 ############################################################################# 2 2 # Makefile for building: interface 3 # Generated by qmake (2.01a) (Qt 4.5. 2) on: mar. avr. 13 16:16:3820103 # Generated by qmake (2.01a) (Qt 4.5.3) on: dim. mai 2 18:44:30 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 -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -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 -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -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. -I../../share/antlr-2.7.7/lib/cpp/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. 17 17 LINK = g++ 18 LFLAGS = -Wl,- -as-needed -Wl,--no-undefined -Wl,-z,relro -Wl,-O119 LIBS = $(SUBLIBS) -L/usr/lib -lQtGui - L/usr/lib -pthread -lpng -lfreetype -lgobject-2.0 -lSM -lICE -pthread -pthread -lXrender -lfontconfig -lXext -lX11 -lQtCore -lz -lm -pthread -lgthread-2.0 -lrt -lglib-2.0 -ldl -lpthread -L../../share/antlr-2.7.7/lib/cpp/src -lantlr18 LFLAGS = -Wl,-O1 19 LIBS = $(SUBLIBS) -L/usr/lib -lQtGui -lQtCore -lpthread 20 20 AR = ar cqs 21 21 RANLIB = … … 59 59 src/SpaceWindow.cpp \ 60 60 src/TrajectoryWindow.cpp \ 61 ../Translator.cpp \ 62 ../analyzers/BaseParser.cpp \ 63 ../YAOObjects/Modul.cpp \ 64 ../YAOObjects/Connection.cpp \ 65 ../YAOObjects/Order.cpp \ 66 ../analyzers/BaseLexer.cpp moc_ConnectionWindow.cpp \ 61 ../YAOObjects/Modul.cpp moc_ConnectionWindow.cpp \ 67 62 moc_ConstantWindow.cpp \ 68 63 moc_ContextWindow.cpp \ … … 92 87 SpaceWindow.o \ 93 88 TrajectoryWindow.o \ 94 Translator.o \95 BaseParser.o \96 89 Modul.o \ 97 Connection.o \98 Order.o \99 BaseLexer.o \100 90 moc_ConnectionWindow.o \ 101 91 moc_ConstantWindow.o \ … … 110 100 moc_SpaceWindow.o \ 111 101 moc_TrajectoryWindow.o 112 DIST = /usr/ lib/qt4/mkspecs/common/g++.conf \113 /usr/ lib/qt4/mkspecs/common/unix.conf \114 /usr/ lib/qt4/mkspecs/common/linux.conf \115 /usr/ lib/qt4/mkspecs/qconfig.pri \116 /usr/ lib/qt4/mkspecs/features/qt_functions.prf \117 /usr/ lib/qt4/mkspecs/features/qt_config.prf \118 /usr/ lib/qt4/mkspecs/features/exclusive_builds.prf \119 /usr/ lib/qt4/mkspecs/features/default_pre.prf \120 /usr/ lib/qt4/mkspecs/features/release.prf \121 /usr/ lib/qt4/mkspecs/features/default_post.prf \122 /usr/ lib/qt4/mkspecs/features/warn_on.prf \123 /usr/ lib/qt4/mkspecs/features/qt.prf \124 /usr/ lib/qt4/mkspecs/features/unix/thread.prf \125 /usr/ lib/qt4/mkspecs/features/moc.prf \126 /usr/ lib/qt4/mkspecs/features/resources.prf \127 /usr/ lib/qt4/mkspecs/features/uic.prf \128 /usr/ lib/qt4/mkspecs/features/yacc.prf \129 /usr/ lib/qt4/mkspecs/features/lex.prf \130 /usr/ lib/qt4/mkspecs/features/include_source_dir.prf \102 DIST = /usr/share/qt4/mkspecs/common/g++.conf \ 103 /usr/share/qt4/mkspecs/common/unix.conf \ 104 /usr/share/qt4/mkspecs/common/linux.conf \ 105 /usr/share/qt4/mkspecs/qconfig.pri \ 106 /usr/share/qt4/mkspecs/features/qt_functions.prf \ 107 /usr/share/qt4/mkspecs/features/qt_config.prf \ 108 /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ 109 /usr/share/qt4/mkspecs/features/default_pre.prf \ 110 /usr/share/qt4/mkspecs/features/release.prf \ 111 /usr/share/qt4/mkspecs/features/default_post.prf \ 112 /usr/share/qt4/mkspecs/features/warn_on.prf \ 113 /usr/share/qt4/mkspecs/features/qt.prf \ 114 /usr/share/qt4/mkspecs/features/unix/thread.prf \ 115 /usr/share/qt4/mkspecs/features/moc.prf \ 116 /usr/share/qt4/mkspecs/features/resources.prf \ 117 /usr/share/qt4/mkspecs/features/uic.prf \ 118 /usr/share/qt4/mkspecs/features/yacc.prf \ 119 /usr/share/qt4/mkspecs/features/lex.prf \ 120 /usr/share/qt4/mkspecs/features/include_source_dir.prf \ 131 121 interface.pro 132 122 QMAKE_TARGET = interface … … 161 151 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) 162 152 163 Makefile: interface.pro /usr/ lib/qt4/mkspecs/linux-g++/qmake.conf /usr/lib/qt4/mkspecs/common/g++.conf \164 /usr/ lib/qt4/mkspecs/common/unix.conf \165 /usr/ lib/qt4/mkspecs/common/linux.conf \166 /usr/ lib/qt4/mkspecs/qconfig.pri \167 /usr/ lib/qt4/mkspecs/features/qt_functions.prf \168 /usr/ lib/qt4/mkspecs/features/qt_config.prf \169 /usr/ lib/qt4/mkspecs/features/exclusive_builds.prf \170 /usr/ lib/qt4/mkspecs/features/default_pre.prf \171 /usr/ lib/qt4/mkspecs/features/release.prf \172 /usr/ lib/qt4/mkspecs/features/default_post.prf \173 /usr/ lib/qt4/mkspecs/features/warn_on.prf \174 /usr/ lib/qt4/mkspecs/features/qt.prf \175 /usr/ lib/qt4/mkspecs/features/unix/thread.prf \176 /usr/ lib/qt4/mkspecs/features/moc.prf \177 /usr/ lib/qt4/mkspecs/features/resources.prf \178 /usr/ lib/qt4/mkspecs/features/uic.prf \179 /usr/ lib/qt4/mkspecs/features/yacc.prf \180 /usr/ lib/qt4/mkspecs/features/lex.prf \181 /usr/ lib/qt4/mkspecs/features/include_source_dir.prf \153 Makefile: interface.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \ 154 /usr/share/qt4/mkspecs/common/unix.conf \ 155 /usr/share/qt4/mkspecs/common/linux.conf \ 156 /usr/share/qt4/mkspecs/qconfig.pri \ 157 /usr/share/qt4/mkspecs/features/qt_functions.prf \ 158 /usr/share/qt4/mkspecs/features/qt_config.prf \ 159 /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ 160 /usr/share/qt4/mkspecs/features/default_pre.prf \ 161 /usr/share/qt4/mkspecs/features/release.prf \ 162 /usr/share/qt4/mkspecs/features/default_post.prf \ 163 /usr/share/qt4/mkspecs/features/warn_on.prf \ 164 /usr/share/qt4/mkspecs/features/qt.prf \ 165 /usr/share/qt4/mkspecs/features/unix/thread.prf \ 166 /usr/share/qt4/mkspecs/features/moc.prf \ 167 /usr/share/qt4/mkspecs/features/resources.prf \ 168 /usr/share/qt4/mkspecs/features/uic.prf \ 169 /usr/share/qt4/mkspecs/features/yacc.prf \ 170 /usr/share/qt4/mkspecs/features/lex.prf \ 171 /usr/share/qt4/mkspecs/features/include_source_dir.prf \ 182 172 /usr/lib/libQtGui.prl \ 183 173 /usr/lib/libQtCore.prl 184 174 $(QMAKE) -unix -o Makefile interface.pro 185 /usr/ lib/qt4/mkspecs/common/g++.conf:186 /usr/ lib/qt4/mkspecs/common/unix.conf:187 /usr/ lib/qt4/mkspecs/common/linux.conf:188 /usr/ lib/qt4/mkspecs/qconfig.pri:189 /usr/ lib/qt4/mkspecs/features/qt_functions.prf:190 /usr/ lib/qt4/mkspecs/features/qt_config.prf:191 /usr/ lib/qt4/mkspecs/features/exclusive_builds.prf:192 /usr/ lib/qt4/mkspecs/features/default_pre.prf:193 /usr/ lib/qt4/mkspecs/features/release.prf:194 /usr/ lib/qt4/mkspecs/features/default_post.prf:195 /usr/ lib/qt4/mkspecs/features/warn_on.prf:196 /usr/ lib/qt4/mkspecs/features/qt.prf:197 /usr/ lib/qt4/mkspecs/features/unix/thread.prf:198 /usr/ lib/qt4/mkspecs/features/moc.prf:199 /usr/ lib/qt4/mkspecs/features/resources.prf:200 /usr/ lib/qt4/mkspecs/features/uic.prf:201 /usr/ lib/qt4/mkspecs/features/yacc.prf:202 /usr/ lib/qt4/mkspecs/features/lex.prf:203 /usr/ lib/qt4/mkspecs/features/include_source_dir.prf:175 /usr/share/qt4/mkspecs/common/g++.conf: 176 /usr/share/qt4/mkspecs/common/unix.conf: 177 /usr/share/qt4/mkspecs/common/linux.conf: 178 /usr/share/qt4/mkspecs/qconfig.pri: 179 /usr/share/qt4/mkspecs/features/qt_functions.prf: 180 /usr/share/qt4/mkspecs/features/qt_config.prf: 181 /usr/share/qt4/mkspecs/features/exclusive_builds.prf: 182 /usr/share/qt4/mkspecs/features/default_pre.prf: 183 /usr/share/qt4/mkspecs/features/release.prf: 184 /usr/share/qt4/mkspecs/features/default_post.prf: 185 /usr/share/qt4/mkspecs/features/warn_on.prf: 186 /usr/share/qt4/mkspecs/features/qt.prf: 187 /usr/share/qt4/mkspecs/features/unix/thread.prf: 188 /usr/share/qt4/mkspecs/features/moc.prf: 189 /usr/share/qt4/mkspecs/features/resources.prf: 190 /usr/share/qt4/mkspecs/features/uic.prf: 191 /usr/share/qt4/mkspecs/features/yacc.prf: 192 /usr/share/qt4/mkspecs/features/lex.prf: 193 /usr/share/qt4/mkspecs/features/include_source_dir.prf: 204 194 /usr/lib/libQtGui.prl: 205 195 /usr/lib/libQtCore.prl: … … 209 199 dist: 210 200 @$(CHK_DIR_EXISTS) .tmp/interface1.0.0 || $(MKDIR) .tmp/interface1.0.0 211 $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/interface1.0.0/ && $(COPY_FILE) --parents projects/ sdfqsdf/sdfqsdf.h projects/sdfsd/sdfsd.h src/Include/ConnectionWindow.hpp src/Include/ConstantWindow.hpp src/Include/ContextWindow.hpp src/Include/Entete.hpp src/Include/FilesViewer.hpp src/Include/HatNameWindow.hpp src/Include/InsertFCTWindow.hpp src/Include/ListeVariables.hpp src/Include/MainWindow.hpp src/Include/MainWindowController.hpp src/Include/Modul.hpp src/Include/ModulWindow.hpp src/Include/NetwardWindow.hpp src/Include/OperaWindow.hpp src/Include/OrderWindow.hpp src/Include/SpaceController.hpp src/Include/SpaceWindow.hpp src/Include/TrajectoryWindow.hpp ../help/Enforcer.hpp ../help/FilePath.hpp ../YAOObjects/Constant.hpp ../YAOObjects/Object.hpp ../help/Helper.hpp ../YAOObjects/Table.hpp ../YAOObjects/SpaceExtent.hpp ../YAOObjects/Identifier.hpp ../YAOObjects/Trajectory.hpp ../YAOObjects/Context.hpp ../../include/Yaoopt.h ../Translator.hpp ../analyzers/BaseParser.hpp ../YAOObjects/Function.hpp ../YAOObjects/Neuron.hpp ../YAOObjects/Operator.hpp ../YAOObjects/Component.hpp ../YAOObjects/Modul.hpp ../YAOObjects/Connection.hpp ../YAOObjects/Order.hpp ../help/Display.hpp ../analyzers/YaoTokenTypes.hpp ../Tokenizer.hpp ../analyzers/BaseLexer.hpp .tmp/interface1.0.0/ && $(COPY_FILE) --parents Main.cpp src/ConnectionWindow.cpp src/ConstantWindow.cpp src/ContextWindow.cpp src/FilesViewer.cpp src/HatNameWindow.cpp src/InsertFCTWindow.cpp src/MainWindow.cpp src/MainWindowController.cpp src/ModulWindow.cpp src/NetwardWindow.cpp src/OperaWindow.cpp src/OrderWindow.cpp src/SpaceController.cpp src/SpaceWindow.cpp src/TrajectoryWindow.cpp ../Translator.cpp ../analyzers/BaseParser.cpp ../YAOObjects/Modul.cpp ../YAOObjects/Connection.cpp ../YAOObjects/Order.cpp ../analyzers/BaseLexer.cpp .tmp/interface1.0.0/ && (cd `dirname .tmp/interface1.0.0` && $(TAR) interface1.0.0.tar interface1.0.0 && $(COMPRESS) interface1.0.0.tar) && $(MOVE) `dirname .tmp/interface1.0.0`/interface1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/interface1.0.0201 $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/interface1.0.0/ && $(COPY_FILE) --parents projects/test_00/test_00.h projects/test_02/test_02.h projects/test_03/test_03.h projects/test_05/test_05.h projects/test_Ú06/test_Ú06.h src/Include/ConnectionWindow.hpp src/Include/ConstantWindow.hpp src/Include/ContextWindow.hpp src/Include/Entete.hpp src/Include/FilesViewer.hpp src/Include/HatNameWindow.hpp src/Include/InsertFCTWindow.hpp src/Include/ListeVariables.hpp src/Include/MainWindow.hpp src/Include/MainWindowController.hpp src/Include/Modul.hpp src/Include/ModulWindow.hpp src/Include/NetwardWindow.hpp src/Include/OperaWindow.hpp src/Include/OrderWindow.hpp src/Include/SpaceController.hpp src/Include/SpaceWindow.hpp src/Include/TrajectoryWindow.hpp ../help/Enforcer.hpp ../help/FilePath.hpp ../YAOObjects/Constant.hpp ../YAOObjects/Object.hpp ../help/Helper.hpp ../YAOObjects/Table.hpp ../YAOObjects/Component.hpp ../YAOObjects/Operator.hpp ../YAOObjects/SpaceExtent.hpp ../YAOObjects/Trajectory.hpp ../YAOObjects/Modul.hpp ../YAOObjects/Neuron.hpp ../YAOObjects/Context.hpp ../../include/Yaoopt.h ../YAOObjects/Identifier.hpp .tmp/interface1.0.0/ && $(COPY_FILE) --parents Main.cpp src/ConnectionWindow.cpp src/ConstantWindow.cpp src/ContextWindow.cpp src/FilesViewer.cpp src/HatNameWindow.cpp src/InsertFCTWindow.cpp src/MainWindow.cpp src/MainWindowController.cpp src/ModulWindow.cpp src/NetwardWindow.cpp src/OperaWindow.cpp src/OrderWindow.cpp src/SpaceController.cpp src/SpaceWindow.cpp src/TrajectoryWindow.cpp ../YAOObjects/Modul.cpp .tmp/interface1.0.0/ && (cd `dirname .tmp/interface1.0.0` && $(TAR) interface1.0.0.tar interface1.0.0 && $(COMPRESS) interface1.0.0.tar) && $(MOVE) `dirname .tmp/interface1.0.0`/interface1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/interface1.0.0 212 202 213 203 … … 232 222 -$(DEL_FILE) moc_ConnectionWindow.cpp moc_ConstantWindow.cpp moc_ContextWindow.cpp moc_FilesViewer.cpp moc_HatNameWindow.cpp moc_InsertFCTWindow.cpp moc_MainWindow.cpp moc_ModulWindow.cpp moc_NetwardWindow.cpp moc_OperaWindow.cpp moc_SpaceWindow.cpp moc_TrajectoryWindow.cpp 233 223 moc_ConnectionWindow.cpp: src/Include/ConnectionWindow.hpp 234 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/Include/ConnectionWindow.hpp -o moc_ConnectionWindow.cpp224 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/Include/ConnectionWindow.hpp -o moc_ConnectionWindow.cpp 235 225 236 226 moc_ConstantWindow.cpp: src/Include/HatNameWindow.hpp \ … … 242 232 ../YAOObjects/Table.hpp \ 243 233 src/Include/ConstantWindow.hpp 244 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/Include/ConstantWindow.hpp -o moc_ConstantWindow.cpp234 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/Include/ConstantWindow.hpp -o moc_ConstantWindow.cpp 245 235 246 236 moc_ContextWindow.cpp: src/Include/Entete.hpp \ … … 249 239 ../help/Enforcer.hpp \ 250 240 src/Include/ContextWindow.hpp 251 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/Include/ContextWindow.hpp -o moc_ContextWindow.cpp241 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/Include/ContextWindow.hpp -o moc_ContextWindow.cpp 252 242 253 243 moc_FilesViewer.cpp: src/Include/FilesViewer.hpp 254 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/Include/FilesViewer.hpp -o moc_FilesViewer.cpp244 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/Include/FilesViewer.hpp -o moc_FilesViewer.cpp 255 245 256 246 moc_HatNameWindow.cpp: ../help/FilePath.hpp \ … … 261 251 ../YAOObjects/Table.hpp \ 262 252 src/Include/HatNameWindow.hpp 263 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/Include/HatNameWindow.hpp -o moc_HatNameWindow.cpp253 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/Include/HatNameWindow.hpp -o moc_HatNameWindow.cpp 264 254 265 255 moc_InsertFCTWindow.cpp: src/Include/InsertFCTWindow.hpp 266 /usr/lib/qt4/bin/moc $(DEFINES) $(INCPATH) src/Include/InsertFCTWindow.hpp -o moc_InsertFCTWindow.cpp 267 268 moc_MainWindow.cpp: ../Translator.hpp \ 269 ../analyzers/BaseParser.hpp \ 270 ../YAOObjects/Constant.hpp \ 271 ../YAOObjects/Object.hpp \ 272 ../help/Helper.hpp \ 273 ../help/Enforcer.hpp \ 274 ../YAOObjects/Context.hpp \ 275 ../../include/Yaoopt.h \ 276 ../YAOObjects/Function.hpp \ 277 ../YAOObjects/Identifier.hpp \ 278 ../YAOObjects/Neuron.hpp \ 279 ../YAOObjects/Operator.hpp \ 280 ../YAOObjects/Component.hpp \ 281 ../YAOObjects/SpaceExtent.hpp \ 282 ../YAOObjects/Trajectory.hpp \ 283 ../YAOObjects/Table.hpp \ 256 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/Include/InsertFCTWindow.hpp -o moc_InsertFCTWindow.cpp 257 258 moc_MainWindow.cpp: src/Include/MainWindowController.hpp \ 259 ../help/Enforcer.hpp \ 284 260 ../help/FilePath.hpp \ 285 ../YAOObjects/Modul.hpp \286 ../YAOObjects/Connection.hpp \287 ../YAOObjects/Order.hpp \288 ../help/Display.hpp \289 ../analyzers/YaoTokenTypes.hpp \290 ../Tokenizer.hpp \291 ../analyzers/BaseLexer.hpp \292 261 src/Include/ConnectionWindow.hpp \ 293 262 src/Include/ConstantWindow.hpp \ 294 263 src/Include/HatNameWindow.hpp \ 264 ../YAOObjects/Constant.hpp \ 265 ../YAOObjects/Object.hpp \ 266 ../help/Helper.hpp \ 267 ../YAOObjects/Table.hpp \ 295 268 src/Include/FilesViewer.hpp \ 296 269 src/Include/InsertFCTWindow.hpp \ 297 270 src/Include/ModulWindow.hpp \ 298 271 src/Include/Entete.hpp \ 272 ../YAOObjects/Component.hpp \ 273 ../YAOObjects/Operator.hpp \ 274 ../YAOObjects/SpaceExtent.hpp \ 275 ../YAOObjects/Trajectory.hpp \ 276 ../YAOObjects/Modul.hpp \ 277 ../YAOObjects/Neuron.hpp \ 278 ../YAOObjects/Context.hpp \ 279 ../../include/Yaoopt.h \ 299 280 src/Include/NetwardWindow.hpp \ 300 281 src/Include/SpaceController.hpp \ 282 ../YAOObjects/Identifier.hpp \ 301 283 src/Include/SpaceWindow.hpp \ 302 284 src/Include/TrajectoryWindow.hpp \ … … 305 287 src/Include/OrderWindow.hpp \ 306 288 src/Include/MainWindow.hpp 307 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/Include/MainWindow.hpp -o moc_MainWindow.cpp289 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/Include/MainWindow.hpp -o moc_MainWindow.cpp 308 290 309 291 moc_ModulWindow.cpp: src/Include/Entete.hpp \ 292 ../YAOObjects/Component.hpp \ 293 ../YAOObjects/Object.hpp \ 294 ../help/Helper.hpp \ 295 ../help/Enforcer.hpp \ 296 ../YAOObjects/Operator.hpp \ 297 ../YAOObjects/SpaceExtent.hpp \ 298 ../YAOObjects/Trajectory.hpp \ 299 ../YAOObjects/Table.hpp \ 300 ../YAOObjects/Modul.hpp \ 301 ../YAOObjects/Neuron.hpp \ 302 ../YAOObjects/Context.hpp \ 303 ../../include/Yaoopt.h \ 310 304 src/Include/ModulWindow.hpp 311 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/Include/ModulWindow.hpp -o moc_ModulWindow.cpp305 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/Include/ModulWindow.hpp -o moc_ModulWindow.cpp 312 306 313 307 moc_NetwardWindow.cpp: src/Include/Entete.hpp \ 314 308 src/Include/NetwardWindow.hpp 315 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/Include/NetwardWindow.hpp -o moc_NetwardWindow.cpp309 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/Include/NetwardWindow.hpp -o moc_NetwardWindow.cpp 316 310 317 311 moc_OperaWindow.cpp: src/Include/Entete.hpp \ 318 312 src/Include/OperaWindow.hpp 319 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/Include/OperaWindow.hpp -o moc_OperaWindow.cpp313 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/Include/OperaWindow.hpp -o moc_OperaWindow.cpp 320 314 321 315 moc_SpaceWindow.cpp: src/Include/Entete.hpp \ 316 ../YAOObjects/Component.hpp \ 317 ../YAOObjects/Object.hpp \ 318 ../help/Helper.hpp \ 319 ../help/Enforcer.hpp \ 320 ../YAOObjects/Operator.hpp \ 321 ../YAOObjects/SpaceExtent.hpp \ 322 ../YAOObjects/Trajectory.hpp \ 323 ../YAOObjects/Table.hpp \ 324 ../YAOObjects/Identifier.hpp \ 322 325 src/Include/SpaceWindow.hpp 323 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/Include/SpaceWindow.hpp -o moc_SpaceWindow.cpp326 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/Include/SpaceWindow.hpp -o moc_SpaceWindow.cpp 324 327 325 328 moc_TrajectoryWindow.cpp: ../YAOObjects/Table.hpp \ … … 330 333 ../YAOObjects/Constant.hpp \ 331 334 src/Include/TrajectoryWindow.hpp 332 /usr/ lib/qt4/bin/moc$(DEFINES) $(INCPATH) src/Include/TrajectoryWindow.hpp -o moc_TrajectoryWindow.cpp335 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/Include/TrajectoryWindow.hpp -o moc_TrajectoryWindow.cpp 333 336 334 337 compiler_rcc_make_all: … … 351 354 ####### Compile 352 355 353 Main.o: Main.cpp src/Include/MainWindowController.hpp \ 356 Main.o: Main.cpp src/Include/MainWindow.hpp \ 357 src/Include/MainWindowController.hpp \ 354 358 ../help/Enforcer.hpp \ 355 359 ../help/FilePath.hpp \ … … 365 369 src/Include/ModulWindow.hpp \ 366 370 src/Include/Entete.hpp \ 371 ../YAOObjects/Component.hpp \ 372 ../YAOObjects/Operator.hpp \ 373 ../YAOObjects/SpaceExtent.hpp \ 374 ../YAOObjects/Trajectory.hpp \ 375 ../YAOObjects/Modul.hpp \ 376 ../YAOObjects/Neuron.hpp \ 377 ../YAOObjects/Context.hpp \ 378 ../../include/Yaoopt.h \ 367 379 src/Include/NetwardWindow.hpp \ 368 380 src/Include/SpaceController.hpp \ 369 ../YAOObjects/SpaceExtent.hpp \370 381 ../YAOObjects/Identifier.hpp \ 371 382 src/Include/SpaceWindow.hpp \ 372 383 src/Include/TrajectoryWindow.hpp \ 373 ../YAOObjects/Trajectory.hpp \374 384 src/Include/OperaWindow.hpp \ 375 385 src/Include/ContextWindow.hpp \ 376 ../YAOObjects/Context.hpp \ 377 ../../include/Yaoopt.h \ 378 src/Include/OrderWindow.hpp \ 379 src/Include/MainWindow.hpp \ 380 ../Translator.hpp \ 381 ../analyzers/BaseParser.hpp \ 382 ../YAOObjects/Function.hpp \ 383 ../YAOObjects/Neuron.hpp \ 384 ../YAOObjects/Operator.hpp \ 385 ../YAOObjects/Component.hpp \ 386 ../YAOObjects/Modul.hpp \ 387 ../YAOObjects/Connection.hpp \ 388 ../YAOObjects/Order.hpp \ 389 ../help/Display.hpp \ 390 ../analyzers/YaoTokenTypes.hpp \ 391 ../Tokenizer.hpp \ 392 ../analyzers/BaseLexer.hpp 386 src/Include/OrderWindow.hpp 393 387 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Main.o Main.cpp 394 388 … … 429 423 430 424 MainWindow.o: src/MainWindow.cpp src/Include/MainWindow.hpp \ 431 ../Translator.hpp \ 432 ../analyzers/BaseParser.hpp \ 433 ../YAOObjects/Constant.hpp \ 434 ../YAOObjects/Object.hpp \ 435 ../help/Helper.hpp \ 436 ../help/Enforcer.hpp \ 437 ../YAOObjects/Context.hpp \ 438 ../../include/Yaoopt.h \ 439 ../YAOObjects/Function.hpp \ 440 ../YAOObjects/Identifier.hpp \ 441 ../YAOObjects/Neuron.hpp \ 442 ../YAOObjects/Operator.hpp \ 443 ../YAOObjects/Component.hpp \ 444 ../YAOObjects/SpaceExtent.hpp \ 445 ../YAOObjects/Trajectory.hpp \ 446 ../YAOObjects/Table.hpp \ 425 src/Include/MainWindowController.hpp \ 426 ../help/Enforcer.hpp \ 447 427 ../help/FilePath.hpp \ 448 ../YAOObjects/Modul.hpp \449 ../YAOObjects/Connection.hpp \450 ../YAOObjects/Order.hpp \451 ../help/Display.hpp \452 ../analyzers/YaoTokenTypes.hpp \453 ../Tokenizer.hpp \454 ../analyzers/BaseLexer.hpp \455 428 src/Include/ConnectionWindow.hpp \ 456 429 src/Include/ConstantWindow.hpp \ 457 430 src/Include/HatNameWindow.hpp \ 431 ../YAOObjects/Constant.hpp \ 432 ../YAOObjects/Object.hpp \ 433 ../help/Helper.hpp \ 434 ../YAOObjects/Table.hpp \ 458 435 src/Include/FilesViewer.hpp \ 459 436 src/Include/InsertFCTWindow.hpp \ 460 437 src/Include/ModulWindow.hpp \ 461 438 src/Include/Entete.hpp \ 439 ../YAOObjects/Component.hpp \ 440 ../YAOObjects/Operator.hpp \ 441 ../YAOObjects/SpaceExtent.hpp \ 442 ../YAOObjects/Trajectory.hpp \ 443 ../YAOObjects/Modul.hpp \ 444 ../YAOObjects/Neuron.hpp \ 445 ../YAOObjects/Context.hpp \ 446 ../../include/Yaoopt.h \ 462 447 src/Include/NetwardWindow.hpp \ 463 448 src/Include/SpaceController.hpp \ 449 ../YAOObjects/Identifier.hpp \ 464 450 src/Include/SpaceWindow.hpp \ 465 451 src/Include/TrajectoryWindow.hpp \ … … 483 469 src/Include/ModulWindow.hpp \ 484 470 src/Include/Entete.hpp \ 471 ../YAOObjects/Component.hpp \ 472 ../YAOObjects/Operator.hpp \ 473 ../YAOObjects/SpaceExtent.hpp \ 474 ../YAOObjects/Trajectory.hpp \ 475 ../YAOObjects/Modul.hpp \ 476 ../YAOObjects/Neuron.hpp \ 477 ../YAOObjects/Context.hpp \ 478 ../../include/Yaoopt.h \ 485 479 src/Include/NetwardWindow.hpp \ 486 480 src/Include/SpaceController.hpp \ 487 ../YAOObjects/SpaceExtent.hpp \488 481 ../YAOObjects/Identifier.hpp \ 489 482 src/Include/SpaceWindow.hpp \ 490 483 src/Include/TrajectoryWindow.hpp \ 491 ../YAOObjects/Trajectory.hpp \492 484 src/Include/OperaWindow.hpp \ 493 485 src/Include/ContextWindow.hpp \ 494 ../YAOObjects/Context.hpp \ 495 ../../include/Yaoopt.h \ 496 src/Include/OrderWindow.hpp \ 497 src/Include/MainWindow.hpp \ 498 ../Translator.hpp \ 499 ../analyzers/BaseParser.hpp \ 500 ../YAOObjects/Function.hpp \ 486 src/Include/OrderWindow.hpp 487 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o MainWindowController.o src/MainWindowController.cpp 488 489 ModulWindow.o: src/ModulWindow.cpp src/Include/ModulWindow.hpp \ 490 src/Include/Entete.hpp \ 491 ../YAOObjects/Component.hpp \ 492 ../YAOObjects/Object.hpp \ 493 ../help/Helper.hpp \ 494 ../help/Enforcer.hpp \ 495 ../YAOObjects/Operator.hpp \ 496 ../YAOObjects/SpaceExtent.hpp \ 497 ../YAOObjects/Trajectory.hpp \ 498 ../YAOObjects/Table.hpp \ 499 ../YAOObjects/Modul.hpp \ 501 500 ../YAOObjects/Neuron.hpp \ 502 ../YAOObjects/Operator.hpp \ 503 ../YAOObjects/Component.hpp \ 504 ../YAOObjects/Modul.hpp \ 505 ../YAOObjects/Connection.hpp \ 506 ../YAOObjects/Order.hpp \ 507 ../help/Display.hpp \ 508 ../analyzers/YaoTokenTypes.hpp \ 509 ../Tokenizer.hpp \ 510 ../analyzers/BaseLexer.hpp 511 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o MainWindowController.o src/MainWindowController.cpp 512 513 ModulWindow.o: src/ModulWindow.cpp src/Include/ModulWindow.hpp \ 514 src/Include/Entete.hpp 501 ../YAOObjects/Context.hpp \ 502 ../../include/Yaoopt.h 515 503 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ModulWindow.o src/ModulWindow.cpp 516 504 … … 536 524 SpaceWindow.o: src/SpaceWindow.cpp src/Include/SpaceWindow.hpp \ 537 525 src/Include/Entete.hpp \ 526 ../YAOObjects/Component.hpp \ 527 ../YAOObjects/Object.hpp \ 528 ../help/Helper.hpp \ 529 ../help/Enforcer.hpp \ 530 ../YAOObjects/Operator.hpp \ 531 ../YAOObjects/SpaceExtent.hpp \ 532 ../YAOObjects/Trajectory.hpp \ 533 ../YAOObjects/Table.hpp \ 534 ../YAOObjects/Identifier.hpp \ 538 535 src/Include/TrajectoryWindow.hpp \ 539 ../YAOObjects/Table.hpp \540 ../YAOObjects/Trajectory.hpp \541 ../YAOObjects/Object.hpp \542 ../help/Helper.hpp \543 ../help/Enforcer.hpp \544 536 ../YAOObjects/Constant.hpp 545 537 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o SpaceWindow.o src/SpaceWindow.cpp … … 554 546 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o TrajectoryWindow.o src/TrajectoryWindow.cpp 555 547 556 Translator.o: ../Translator.cpp ../help/FilePath.hpp \557 ../help/Enforcer.hpp \558 ../Translator.hpp \559 ../analyzers/BaseParser.hpp \560 ../YAOObjects/Constant.hpp \561 ../YAOObjects/Object.hpp \562 ../help/Helper.hpp \563 ../YAOObjects/Context.hpp \564 ../../include/Yaoopt.h \565 ../YAOObjects/Function.hpp \566 ../YAOObjects/Identifier.hpp \567 ../YAOObjects/Neuron.hpp \568 ../YAOObjects/Operator.hpp \569 ../YAOObjects/Component.hpp \570 ../YAOObjects/SpaceExtent.hpp \571 ../YAOObjects/Trajectory.hpp \572 ../YAOObjects/Table.hpp \573 ../YAOObjects/Modul.hpp \574 ../YAOObjects/Connection.hpp \575 ../YAOObjects/Order.hpp \576 ../help/Display.hpp \577 ../analyzers/YaoTokenTypes.hpp \578 ../Tokenizer.hpp \579 ../analyzers/BaseLexer.hpp580 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Translator.o ../Translator.cpp581 582 BaseParser.o: ../analyzers/BaseParser.cpp ../analyzers/BaseParser.hpp \583 ../YAOObjects/Constant.hpp \584 ../YAOObjects/Object.hpp \585 ../help/Helper.hpp \586 ../help/Enforcer.hpp \587 ../YAOObjects/Context.hpp \588 ../../include/Yaoopt.h \589 ../YAOObjects/Function.hpp \590 ../YAOObjects/Identifier.hpp \591 ../YAOObjects/Neuron.hpp \592 ../YAOObjects/Operator.hpp \593 ../YAOObjects/Component.hpp \594 ../YAOObjects/SpaceExtent.hpp \595 ../YAOObjects/Trajectory.hpp \596 ../YAOObjects/Table.hpp \597 ../help/FilePath.hpp \598 ../YAOObjects/Modul.hpp \599 ../YAOObjects/Connection.hpp \600 ../YAOObjects/Order.hpp \601 ../help/Display.hpp \602 ../analyzers/YaoTokenTypes.hpp603 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o BaseParser.o ../analyzers/BaseParser.cpp604 605 548 Modul.o: ../YAOObjects/Modul.cpp ../YAOObjects/Modul.hpp \ 606 549 ../YAOObjects/Neuron.hpp \ … … 617 560 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Modul.o ../YAOObjects/Modul.cpp 618 561 619 Connection.o: ../YAOObjects/Connection.cpp ../YAOObjects/Connection.hpp \620 ../help/Helper.hpp \621 ../help/Enforcer.hpp \622 ../YAOObjects/Modul.hpp \623 ../YAOObjects/Neuron.hpp \624 ../YAOObjects/Object.hpp \625 ../YAOObjects/Component.hpp \626 ../YAOObjects/Operator.hpp \627 ../YAOObjects/SpaceExtent.hpp \628 ../YAOObjects/Trajectory.hpp \629 ../YAOObjects/Table.hpp \630 ../YAOObjects/Context.hpp \631 ../../include/Yaoopt.h632 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Connection.o ../YAOObjects/Connection.cpp633 634 Order.o: ../YAOObjects/Order.cpp ../YAOObjects/Order.hpp \635 ../help/Helper.hpp \636 ../help/Enforcer.hpp \637 ../YAOObjects/Table.hpp \638 ../YAOObjects/Modul.hpp \639 ../YAOObjects/Neuron.hpp \640 ../YAOObjects/Object.hpp \641 ../YAOObjects/Component.hpp \642 ../YAOObjects/Operator.hpp \643 ../YAOObjects/SpaceExtent.hpp \644 ../YAOObjects/Trajectory.hpp \645 ../YAOObjects/Context.hpp \646 ../../include/Yaoopt.h \647 ../YAOObjects/Connection.hpp648 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Order.o ../YAOObjects/Order.cpp649 650 BaseLexer.o: ../analyzers/BaseLexer.cpp ../analyzers/BaseLexer.hpp \651 ../YAOObjects/Constant.hpp \652 ../YAOObjects/Object.hpp \653 ../help/Helper.hpp \654 ../help/Enforcer.hpp \655 ../YAOObjects/Context.hpp \656 ../../include/Yaoopt.h \657 ../YAOObjects/Function.hpp \658 ../YAOObjects/Identifier.hpp \659 ../YAOObjects/Neuron.hpp \660 ../YAOObjects/Operator.hpp \661 ../YAOObjects/Component.hpp \662 ../YAOObjects/SpaceExtent.hpp \663 ../YAOObjects/Trajectory.hpp \664 ../YAOObjects/Table.hpp \665 ../help/FilePath.hpp \666 ../YAOObjects/Modul.hpp \667 ../YAOObjects/Connection.hpp \668 ../YAOObjects/Order.hpp \669 ../help/Display.hpp \670 ../analyzers/YaoTokenTypes.hpp671 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o BaseLexer.o ../analyzers/BaseLexer.cpp672 673 562 moc_ConnectionWindow.o: moc_ConnectionWindow.cpp 674 563 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_ConnectionWindow.o moc_ConnectionWindow.cpp -
trunk/yao/src/interface/help/constante_aide.html
r265 r314 1 1 <HTML> 2 2 <HEAD> 3 <TITLE>Aide pour la Directive Deval</TITLE>3 <TITLE>Aide sur la Directive Deval</TITLE> 4 4 </HEAD> 5 5 <BODY> 6 <H1>Aide pour la Directive Defval</H1>6 <H1>Aide sur la Directive Defval</H1> 7 7 <br><a href="accueil_aide.html">Revenir à la page d'accueil</a> 8 8 <PRE> -
trunk/yao/src/interface/src/ConstantWindow.cpp
r305 r314 176 176 177 177 QMessageBox::about(this, tr("Aide sur la directive Constant."), 178 ("<p> La directive Constant appelée aussi Defval permet d'associer un nom symbolique à une valeur."179 "<p><u>Exemple 1</u>: Defval szx 12 <p><u>Exemple 2</u>: Defval szy \"chaine\"<p> <u>Exemple 3</u>: Defval szz szx"178 ("<p> La directive Defval appelée aussi Constant permet d'associer un nom symbolique à une valeur. Voici les différents emplois:" 179 "<p><u>Exemple 1</u>: defval szx 12 <p><u>Exemple 2</u>: defval szy \"chaine\"<p> <u>Exemple 3</u>: defval szz szx" 180 180 "<p> Pour plus d'informations sur defval, <a href=\"help/constante_aide.html\">cliquez ici.</a>")); 181 181 … … 195 195 void ConstantWindow::closeEvent(QCloseEvent *event) { 196 196 197 int ret = QMessageBox::warning(this, tr("Confirmation de fermeture"), 197 // emit 198 /*int ret = QMessageBox::warning(this, tr("Confirmation de fermeture"), 198 199 tr("Voulez-vous vraiment quitter?"), 199 200 QMessageBox::Yes | QMessageBox::Default, … … 205 206 else 206 207 event->ignore(); 207 208 */ 208 209 /* if (maybeSave()) { 209 210 //writeSettings(); -
trunk/yao/src/interface/src/HatNameWindow.cpp
r305 r314 124 124 if (c != NULL) { //C'est alors une constante. 125 125 string constantValue = localConstantTable->find(hatFile)->getText(); 126 modeleHatName->setItem(modeleHatName->rowCount(), new QStandardItem(QString( hatFile.c_str())));126 modeleHatName->setItem(modeleHatName->rowCount(), new QStandardItem(QString(constantValue.c_str()))); 127 127 hatHeaderList->push_back(hatFile); 128 128 initialiserChamps(); … … 225 225 226 226 227 cout << choix.toStdString() << endl;227 //cout << choix.toStdString() << endl; 228 228 /* 229 229 int c = vueFichiers->currentIndex().row(); … … 284 284 285 285 //} 286 /******************************************************/ 287 void HatNameWindow::closeEvent(QCloseEvent *event){ 288 289 //if (event->accept()) 290 // emit windowIsCLosed(false); 291 292 } 286 293 /****************************************************************************************/ 287 294 void HatNameWindow::ouvrirProjetExistant() { -
trunk/yao/src/interface/src/Include/HatNameWindow.hpp
r304 r314 43 43 */ 44 44 45 46 47 48 49 QStringList getHatName();50 void setLocalProjectName(std::string name);51 52 53 void toUpdateView(QString choix);54 // void toResetWindow();55 ~HatNameWindow();45 HatNameWindow(std::vector <std::string> *aHeaderList, yao::Table <yao::Constant> *aConstantTable, QWidget *parent = 0); 46 void setNomFichierHat(QString nomFichierHat); /*!< This function sets the file's name. */ 47 std::string getNomFichierHat(); /*!< This function returns the fil's name */ 48 void testPresenceFichier(); 49 QStringList getHatName(); 50 void setLocalProjectName(std::string name); 51 std::string getLocalProjectName(); 52 bool testContenu(int anInt); 53 void toUpdateView(QString choix); 54 // void toResetWindow(); 55 ~HatNameWindow(); 56 56 57 57 /*! … … 77 77 QStringList getHatList(); 78 78 void callHatHelp(); 79 79 signals : 80 81 void windowIsCLosed(bool aTest); 80 82 /*! 81 83 * \brief private functions … … 85 87 * \param vector<string> * theHeaderList; 86 88 */ 89 90 protected : 91 92 void closeEvent(QCloseEvent *event); 87 93 88 94 -
trunk/yao/src/interface/src/Include/MainWindow.hpp
r309 r314 4 4 #include <cstring> 5 5 6 #include "../Translator.hpp"7 8 9 6 //#include "../Translator.hpp" 7 8 9 #include "MainWindowController.hpp" 10 10 #include "../help/Enforcer.hpp" 11 11 #include "../help/FilePath.hpp" … … 19 19 #include <QWidget> 20 20 #include <QCloseEvent> 21 21 22 22 23 #include "ConnectionWindow.hpp" … … 33 34 #include "ContextWindow.hpp" 34 35 #include "OrderWindow.hpp" 36 35 37 #include "../YAOObjects/Table.hpp" 36 38 #include "../YAOObjects/Constant.hpp" 37 39 #include "../YAOObjects/Trajectory.hpp" 38 //#include "../YAOObjects/Constant.hpp" 40 #include "../YAOObjects/Operator.hpp" 41 #include "../YAOObjects/Modul.hpp" 42 39 43 /*! 40 44 * \class MainWindow … … 53 57 */ 54 58 55 MainWindow( QWidget *parent = 0);59 MainWindow(MainWindowController *mwc, QWidget *parent = 0); 56 60 57 61 void toolBarActions(QWorkspace *espace); … … 114 118 115 119 private : 120 121 MainWindowController *local_mwc; 116 122 // Les attributs des menus 117 123 QMenu *menuFichier; … … 212 218 yao::Table <yao::Constant> theConstantTable; 213 219 yao::Table <yao::Trajectory> theTrajectoryTable; 220 yao::Table <yao::Operator> theOperaTable; 221 yao::Table <yao::Space> theSpaceTable; 222 yao::Table <yao::Modul> theModulTable; 214 223 yao::Constant m_theConstant; 215 224 -
trunk/yao/src/interface/src/Include/MainWindowController.hpp
r268 r314 22 22 #include "OrderWindow.hpp" 23 23 #include "../YAOObjects/Table.hpp" 24 #include "MainWindow.hpp"25 24 //#include "MainWindow.hpp" 25 #include <QMessageBox> 26 26 27 27 class MainWindowController { … … 61 61 62 62 yao::Table<yao::Trajectory> getTheTrajectoryTable(); 63 void isIdentifier(std::string aString); 63 64 64 65 ~MainWindowController(); -
trunk/yao/src/interface/src/Include/ModulWindow.hpp
r171 r314 10 10 #define MODULWINDOW_HPP 11 11 #include "src/Include/Entete.hpp" 12 #include "../../../YAOObjects/Component.hpp" 13 #include "../../../YAOObjects/Operator.hpp" 14 #include "../../../YAOObjects/Table.hpp" 15 #include "../../../YAOObjects/Trajectory.hpp" 16 #include "../../../YAOObjects/Modul.hpp" 17 12 18 #include <QLineEdit> 13 19 #include <QRadioButton> 14 #include <QTableWidget> 20 #include <QTableView> 21 #include <QItemSelectionModel> 22 #include <QStandardItemModel> 15 23 #include <QComboBox> 16 24 #include <QHBoxLayout> 17 25 #include <QWidget> 18 26 #include <QFormLayout> 27 #include <QGridLayout> 19 28 #include <QCheckBox> 20 29 #include <QGroupBox> … … 25 34 Q_OBJECT 26 35 27 28 ModulWindow(QWidget *parent=0); 29 //void controlBox();30 31 36 public : 37 38 ModulWindow(yao::Table <yao::Modul> *aModulTable, yao::Table <yao::Space> *aSpaceIdentifier, yao::Table <yao::Operator> *anOperatorTable, QWidget *parent=0); 39 QStringList getDataModul(); 40 void initialiserModul(); 32 41 33 private slots : 42 private slots : 43 34 44 void appelAjoutModul(); 35 45 void appelSuppModul(); 36 46 void callModuljHelp(); 37 47 38 private : 39 QWidget *centralWidget; 40 QWidget *horizontalLayoutWidgetModul1; 41 QWidget *horizontalLayoutWidgetspace1; 42 QHBoxLayout *horizontalLayoutModul1; 43 QHBoxLayout *horizontalLayoutspace1; 44 QLineEdit *m_modulName; 45 QLabel *labelModul1;////////////////////////// 46 QLabel *labelInput; 47 QLabel *labelOutput; 48 QLabel * labelspace11; 49 QComboBox *m_SpaceName; 50 QWidget *horizontalLayoutWidgetspace2; 51 QHBoxLayout *horizontalLayoutspace2; 52 QLineEdit *m_modulInput; 53 QWidget *horizontalLayoutWidgetOut; 54 QHBoxLayout *horizontalLayoutOut; 55 QLineEdit *m_modulOutput; 56 //---------------------------------------------------------- 57 QWidget *horizontalLayoutWidgetopera; 58 QHBoxLayout *horizontalLayoutopera; 59 QLabel * labelopera; 60 QComboBox *m_OperaName; 61 //---------------------------------------------------------- 62 QWidget *formLayoutWidgetInter; 63 QComboBox *m_Inter; 64 QComboBox *m_lopera; 65 QFormLayout *formLayoutInter; 66 //QCheckBox *checkBoxOutput; 67 //---------------------------------------------------------- 68 QWidget *formLayoutWidgetArray; 69 QFormLayout *formLayoutArray; 70 QCheckBox *arrayButton; 71 //---------------------------------------------------------- 72 QWidget *formLayoutWidget; 73 QFormLayout *formLayout; 74 //QRadioButton *targetButton; 75 QCheckBox *targetButton; 76 QCheckBox *checkBoxUptime; 77 QCheckBox *checkBoxSeptime; 78 QCheckBox *checkBoxAlltime; 79 //----------------------------------------------------------- 80 QGroupBox *groupTarget; 81 QGroupBox *groupTargetspace1; 82 QGroupBox *groupTargetopera; 83 //----------------------------------------------------------- 84 QWidget *horizontalLayoutWidget; 85 QHBoxLayout *horizontalLayout; 86 /*QRadioButton *radioButton_4; 87 QRadioButton *radioButton_3; 88 QRadioButton *radioButton_2; 89 QWidget *verticalLayoutWidget;*/ 90 //------------------------------------------------------------ 91 QWidget *verticalLayoutWidgetBox; 92 QVBoxLayout *verticalLayoutBox; 93 QCheckBox *checkBoxnoward; 94 QCheckBox *checkBoxtempo; 95 QCheckBox *checkBoxspec; 96 QCheckBox *checkBoxnetward; 97 QCheckBox *checkBoxcout; 98 QCheckBox *checkBoxhidjac; 99 QCheckBox *checkBoxautonet; 100 QCheckBox *checkBoxclonol; 101 QCheckBox *checkBoxclonof; 102 //----------------------------------------------------------- 103 QFormLayout *formLayoutmodul; 104 QWidget *formLayoutWidgetmodul; 105 QTableWidget *tableWidgetmodul; 106 QPushButton *m_Ajoutmodul; 107 //----------------------------------------------------------- 108 QWidget *horizontalLayoutWidgetmodul2; 109 QHBoxLayout *horizontalLayoutmodul2; 110 QPushButton *pushButtonmodul3; 111 QPushButton *pushButtonmodul2; 112 QPushButton *pushButtonmodul1; 113 //------------------------------------------ 114 QStringList ModulData; 115 QPushButton *pushButtonmodulAid; 116 //----------------------------------------------------------- 48 private : 49 50 QWidget *centralWidget; 51 QWidget *horizontalLayoutWidgetModul1; 52 QWidget *horizontalLayoutWidgetspace1; 53 QHBoxLayout *horizontalLayoutModul1; 54 QHBoxLayout *horizontalLayoutspace1; 55 QLineEdit *m_lineModulName; 56 QLabel *labelModul1; // 57 QRadioButton *labelSpaceName; // 58 QLabel *m_labelInputModul; // 59 QLabel *m_labelOutputModul; // 60 QLabel * labelspace11; 61 QComboBox *m_comboSpaceName; // 62 QHBoxLayout *horizontalLayoutspace2; 63 QLineEdit *m_comboInputModul; // 64 QHBoxLayout *horizontalLayoutOut; 65 QLineEdit *m_comboOutputModul; // 66 67 QHBoxLayout *horizontalLayoutopera; 68 QRadioButton * m_labelOperaName; // 69 QComboBox *m_comboOperaName; // 70 71 QComboBox *m_Inter; 72 QComboBox *m_lopera; 73 QFormLayout *formLayoutInter; 74 //QCheckBox *checkBoxOutput; 75 76 QFormLayout *formLayoutArray; 77 QCheckBox *arrayButton; 78 79 QWidget *formLayoutWidget; 80 QFormLayout *formLayout; 81 //QRadioButton *targetButton; 82 QCheckBox *targetButton; 83 QCheckBox *checkBoxUptime; 84 QCheckBox *checkBoxSeptime; 85 QCheckBox *checkBoxAlltime; 86 87 QGroupBox *groupTarget; 88 QGroupBox *groupTargetspace1; 89 QGroupBox *groupTargetopera; 90 91 QWidget *horizontalLayoutWidget; 92 QHBoxLayout *horizontalLayout; 93 /*QRadioButton *radioButton_4; 94 QRadioButton *radioButton_3; 95 QRadioButton *radioButton_2; 96 QWidget *verticalLayoutWidget;*/ 97 98 QGridLayout *m_layoutGridModul; // 99 100 QWidget *verticalLayoutWidgetBox; 101 QVBoxLayout *verticalLayoutBox; 102 QCheckBox *checkBoxnoward; 103 QCheckBox *checkBoxtempo; 104 QCheckBox *checkBoxspec; 105 QCheckBox *checkBoxnetward; 106 QCheckBox *checkBoxcout; 107 QCheckBox *checkBoxhidjac; 108 QCheckBox *checkBoxautonet; 109 QCheckBox *checkBoxclonol; 110 QCheckBox *checkBoxclonof; 111 112 QFormLayout *formLayoutmodul; 113 QWidget *formLayoutWidgetmodul; 114 QTableView *m_modulView; // 115 QStandardItemModel *m_modulModele; // 116 QModelIndex index; // 117 118 QPushButton *m_modulAddButton; 119 120 QWidget *horizontalLayoutWidgetmodul2; 121 QHBoxLayout *horizontalLayoutmodul2; 122 QPushButton *pushButtonmodul3; 123 QPushButton *m_modulDeleteButton; 124 QPushButton *m_modulQuitButton; 125 126 QStringList ModulData; 127 QPushButton *m_modulHelpButton; 128 yao::Table <yao::Space> *localSpaceTable; // 129 yao::Table <yao::Operator> *localOperatorTable; // 130 yao::Table <yao::Modul> *localModulTable; 131 117 132 }; 118 133 #endif // MODULWINDOW_HPP -
trunk/yao/src/interface/src/Include/SpaceWindow.hpp
r249 r314 17 17 #include <QFormLayout> 18 18 #include <QGridLayout> 19 #include <QTableWidget> 19 #include <QStandardItemModel> 20 #include <QTableView> 20 21 #include <QStringList> 21 22 #include <QLabel> 22 23 #include <string> 23 24 #include <QMessageBox> 25 #include "../../../YAOObjects/Component.hpp" 26 #include "../../../YAOObjects/Operator.hpp" 27 #include "../../../YAOObjects/Table.hpp" 28 #include "../../../YAOObjects/Trajectory.hpp" 29 #include "../../../YAOObjects/Identifier.hpp" 30 24 31 /*! 25 32 * \class SpaceWindow … … 42 49 43 50 44 SpaceWindow(QWidget *parent=0); /*!< This function sets the file's name. */ 45 QStringList getData(); /*!< This function returns the space's data. */ 51 SpaceWindow(yao::Table <yao::Space> *aSpaceTable, yao::Table <yao::Trajectory> *aTrajectory, QWidget *parent=0); /*!< This function sets the file's name. */ 52 53 QStringList getData(); /*!< This function returns the space's data. */ 46 54 void toInitialize(); // Est appelée pour réinitialiser les champs. 47 55 bool isString(std::string aString); // Teste si le parametre est une chaine. 48 56 bool isInt(std::string aStringToInt);//Teste si le parametre est un entier. 49 void addRow(); /*!< This function is called to add row in the visual window model. */57 //void addRow(); /*!< This function is called to add row in the visual window model. */ 50 58 void testPresenceLigne(); 51 59 bool testContenu(int anInt); 60 const int toInt(const std::string& s); 61 //typedef yao::Operator Space; 52 62 53 63 public slots: /*!< Functions called after a click. */ 54 64 55 56 57 58 65 void addSpaceRow(); 66 void deleteRow(); /*!< This function is called to delete row from the Yao model. */ 67 void saveInYaoStructure(); /*!< This function is called to add data in the Yao model. */ 68 void callSpaceHelp(); 59 69 60 70 private : 61 62 63 64 65 66 71 QLabel *m_spaceNameLabel; /*!< Label of the QLineEdit. */ 72 QLabel *m_spaceTypeLabel; /*!< The QComboBox's type label. */ 73 QLabel *m_spaceD1Label; /*!< Label of the 1st dimension. */ 74 QLabel *m_spaceD2Label; 75 QLabel *m_spaceD3Label; 76 QLabel *m_spaceTrajLabel; 67 77 68 69 78 QLineEdit *m_spaceNameLine; /*!< Name of the space. */ 79 QLineEdit *m_spaceType; /*!< Type of the space. */ 70 80 71 72 73 74 81 QComboBox *m_spaceD1; /*!< Name of the 1st dimension. */ 82 QComboBox *m_spaceD2; /*!< Name of the 2nd dimension. */ 83 QComboBox *m_spaceD3; /*!< Name of the 3rd dimension. */ 84 QComboBox *m_spaceTrajname; /*!< Name of the selected traj. Must be declared in the traj Window */ 75 85 76 QTableWidget *m_spaceTableView; /*!< Name of the QTableWidget's object in whitch the objects are listed for the viewer. */ 86 QModelIndex index; 87 QStandardItemModel *modeleSpace; 88 QTableView *m_spaceTableView; /*!< Name of the QTableView's object in whitch the objects are listed for the viewer. */ 77 89 78 79 80 81 82 90 QPushButton *m_spaceAddButton; /*!< The button "add". */ 91 QPushButton *m_spaceEnregButton; /*!< The button "save". */ 92 QPushButton *m_spaceDeleteButton; /*!< The button "delete". */ 93 QPushButton *m_spaceHelpButton; 94 QPushButton *m_spaceQuitButton; /*!< The button "Quit". */ 83 95 84 85 86 87 96 QHBoxLayout *m_spaceLayout1H; /*!< The 1st horizontal Layout's name. */ 97 QHBoxLayout *m_spaceLayout2H; /*!< The 2nd horizontal Layout's name. */ 98 QVBoxLayout *m_spaceLayout1V; 99 QGridLayout *m_spaceLayoutG; 88 100 89 101 90 91 102 QVBoxLayout *m_layoutPrincipalSpace;/*!< The vertical Layout's name. */ 103 QFormLayout *m_layout1Space; /*!< The only QFormLayout's name. */ 92 104 93 QStringList m_horizontalHeader; 94 QStringList m_spaceData; 95 QStringList m_localData; 96 //SpaceController m_spc; 97 bool isCalled; 98 int compteur; 105 QStringList m_horizontalHeader; 106 QStringList m_spaceData; 107 QStringList m_localData; 108 //SpaceController m_spc; 109 //yao::Component t; 110 //yao::Table <yao::Identifier> *localSpaceIdentifier; 111 //yao::Table <Operator> *localSpaceExtent; 112 yao::Table <yao::Trajectory> *localTrajectoryTable; 113 yao::Table <yao::Space> *localSpaceTable; //!< Table of so-called spaces (model operators). 114 //yao::Component theComponent; 115 bool isCalled; 116 int compteur; 99 117 100 118 }; -
trunk/yao/src/interface/src/MainWindow.cpp
r309 r314 12 12 13 13 #include "Include/MainWindow.hpp" 14 14 15 #include<iostream> 15 16 … … 26 27 */ 27 28 28 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), m_ConstantCopy(NULL), m_hatCopy(NULL), m_ContextCopy(NULL), m_trajCopy(NULL), 29 m_spaceCopy(NULL), m_operaCopy(NULL), m_netwardCopy(NULL), m_modulCopy(NULL), m_ctinCopy(NULL), m_orderCopy(NULL), 30 m_insertFCTCopy(NULL), newProjectWindow(NULL) 31 { 29 MainWindow::MainWindow(MainWindowController *mwc, QWidget *parent) : QMainWindow(parent), m_ConstantCopy(NULL), m_hatCopy(NULL), m_ContextCopy(NULL), m_trajCopy(NULL), m_spaceCopy(NULL), m_operaCopy(NULL), m_netwardCopy(NULL), m_modulCopy(NULL), m_ctinCopy(NULL), m_orderCopy(NULL), m_insertFCTCopy(NULL), newProjectWindow(NULL) { 32 30 33 31 setWindowTitle(" Visual YAO "); //Donne un titre à la fenêtre principale … … 73 71 void MainWindow::setTitle() { 74 72 75 QWidget::setWindowTitle("Projet courant: " + QString(getProjectName().c_str()) );73 QWidget::setWindowTitle("Projet: " + QString(getProjectName().c_str()) ); 76 74 //QWidget::setWindowTitle(title); 77 75 … … 243 241 void MainWindow::toolBarActions(QWorkspace *espace) { 244 242 245 m_constantButton = new QPushButton(tr(" Constant"), this);243 m_constantButton = new QPushButton(tr("Defval"), this); 246 244 m_constantButton->setToolTip("Bouton désactivé. Vous devez d'abord creer un nouveau projet ou en ouvrir un."); 247 245 m_ConstantCopy = new ConstantWindow(&theConstantTable, &theHeaderList); … … 267 265 connect(m_trajButton, SIGNAL(clicked()), this, SLOT(changeColorTrajButton())); 268 266 m_spaceButton = new QPushButton(tr("Space"), this); 269 m_spaceCopy = new SpaceWindow ; //mwc.getSpace();267 m_spaceCopy = new SpaceWindow(&theSpaceTable, &theTrajectoryTable); //mwc.getSpace(); 270 268 espace->addWindow(m_spaceCopy); 271 269 m_spaceCopy->hide(); … … 287 285 288 286 m_modulButton = new QPushButton(tr("Modul"), this); 289 m_modulCopy = new ModulWindow; //mwc.getModul(); 287 //ModulWindow::ModulWindow(Table <Modul> *aModulTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, QWidget *parent) 288 m_modulCopy = new ModulWindow(&theModulTable, &theSpaceTable, &theOperaTable); //mwc.getModul(); 290 289 espace->addWindow(m_modulCopy); 291 290 m_modulCopy->hide(); … … 360 359 361 360 // Initilization of the lexer and lexing (wrapped from the object tokenizer) 362 Tokenizer tokenizer("projects/sdfqsdf/sdfqsdf.d");361 //Tokenizer tokenizer("projects/test_00/test_00.d"); 363 362 // Initialization of the parser and parsing (wrapped from the object tokenizer) 364 Translator translator(tokenizer);363 //Translator translator(tokenizer); 365 364 // Code generation of the files Y1ProjectName.h and Y2ProjectName.h 366 translator.descriptionVisualYAO();365 // translator.descriptionVisualYAO(); 367 366 368 367 … … 371 370 372 371 373 for (Table<Constant>::iterator it = translator.theConstantTable.begin(); it != translator.theConstantTable.end(); it++)374 cout << "defval " << it->getName() << " " << it->getText() << endl;372 //for (Table<Constant>::iterator it = translator.theConstantTable.begin(); it != translator.theConstantTable.end(); it++) 373 // cout << "defval " << it->getName() << " " << it->getText() << endl; 375 374 376 375 … … 725 724 726 725 emit newProjectIsCreated(); 727 QString nouveauTitre = "Projet courant: " ;//+ QString(getProjectName().c_str());726 QString nouveauTitre = "Projet : " ;//+ QString(getProjectName().c_str()); 728 727 setWindowTitle(nouveauTitre); 729 728 } -
trunk/yao/src/interface/src/MainWindowController.cpp
r301 r314 18 18 //for(vector<string>::iterator it = m_hat->getTheHeaderList().begin(); it != m_hat->getTheHeaderList().end(); it++) 19 19 //setTheHeaderList("test push_back"); 20 MainWindow *fen1 = new MainWindow; //fen1->show();21 fen1->show();20 //MainWindow *fen1 = new MainWindow; //fen1->show(); 21 //fen1->show(); 22 22 npTest = false; 23 23 //np = new NewProjectWindow; 24 24 // 25 25 //np->hide(); 26 // std::cout << /*np->getNewProjectName()*/"chaine in mainwindow controller." << std::endl;26 // std::cout << /*np->getNewProjectName()*/"chaine in mainwindow controller." << std::endl; 27 27 // if (npTest) 28 28 // setProjectNameInMWC(np->getNewProjectName()); … … 44 44 // return instance; 45 45 //} 46 /********************************************************** isIdentifier(string aString) *******************************************/ 47 void MainWindowController::isIdentifier(string aString) { 48 49 //m_projectNameInMWC = name; 50 51 for(int i1 = 0; i1 < aString.size(); i1++) { 52 if(!((aString.at(i1) >= QChar('a')&& aString.at(i1) <= QChar('z')) || (aString.at(i1) >= QChar('A')&& aString.at(i1) <= QChar('Z')) 53 || (aString.at(i1) >= QChar('0')&& aString.at(i1) <= QChar('9')) || (aString.at(i1) == QChar('_')))) { 54 55 //QMessageBox::critical(this, "Erreur", "Les caractÚres saisis ne sont pas conformes."); 56 // return; // Arrêt de la méthode 57 } 58 59 else 60 61 if((aString.at(0) >= QChar('0') && aString.at(0) <= QChar('9'))) { 62 63 //QMessageBox::critical(this, "Erreur", "Le premier caractÚre ne doit pas être un chiffre!"); 64 //return; // Arrêt de la méthode 65 } 66 } 67 68 } 69 70 46 71 /********************************************************** setProjectNameInMWC(string name ) *******************************************/ 47 72 void MainWindowController::setProjectNameInMWC(string name ) { … … 64 89 /************************************************************ getConstant() **************************************************************/ 65 90 ConstantWindow *MainWindowController::getConstant() { 91 66 92 //m_Constant = new ConstantWindow(); 93 67 94 //return m_Constant = new ConstantWindow; 68 95 } … … 121 148 ModulWindow *MainWindowController::getModul() { 122 149 123 return m_modul = new ModulWindow;150 //return m_modul = new ModulWindow; 124 151 } 125 152 -
trunk/yao/src/interface/src/ModulWindow.cpp
r192 r314 8 8 9 9 #include "Include/ModulWindow.hpp" 10 ModulWindow::ModulWindow(QWidget *parent) : QWidget(parent) { 11 12 this->setWindowTitle("Directive Module."); 13 this->resize(710, 518); ///////////////////////////// 14 15 centralWidget = new QWidget(this); 16 horizontalLayoutWidgetModul1 = new QWidget(centralWidget); 17 horizontalLayoutWidgetModul1->setGeometry(QRect(10, 3, 300, 51)); 18 horizontalLayoutModul1 = new QHBoxLayout(horizontalLayoutWidgetModul1); 19 horizontalLayoutModul1->setSpacing(6); 20 horizontalLayoutModul1->setMargin(11); 21 horizontalLayoutModul1->setContentsMargins(0, 0, 0, 0); 22 23 labelModul1 = new QLabel("Nom du module: ", horizontalLayoutWidgetModul1); 24 horizontalLayoutModul1->addWidget(labelModul1); 10 11 using namespace yao; 12 using namespace std; 13 14 ModulWindow::ModulWindow(Table <Modul> *aModulTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, QWidget *parent) : QWidget(parent) { 15 16 setWindowTitle("Directive Module."); 17 localSpaceTable = aSpaceTable; 18 localOperatorTable = anOperatorTable; 19 localModulTable = aModulTable; 20 m_modulAddButton = new QPushButton("Ajouter"); 21 m_modulDeleteButton = new QPushButton("Supprimer"); 22 m_modulDeleteButton->setDisabled(true); 23 //m_modulDeleteButton -> setGeometry(625, 370, 70, 23); 24 m_modulQuitButton = new QPushButton("Quitter"); 25 m_modulHelpButton = new QPushButton("Aide"); 26 m_modulHelpButton->setMaximumSize(35, 25); 27 m_modulModele = new QStandardItemModel(0, 4); 28 m_modulModele->setHorizontalHeaderLabels(QStringList() << "Module" << "Space/Opera" << "Input" << "Output"); 29 m_modulView = new QTableView; 30 m_modulView->setModel(m_modulModele); 31 m_modulView->setEditTriggers(QAbstractItemView::NoEditTriggers); 32 m_modulView->setShowGrid(false); 33 m_modulView->setSelectionBehavior(QAbstractItemView::SelectRows); 34 35 labelModul1 = new QLabel("Nom module: ", this); 36 labelSpaceName = new QRadioButton("Space: ", this); 37 labelSpaceName->setChecked(true); 38 m_labelOperaName = new QRadioButton("operaname: ", this); 39 40 m_labelInputModul = new QLabel("Input: "); 41 m_labelOutputModul = new QLabel("Output:"); 42 43 m_lineModulName = new QLineEdit(this); 44 m_comboInputModul = new QLineEdit; 45 m_comboOutputModul = new QLineEdit; 46 47 48 m_comboSpaceName = new QComboBox(this); 49 m_comboSpaceName->addItem(""); 50 for (Table <Space>::iterator it = localSpaceTable->begin(); it != localSpaceTable->end(); it++ ) 51 m_comboSpaceName->addItem(it->getName().c_str()); 52 53 m_comboOperaName = new QComboBox(this);//(horizontalLayoutWidgetopera); 54 m_comboOperaName->setDisabled(true); 55 m_comboOperaName->addItem(""); 56 for (Table <Operator>::iterator it = localOperatorTable->begin(); it != localOperatorTable->end(); it++ ) 57 m_comboOperaName->addItem(it->getName().c_str()); 58 59 m_layoutGridModul = new QGridLayout; 60 m_layoutGridModul->addWidget(labelModul1, 0, 0); 61 m_layoutGridModul->addWidget(m_lineModulName, 0, 1, Qt::AlignLeft); 62 m_layoutGridModul->addWidget(labelSpaceName, 1, 0 ); 63 m_layoutGridModul->addWidget(m_comboSpaceName, 1, 1, Qt::AlignLeft); 64 m_layoutGridModul->addWidget(m_labelOperaName, 1, 2); 65 m_layoutGridModul->addWidget(m_comboOperaName, 1, 3, Qt::AlignLeft); 66 m_layoutGridModul->addWidget(m_labelInputModul, 2, 0); 67 m_layoutGridModul->addWidget(m_comboInputModul, 2, 1, Qt::AlignLeft); 68 m_layoutGridModul->addWidget(m_labelOutputModul, 3, 0); 69 m_layoutGridModul->addWidget(m_comboOutputModul, 3, 1, Qt::AlignLeft); 70 m_layoutGridModul->addWidget(m_modulView, 4, 0, 6, 4); 71 m_layoutGridModul->addWidget(m_modulAddButton, 5, 5); 72 m_layoutGridModul->addWidget(m_modulDeleteButton, 6, 5); 73 m_layoutGridModul->addWidget(m_modulQuitButton, 7, 5); 74 m_layoutGridModul->addWidget(m_modulHelpButton, 9, 5); 75 //m_layoutGridModul->addWidget(); 76 //m_layoutGridModul->addWidget(); 77 //m_layoutGridModul->addWidget(); 78 //m_layoutGridModul->addWidget(); 79 //m_layoutGridModul->addWidget(); 80 //m_layoutGridModul->addWidget(); 81 //m_layoutGridModul->addWidget(); 82 //m_layoutGridModul->addWidget(); 83 //m_layoutGridModul->addWidget(); 84 //m_layoutGridModul->addWidget(); 85 //m_layoutGridModul->addWidget(); 86 //m_layoutGridModul->addWidget(); 87 //m_layoutGridModul->addWidget(); 88 //m_layoutGridModul->addWidget(); 89 //m_layoutGridModul->addWidget(); 90 //m_layoutGridModul->addWidget(); 91 //m_layoutGridModul->addWidget(); 92 //m_layoutGridModul->addWidget(); 93 //m_layoutGridModul->addWidget(); 94 //m_layoutGridModul->addWidget(); 95 //m_layoutGridModul->addWidget(); 96 //m_layoutGridModul->addWidget(); 97 //m_layoutGridModul->addWidget(); 98 //m_layoutGridModul->addWidget(); 99 //m_layoutGridModul->addWidget(); 100 //m_layoutGridModul->addWidget(); 101 102 setLayout(m_layoutGridModul); 103 104 // centralWidget = new QWidget(this); 105 // horizontalLayoutWidgetModul1 = new QWidget(centralWidget); 106 // horizontalLayoutWidgetModul1->setGeometry(QRect(10, 3, 300, 51)); 107 // horizontalLayoutModul1 = new QHBoxLayout(horizontalLayoutWidgetModul1); 108 // horizontalLayoutModul1->setSpacing(6); 109 // horizontalLayoutModul1->setMargin(11); 110 // horizontalLayoutModul1->setContentsMargins(0, 0, 0, 0); 111 112 // horizontalLayoutModul1->addWidget(labelModul1); 25 113 26 m_modulName = new QLineEdit(horizontalLayoutWidgetModul1); 27 horizontalLayoutModul1->addWidget(m_modulName);//----------------------------------- 28 114 // horizontalLayoutModul1->addWidget(m_lineModulName);//----------------------------------- 115 /* 29 116 //-------------------------------------------------------------------------------------------------- 30 117 … … 40 127 horizontalLayoutspace1->addWidget(labelspace11); 41 128 42 m_SpaceName = new QComboBox;//(horizontalLayoutWidgetspace1); 43 m_SpaceName ->setEditable(true); 44 m_SpaceName ->addItem(""); 45 m_SpaceName ->addItem(""); 46 m_SpaceName ->addItem(""); 47 m_SpaceName ->addItem(""); 48 horizontalLayoutspace1->addWidget(m_SpaceName); 129 /m_comboSpaceName->addItem("S2"); 130 //m_comboSpaceName->addItem("S3"); 131 horizontalLayoutspace1->addWidget(m_comboSpaceName); 49 132 50 133 groupTargetspace1 = new QGroupBox("Space :", horizontalLayoutWidgetspace1); … … 61 144 horizontalLayoutopera->setContentsMargins(0, 0, 0, 0); 62 145 63 labelopera = new QLabel("operaname: ");//, horizontalLayoutWidgetopera); 64 horizontalLayoutopera->addWidget(labelopera); 65 66 m_OperaName = new QComboBox;//(horizontalLayoutWidgetopera); 67 m_OperaName ->setEditable(true); 68 m_OperaName ->addItem(""); 69 m_OperaName ->addItem(""); 70 m_OperaName ->addItem(""); 71 m_OperaName ->addItem(""); 72 horizontalLayoutopera->addWidget(m_OperaName); 146 //m_comboOperaName->addItem("OP1"); 147 //m_comboOperaName->addItem("OP2"); 148 //m_comboOperaName ->addItem("OP3"); 149 horizontalLayoutopera->addWidget(m_comboOperaName); 73 150 74 151 groupTargetopera = new QGroupBox("Operaname :", horizontalLayoutWidgetopera); … … 84 161 horizontalLayoutspace2->setContentsMargins(0, 0, 0, 0); 85 162 86 labelInput = new QLabel("Entree: ",horizontalLayoutWidgetspace2); 87 horizontalLayoutspace2->addWidget(labelInput); 88 m_modulInput = new QLineEdit(horizontalLayoutWidgetspace2); 89 horizontalLayoutspace2->addWidget(m_modulInput); 90 //----------------------------------------------- 163 /----------------------------------------------- 91 164 92 165 horizontalLayoutWidgetOut = new QWidget(centralWidget); … … 97 170 horizontalLayoutOut->setContentsMargins(0, 0, 0, 0); 98 171 99 labelOutput = new QLabel("Sortie:",horizontalLayoutWidgetOut); 100 horizontalLayoutOut->addWidget(labelOutput); 101 m_modulOutput = new QLineEdit(horizontalLayoutWidgetOut); 102 horizontalLayoutOut->addWidget(m_modulOutput); 103 //----------------------------- 172 ----------------------------- 104 173 //checkBoxOutput = new QCheckBox("Output", horizontalLayoutWidgetOut); 105 174 //horizontalLayoutOut->addWidget(checkBoxOutput); … … 218 287 formLayoutmodul->addRow(tableWidgetmodul); 219 288 220 m_Ajoutmodul = new QPushButton("Ajouter", centralWidget); 221 m_Ajoutmodul -> setGeometry(625, 330, 70, 23); 222 pushButtonmodul2 = new QPushButton("Supprimer", centralWidget); 223 pushButtonmodul2->setDisabled(true); 224 pushButtonmodul2 -> setGeometry(625, 370, 70, 23); 225 pushButtonmodulAid = new QPushButton("De l'aide?", centralWidget); 226 //pushButtonmodulAid -> setGeometry(640, 150, 45, 23); 227 pushButtonmodulAid -> setGeometry(5, 340, 65, 23); /*!< set size button */ 289 */ //m_modulHelpButton -> setGeometry(640, 150, 45, 23); 290 // m_modulHelpButton -> setGeometry(5, 340, 65, 23); /*!< set size button */ 228 291 //----------------------------------------------------------------------------------------------------------------- 229 horizontalLayoutWidgetmodul2 = new QWidget(centralWidget);292 // horizontalLayoutWidgetmodul2 = new QWidget(centralWidget); 230 293 //horizontalLayoutWidgetctin2->setObjectName(QString::fromUtf8("horizontalLayoutWidget_2")); 231 horizontalLayoutWidgetmodul2->setGeometry(QRect(170, 450, 400, 75));294 /* horizontalLayoutWidgetmodul2->setGeometry(QRect(170, 450, 400, 75)); 232 295 horizontalLayoutmodul2 = new QHBoxLayout(horizontalLayoutWidgetmodul2); 233 296 horizontalLayoutmodul2->setSpacing(6); … … 240 303 horizontalLayoutmodul2->addWidget(pushButtonmodul3); 241 304 242 pushButtonmodul1 = new QPushButton("Quitter", horizontalLayoutWidgetmodul2);243 305 //pushButton->setObjectName(QString::fromUtf8("pushButton")); 244 306 245 horizontalLayoutmodul2->addWidget( pushButtonmodul1);307 horizontalLayoutmodul2->addWidget(m_modulQuitButton);*/ 246 308 //----------------------------------------------------------------------------------------------------------- 247 connect(pushButtonmodul1, SIGNAL(clicked()), this, SLOT(close())); /*!< slot for the close this windows*/ 248 connect(pushButtonmodul2, SIGNAL(clicked()), this, SLOT(appelSuppModul())); /*!< slot for the delete the object selected in the view*/ 249 connect(m_Ajoutmodul, SIGNAL(clicked()), this, SLOT(appelAjoutModul())); /*!< This slot add the object in the view */ 250 connect(pushButtonmodulAid, SIGNAL(clicked()), this, SLOT(callModuljHelp())); /*!< This slot add the object in the view */ 309 connect(m_modulAddButton, SIGNAL(clicked()), this, SLOT(appelAjoutModul())); /*!< This slot add the object in the view */ 310 connect(m_modulDeleteButton, SIGNAL(clicked()), this, SLOT(appelSuppModul())); /*!< slot for the delete the object selected in the view*/ 311 connect(m_modulHelpButton, SIGNAL(clicked()), this, SLOT(callModuljHelp())); /*!< This slot add the object in the view */ 312 connect(m_modulQuitButton, SIGNAL(clicked()), this, SLOT(close())); /*!< slot for the close this windows*/ 313 314 connect(m_labelOperaName, SIGNAL(toggled (bool)), m_comboSpaceName, SLOT(setDisabled(bool))); 315 connect(labelSpaceName, SIGNAL(toggled (bool)), m_comboOperaName, SLOT(setDisabled(bool))); 316 317 setFixedWidth(baseSize().width() + 750); 251 318 } 252 319 … … 254 321 /*void ModulWindow::controlBox(){ 255 322 256 257 323 258 324 }*/ 325 326 /****************************************************************************************************************************************/ 259 327 void ModulWindow::appelAjoutModul() { 260 328 261 QString espace = " space "; 329 m_modulDeleteButton->setDisabled(false); 330 int row = m_modulModele->rowCount(); 331 //cout << row << endl; 332 /* QString espace = " space "; 262 333 QString operat = " opera "; 263 334 QString entre = " input "; … … 277 348 QString hidjacT; 278 349 //----------------------- 279 QString modulenom = m_ modulName->text();280 QString espacenom = m_ SpaceName->currentText();281 QString operanom = m_OperaName->currentText();282 QString linput = m_ modulInput->text();283 QString loutput = m_ modulOutput->text();350 QString modulenom = m_lineModulName->text(); 351 QString espacenom = m_comboSpaceName->currentText(); 352 //QString operanom = m_comboOperaName->currentText(); 353 QString linput = m_comboInputModul->text(); 354 QString loutput = m_comboOutputModul->text(); 284 355 QString vide1 = " "; 285 356 QString vide2 = " "; 286 static int row = 0;287 357 int l = 0; 288 358 static int row1 = 0; … … 317 387 } 318 388 319 for(int j = 0; j<operanom.size(); j++)320 if(!((operanom.at(j) >= QChar('a')&& operanom.at(j) <= QChar('z')) || (operanom.at(j) >= QChar('A')&& operanom.at(j) <= QChar('Z'))//----------321 || (operanom.at(j) >= QChar('0')&& operanom.at(j) <= QChar('9')) || (operanom.at(j) == QChar('_'))))322 {323 QMessageBox::critical(this, "Erreur", "Veuillez entrer un nom de l'opera associe correcte");324 return; // Arrêt de la méthode325 }389 //for(int j = 0; j<operanom.size(); j++) 390 // if(!((operanom.at(j) >= QChar('a')&& operanom.at(j) <= QChar('z')) || (operanom.at(j) >= QChar('A')&& operanom.at(j) <= QChar('Z'))//---------- 391 // || (operanom.at(j) >= QChar('0')&& operanom.at(j) <= QChar('9')) || (operanom.at(j) == QChar('_')))) 392 // { 393 // QMessageBox::critical(this, "Erreur", "Veuillez entrer un nom de l'opera associe correcte"); 394 // return; // Arrêt de la méthode 395 // } 326 396 for(int i1 = 0; i1<linput.size(); i1++) 327 397 if(!((linput.at(i1) >= QChar('0')&& linput.at(i1) <= QChar('9')) || (linput.at(i1) == QChar('+')) || (linput.at(i1) == QChar('-')) … … 411 481 if (checkBoxclonol->isChecked()) 412 482 { 413 clonolT = " clonol " + m_ modulName->text();483 clonolT = " clonol " + m_lineModulName->text(); 414 484 } 415 485 else { … … 423 493 if (checkBoxclonof->isChecked()) 424 494 { 425 clonofT = " clonof " + m_ modulName->text();495 clonofT = " clonof " + m_lineModulName->text(); 426 496 } 427 497 else { … … 441 511 } 442 512 443 if (m_ modulName->text().isEmpty())513 if (m_lineModulName->text().isEmpty()) 444 514 { 445 515 QMessageBox::critical(this, "Erreur", "Veuillez définir au moins un nom du module SVP!"); … … 447 517 } 448 518 449 if ((groupTargetspace1->isChecked()) && (!(groupTargetopera->isChecked()))) //(m_ OperaName->currentText().isEmpty()))// &&519 if ((groupTargetspace1->isChecked()) && (!(groupTargetopera->isChecked()))) //(m_comboOperaName->currentText().isEmpty()))// && 450 520 { 451 521 if (l >= 0) 452 { 453 tableWidgetmodul->setItem(row, 0, new QTableWidgetItem(m_modulName->text()));454 tableWidgetmodul->setItem(row, 1, new QTableWidgetItem(m_SpaceName->currentText()));455 tableWidgetmodul->setItem(row, 2, new QTableWidgetItem(vide2));456 tableWidgetmodul->setItem(row, 3, new QTableWidgetItem(m_Inter->currentText()));457 tableWidgetmodul->setItem(row, 4, new QTableWidgetItem(nowardT));458 tableWidgetmodul->setItem(row, 5, new QTableWidgetItem(m_modulInput->text()));459 tableWidgetmodul->setItem(row, 6, new QTableWidgetItem(m_modulOutput->text()));460 tableWidgetmodul->setItem(row, 7, new QTableWidgetItem(targT));461 tableWidgetmodul->setItem(row, 8, new QTableWidgetItem(tempoT));462 tableWidgetmodul->setItem(row, 9, new QTableWidgetItem(coutT));463 tableWidgetmodul->setItem(row, 10, new QTableWidgetItem(m_lopera->currentText()));464 tableWidgetmodul->setItem(row, 11, new QTableWidgetItem(specT));465 tableWidgetmodul->setItem(row, 12, new QTableWidgetItem(netwardT));466 tableWidgetmodul->setItem(row, 13, new QTableWidgetItem(clonolT));467 tableWidgetmodul->setItem(row, 14, new QTableWidgetItem(clonofT));468 tableWidgetmodul->setItem(row, 15, new QTableWidgetItem(hidjacT));522 {*/ 523 m_modulModele->setItem(row, 0, new QStandardItem(m_lineModulName->text())); 524 m_modulModele->setItem(row, 1, new QStandardItem(m_comboSpaceName->currentText())); 525 // m_modulModele->setItem(row, 2, new QStandardItem(vide2)); 526 // m_modulModele->setItem(row, 3, new QStandardItem(m_Inter->currentText())); 527 // m_modulModele->setItem(row, 4, new QStandardItem(nowardT)); 528 m_modulModele->setItem(row, 2, new QStandardItem(m_comboInputModul->text())); 529 m_modulModele->setItem(row, 3, new QStandardItem(m_comboOutputModul->text())); 530 // m_modulModele->setItem(row, 7, new QStandardItem(targT)); 531 // m_modulModele->setItem(row, 8, new QStandardItem(tempoT)); 532 // m_modulModele->setItem(row, 9, new QStandardItem(coutT)); 533 // m_modulModele->setItem(row, 10, new QStandardItem(m_lopera->currentText())); 534 // m_modulModele->setItem(row, 11, new QStandardItem(specT)); 535 // m_modulModele->setItem(row, 12, new QStandardItem(netwardT)); 536 // m_modulModele->setItem(row, 13, new QStandardItem(clonolT)); 537 // m_modulModele->setItem(row, 14, new QStandardItem(clonofT)); 538 // m_modulModele->setItem(row, 15, new QStandardItem(hidjacT)); 469 539 470 ModulData.push_back(m_modulName->text() + espace + m_SpaceName->currentText() + intre + m_Inter->currentText() + nowardT + entre +471 m_modulInput->text() + sorti + m_modulOutput->text() + targT + tempoT + coutT472 + m_lopera->currentText() + specT + netwardT + clonolT + clonofT + hidjacT);540 //ModulData.push_back(m_lineModulName->text() + espace + m_comboSpaceName->currentText() + intre + m_Inter->currentText() + nowardT + entre + 541 // m_comboInputModul->text() + sorti + m_comboOutputModul->text() + targT + tempoT + coutT 542 // + m_lopera->currentText() + specT + netwardT + clonolT + clonofT + hidjacT); 473 543 474 row++;475 }476 }477 else if ((groupTargetopera->isChecked()) && (!(groupTargetspace1->isChecked())))// || (!(m_SpaceName->currentText().isEmpty())))478 {544 //row++; 545 //} 546 // } 547 // else if ((groupTargetopera->isChecked()) && (!(groupTargetspace1->isChecked())))// || (!(m_comboSpaceName->currentText().isEmpty()))) 548 // { 479 549 480 if (l1 >= 0)481 {482 tableWidgetmodul->setItem(row1, 0, new QTableWidgetItem(m_modulName->text()));483 tableWidgetmodul->setItem(row1, 1, new QTableWidgetItem(vide2));484 tableWidgetmodul->setItem(row1, 2, new QTableWidgetItem(m_OperaName->currentText()));485 tableWidgetmodul->setItem(row1, 3, new QTableWidgetItem(m_Inter->currentText()));486 tableWidgetmodul->setItem(row1, 4, new QTableWidgetItem(nowardT));487 tableWidgetmodul->setItem(row1, 5, new QTableWidgetItem(m_modulInput->text()));488 tableWidgetmodul->setItem(row1, 6, new QTableWidgetItem(m_modulOutput->text()));489 tableWidgetmodul->setItem(row1, 7, new QTableWidgetItem(targT));490 tableWidgetmodul->setItem(row1, 8, new QTableWidgetItem(tempoT));491 tableWidgetmodul->setItem(row1, 9, new QTableWidgetItem(coutT));492 tableWidgetmodul->setItem(row1, 10, new QTableWidgetItem(m_lopera->currentText()));493 tableWidgetmodul->setItem(row1, 11, new QTableWidgetItem(specT));494 tableWidgetmodul->setItem(row1, 12, new QTableWidgetItem(netwardT));495 tableWidgetmodul->setItem(row1, 13, new QTableWidgetItem(clonolT));496 tableWidgetmodul->setItem(row1, 14, new QTableWidgetItem(clonofT));497 tableWidgetmodul->setItem(row1, 15, new QTableWidgetItem(hidjacT));498 499 ModulData.push_back(m_modulName->text() + operat + m_OperaName->currentText() + intre + m_Inter->currentText() + nowardT + entre +500 m_modulInput->text() + sorti + m_modulOutput->text() + targT + tempoT + coutT501 + m_lopera->currentText() + specT + netwardT + clonolT + clonofT + hidjacT);550 //if (l1 >= 0) 551 //{ 552 /* m_modulModele->setItem(row1, 0, new QStandardItem(m_lineModulName->text())); 553 m_modulModele->setItem(row1, 1, new QStandardItem(vide2)); 554 //m_modulModele->setItem(row1, 2, new QStandardItem(m_comboOperaName->currentText())); 555 m_modulModele->setItem(row1, 3, new QStandardItem(m_Inter->currentText())); 556 m_modulModele->setItem(row1, 4, new QStandardItem(nowardT)); 557 m_modulModele->setItem(row1, 5, new QStandardItem(m_comboInputModul->text())); 558 m_modulModele->setItem(row1, 6, new QStandardItem(m_comboOutputModul->text())); 559 m_modulModele->setItem(row1, 7, new QStandardItem(targT)); 560 m_modulModele->setItem(row1, 8, new QStandardItem(tempoT)); 561 m_modulModele->setItem(row1, 9, new QStandardItem(coutT)); 562 m_modulModele->setItem(row1, 10, new QStandardItem(m_lopera->currentText())); 563 m_modulModele->setItem(row1, 11, new QStandardItem(specT)); 564 m_modulModele->setItem(row1, 12, new QStandardItem(netwardT)); 565 m_modulModele->setItem(row1, 13, new QStandardItem(clonolT)); 566 m_modulModele->setItem(row1, 14, new QStandardItem(clonofT)); 567 m_modulModele->setItem(row1, 15, new QStandardItem(hidjacT)); 568 */ 569 //ModulData.push_back(m_lineModulName->text() + operat + m_comboOperaName->currentText() + intre + m_Inter->currentText() + nowardT + entre + 570 // m_comboInputModul->text() + sorti + m_comboOutputModul->text() + targT + tempoT + coutT 571 //+ m_lopera->currentText() + specT + netwardT + clonolT + clonofT + hidjacT); 502 572 503 573 504 /* ModulData.push_back(m_ modulName->text() + operat + m_OperaName->currentText() + intre + m_Inter->currentText() + nowardT + entre +505 m_ modulInput->text() + sorti + m_modulOutput->text() + targT + tempoT + coutT + m_lopera->currentText() + specT + netwardT + clonolT + clonofT + hidjacT);*/574 /* ModulData.push_back(m_lineModulName->text() + operat + m_comboOperaName->currentText() + intre + m_Inter->currentText() + nowardT + entre + 575 m_comboInputModul->text() + sorti + m_comboOutputModul->text() + targT + tempoT + coutT + m_lopera->currentText() + specT + netwardT + clonolT + clonofT + hidjacT);*/ 506 576 507 row1++;508 }577 // row1++; 578 // } 509 579 510 580 511 } 512 else //if (comboBoxctin_i->currentText().isEmpty()) 513 { 514 QMessageBox::critical(this, "Erreur", "vous ne pouvez pas definir un espace et un opera en meme temps SVP!"); 515 return; // Arrêt de la méthode 516 } 517 initialiserModul(); 518 } 581 //} 582 // else //if (comboBoxctin_i->currentText().isEmpty()) 583 // { 584 //QMessageBox::critical(this, "Erreur", "vous ne pouvez pas definir un espace et un opera en meme temps SVP!"); 585 // return; // Arrêt de la méthode 586 // } 587 // initialiserModul(); 588 589 } 519 590 520 591 /****************************************************************************************/ 521 592 void ModulWindow::appelSuppModul() { 522 593 523 tableWidgetmodul->removeRow(tableWidgetmodul->currentRow()); 524 525 } 594 QItemSelectionModel *selection = m_modulView->selectionModel(); 595 index = selection->currentIndex(); 596 QVariant element = m_modulModele->data(index, Qt::DisplayRole); 597 int r = index.row(); 598 if (selection->hasSelection())// Permet de supprimer la ligne qui est selectionnée. Evite ainsi certains effets indesirables. 599 { 600 m_modulModele->removeRows(m_modulView->currentIndex().row(), 1); 601 // m_localConstantTable->erase(m_localConstantTable->begin() + r); 602 603 //for (unsigned int i=0; i < localHeaderList->size(); i++ ) //Parcourt le vecteur en fonction de sa taille (nombre d'éléments) 604 // { 605 606 // if (element.toString().toStdString() == localHeaderList->at(i)) //Teste si l'éléement à supprimer dans defval est aussi dans hat 607 // localHeaderList->erase(localHeaderList->begin() + i);//localHeaderList->begin() +i ); 608 // } 609 610 // emit rowIsDeleted(element.toString()); // signal emis lorsqu'une ligne retirée du tableau. 611 } 612 613 } 526 614 /****************************************************************************************************************************/ 527 615 QStringList ModulWindow::getDataModul() { … … 532 620 void ModulWindow::initialiserModul() { 533 621 534 m_ modulName-> clear();535 m_ SpaceName-> clearEditText();536 m_OperaName-> clearEditText();537 m_ modulInput-> clear();538 m_ modulOutput-> clear();539 m_Inter 540 m_lopera 622 m_lineModulName-> clear(); 623 m_comboSpaceName-> clearEditText(); 624 //m_comboOperaName-> clearEditText(); 625 m_comboInputModul-> clear(); 626 m_comboOutputModul-> clear(); 627 m_Inter-> clearEditText(); 628 m_lopera-> clearEditText(); 541 629 } 542 630 void ModulWindow::callModuljHelp() { -
trunk/yao/src/interface/src/SpaceWindow.cpp
r305 r314 19 19 20 20 using namespace std; 21 using namespace yao; 21 22 22 23 /******************************************* Contructeur ***************************************************/ 23 SpaceWindow::SpaceWindow( QWidget *parent) : QWidget(parent) { /*!< The constructor. */24 SpaceWindow::SpaceWindow(yao::Table <yao::Space> *aSpaceTable, Table <Trajectory> *aTrajectory, QWidget *parent) : QWidget(parent) { /*!< The constructor. */ 24 25 25 26 this->setWindowTitle("Directive Space."); /*!< To set the window's title. */ 26 27 isCalled = false; 27 28 //QStringList *localTrajData = trajData; 29 localTrajectoryTable = aTrajectory; 30 //localSpaceExtent = aSpaceExtent; 31 //localSpaceIdentifier = aSpaceIdentifier; 28 32 compteur = 0; 29 33 m_spaceNameLabel = new QLabel("Nom de l'espace: "); /*!< Label of the QLineEdit. */ 30 m_spaceTypeLabel = new QLabel("Type de l'espace: "); /*!< The QComboBox's type label. */31 m_spaceD1Label = new QLabel("Dimension 1: "); /*!< Label of the 1st dimension. */32 m_spaceD2Label = new QLabel("Dimension 2: ");34 m_spaceTypeLabel = new QLabel("Type de l'espace: "); /*!< The QComboBox's type label. */ 35 m_spaceD1Label = new QLabel("Dimension 1: "); /*!< Label of the 1st dimension. */ 36 m_spaceD2Label = new QLabel("Dimension 2: "); 33 37 m_spaceD3Label = new QLabel("Dimension 3: "); 34 m_spaceTrajLabel = new QLabel("Trajectoire: ");38 m_spaceTrajLabel = new QLabel("Trajectoire: "); 35 39 36 m_spaceNameLine = new QLineEdit(this); /*!< Name of the QLineEdit. */37 m_spaceType = new QLineEdit("M",this); /*!< Type of the QComboBox. */40 m_spaceNameLine = new QLineEdit(this); /*!< Name of the QLineEdit. */ 41 m_spaceType = new QLineEdit("M",this); /*!< Type of the QComboBox. */ 38 42 m_spaceType->setEnabled(false); 39 m_spaceD1 = new QComboBox(this); /*!< Name of the 1st dimension. */43 m_spaceD1 = new QComboBox(this); /*!< Name of the 1st dimension. */ 40 44 m_spaceD1->setEditable(true); 41 m_spaceD2 = new QComboBox(this); /*!< Name of the 2nd dimension. */45 m_spaceD2 = new QComboBox(this); /*!< Name of the 2nd dimension. */ 42 46 m_spaceD2->setEditable(true); 43 m_spaceD3 = new QComboBox(this); /*!< Name of the 3rd dimension. */47 m_spaceD3 = new QComboBox(this); /*!< Name of the 3rd dimension. */ 44 48 m_spaceD3->setEditable(true); 45 m_spaceTrajname = new QComboBox(this); /*!< Name of the selected traj. Must be declared */49 m_spaceTrajname = new QComboBox(this); /*!< Name of the selected traj. Must be declared */ 46 50 m_spaceTrajname->setEditable(true); 47 51 //for (QStringList::iterator it = trajData->getTrajName().begin(); it != trajData->getTrajName().end(); it++) … … 49 53 50 54 //m_spaceTrajname->addItem(trajData->); 51 m_spaceAddButton = new QPushButton("Ajouter", this); /*!< The button "add". */55 m_spaceAddButton = new QPushButton("Ajouter", this); /*!< The button "add". */ 52 56 //m_spaceEnregButton = new QPushButton("Enregistrer",this); /*!< The button "save". */ 53 57 // m_spaceEnregButton->setDisabled(true); 54 m_spaceDeleteButton = new QPushButton("Supprimer", this); /*!< The button "delete". */58 m_spaceDeleteButton = new QPushButton("Supprimer", this); /*!< The button "delete". */ 55 59 m_spaceDeleteButton->setDisabled(true); 56 m_spaceHelpButton = new QPushButton("Aide", this); 57 m_spaceQuitButton = new QPushButton("Quitter", this); /*!< The button "Quit". */ 58 59 m_spaceTableView = new QTableWidget(0, 6, this); /*!< Name of the QTableWidget's object in whitch the objects are listed for the viewer. */ 60 m_horizontalHeader << "Nom" << "Type" << "Dim 1" << "Dim 2" << "Dim 3" << "Nom traj"; 61 62 m_spaceTableView->setHorizontalHeaderLabels(m_horizontalHeader); 63 m_spaceTableView->setEditTriggers(QAbstractItemView::NoEditTriggers); 64 m_spaceTableView->setShowGrid(false); 65 m_spaceTableView->setSelectionBehavior(QAbstractItemView::SelectRows); 66 67 68 m_spaceLayout1V = new QVBoxLayout; 60 m_spaceHelpButton = new QPushButton("Aide", this); 61 m_spaceHelpButton->setMaximumSize(35, 25); 62 m_spaceQuitButton = new QPushButton("Quitter", this); /*!< The button "Quit". */ 63 64 modeleSpace = new QStandardItemModel(0, 6) ; 65 modeleSpace->setHorizontalHeaderLabels(QStringList() << "Nom" << "Type" << "Dim 1" << "Dim 2" << "Dim 3" << "Nom traj"); 66 67 m_spaceTableView = new QTableView; /*!< Name of the QTableView's object in whitch the objects are listed for the viewer. */ 68 m_spaceTableView->setModel(modeleSpace); 69 m_spaceTableView->setEditTriggers(QAbstractItemView::NoEditTriggers); /*!< this ligne give no edit mode*/ 70 m_spaceTableView->setShowGrid(false); /*!< this ligne cover the grille in table */ 71 m_spaceTableView->setSelectionBehavior(QAbstractItemView::SelectRows); 72 73 m_spaceLayout1V = new QVBoxLayout; 69 74 m_spaceLayout1V->addWidget(m_spaceAddButton); 70 75 m_spaceLayout1V->addWidget(m_spaceDeleteButton); 71 76 m_spaceLayout1V->addWidget(m_spaceHelpButton); 72 77 73 m_spaceLayout1H = new QHBoxLayout; /*!< The 1st horizontal Layout's name. */78 m_spaceLayout1H = new QHBoxLayout; /*!< The 1st horizontal Layout's name. */ 74 79 m_spaceLayout1H->addWidget(m_spaceTableView); 75 80 m_spaceLayout1H->addLayout(m_spaceLayout1V); 76 81 77 m_spaceLayout2H = new QHBoxLayout; /*!< The 2nd horizontal Layout's name. */82 m_spaceLayout2H = new QHBoxLayout; /*!< The 2nd horizontal Layout's name. */ 78 83 m_spaceLayout2H->addWidget(m_spaceQuitButton); 79 84 80 m_spaceLayoutG = new QGridLayout;85 m_spaceLayoutG = new QGridLayout; 81 86 m_spaceLayoutG->addWidget(m_spaceNameLabel, 0, 1); /*!< Adding in the main layout: the space's name. */ 82 87 m_spaceLayoutG->addWidget(m_spaceNameLine, 0, 2, Qt::AlignLeft); … … 95 100 m_spaceLayoutG->addWidget(m_spaceAddButton, 7, 5); 96 101 m_spaceLayoutG->addWidget(m_spaceDeleteButton, 8, 5); 97 m_spaceLayoutG->addWidget(m_space HelpButton, 9, 5);98 m_spaceLayoutG->addWidget(m_space QuitButton, 10, 5);102 m_spaceLayoutG->addWidget(m_spaceQuitButton, 9, 5); 103 m_spaceLayoutG->addWidget(m_spaceHelpButton, 11, 5); 99 104 //m_spaceLayoutG->addLayout(m_spaceLayout2H, 10, 1, 1, 4); 100 105 … … 114 119 void SpaceWindow::addSpaceRow() { 115 120 116 addRow(); 117 testContenu(compteur); 118 119 //static int i = 1; 120 //static int j = 1; 121 122 string name = m_spaceNameLine->text().toStdString(), 123 d1 = m_spaceD1->currentText().toStdString(), 124 d2 = m_spaceD2->currentText().toStdString(), 125 d3 = m_spaceD3->currentText().toStdString(), 126 traj = m_spaceTrajname->currentText().toStdString(); 127 128 //for (int i = 0; name.size(); i++) { 129 130 if (!isString(name)) { 131 QMessageBox::about(this, tr("Erreur de saisie!"), 132 tr("<p>Le premier champ contient au moins un caractere non conforme!<p> Les Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 133 return; 134 } 135 if (!isInt(d1)) { 136 QMessageBox::about(this, tr("Erreur de saisie!"), 137 tr("<p>Seuls les nombres entiers sont acceptes au niveau du champ D1! <p> Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 138 return; 139 } 140 if (!isInt(d2)) { 141 QMessageBox::about(this, tr("Erreur de saisie!"), 142 tr("<p>Seuls les nombres entiers sont acceptes au niveau du champ D2! <p> Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 143 return; 144 } 145 if (!isInt(d3)) { 146 QMessageBox::about(this, tr("Erreur de saisie!"), 147 tr("<p>Seuls les nombres entiers sont acceptes au niveau du champ D3! <p> Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 148 return; 149 } 150 151 152 if (!isString(traj)) { 153 QMessageBox::about(this, tr("Erreur de saisie!"), 154 tr("<p>Vous avez saisi au moins un caractere non conforme au niveau du champ de la trajectoire!<p> Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 155 return; 156 } 157 158 static int row = 0; 159 int l = 0; 160 161 if (l >= 0) { 162 if (isCalled) {--row ; isCalled = false; } 163 m_spaceTableView->setItem(row,0, new QTableWidgetItem(m_spaceNameLine->text())); 164 m_spaceTableView->setItem(row,1, new QTableWidgetItem(m_spaceType->text())); 165 m_spaceTableView->setItem(row,2, new QTableWidgetItem(m_spaceD1->currentText())); 166 m_spaceTableView->setItem(row,3, new QTableWidgetItem(m_spaceD2->currentText())); 167 m_spaceTableView->setItem(row,4, new QTableWidgetItem(m_spaceD3->currentText())); 168 m_spaceTableView->setItem(row,5, new QTableWidgetItem(m_spaceTrajname->currentText())); 169 170 m_localData.push_back(m_spaceNameLine->text()); //+ " " + m_spaceType->text() + " " + m_spaceD1->currentText() + 121 122 m_spaceDeleteButton->setEnabled(true); 123 124 string name = m_spaceNameLine->text().toStdString(), 125 d1 = m_spaceD1->currentText().toStdString(), 126 d2 = m_spaceD2->currentText().toStdString(), 127 d3 = m_spaceD3->currentText().toStdString(), 128 traj = m_spaceTrajname->currentText().toStdString(); 129 130 131 /* if (!isString(name)) { 132 QMessageBox::about(this, tr("Erreur de saisie!"), 133 tr("<p>Le premier champ contient au moins un caractere non conforme!<p> Les Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 134 return; 135 } 136 if (!isInt(d1)) { 137 QMessageBox::about(this, tr("Erreur de saisie!"), 138 tr("<p>Seuls les nombres entiers sont acceptes au niveau du champ D1! <p> Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 139 return; 140 } 141 if (!isInt(d2)) { 142 QMessageBox::about(this, tr("Erreur de saisie!"), 143 tr("<p>Seuls les nombres entiers sont acceptes au niveau du champ D2! <p> Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 144 return; 145 } 146 if (!isInt(d3)) { 147 QMessageBox::about(this, tr("Erreur de saisie!"), 148 tr("<p>Seuls les nombres entiers sont acceptes au niveau du champ D3! <p> Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 149 return; 150 } 151 152 if (!isString(traj)) { 153 QMessageBox::about(this, tr("Erreur de saisie!"), 154 tr("<p>Vous avez saisi au moins un caractere non conforme au niveau du champ de la trajectoire!<p> Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 155 return; 156 } 157 158 //static int row = 0; 159 // int l = 0; 160 //else 161 //if (l >= 0) 162 // {*/ 163 int row = modeleSpace->rowCount(); 164 165 modeleSpace->setItem(row, 0, new QStandardItem(m_spaceNameLine->text())); 166 modeleSpace->setItem(row, 1, new QStandardItem(m_spaceType->text())); 167 modeleSpace->setItem(row, 2, new QStandardItem(m_spaceD1->currentText())); 168 modeleSpace->setItem(row, 3, new QStandardItem(m_spaceD2->currentText())); 169 modeleSpace->setItem(row, 4, new QStandardItem(m_spaceD3->currentText())); 170 modeleSpace->setItem(row, 5, new QStandardItem(m_spaceTrajname->currentText())); 171 172 Identifier id(name, row); 173 vector <int> vecteur; 174 vecteur.push_back(toInt(d1)); 175 vecteur.push_back(toInt(d2)); 176 vecteur.push_back(toInt(d3)); 177 //Component(const std::string& aName, const T* aParent); 178 //Component com(name, ); 179 //localSpaceExtent->push_back(vecteur); 180 //localSpaceIdentifier->push_back(id); 181 //for (Table <Identifier>::iterator it = localSpaceExtent->begin(); it != localSpaceExtent->end(); it++) 182 //cout << "Voici le dernier ajout: " << it->getName().toStdString() << endl; 183 //m_localData.push_back(m_spaceNameLine->text()); //+ " " + m_spaceType->text() + " " + m_spaceD1->currentText() + 171 184 //" " + m_spaceD2->currentText() + " " + m_spaceD3->currentText() + 172 185 //" " + m_spaceTrajname->currentText()); //<< m_spaceNameLine->text() << m_spaceType->text(); 173 row++; 174 } 175 //m_spaceDeleteButton->setEnabled(true); 176 toInitialize(); 186 // row++; 187 toInitialize(); 188 // } 177 189 //testPresenceLigne(); 178 179 180 181 } 190 } 191 192 /***********************************************************************************************************************/ 193 const int SpaceWindow::toInt(const string& s) { 194 195 //QStringList test; 196 return atoi(s.c_str()); 197 198 } 199 182 200 /************************************* Implementation of function addRow **************************************************/ 183 void SpaceWindow::addRow() {184 185 int row = m_spaceTableView->rowCount();186 m_spaceTableView->insertRow(row);187 compteur ++;188 189 }201 //void SpaceWindow::addRow() { 202 203 //int row = m_spaceTableView->rowCount(); 204 //m_spaceTableView->insertRow(row); 205 //compteur ++; 206 207 //} 190 208 191 209 /************************************** Implementation of function deleteRow **********************************************/ 192 210 void SpaceWindow::deleteRow() { 193 211 194 m_spaceTableView->removeRow(m_spaceTableView->currentRow());212 //m_spaceTableView->removeRow(m_spaceTableView->currentRow()); 195 213 //testPresenceLigne(); 196 214 197 isCalled = true; 198 -- compteur; 199 testContenu(compteur); 215 QItemSelectionModel *selection = m_spaceTableView->selectionModel(); 216 index = selection->currentIndex(); 217 QVariant element = modeleSpace->data(index, Qt::DisplayRole); 218 int r = index.row(); 219 if (selection->hasSelection())// Permet de supprimer la ligne qui est selectionnée. Evite ainsi certains effets indesirables. 220 { 221 modeleSpace->removeRows(m_spaceTableView->currentIndex().row(), 1); 222 //localTrajectoryTable->erase(localTrajectoryTable->begin() + r); 223 224 } 200 225 } 201 226
Note: See TracChangeset
for help on using the changeset viewer.