correct bug with clkrstgen

[blast.git] / AbstractBlock.h

diff --git a/AbstractBlock.h b/AbstractBlock.h
index 88e4cb91076e0323eeb141263282e629206f5bad..042a59883b90d4bcf5339a8f491ce3e0ca98234d 100644 (file)
--- a/AbstractBlock.h
+++ b/AbstractBlock.h
@@ -36,15 +36,15 @@ public:
   QList<BlockParameter *> getPortParameters();\r
   QList<BlockParameter *> getWishboneParameters();\r
   inline AbstractBlock* getParent() { return parent; }\r
   QList<BlockParameter *> getPortParameters();\r
   QList<BlockParameter *> getWishboneParameters();\r
   inline AbstractBlock* getParent() { return parent; }\r

-  inline QList<int> getProductionCounter() { return productionCounter; }\r
-  inline int getDelta() { return delta; }\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
   \r
   // setters\r
   void setName(const QString& str);\r
   virtual void setParent(AbstractBlock* _parent);\r

-  inline void setProductionCounter(QList<int> pattern) { productionCounter = pattern; }\r
-  inline void setDelta(int _delta) { delta = _delta; }\r

   inline void setPatternComputed(bool state) { patternComputed = state; }\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


@@ -56,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


@@ -73,7 +75,9 @@ public:
   BlockParameter* getParameterFromName(QString name);\r
 \r
   // patterns\r
   BlockParameter* getParameterFromName(QString name);\r
 \r
   // patterns\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,13 +94,14 @@ protected:
   \r
   // others\r
   \r
   \r
   // others\r
   \r

-  // patterns\r
-  QList<int> productionCounter; //! only usefull for output interfaces\r
-  int delta;\r
+  // patterns  \r

   bool patternComputed;\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