added admittance computation

[blast.git] / InterfaceItem.h

diff --git a/InterfaceItem.h b/InterfaceItem.h
index ce65b9e04605aa58229abb5cfa198d2260e1230b..77ddf72d06334fd8bc8265f76d043c8d3dbfef25 100644 (file)
--- a/InterfaceItem.h
+++ b/InterfaceItem.h
@@ -30,7 +30,7 @@ public:
 
   // getters
   inline int getId() { return id; }
 
   // getters
   inline int getId() { return id; }

-  inline QString getName() { return name; }
+  QString getName();

   inline double getPositionRatio() { return positionRatio; }
   inline double getPosition() { return position; }
   inline int getOrientation() { return orientation; }
   inline double getPositionRatio() { return positionRatio; }
   inline double getPosition() { return position; }
   inline int getOrientation() { return orientation; }


@@ -38,23 +38,21 @@ public:
   inline int getNameWidth() { return nameWidth; }
   inline int getNameHeight() { return nameHeight; }
   QString getStrOrientation();
   inline int getNameWidth() { return nameWidth; }
   inline int getNameHeight() { return nameHeight; }
   QString getStrOrientation();

-  static int getIntOrientation(QString str);
-  QPointF getEndPointInGroup();
+  static int getIntOrientation(QString str);  
+  QPointF getEndPosition();
+  QPointF getStartPosition();

 
   // setters
   void setOriginPoint();
 
   // setters
   void setOriginPoint();

-  inline void setId(int id){ this->id = id; }
-  inline void setName(QString name){ this->name = name; }
+  inline void setId(int id){ this->id = id; }  

   inline void setPositionRatio(double ratio) { positionRatio = ratio; }
   inline void setOrientation(int _orientation){ orientation = _orientation; }
 
   // others
   void addConnectionItem(ConnectionItem* item);
   inline void setPositionRatio(double ratio) { positionRatio = ratio; }
   inline void setOrientation(int _orientation){ orientation = _orientation; }
 
   // others
   void addConnectionItem(ConnectionItem* item);

-  void removeConnectionItem(ConnectionItem* item);
-  bool canConnectWith(InterfaceItem* iface);
-  bool connectWith(InterfaceItem* iface);
-  void unconnectTo(InterfaceItem *iface);
+  void removeConnectionItem(ConnectionItem* item);  

   void updatePosition();
   void updatePosition();

+  void updateName(QString name);

 
   AbstractBoxItem* owner;
   ConnectedInterface* refInter;
 
   AbstractBoxItem* owner;
   ConnectedInterface* refInter;


@@ -68,8 +66,7 @@ public:
 
 
 private:
 
 
 private:

-  int id;
-  QString name;
+  int id;  

   double positionRatio;
   int position; // position in pixels on the "orientation side" of the owner
   int orientation; // north, south, east, west
   double positionRatio;
   int position; // position in pixels on the "orientation side" of the owner
   int orientation; // north, south, east, west