started top group gen, added project subdirs

[blast.git] / GroupBlock.h

diff --git a/GroupBlock.h b/GroupBlock.h
index 0f0d206fa3d1c9716b94db94dd8049f01a6ca87a..bb5e7710cb0adcc3b1f40d786cbe32160fab76e6 100644 (file)
--- a/GroupBlock.h
+++ b/GroupBlock.h
@@ -34,7 +34,7 @@ public:
   inline void addBlock(AbstractBlock* block) { blocks.append(block); }
   void removeBlock(AbstractBlock* block);
   AbstractBlock* getFunctionalBlockByName(QString name);
   inline void addBlock(AbstractBlock* block) { blocks.append(block); }
   void removeBlock(AbstractBlock* block);
   AbstractBlock* getFunctionalBlockByName(QString name);

-  
+

   void removeAllBlocks();
   void parametersValidation(QList<AbstractBlock *> *checkedBlocks, QList<AbstractBlock*>* blocksToConfigure);  
   void addGenericParameter(QString name, QString type, QString value);
   void removeAllBlocks();
   void parametersValidation(QList<AbstractBlock *> *checkedBlocks, QList<AbstractBlock*>* blocksToConfigure);  
   void addGenericParameter(QString name, QString type, QString value);


@@ -64,11 +64,12 @@ private:
    * found by taking the output pattern of the connectedFrom interface.
    */   
   void createInputPattern();
    * found by taking the output pattern of the connectedFrom interface.
    */   
   void createInputPattern();

-  void generateComments(QTextStream& out) throw(Exception);
-  void generateLibraries(QTextStream& out) throw(Exception);
-  void generateEntity(QTextStream& out) throw(Exception);
-  void generateArchitecture(QTextStream& out) throw(Exception);

 
 

+  void generateComments(QTextStream& out, QDomElement &elt, QString coreFile) throw(Exception); // generates comments from <comments> element
+  void generateLibraries(QTextStream& out, QDomElement &elt) throw(Exception); // generates libraries from <libraries> element
+  void generateEntity(QTextStream& out, bool hasController=false) throw(Exception); // generate the entity using reference
+  void generateArchitecture(QTextStream& out, QDomElement &elt ) throw(Exception); // generate the architecture using <architecture> element
+  void generateController(QTextStream& out) throw(Exception); // generate the wishbone controller of the block

   
   bool topGroup;  
   QList<AbstractBlock*> blocks; // contains instances of FunctionalBlock or GroupBlock that are children of this group
   
   bool topGroup;  
   QList<AbstractBlock*> blocks; // contains instances of FunctionalBlock or GroupBlock that are children of this group