added admittance computation

[blast.git] / GroupScene.h

diff --git a/GroupScene.h b/GroupScene.h
index 19185a1f6787b730929c6a5ebc0a4784bc688485..a691a6dec8d7bdd41fe1590b0023c9e2dcd3ec07 100644 (file)
--- a/GroupScene.h
+++ b/GroupScene.h
@@ -42,7 +42,7 @@ public:
      - AddGroup: while a new group (empty or from selected blocks) is created
      - ItemEdtion: can move/resize blocks/interfaces, remove blocks/interface/group, ...
    */
      - AddGroup: while a new group (empty or from selected blocks) is created
      - ItemEdtion: can move/resize blocks/interfaces, remove blocks/interface/group, ...
    */

-  enum EditMode { InitState, AddBlock, AddConnection, AddGroup, ItemEdition };
+  enum EditMode { InitState, AddConnection, ItemEdition };

 
   GroupScene(GroupScene* _parentScene, GroupWidget* _window, Dispatcher* _dispatcher, Parameters* _params, bool topScene = false, QObject *parent = 0);
   ~GroupScene();
 
   GroupScene(GroupScene* _parentScene, GroupWidget* _window, Dispatcher* _dispatcher, Parameters* _params, bool topScene = false, QObject *parent = 0);
   ~GroupScene();


@@ -50,6 +50,7 @@ public:
   // attributes getters
   inline GroupItem* getGroupItem() {return groupItem;}
   inline QList<BoxItem*> getBoxItems() { return boxItems; }
   // attributes getters
   inline GroupItem* getGroupItem() {return groupItem;}
   inline QList<BoxItem*> getBoxItems() { return boxItems; }

+  inline QList<SourceItem*> getSourceItems() { return sourceItems; }

   inline QList<ConnectionItem*> getConnectionItems() { return connectionItems; }
   inline QList<GroupScene*> getChildrenScene() { return childrenScene; }
   inline GroupScene* getParentScene() { return parentScene; }
   inline QList<ConnectionItem*> getConnectionItems() { return connectionItems; }
   inline QList<GroupScene*> getChildrenScene() { return childrenScene; }
   inline GroupScene* getParentScene() { return parentScene; }


@@ -76,7 +77,7 @@ public:
   void removeBoxItem(BoxItem* item);
   
   // ConnectionItem related
   void removeBoxItem(BoxItem* item);
   
   // ConnectionItem related

-  void createConnectionItem(InterfaceItem* iface1, InterfaceItem* iface2, bool withinGroup = true);
+  void createConnectionItem(InterfaceItem* iface1, InterfaceItem* iface2);

   ConnectionItem* searchConnectionItem(InterfaceItem* iface1, InterfaceItem* iface2);
   void addConnectionItem(ConnectionItem* item);
   void removeConnectionItem(ConnectionItem* item);
   ConnectionItem* searchConnectionItem(InterfaceItem* iface1, InterfaceItem* iface2);
   void addConnectionItem(ConnectionItem* item);
   void removeConnectionItem(ConnectionItem* item);