Changeset 470 for trunk/yao

Timestamp:

10/27/10 18:25:55 (14 years ago)

Author:

yerima

Message:

updates in a project opening

Location:

trunk/yao/src/interface

Files:

• Yao9Generator (modified) (previous)
• projects/demo/demo.d (modified) (2 diffs)
• src/MainWindow.cpp (modified) (13 diffs)
• src/include/MainWindow.hpp (modified) (2 diffs)

trunk/yao/src/interface/projects/demo/demo.d

@@ -12 +12 @@
 #TRAJ name type uptime offtime dtime steptime ------------------------------------------
 traj toc_1 M 20 0 1 30 
+traj toc_2 M 10 0 1 21
+traj toc_3 M 8 0 1 11
+traj toc_4 M 7 0 1 9
 
 #SPACE name type dim1 [[dim2]---[dim3]] traj ---------------------------------------------------
 space soc_0 M 1 3 5 toc_1
+space soc_1 M 3 5 toc_4
+space soc_2 M 1 3 5 toc_2
+space soc_3 M 7 3 5 toc_3
+space soc_4 M 5 5 3 toc_4
+space soc_5 M 4 3 5 toc_1
 
 #NETWARD netname indegree outdegree
@@ -21 +29 @@
 netward NNTd        4 1
 netward NNInvtau    9 1
+
+modul mod_1 space soc_0 input  4 output 1
+modul mod_2 space soc_1 input  3 
+modul mod_3 space soc_0 input  49 output 13
+modul mod_4 space soc_1 input  22 
+modul mod_5 space soc_0 input  41 output 10
+modul mod_6 space soc_1 input  12 
 
 #INSERTFCT

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

@@ -34 +34 @@
 */
 
-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), iw(NULL)     
+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), iw(NULL), confirmationFlag(false)     
 {
 
@@ -216 +216 @@
                 actionGenerationD->setText("Générer le fichier .d");
 
-                connect(actionGenerationD, SIGNAL(triggered()), this, SLOT(generateDFile()));
+                connect(actionGenerationD, SIGNAL(triggered()), this, SLOT(callGenerateDFile()));
                 //connect(actionGenerationD, SIGNAL(triggered()), this, SLOT(information()));
 
@@ -535 +535 @@
                 emit newProjectIsCreated();//Emits the signal that the project is created.
                 activateToolBarButtons(); // To active the toolbar buttons.
+                actionSaveAsProject->setEnabled(true); // Option désactivée par défaut.
         }
         fv->updateTheView(); //Permet de mettre à jour automatiquement la liste des fichiers visibles dans filesviewer.
@@ -590 +591 @@
 
 }
+
+/**************************************** Implementation of the method callgenerateDFile() (SLOT) *******************************************************/
+void MainWindow::callGenerateDFile() {
+        
+        generateDFile();
+        QMessageBox::about(this, "Avis", "Le fichier <B>"+ QString(getProjectName().c_str()) + ".d</B> a été généré avec succÚs.");
+
+}
 /**************************************** Implementation of the method saveAs() (SLOT) *******************************************************/
 void MainWindow::saveAs() {
@@ -611 +620 @@
         generateDFile(m_projectPath + "/");
         //cout << cheminFichier.toStdString() << endl;
+        
+        actionGenerationD->setEnabled(true);
 
 }
@@ -633 +644 @@
                 test = builder.readAll();//the results are saved in a string format.
                 istringstream iss(test.toStdString()); //To have each word that compose the string.
-                FilePath aString, theShape, name, parent, aType, boot, offset, step, size, netname, indegree, outdegree, arg;
+                FilePath aString, theShape, name, parent, aType, boot, offset, step, size, netname, indegree, outdegree, modname, arg;
                 vector <int> theShapeVector;
 
@@ -717 +728 @@
                                 if (aString.getExtension() == ".nw3") {
                                         outdegree = aString.getTitle(); 
+                                        theNeuronTable.push_back(Neuron(netname, m_netwardWindow->toInt(indegree), m_netwardWindow->toInt(outdegree)));
+                                }
+                                //For MODUL
+                                if (aString.getExtension() == ".mod1") {
+                                        modname = aString.getTitle(); 
                                         
-                                        theNeuronTable.push_back(Neuron(netname, m_netwardWindow->toInt(indegree), m_netwardWindow->toInt(outdegree)));
-                                }
-                                /*if (aString.getExtension() == ".op1") {
+                                }
+                                if (aString.getExtension() == ".mod2") {
+                                        aType = aString.getTitle(); 
+                                        
+                                }
+                                if (aString.getExtension() == ".mod3") {
+                                        parent = aString.getTitle(); 
+                                        
+                                        Modul mod1(modname, theSpaceTable.find(parent), true);
+                                        theModulTable.push_back(mod1);  
+                                }
+                                //For CONNECTION
+                                /*if (aString.getExtension() == ".mod1") {
                                         parent = aString.getTitle(); 
                                         //cout << parent << endl;
@@ -728 +754 @@
                                         
                                 }*/
+
                                 //For INSERTFCT 
                                 if (aString.getExtension() == ".fct1") {
@@ -750 +777 @@
                         actionSaveAsProject->setEnabled(true);
                 }
-
+        
+        
+        
         //connect(m_trajectoryWindow, SIGNAL(trajRowIsAdded(bool)), m_spaceButton, SLOT(setEnabled(bool)));
         //connect(m_trajectoryWindow, SIGNAL(trajRowIsAdded(bool)), m_operaButton, SLOT(setEnabled(bool)));
@@ -887 +916 @@
 }
 
-/**************************************** Implementation of the method generateDFile() (SLOT) ****************************************************/
+/**************************************** Implementation of the method generateDFile(string destination) (SLOT) *****************************/
 void MainWindow::generateDFile(string destination) {
         
@@ -952 +981 @@
                                 for (Table<Modul>::iterator it = theModulTable.begin(); it != theModulTable.end(); it++) {
                                         string parentType = it->isSpaceOrOperator()? "space " : "operator ";
-                                        description << "modul " << it->getName() << " " << parentType << it->getSpaceOrOperator() << " " << "input "<< it->getInput() << " " << "output "<< it->getOutput() << " " << "target " << it->getTarget()<< endl;
+                                        string aString =  "modul " + it->getName() + " " + parentType + it->getSpaceOrOperator(); 
+                                        if (!it->getInput())
+                                                aString.append(" input " + it->getInput());
+                                        description << aString << " " << "input "<< it->getInput() << " " << "output "<< it->getOutput() << " " << "target " << it->getTarget()<< endl;
                                 }
                                         description << endl;
@@ -978 +1010 @@
 
                         description.close();
-                        QMessageBox::about(this, "Avis", "Le fichier <B>"+ QString(filename.c_str()) + ".d</B> a été généré avec succÚs.");
                 }
 
@@ -1184 +1215 @@
       
 }*/
-
+/********************************** **/
 
 /*********************************** Implementation of the destructor method (~MainWindow()) *******************************************************/

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

@@ -97 +97 @@
                         void desactivateToolBarButtons();
                         void generateDFile(std::string destination = "projects/");
+                        void callGenerateDFile();// used only for the execution button
                         void generateIFile(std::string destination = "projects/");
                         void instructionFileManager();
@@ -274 +275 @@
 
                         bool m_activeProject;
+                        bool confirmationFlag;
                                 
                         QDateEdit *date;