X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/f311fbc3e1436bf248c54225f0743cfa671c4bd7..18fecf25efe710631fabecbb9f689c2997fdfe18:/Parameters.h?ds=sidebyside

diff --git a/Parameters.h b/Parameters.h
index 7f14814..f03ca0a 100644
--- a/Parameters.h
+++ b/Parameters.h
@@ -16,10 +16,12 @@ class ReferenceBlock;
 class GroupBlock;
 class FunctionalBlock;
 class GroupScene;
+class AbstractBoxItem;
 class GroupItem;
 class BoxItem;
 class InterfaceItem;
 class Graph;
+class GroupWidget;
 
 #include "BlockImplementation.h"
 
@@ -76,6 +78,11 @@ public :
   inline void setCursorState(CursorState state) { cursorState = state; }
   inline void setDispatcher(Dispatcher* _dispatcher) { dispatcher = _dispatcher;}
 
+  // testers
+
+  // others
+  static QString normalizeName(const QString& name);
+
   /***************************************************
     attributes that are general to the application
   ***************************************************/  
@@ -84,7 +91,8 @@ public :
   QList<QString> implPathes;
   QList<ReferenceBlock*> availableBlocks;
   QList<BlockImplementation*> availableImplementations;
-
+  ReferenceBlock* delayRef;
+  BlockImplementation* delayImpl;  
 
   QString refLib;
   QString implLib;
@@ -92,6 +100,8 @@ public :
   // defaults for vhdl
   int wbDataWidth;
   int wbAddressWidth;
+  QString validityExtension; //! the string to add to ports to obtain the name of the associated validity port.
+  
   // defaults for scene elements
   int defaultBlockWidth;
   int defaultBlockHeight;
@@ -105,8 +115,10 @@ public :
   QString defaultIfaceFontName;
   int defaultIfaceFontSize;
   int connGapLength;
-  QPainterPath inArrow;
-  QPainterPath outArrow;
+  QPainterPath dataArrowIn;
+  QPainterPath dataArrowOut;
+  QPainterPath clkrstArrow;
+
 
   /***************************************************
    attributes that are specific for the current project
@@ -117,23 +129,29 @@ public :
   EditState editState; // takes values from EDIT_STATE_XXX
   bool unsaveModif;
   bool isRstClkShown;
+  QMap<FunctionalBlock*, BoxItem*> blockToItem; // allow to retrieve a box item from a functionnal block
+  QString projectPath;
+  QString projectName;
+  QString projectFile; // equals to projectPath/projectName.xml
 
   Graph* createGraph();
   void destroyGraph();
   inline Graph* getGraph() { return graph; }  
   ReferenceBlock* getReferenceBlock(int idCategory, int idBlock); // get the reference block from its category and index
+  ReferenceBlock* getHiddenReferenceBlock(QString blockName); // get a hidden block by name, i.e. in category 100
   FunctionalBlock* duplicateFunctionalBlock(FunctionalBlock* block); // adding a copy of a functional block to current group
 
 
   void clear();
 
   QDomElement openProjectFile(const QString& projectFileName) throw(Exception);
-  void loadProject(QDomElement root);
+  GroupWidget *loadProject(QDomElement root) throw(Exception);
 
   void loadBlastConfiguration(QString confFile) throw(Exception);
   void loadReferencesFromXml() throw(Exception);
   void loadReferencesFromLib() throw(Exception);
   void saveReferencesToLib() throw(Exception);
+  void createDelayBlock();
 
   void loadImplementationsFromXml() throw(Exception);
   void loadImplementationsFromLib() throw(Exception);
@@ -150,10 +168,12 @@ public :
   ReferenceBlock* searchBlockByXml(QString xmlName);
   ReferenceBlock* searchBlockByMd5(QString sumMd5);
 
+  BoxItem* searchFunctionalBlock(AbstractBlock* block);
+
   void save(QString confFile);
 
 
-  QString projectPath;
+
 
 private:
   Graph* graph; // the graph model of blocks
@@ -166,6 +186,7 @@ private:
 
   GroupScene* searchSceneById(int id, GroupScene* scene);
   BoxItem* searchBlockItemById(int id, GroupScene* scene);
+  BoxItem* searchFunctionalBlockRecur(AbstractBlock* block, GroupScene* scene);
   GroupItem* searchGroupItemById(int id, GroupScene* scene);
   InterfaceItem* searchInterfaceItemById(int id, GroupScene *scene);