Changeset 378 for trunk/yao

Timestamp:

07/06/10 10:01:10 (14 years ago)

Author:

yerima

Message:

Data generaed from modul window in visual Yao.

Location:

trunk/yao/src/interface/src

Files:

• MainWindow.cpp (modified) (1 diff)
• ModulWindow.cpp (modified) (1 diff)
• include/ModulWindow.hpp (modified) (1 diff)

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

@@ -640 +640 @@
                                         description << endl;
                         description << "//MODUL --------------------------------------------------------------------------" << endl;
-   
-                                /*  for (QStringList::iterator it = m_modulWindow->getDataModul().begin(); it != m_modulWindow->getDataModul().end(); it++)
-                        description << "modul " << it->toStdString() << endl;
-                        description << endl;*/
+                                for (Table<Modul>::iterator it = theModulTable.begin(); it != theModulTable.end(); it++)
+                                        description << "modul " << it->getName() << " " << it->getSpaceOrOperator() << " " << "input "<< it->getInput() << " " << "output "<< it->getOutput() << " " << "target " << it->getTarget()<< endl;
+                                        description << endl;
                         description << "//CONNECTIONS----------------------------------------------------------------------" << endl;
 

trunk/yao/src/interface/src/ModulWindow.cpp

@@ -20 +20 @@
 //! \brief Implementation of the Modul window for visual_YAO.
 //ModulWindow::ModulWindow(QWidget *parent):QWidget(parent) {
-ModulWindow::ModulWindow(Table <Modul> *aModulTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Table <Constant> *aConstantTable, MainWindowController *mwc, string *aProjectName, string *aProjectPath, QWidget *parent) : QWidget(parent), m_localModulTable(NULL), m_localModulName("") , Modul(m_localModulName) {
+ModulWindow::ModulWindow(Table <Modul> *aModulTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Table <Constant> *aConstantTable, MainWindowController *mwc, string *aProjectName, string *aProjectPath, QWidget *parent) : QWidget(parent), m_localModulTable(NULL)/*, Modul(m_localModulName)*/ {
 
 

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

@@ -16 +16 @@
 
 
-class ModulWindow: public QWidget, public Ui::ModulWindow, public yao::Modul {
+class ModulWindow: public QWidget, public Ui::ModulWindow/*, public yao::Modul*/ {
 
         Q_OBJECT