after merge

[blast.git] / AbstractBoxItem.cpp

diff --git a/AbstractBoxItem.cpp b/AbstractBoxItem.cpp
index 391f79541c7c9f45935d86669fe7ed01b283e89e..925cd6fa83ef1ed479163fe72077779bd2923780 100644 (file)
--- a/AbstractBoxItem.cpp
+++ b/AbstractBoxItem.cpp
@@ -99,7 +99,7 @@ void AbstractBoxItem::setRstClkVisible(bool b) {
       ifaceItem->visible = b;
     }
   }
       ifaceItem->visible = b;
     }
   }

-  resetInterfacesPosition();
+  resetInterfaceItemsPosition();

   updateGeometry(InterfaceMove);
   update();
   getScene()->updateConnectionItemsShape();
   updateGeometry(InterfaceMove);
   update();
   getScene()->updateConnectionItemsShape();


@@ -114,7 +114,7 @@ void AbstractBoxItem::setWishboneVisible(bool b) {
       ifaceItem->visible = b;
     }
   }
       ifaceItem->visible = b;
     }
   }

-  resetInterfacesPosition();
+  resetInterfaceItemsPosition();

   updateGeometry(InterfaceMove);
   update();
   getScene()->updateConnectionItemsShape();
   updateGeometry(InterfaceMove);
   update();
   getScene()->updateConnectionItemsShape();


@@ -128,7 +128,7 @@ void AbstractBoxItem::setRefBlock(AbstractBlock* _refBlock) {
   nameHeight = fmId.height();
 }
 
   nameHeight = fmId.height();
 }
 

-void AbstractBoxItem::initInterfaces() {
+void AbstractBoxItem::initInterfaceItems() {

   /* TO DO : creating all needed InterfaceItem, with by default, input at west and output at east */
   int orientation = Parameters::West;
 
   /* TO DO : creating all needed InterfaceItem, with by default, input at west and output at east */
   int orientation = Parameters::West;
 


@@ -151,7 +151,7 @@ void AbstractBoxItem::initInterfaces() {
   }
 }
 
   }
 }
 

-InterfaceItem* AbstractBoxItem::searchInterfaceByName(QString name) {
+InterfaceItem* AbstractBoxItem::searchInterfaceItemByName(QString name) {

   foreach(InterfaceItem *inter, interfaces){
     if(inter->getName() == name)
       return inter;
   foreach(InterfaceItem *inter, interfaces){
     if(inter->getName() == name)
       return inter;


@@ -159,7 +159,7 @@ InterfaceItem* AbstractBoxItem::searchInterfaceByName(QString name) {
   return NULL;
 }
 
   return NULL;
 }
 

-InterfaceItem* AbstractBoxItem::searchInterfaceByRef(ConnectedInterface *ref) {
+InterfaceItem* AbstractBoxItem::searchInterfaceItemByRef(ConnectedInterface *ref) {

   foreach(InterfaceItem *inter, interfaces){
     if(inter->refInter == ref) {
       return inter;
   foreach(InterfaceItem *inter, interfaces){
     if(inter->refInter == ref) {
       return inter;


@@ -168,16 +168,16 @@ InterfaceItem* AbstractBoxItem::searchInterfaceByRef(ConnectedInterface *ref) {
   return NULL;
 }
 
   return NULL;
 }
 

-void AbstractBoxItem::addInterface(InterfaceItem *i, bool resetPosition) {
+void AbstractBoxItem::addInterfaceItem(InterfaceItem *i, bool resetPosition) {

   interfaces.append(i);
   interfaces.append(i);

-  if (resetPosition) resetInterfacesPosition();
+  if (resetPosition) resetInterfaceItemsPosition();

   updateGeometry(InterfaceMove);
   update();
 }
 
   updateGeometry(InterfaceMove);
   update();
 }
 

-void AbstractBoxItem::removeInterface(InterfaceItem *i) {
+void AbstractBoxItem::removeInterfaceItem(InterfaceItem *i) {

   // NB : removing from model is done in dispatcher
   // NB : removing from model is done in dispatcher

-  interfaces.removeOne(i);
+  interfaces.removeAll(i);

   delete i;
 
   //resetInterfacesPosition();
   delete i;
 
   //resetInterfacesPosition();


@@ -186,7 +186,7 @@ void AbstractBoxItem::removeInterface(InterfaceItem *i) {
 }
 
 
 }
 
 

-void AbstractBoxItem::resetInterfacesPosition() {
+void AbstractBoxItem::resetInterfaceItemsPosition() {

 
   int nbNorth=0, nbSouth=0, nbEast=0, nbWest=0;
   double cntNorth=1.0,cntSouth=1.0,cntEast=1.0,cntWest=1.0;
 
   int nbNorth=0, nbSouth=0, nbEast=0, nbWest=0;
   double cntNorth=1.0,cntSouth=1.0,cntEast=1.0,cntWest=1.0;


@@ -231,7 +231,7 @@ void AbstractBoxItem::resetInterfacesPosition() {
   }
 }
 
   }
 }
 

-void AbstractBoxItem::moveInterfaceTo(QPointF pos) {
+void AbstractBoxItem::moveInterfaceItemTo(QPointF pos) {

   double positionRatio;
   if(currentInterface->getOrientation() == Parameters::North || currentInterface->getOrientation() == Parameters::South){
     if(pos.x() < 0){
   double positionRatio;
   if(currentInterface->getOrientation() == Parameters::North || currentInterface->getOrientation() == Parameters::South){
     if(pos.x() < 0){


@@ -308,7 +308,7 @@ int AbstractBoxItem::nbInterfacesByOrientation(int orientation) {
   return nb;
 }
 
   return nb;
 }
 

-void AbstractBoxItem::updateInterfacesAndConnections() {
+void AbstractBoxItem::updateInterfaceAndConnectionItems() {

 
   // update all interfaces positions
   foreach(InterfaceItem *item, interfaces){
 
   // update all interfaces positions
   foreach(InterfaceItem *item, interfaces){


@@ -330,7 +330,7 @@ void AbstractBoxItem::setDimension(int x, int y) {
   boxHeight = y;
 }
 
   boxHeight = y;
 }
 

-InterfaceItem* AbstractBoxItem::getInterfaceFromCursor(qreal x, qreal y) {
+InterfaceItem* AbstractBoxItem::getInterfaceItemFromCursor(qreal x, qreal y) {

 
   foreach(InterfaceItem* inter, interfaces) {
     if(x > inter->boundingRect().x() && x < (inter->boundingRect().x() + inter->boundingRect().width())){
 
   foreach(InterfaceItem* inter, interfaces) {
     if(x > inter->boundingRect().x() && x < (inter->boundingRect().x() + inter->boundingRect().width())){