X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/8fb3c55ee009a11db5e1c08a4cfb286979412745..HEAD:/AbstractBlock.h?ds=sidebyside

diff --git a/AbstractBlock.h b/AbstractBlock.h
index e1c33e4..f40af86 100644
--- a/AbstractBlock.h
+++ b/AbstractBlock.h
@@ -9,6 +9,7 @@
 #include "AbstractInterface.h"
 class AbstractInterface;
 class BlockParameter;
+class Graph;
 
 #define AB_TO_REF(ptr) ((ReferenceBlock*)ptr)
 #define AB_TO_FUN(ptr) ((FunctionalBlock*)ptr)
@@ -26,7 +27,7 @@ public:
   enum SpecialType { NotSpecial = 0, Source = 1, Sink = 2, ClkConvert = 3 };
 
 
-  AbstractBlock();
+  AbstractBlock(Graph* _graph);
   //AbstractBlock(const QString& _name);
   virtual ~AbstractBlock();
 
@@ -35,14 +36,25 @@ public:
   inline int getSpecialType() { return specialType; }
   inline QString getVersion() { return version; }
   inline int nbParameters() { return params.size(); }
-  inline QList<BlockParameter *> getParameters() { return params; }
+  inline Graph* getGraph() { return graph; }
+
   inline QList<AbstractInterface*> getInputs() { return inputs; }
   inline QList<AbstractInterface*> getOutputs() { return outputs; }
   inline QList<AbstractInterface*> getBidirs() { return bidirs; }  
+  QList<AbstractInterface *> getInterfaces(int direction = AbstractInterface::AnyDirection, int purpose = AbstractInterface::AnyPurpose);
+  QList<AbstractInterface *> getDataInputs(); //! return all inputs of type data
+  QList<AbstractInterface *> getDataOutputs(); //! return all inputs of type data
+  QList<AbstractInterface *> getControlInputs(); //! return all inputs of type control
+  QList<AbstractInterface *> getControlOutputs(); //! return all outputs of type control
+  AbstractInterface* getIfaceFromName(QString name);
+
+  inline QList<BlockParameter *> getParameters() { return params; }
+  BlockParameter* getParameterFromName(QString name);
   QList<BlockParameter *> getUserParameters();
   QList<BlockParameter *> getGenericParameters();
   QList<BlockParameter *> getPortParameters();
   QList<BlockParameter *> getWishboneParameters();
+
   inline AbstractBlock* getParent() { return parent; }
   inline bool getOutputPatternComputed() { return outputPatternComputed; }
   inline int getTraversalLevel() { return traversalLevel; }
@@ -63,7 +75,7 @@ public:
   virtual bool isGroupBlock();
   virtual bool isStimuliBlock(); //! a stimuli block is outside the top group and simulates a peripheral (NB: this is also a source)
   virtual bool isTopGroupBlock();
-  bool isSourceBlock(); //! a source block has no data inputs and thus executes infinitely
+  bool isSourceBlock(); //! a source block is either a block that has no data inputs or that is of special type source. Thus it executes infinitely
   bool isSinkBlock(); //! a sink block has no data outputs and just collects what it receives (i.e. no compatibility check)
   bool isWBConfigurable();
 
@@ -74,9 +86,7 @@ public:
    * \brief connectClkReset connects the clock and reset inputs to a clkrstgen block or the the group ifaces
    * \param idBlockClk is the id of the clock interface (there may be severals)
    * \param idGen is the id of the clkrstgen block
-  */
-  void connectClock(QString clkName, int idGen = 0) throw(Exception);
-  void connectReset(QString rstName, int idGen = 0) throw(Exception);
+  */  
   virtual QList<QString> getExternalResources() = 0; // returns the list of all external files needed for VHDL generation
   virtual void generateVHDL(const QString& path) throw(Exception) = 0; // main entry to generate the VHDL code
   void generateComponent(QTextStream& out, bool hasController=false) throw(Exception); // generate the component using reference
@@ -90,13 +100,6 @@ public:
   void removeAllInterfaces();
   void defineBlockParam(BlockParameter *param);
 
-  QList<AbstractInterface *> getInterfaces(int direction = AbstractInterface::AnyDirection, int purpose = AbstractInterface::AnyPurpose);
-  QList<AbstractInterface *> getDataInputs(); //! return all inputs of type data
-  QList<AbstractInterface *> getDataOutputs(); //! return all inputs of type data
-  QList<AbstractInterface *> getControlInputs(); //! return all inputs of type control
-  QList<AbstractInterface *> getControlOutputs(); //! return all outputs of type control
-  AbstractInterface* getIfaceFromName(QString name);
-  BlockParameter* getParameterFromName(QString name);
 
   // patterns
   virtual void checkInputPatternCompatibility() throw(Exception) = 0;
@@ -109,6 +112,7 @@ protected:
   QString name;
   int specialType;
   QString version;
+  Graph* graph;
 
   // parameters
   QList<BlockParameter *> params;