X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/4cf57e6db08da791233d75237f62e74bc88dd427..756baf5c8eaf003e8271dab9c395de2b0e704857:/FunctionalBlock.cpp?ds=sidebyside

diff --git a/FunctionalBlock.cpp b/FunctionalBlock.cpp
index 91f4e03..b494784 100644
--- a/FunctionalBlock.cpp
+++ b/FunctionalBlock.cpp
@@ -649,9 +649,7 @@ void FunctionalBlock::createInputPattern()  throw(Exception) {
     }
     // get the precursor output pattern
     QList<char>* out = connIface->getConnectedFrom()->getOutputPattern();
-
-    ConnectedInterface* assoIface = AI_TO_CON(connIface->getAssociatedIface());
-    AbstractInputModifier* modifier = assoIface->getInputModifier();
+    AbstractInputModifier* modifier = connIface->getInputModifier();
     // check if the input is modified
     if (modifier != NULL) {
 
@@ -815,12 +813,13 @@ void FunctionalBlock::computeOutputPattern(int nbExec) throw(Exception) {
 #ifdef DEBUG_FCTNAME
   cout << "call to " << qPrintable(fctName) << endl;
 #endif
-  
+
+  clearOutputPattern();
+
   /* case 1: the block is a generator for which output pattern
      must be computed for a nbExec following executions
   */
-  
-  
+
   if (nbExec > 0) {
     cout << "computing output pattern of " << qPrintable(name) << " for " << nbExec << " executions" << endl;
     foreach(AbstractInterface* iface, getControlOutputs()) {
@@ -1243,6 +1242,20 @@ void FunctionalBlock::clearInputPattern() {
   lengthIP = -1;
 }
 
+void FunctionalBlock::clearOutputPattern() {
+
+  QMapIterator<AbstractInterface*,QList<char>* > iterO(outputPattern);
+  while (iterO.hasNext()) {
+    iterO.next();
+    ConnectedInterface* connIface = AI_TO_CON(iterO.key());
+    connIface->resetOutputPattern();
+    QList<char>* pattern = iterO.value();
+    if (pattern != NULL) delete pattern;
+  }
+  outputPattern.clear();
+  lengthOP = -1;
+}
+
 void FunctionalBlock::clearAdmittanceDelays() {
   QMapIterator<AbstractInterface*, QList<int>* > iterA(admittanceDelays);
   while (iterA.hasNext()) {