Changeset 436 for trunk/yao

Timestamp:

10/03/10 16:21:45 (14 years ago)

Author:

yerima

Message:

The instruction window's graphical interface appear in the the visual Yao's workspace after clicking on the appropriate button in edition bar.

Location:

trunk/yao/src/interface

Files:

• src/MainWindow.cpp (modified) (4 diffs)
• src/include/MainWindow.hpp (modified) (1 diff)
• src/ui_/instructionwindow.ui (modified) (1 diff)
• ui_newprojectwindow.h (modified) (1 diff)

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
@@ -105 +103 @@
                 menuFichier->addAction(actionSortieProjet);
         menuEdition = menuBar()->addMenu("&Edition");
-                menuEdition->addAction(actionFichierDescription);
-                menuEdition->addAction(actionFichierHat);
+                //menuEdition->addAction(actionFichierDescription);
+                //menuEdition->addAction(actionFichierHat);
                 //nouveau->addAction(actionModule);
                 menuEdition->addAction(actionFichierInstruction);
                 menuEdition->addAction(actionGrapheModulaire);
-                menuEdition->addAction(actionInfosProjet);
+                //menuEdition->addAction(actionInfosProjet);
 
         menuAffichage = menuBar()->addMenu("&Affichage");
@@ -183 +181 @@
 
      // Les actions du menu Edition
-        actionFichierDescription = new QAction(tr("Fichier de description (.d)"), this);
-
-                connect(actionFichierDescription, SIGNAL(triggered()), this, SLOT(generateDFile()));
-
-        actionFichierHat = new QAction(tr("Fichier  (.h)"), this);
-        //actionModule = new QAction(tr("Modul"), this);
+        //actionFichierDescription = new QAction(tr("Fichier de description (.d)"), this);
+
+                //connect(actionFichierDescription, SIGNAL(triggered()), this, SLOT(generateDFile()));
+
+        //actionFichierHat = new QAction(tr("Fichier  (.h)"), this);
+                //actionModule = new QAction(tr("Modul"), this);
         actionFichierInstruction = new QAction(tr("Fichier instruction (.i)"), this);
+                connect(actionFichierInstruction, SIGNAL(triggered()), this, SLOT(instructionFileManager()));
         actionGrapheModulaire = new QAction(tr("Graphe modulaire"), this);
-        actionInfosProjet = new QAction(tr("Edition infos projet"), this);
+        //actionInfosProjet = new QAction(tr("Edition infos projet"), this);
 
      // Les actions du menu Affichage
@@ -904 +903 @@
 }
 
+/********************************************* Implementation of the method instructionFileManager() *********************************************/
+void MainWindow::instructionFileManager() {
+
+        
+        InstructionWindow *iw = new InstructionWindow ;
+        espace.addWindow(iw)->move(0, 0); 
+        iw->show();     
+
+}
 /********************************************* Implementation of the method initializeWindow(int anInt) *********************************************/
 void MainWindow::initializeWindow(int anInt) {

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

@@ -107 +107 @@
                         void desactivateToolBarButtons();
                         void generateDFile(std::string destination = "projects/");
+                        void instructionFileManager();
                         void montrerActionCompilation();
                         void montrerActionGenererD();

trunk/yao/src/interface/src/ui_/instructionwindow.ui

@@ -90 +90 @@
       <widget class="QLabel" name="m_fonctionParameterLabel">
        <property name="text">
-        <string>ParamÚtre:</string>
+        <string>ParamÚtre(s):</string>
        </property>
       </widget>

trunk/yao/src/interface/ui_newprojectwindow.h

@@ -2 +2 @@
 ** Form generated from reading UI file 'newprojectwindow.ui'
 **
-** Created: Tue Aug 3 14:31:25 2010
-**      by: Qt User Interface Compiler version 4.6.3
+** Created: Sun Oct 3 13:46:54 2010
+**      by: Qt User Interface Compiler version 4.6.2
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!