debugged clk/rst auto conn

[blast.git] / AbstractBlock.h

diff --git a/AbstractBlock.h b/AbstractBlock.h
index 2bb2717f969767ec4a6cce4e42f1b5b2727317d1..616682de66bc2cfbc12151269c3293671d97f33c 100644 (file)
--- a/AbstractBlock.h
+++ b/AbstractBlock.h
@@ -21,7 +21,7 @@ class AbstractBlock {
 public:  \r
       \r
   AbstractBlock();\r
 public:  \r
       \r
   AbstractBlock();\r

-  AbstractBlock(const QString& _name);\r
+  //AbstractBlock(const QString& _name);\r

   virtual ~AbstractBlock();\r
 \r
   // getters\r
   virtual ~AbstractBlock();\r
 \r
   // getters\r


@@ -30,18 +30,21 @@ public:
   inline QList<BlockParameter *> getParameters() { return params; }\r
   inline QList<AbstractInterface*> getInputs() { return inputs; }\r
   inline QList<AbstractInterface*> getOutputs() { return outputs; }\r
   inline QList<BlockParameter *> getParameters() { return params; }\r
   inline QList<AbstractInterface*> getInputs() { return inputs; }\r
   inline QList<AbstractInterface*> getOutputs() { return outputs; }\r

-  inline QList<AbstractInterface*> getBidirs() { return bidirs; }\r
+  inline QList<AbstractInterface*> getBidirs() { return bidirs; }  \r

   QList<BlockParameter *> getUserParameters();\r
   QList<BlockParameter *> getGenericParameters();\r
   QList<BlockParameter *> getPortParameters();\r
   QList<BlockParameter *> getWishboneParameters();\r
   inline AbstractBlock* getParent() { return parent; }\r
   inline bool getPatternComputed() { return patternComputed; }\r
   QList<BlockParameter *> getUserParameters();\r
   QList<BlockParameter *> getGenericParameters();\r
   QList<BlockParameter *> getPortParameters();\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,9 @@ public:
   bool isWBConfigurable();\r
 \r
   // others\r
   bool isWBConfigurable();\r
 \r
   // others\r

+  static QString normalizeName(const QString& name);\r
+  void connectClkReset() throw(Exception);\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


@@ -72,6 +78,7 @@ public:
   // patterns\r
   virtual void checkInputPatternCompatibility() throw(Exception) = 0;\r
   virtual void computeOutputPattern(int nbExec = -1) throw(Exception) = 0;\r
   // patterns\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 +97,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