after merge

[blast.git] / Dispatcher.h

diff --git a/Dispatcher.h b/Dispatcher.h
index 0ddba40cfcd221d46594c81dd6785f9a9b97da16..538ee667d23cfcded6ff7b63e4fc55ef12bf0fdd 100644 (file)
--- a/Dispatcher.h
+++ b/Dispatcher.h
@@ -68,18 +68,20 @@ public slots:
   BoxItem* getBoxItemById(int id);
   GroupItem* getGroupItemById(int id);
   InterfaceItem* getInterfaceItemById(int id);
   BoxItem* getBoxItemById(int id);
   GroupItem* getGroupItemById(int id);
   InterfaceItem* getInterfaceItemById(int id);

-  
+

 
   // block ops
 
   // block ops

-  void addBlock(int idCategory, int idBlock, int idScene);
+  BoxItem* addBlock(int idCategory, int idBlock, int idScene);

   void removeBoxItem(BoxItem* item);
   void duplicateBoxItem(BoxItem* item);
   void renameFunctionalBlock(BoxItem* item);
   void removeBoxItem(BoxItem* item);
   void duplicateBoxItem(BoxItem* item);
   void renameFunctionalBlock(BoxItem* item);

+  void generateBlockVHDL(BoxItem* item);

   void renameGroupBlock(GroupItem* item);
   void renameSourceBlock(SourceItem* item);
   void removeSourceItem(SourceItem* item);
   void duplicateSourceItem(SourceItem* item);
 
   void renameGroupBlock(GroupItem* item);
   void renameSourceBlock(SourceItem* item);
   void removeSourceItem(SourceItem* item);
   void duplicateSourceItem(SourceItem* item);
 

+

   // interface ops
   /*!
    * \brief connectInterToGroup
   // interface ops
   /*!
    * \brief connectInterToGroup


@@ -90,17 +92,7 @@ public slots:
    * connect to group in the contextual menu.
    * Thus, parameter item is always owned by a BoxItem
    */
    * connect to group in the contextual menu.
    * Thus, parameter item is always owned by a BoxItem
    */

-  void connectInterToGroup(InterfaceItem* item);
-  /*!
-   * \brief disconnectInterFromGroup
-   * \param item item is always owned by a BoxItem
-   *
-   * This method is called only when the user right clicks on an InterfaceItem (that belongs
-   * to a BoxItem and if it IS connected to an InterfaceItem of the GroupItem) and chooses
-   * disconnect from group in the contextual menu.
-   * Thus, parameter item is always owned by a BoxItem
-   */
-  void disconnectInterFromGroup(InterfaceItem* item);
+  void connectInterToGroup(InterfaceItem* item);  

   /*!
    * \brief removeFunctionalInterface
    * \param item item is always owned by a BoxItem
   /*!
    * \brief removeFunctionalInterface
    * \param item item is always owned by a BoxItem


@@ -122,13 +114,19 @@ public slots:
   void duplicateInterfaceItem(InterfaceItem* item);
   void showProperties(InterfaceItem *inter);
   void renameInterface(InterfaceItem* item);
   void duplicateInterfaceItem(InterfaceItem* item);
   void showProperties(InterfaceItem *inter);
   void renameInterface(InterfaceItem* item);

+  void showPatterns(InterfaceItem* item);
+  void showModifier(InterfaceItem* item);
+  void removeModifier(InterfaceItem* item);

 
   // connection ops
 
   // connection ops

-  bool createConnectionItem(InterfaceItem *iface1, InterfaceItem *iface2);    
+  bool createConnection(InterfaceItem *iface1, InterfaceItem *iface2, bool visible = true);

   void removeAllBlockConnections(AbstractBoxItem *item);
   void removeConnection(ConnectionItem *conn);
 
 
   void removeAllBlockConnections(AbstractBoxItem *item);
   void removeConnection(ConnectionItem *conn);
 
 

+  // analysis ops
+  void findGraphModifications(FunctionalBlock* block); // find modif so that block has compatible inputs
+

   // others
   void showBlocksLibrary();
 
   // others
   void showBlocksLibrary();