Changeset 435

Timestamp:

10/03/10 15:45:17 (14 years ago)

Author:

yerima

Message:

In the process of generating the instruction's file: the icon for the right button, the ui_instruction's graphical window and the Instruction's class (InstructionWindow?.cpp & InstructionWindow?.hpp) have been added for Visual Yao.

Location:

trunk/yao/src/interface

Files:

• Images/icons/rightarrow2.png (added)
• Makefile.save (modified) (1 diff)
• src/InstructionWindow.cpp (added)
• src/MainWindow.cpp (modified) (1 diff)
• src/include/InstructionWindow.hpp (added)
• src/include/MainWindow.hpp (modified) (1 diff)
• src/ui_/instructionwindow.ui (added)

trunk/yao/src/interface/Makefile.save

@@ -14 +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)
 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)
-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/
+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/ -I../../share/boost_1_39_0/ -I.
 LINK          = g++
 LFLAGS        = -Wl,--as-needed -Wl,--no-undefined -Wl,-z,relro -Wl,-O1

trunk/yao/src/interface/src/MainWindow.cpp

@@ -36 +36 @@
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), m_constantWindow(NULL), m_hatnameWindow(NULL), m_contextWindow(NULL), m_trajectoryWindow(NULL), m_spaceWindow(NULL), m_operaWindow(NULL), m_netwardWindow(NULL), m_modulWindow(NULL), m_ctinWindow(NULL), m_orderWindow(NULL), m_insertFCTWindow(NULL), m_newProjectWindow(NULL), m_newProjectName(""), theConstantTablePt(theConstantTable), contextTest(false)    
 {
-        
+        InstructionWindow *in = new InstructionWindow ;
+        in->show();     
         setWindowTitle(" Visual YAO ");         //Gives a title to the mainwindow.
         pt_espace = new QWorkspace;                             //Crée un espace de travail. Ici, ça serait notre zone centrale

trunk/yao/src/interface/src/include/MainWindow.hpp

@@ -46 +46 @@
 #include "ConnectionWindow.hpp"
 #include "NewProjectWindow.hpp"
+#include "InstructionWindow.hpp"
 
 /*!