X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/e5af659f87bcb199d6a5f10f09b311138351d0f3..fc9f5b8b77edda9e49a35d8ef75c4d71caf1c832:/GroupInterface.cpp

diff --git a/GroupInterface.cpp b/GroupInterface.cpp
index 7fc8745..ecc6ba7 100644
--- a/GroupInterface.cpp
+++ b/GroupInterface.cpp
@@ -2,7 +2,7 @@
 #include "FunctionalInterface.h"
 #include "GroupBlock.h"
 
-GroupInterface::GroupInterface(AbstractBlock* _owner, const QString& _name, int _direction, int _purpose) throw(Exception) : ConnectedInterface(_owner,_name,"expression","",_direction,_purpose) {
+GroupInterface::GroupInterface(AbstractBlock* _owner, const QString& _name, int _direction, int _purpose) throw(Exception) : ConnectedInterface(_owner,_name,"inherited","",_direction,_purpose) {
   if (! _owner->isGroupBlock()) throw(Exception(BLOCK_INVALID_TYPE));
 
   connectedFrom = NULL;
@@ -14,9 +14,7 @@ bool GroupInterface::isGroupInterface() {
 
 AbstractInterface *GroupInterface::clone() {
     GroupInterface *inter = new GroupInterface(owner,name,direction, purpose);
-    inter->setWidth(width);    
-    inter->connectFrom(NULL);
-
+    inter->setWidth(width);        
     return inter;
 }
 
@@ -38,11 +36,13 @@ 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
+     
 
 
   */
   if (iface->isReferenceInterface()) return false;
-  if (iface->getConnectedFrom() != NULL) return false;
+  ConnectedInterface* connIface = AI_TO_CON(iface);
+  if (connIface->getConnectedFrom() != NULL) return false;
 
   if (this->getOwner() == iface->getOwner()->getParent()) {
     if ((direction == Input) && (iface->getDirection() == Input)) return true;
@@ -57,6 +57,7 @@ bool GroupInterface::canConnectTo(AbstractInterface *iface) {
     if ((direction == Output) && (iface->getDirection() == Output)) return true;
     if ((direction == InOut) && (iface->getDirection() == InOut)) return true;
   }
+  
 
   return false;
 }
@@ -78,6 +79,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
+     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;
@@ -95,6 +97,9 @@ bool GroupInterface::canConnectFrom(AbstractInterface *iface) {
     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;
 }