patter compat continued

[blast.git] / AbstractBlock.h

diff --git a/AbstractBlock.h b/AbstractBlock.h
index 88e4cb91076e0323eeb141263282e629206f5bad..aee8c99766ae2256175662dbba913f1734d25382 100644 (file)
--- a/AbstractBlock.h
+++ b/AbstractBlock.h
@@ -36,14 +36,11 @@ 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

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


@@ -73,6 +70,7 @@ 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
   \r
 protected:\r
   virtual bool computeOutputPattern(int nbExec = -1) = 0;\r
   \r
 protected:\r


@@ -90,9 +88,7 @@ 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
   \r
   // NB: only GroupBlock and FunctionalBlock have a real parent, except sources that have no parents\r
   bool patternComputed;\r
   \r
   // NB: only GroupBlock and FunctionalBlock have a real parent, except sources that have no parents\r