correct bug with clkrstgen

[blast.git] / AbstractBlock.h

diff --git a/AbstractBlock.h b/AbstractBlock.h
index aee8c99766ae2256175662dbba913f1734d25382..042a59883b90d4bcf5339a8f491ce3e0ca98234d 100644 (file)
--- a/AbstractBlock.h
+++ b/AbstractBlock.h
@@ -37,11 +37,14 @@ public:
   QList<BlockParameter *> getWishboneParameters();\r
   inline AbstractBlock* getParent() { return parent; }\r
   inline bool getPatternComputed() { return patternComputed; }\r
   QList<BlockParameter *> getWishboneParameters();\r
   inline AbstractBlock* getParent() { return parent; }\r
   inline bool getPatternComputed() { return patternComputed; }\r

+  inline int getTraversalLevel() { return traversalLevel; }\r

   \r
   // setters\r
   void setName(const QString& str);\r
   virtual void setParent(AbstractBlock* _parent);\r
   inline void setPatternComputed(bool state) { patternComputed = state; }\r
   \r
   // setters\r
   void setName(const QString& str);\r
   virtual void setParent(AbstractBlock* _parent);\r
   inline void setPatternComputed(bool state) { patternComputed = state; }\r

+  inline void resetTraversalLevel() { traversalLevel = -1; }\r
+  inline void setTraversalLevel(int level) { traversalLevel = level; }\r

 \r
   // testers\r
   virtual bool isReferenceBlock();\r
 \r
   // testers\r
   virtual bool isReferenceBlock();\r


@@ -53,6 +56,8 @@ public:
   bool isWBConfigurable();\r
 \r
   // others\r
   bool isWBConfigurable();\r
 \r
   // others\r

+  static QString normalizeName(const QString& name);\r
+\r

   virtual void parametersValidation(QList<AbstractBlock*>* checkedBlocks, QList<AbstractBlock*>* blocksToConfigure) = 0; // ugly but usefull   \r
 \r
   void addParameter(BlockParameter *param);\r
   virtual void parametersValidation(QList<AbstractBlock*>* checkedBlocks, QList<AbstractBlock*>* blocksToConfigure) = 0; // ugly but usefull   \r
 \r
   void addParameter(BlockParameter *param);\r


@@ -70,8 +75,9 @@ public:
   BlockParameter* getParameterFromName(QString name);\r
 \r
   // patterns\r
   BlockParameter* getParameterFromName(QString name);\r
 \r
   // patterns\r

-  virtual bool checkInputPatternCompatibility() = 0;\r
-  virtual bool computeOutputPattern(int nbExec = -1) = 0;\r
+  virtual void checkInputPatternCompatibility() throw(Exception) = 0;\r
+  virtual void computeOutputPattern(int nbExec = -1) throw(Exception) = 0;\r
+  virtual void computeAdmittanceDelays() throw(Exception) = 0;\r

   \r
 protected:\r
 \r
   \r
 protected:\r
 \r


@@ -90,9 +96,12 @@ protected:
   \r
   // patterns  \r
   bool patternComputed;\r
   \r
   // patterns  \r
   bool patternComputed;\r

+  int traversalLevel; // the level (0, 1, ...) during the traversal of the graph\r

   \r
   // NB: only GroupBlock and FunctionalBlock have a real parent, except sources that have no parents\r
   AbstractBlock* parent;\r
   \r
   // NB: only GroupBlock and FunctionalBlock have a real parent, except sources that have no parents\r
   AbstractBlock* parent;\r

+\r
+\r

 };\r
 \r
 #endif // __ABSTRACTBLOCK_H__\r
 };\r
 \r
 #endif // __ABSTRACTBLOCK_H__\r