correct relative positionning of source/group

[blast.git] / GroupInterface.cpp

diff --git a/GroupInterface.cpp b/GroupInterface.cpp
index 14f8b43e08b0912f8fc4f50e00c4a1e233ade918..67577900b5bb85c22261ff96d2d779b430924b25 100644 (file)
--- a/GroupInterface.cpp
+++ b/GroupInterface.cpp
@@ -2,18 +2,9 @@
 #include "FunctionalInterface.h"
 #include "GroupBlock.h"
 
 #include "FunctionalInterface.h"
 #include "GroupBlock.h"
 

-GroupInterface::GroupInterface(AbstractBlock* _owner, const QString& _name, int _direction, int _level) throw(Exception) : ConnectedInterface(_owner,_name,"expression","",_direction,AbstractInterface::Data,_level) {
+GroupInterface::GroupInterface(AbstractBlock* _owner, const QString& _name, int _direction, int _purpose) throw(Exception) : ConnectedInterface(_owner,_name,AbstractInterface::Inherited,"",_direction,_purpose) {

   if (! _owner->isGroupBlock()) throw(Exception(BLOCK_INVALID_TYPE));
 
   if (! _owner->isGroupBlock()) throw(Exception(BLOCK_INVALID_TYPE));
 

-  /* If the owner group is the top group, then all its interfaces are at top level => force them to be top.
-     If not, force them to be basic
-   */
-  if (((GroupBlock*)_owner)->isTop()) {
-    level = AbstractInterface::Top;
-  }
-  else {
-    level = AbstractInterface::Basic;
-  }

   connectedFrom = NULL;
 }
 
   connectedFrom = NULL;
 }
 


@@ -22,11 +13,8 @@ bool GroupInterface::isGroupInterface() {
 }
 
 AbstractInterface *GroupInterface::clone() {
 }
 
 AbstractInterface *GroupInterface::clone() {

-    GroupInterface *inter = new GroupInterface(owner,name,direction,level);
-    inter->setWidth(width);
-    inter->setDirection(direction);
-    inter->setPurpose(purpose);
-    inter->setLevel(level);
+    GroupInterface *inter = new GroupInterface(owner,name,direction, purpose);
+    inter->setWidth(width);    

     inter->connectFrom(NULL);
 
     return inter;
     inter->connectFrom(NULL);
 
     return inter;


@@ -50,6 +38,7 @@ bool GroupInterface::canConnectTo(AbstractInterface *iface) {
      3 - this is owned by a group and iface by its parent group
         2.1 - this is an output, iface is an output of the group
         2.2 - both are inout
      3 - this is owned by a group and iface by its parent group
         2.1 - this is an output, iface is an output of the group
         2.2 - both are inout

+     

 
 
   */
 
 
   */


@@ -69,6 +58,7 @@ bool GroupInterface::canConnectTo(AbstractInterface *iface) {
     if ((direction == Output) && (iface->getDirection() == Output)) return true;
     if ((direction == InOut) && (iface->getDirection() == InOut)) return true;
   }
     if ((direction == Output) && (iface->getDirection() == Output)) return true;
     if ((direction == InOut) && (iface->getDirection() == InOut)) return true;
   }

+  

 
   return false;
 }
 
   return false;
 }


@@ -90,6 +80,7 @@ bool GroupInterface::canConnectFrom(AbstractInterface *iface) {
      3 - this is owned by a group and iface by its parent group
         2.1 - this is an input, iface is an input of the group
         2.2 - both are inout
      3 - this is owned by a group and iface by its parent group
         2.1 - this is an input, iface is an input of the group
         2.2 - both are inout

+     4 - this is owned by top group and iface is an output of a source block           

   */
   if (iface->isReferenceInterface()) return false;
   if (getConnectedFrom() != NULL) return false;
   */
   if (iface->isReferenceInterface()) return false;
   if (getConnectedFrom() != NULL) return false;


@@ -107,6 +98,9 @@ bool GroupInterface::canConnectFrom(AbstractInterface *iface) {
     if ((direction == Input) && (iface->getDirection() == Input)) return true;
     if ((direction == InOut) && (iface->getDirection() == InOut)) return true;
   }
     if ((direction == Input) && (iface->getDirection() == Input)) return true;
     if ((direction == InOut) && (iface->getDirection() == InOut)) return true;
   }

+  else if ((getOwner()->isTopGroupBlock()) && (iface->getOwner()->isSourceBlock())) {
+    if ((direction == Input) && (iface->getDirection() == Output)) return true;
+  }

 
   return false;
 }
 
   return false;
 }