X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/d43174d0eb3d293b3bb5fbe76662241134e74d0d..3fb762e7042d9b4a1cf78556ad9ed7f117cc53ba:/Parameters.cpp?ds=inline

diff --git a/Parameters.cpp b/Parameters.cpp
index 4fd583d..d7621d2 100644
--- a/Parameters.cpp
+++ b/Parameters.cpp
@@ -9,6 +9,7 @@
 #include "GroupScene.h"
 #include "GroupItem.h"
 #include "BoxItem.h"
+#include "StimuliItem.h"
 #include "InterfaceItem.h"
 #include "ConnectionItem.h"
 
@@ -23,6 +24,10 @@
 #include "Exception.h"
 #include "BlocksToConfigureWidget.h"
 
+#include "BlockParameterGeneric.h"
+
+#include "DelayInputModifier.h"
+
 Parameters::Parameters() {
   categoryTree = NULL;
   arrowWidth = 5;
@@ -41,8 +46,14 @@ Parameters::Parameters() {
 
   unsaveModif = false;
   isRstClkShown = false;
+  
+  validityExtension = "_enb";
+
+  projectPath = "";
+  projectName = "";
+  projectFile = "";
 
-  projectPath = QDir::currentPath();
+  graph = new Graph();
 }
 
 Parameters::~Parameters() {
@@ -60,8 +71,8 @@ void Parameters::clear() {
   refPathes.clear();
 }
 
-Graph* Parameters::createGraph() {
-  graph = new Graph();
+Graph* Parameters::initGraph(bool createTopGroupIfaces) {
+  graph->createTopGroup(createTopGroupIfaces);
   return graph;
 }
 
@@ -74,21 +85,128 @@ ReferenceBlock* Parameters::getReferenceBlock(int idCategory, int idBlock) {
   BlockCategory* blockCat = categoryTree->searchCategory(idCategory);
 
   if (blockCat == NULL) return NULL;
-  ReferenceBlock* ref = blockCat->getBlock(idBlock);
+  ReferenceBlock* ref = blockCat->getBlockById(idBlock);
   return ref;
 }
 
+ReferenceBlock* Parameters::getHiddenReferenceBlock(QString blockName) {
+
+  BlockCategory* blockCat = categoryTree->searchCategory(100);
+  if (blockCat == NULL) return NULL;
+  ReferenceBlock* ref = blockCat->getBlockByName(blockName);
+  return ref;
+}
 
-FunctionalBlock* Parameters::duplicateFunctionalBlock(FunctionalBlock *block) {
+double Parameters::getFeedingClockFrequency(AbstractInterface *iface) {
+
+  int idClock = 0;
+
+  if (iface->isReferenceInterface()) return 0.0;
+
+  if (iface->getClockIfaceType() == AbstractInterface::ParameterName) {
+    BlockParameter* param = iface->getOwner()->getParameterFromName(iface->getClockIfaceString());
+    if (!param->isUserParameter()) return 0.0;
+    bool ok;
+    double freq = param->getDoubleValue(&ok);
+    if (!ok) {
+      cerr << "Abnormal case: cannot retrieve clock id from parameter  " << qPrintable(param->getName()) << endl;
+    }
+    return freq;
+  }
+  else if ( (iface->getClockIfaceType() == AbstractInterface::ClockName) || ((iface->getDirection() == AbstractInterface::Input) && (iface->getPurpose() == AbstractInterface::Clock))) {
+
+    // if iface is not clock, retrieve the clock related to it
+    if (iface->getClockIfaceType() == AbstractInterface::ClockName) {
+      iface = iface->getClockIface();
+    }
+    // if iface is a group interface, then iface name is ext_clk_X, thus extract the X
+    if (iface->isGroupInterface()) {
+      QString name = iface->getName();
+      name.remove(0,8);
+      bool ok;
+      idClock = name.toInt(&ok);
+      if (!ok) {
+        cerr << "Abnormal case: cannot retrieve clock id from iface name " << qPrintable(iface->getName()) << endl;
+        return 0.0;
+      }
+    }
+    // if iface is a functional interface, it is connected to clkrstgen_X (in top group) or to ext_clk_X (in subgroup)
+    else if (iface->isFunctionalInterface()) {
+      FunctionalInterface* funIface = AI_TO_FUN(iface);
+      ConnectedInterface* connFrom = funIface->getConnectedFrom();
+      if (connFrom == NULL) {
+        cerr << "Abnormal case: input clock " << qPrintable(iface->getName()) << " is not connected" << endl;
+        return 0.0;
+      }
+      if (iface->getOwner()->isTopGroupBlock()) {
+        QString name = connFrom->getOwner()->getName();
+        name.remove(0,10);
+        bool ok;
+        idClock = name.toInt(&ok);
+        if (!ok) {
+          cerr << "Abnormal case: cannot retrieve clock id for " << qPrintable(iface->getName()) << endl;
+          return 0.0;
+        }
+      }
+      else {
+        QString name = connFrom->getName();
+        name.remove(0,8);
+        bool ok;
+        idClock = name.toInt(&ok);
+        if (!ok) {
+          cerr << "Abnormal case: cannot retrieve clock id for " << qPrintable(iface->getName()) << endl;
+          return 0.0;
+        }
+      }
+    }
+  }
+  return graph->getClock(idClock);
+}
 
-  ReferenceBlock* ref = block->getReference();
-  GroupBlock* group = AB_TO_GRP(block->getParent());
+void Parameters::createDelayBlock() {
+  delayRef = new ReferenceBlock("no.xml");
+  delayRef->addCategory(100);
+  delayRef->setName("delay");
+
+  BlockCategory* cat = categoryTree->searchCategory(100);
+  cat->blocks.append(delayRef);
+
+  AbstractInterface* interIn = new ReferenceInterface(delayRef,"data_in",AbstractInterface::Input, AbstractInterface::Data, "expression","$in_width");
+  delayRef->addInterface(interIn);
+  AbstractInterface* interInCtl = new ReferenceInterface(delayRef,"data_in_enb",AbstractInterface::Input, AbstractInterface::Control, "boolean","1");
+  delayRef->addInterface(interInCtl);
+  interInCtl->setAssociatedIface(interIn);
+  AbstractInterface* interOut = new ReferenceInterface(delayRef,"data_out",AbstractInterface::Output, AbstractInterface::Data, "expression","$in_width");
+  delayRef->addInterface(interOut);
+  AbstractInterface* interOutCtl = new ReferenceInterface(delayRef,"data_out_enb",AbstractInterface::Output, AbstractInterface::Control, "boolean","1");
+  delayRef->addInterface(interOutCtl);
+  interOutCtl->setAssociatedIface(interOut);
+  BlockParameter* param1 = new BlockParameterGeneric(delayRef,"in_width","natural","8");
+  BlockParameter* param2 = new BlockParameterGeneric(delayRef,"dly_length","natural","1");
+  delayRef->addParameter(param1);
+  delayRef->addParameter(param2);
+  delayImpl = new BlockImplementation("no.xml");
+  delayImpl->setDelta("1");
+  QHash<QString,QString> consPattern;
+  consPattern.insert("data_in_enb","1");
+  delayImpl->setConsumptionPattern(consPattern);
+  QHash<QString,QString> prodPattern;
+  prodPattern.insert("data_out_enb","O{$dly_length}1");
+  delayImpl->setProductionPattern(prodPattern);
+  delayImpl->setProductionCounter("1");
+  delayRef->addImplementation(delayImpl);
+  delayImpl->setReference(delayRef);
+  if (! delayImpl->checkPatterns()) {
+    cout << "Delay block creation: failure" << endl;
+  }
+  else {
+    cout << "Delay block creation: success" << endl;
+  }
 
-  // adding to the graph
-  FunctionalBlock* newBlock = graph->addFunctionalBlock(group,ref);
-  return newBlock;
 }
 
+
+
 void Parameters::validateXmlFile(const QString& xmlFileName, const QString& xsdFileName, XmlFileType fileType) throw(Exception) {
   // opening configFile
   QFile xmlFile(xmlFileName);
@@ -197,6 +315,16 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
   GroupBlock *groupBlock = NULL;
 
   GroupWidget* topGroup = NULL;
+
+  QString path = root.attribute("project_path","none");
+  if (path != "none") {
+    QDir dir(path);
+    if (dir.exists()) {
+      projectPath = path;
+
+    }
+    cout << "project path set to " << qPrintable(projectPath) << endl;
+  }
   /**********************************************************
    1 : getting scene and creating associated group widgets
   ***********************************************************/
@@ -212,7 +340,7 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
     if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));
 
     if (idUpperScene == -1) {
-      topGroup = dispatcher->createTopScene();
+      topGroup = dispatcher->createTopScene(Dispatcher::Load);
       topScene->setId(idScene);
       groupItem = topScene->getGroupItem();      
       cout << "top group added to scene n°" << idScene << endl;
@@ -220,7 +348,12 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
     else {
       cout << "trying to create scene n°" << idScene << " with upper scene n°" <<idUpperScene << endl;
       GroupScene* upperScene = searchSceneById(idUpperScene, topScene);
-      groupWidget = dispatcher->addNewEmptyGroup(upperScene,false);
+      /* IMPORTANT: calling addNewEmptyGroup() leads to create a new GroupWidget
+       *            AND a BoxItem in upperScene that represents the GroupItem in the
+       *            newly created child scene. Thus, it has not to be created when
+       *            reading bi_group tags in the following but just searched
+       */
+      groupWidget = dispatcher->addNewEmptyGroup(Dispatcher::Load, upperScene,false);
       groupWidget->getScene()->setId(idScene);
       groupItem = groupWidget->getScene()->getGroupItem();      
     }
@@ -239,9 +372,10 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
     if (idUpperScene != -1) {
       groupWidget->setWindowTitle(groupBlock->getName());
       groupWidget->show();
+      cout << qPrintable(groupItem->getRefBlock()->getName()) << " has upper box item in " << qPrintable(groupItem->getParentItem()->getScene()->getGroupItem()->getRefBlock()->getName()) << endl;
     }    
   }
-  dispatcher->setSceneCounter(maxIdScene+1);
+  dispatcher->setSceneCounter(Dispatcher::Load, maxIdScene+1);
   cout << "groupItems loaded and windows created succefully!" << endl;
 
   /**********************************************************
@@ -256,7 +390,29 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
     GroupScene *currentScene = searchSceneById(idScene,topScene);
 
     if(currentScene == NULL) throw(Exception(PROJECTFILE_CORRUPTED));
-
+    /**********************************************************
+     2.1 : getting sources if it is top scene
+    ***********************************************************/
+    if (currentScene->isTopScene()) {
+      QDomNodeList sourceNodes = currentSceneNode.elementsByTagName("source_item");
+      cout << "top scene has " << sourceNodes.length() << " sources" << endl;
+      for(int j=0; j<sourceNodes.length(); j++) {
+        QDomElement currentSBNode = sourceNodes.at(j).toElement();      
+        StimuliItem* sourceItem = new StimuliItem(dispatcher,this);
+        try {
+          sourceItem->load(currentSBNode);
+        }
+        catch(Exception err) {
+          throw(err);
+        }
+        cout << "source item has been read, add it to the scene" << endl;
+        // add the block to the GroupScene
+        currentScene->addStimuliItem(sourceItem);
+      } 
+    }
+    /**********************************************************
+     2.2 : getting functional blocks
+    ***********************************************************/
     QDomNodeList functionalBlockNodes = currentSceneNode.elementsByTagName("bi_functional");
 
     for(int j=0; j<functionalBlockNodes.length(); j++) {
@@ -269,7 +425,7 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
         throw(err);
       }
       // add the block to the GroupScene
-      currentScene->addBlockItem(funcItem);
+      currentScene->addBoxItem(funcItem);
     }
   }
   cout << "functional blocks loaded and created succefully!" << endl;
@@ -313,9 +469,9 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
       // get the GroupItem already created and set at phase 1
       GroupItem *insideGroup = searchGroupItemById(idGroup, topScene);
       BoxItem* upperItem = NULL;
-      if(insideGroup == NULL) cout << "group null" << endl;
+      if(insideGroup == NULL) cout << "group null" << endl;      
       // now search within the scene which BoxItem has a childItem that is = to insideGroup
-      QList<BoxItem *> lst = currentScene->getBlockItems();
+      QList<BoxItem *> lst = currentScene->getBoxItems();
       foreach(BoxItem* item, lst) {
         if (item->getChildGroupItem() == insideGroup) {
           upperItem = item;
@@ -349,10 +505,10 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
         double position = currentInterfaceNode.attribute("position","none").toDouble(&ok);
         if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));
 
-        ConnectedInterface *refInter = insideGroup->searchInterfaceByName(refName)->refInter;
+        ConnectedInterface *refInter = insideGroup->searchInterfaceItemByName(refName)->refInter;
         InterfaceItem *ifaceItem = new InterfaceItem(position, orientation, refInter, upperItem, this);
         ifaceItem->setId(id);
-        upperItem->addInterface(ifaceItem);
+        upperItem->addInterfaceItem(ifaceItem);
       }
     }
   }
@@ -374,13 +530,47 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
     InterfaceItem *iface2 = searchInterfaceItemById(to,topScene);
 
     if(iface1 != NULL && iface2 != NULL){
-      dispatcher->connect(iface1,iface2);
+      dispatcher->createConnection(Dispatcher::Load, iface1,iface2);
     } else {
       cout << "interfaces not found, connect canceled!" << endl;
     }
   }
   cout << "connections loaded and created succefully!" << endl;
 
+  QDomNodeList modifierNodes = root.elementsByTagName("modifier");
+
+  for(int i=0; i<modifierNodes.length(); i++){
+    QDomElement currentModifierNode = modifierNodes.at(i).toElement();
+
+    int id = currentModifierNode.attribute("id","none").toInt(&ok);
+    if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));
+
+    QString typeStr = currentModifierNode.attribute("type","none");
+    if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));
+    QString paramsStr = currentModifierNode.attribute("params","none");
+    if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));
+
+    /* NB: just adding delays for now. To be cont'd */
+    InterfaceItem *iface = searchInterfaceItemById(id,topScene);
+
+    if ((iface == NULL ) || (iface->refInter == NULL) || (iface->refInter->getAssociatedIface() == NULL)) {
+      cout << "modified interface not found, modifiers setup canceled!" << endl;
+    }
+    else {
+      ConnectedInterface* connIface = AI_TO_CON(iface->refInter->getAssociatedIface());
+
+      AbstractInputModifier* mod = NULL;
+      if (typeStr == "delay") {
+        int delay = paramsStr.toInt(&ok);
+        if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));
+        mod = new DelayInputModifier(connIface, delay);
+        connIface->setInputModifier(mod);
+      }
+    }
+  }
+
+  cout << "modifiers loaded and created succefully!" << endl;
+
   return topGroup;
 }
 
@@ -457,10 +647,27 @@ void Parameters::loadBlastConfiguration(QString confFile) throw(Exception) {
     implPathes.append(path);
     cout << "impl path : " << qPrintable(path) << endl << endl;
   }
+
+  QDomElement eltSource = eltImpl.nextSiblingElement("sources");
+  nbPathesStr = eltSource.attribute("nb","none");
+  nbPathes = nbPathesStr.toInt(&ok);
+  QDomNodeList listSourceDir = eltSource.elementsByTagName("source_lib");
+  if ((!ok) || (nbPathes != listSourceDir.size())) throw(Exception(CONFIGFILE_CORRUPTED));
+
+  for(int i=0;i<listSourceDir.size();i++) {
+    QDomNode nodeSourceDir = listSourceDir.at(i);
+    QDomElement eltSourceDir = nodeSourceDir.toElement();
+    if (eltSourceDir.isNull()) throw(Exception(CONFIGFILE_CORRUPTED));
+    QString path = eltSourceDir.attribute("path","none");
+    if (path == "none") throw(Exception(CONFIGFILE_CORRUPTED));
+    sourcePathes.append(path);
+    cout << "core path : " << qPrintable(path) << endl << endl;
+  }
+
   // getting elt = the element <defaults>
   // for each child element, initialize the associated attributes of Parameters
 
-  QDomElement eltDefaults = eltImpl.nextSiblingElement("defaults");
+  QDomElement eltDefaults = eltSource.nextSiblingElement("defaults");
 
   QDomElement eltBlocks = eltDefaults.firstChildElement("blocks");
   QString attributeStr = eltBlocks.attribute("width", "none");
@@ -522,14 +729,14 @@ void Parameters::loadReferencesFromXml() throw(Exception) {
       QString line = in.readLine();
       line = in.readLine();
 
-      if (!line.contains("<block>")) {
+      if (!line.contains("<block")) {
         blockXML.close();
         continue;
       }
 
       blockXML.close();
       try {
-        validateXmlFile(fileName,"block.xsd",Reference);
+        validateXmlFile(fileName,"reference.xsd",Reference);
       }
       catch(Exception err) {
         throw(err);
@@ -665,14 +872,14 @@ void Parameters::loadImplementationsFromXml() throw(Exception) {
       implXML.close();
       cout << "OK" << endl;
       cout << "reading " << qPrintable(fileName) << " content ...";
-      /*
+
       try {
-        validateXmlFile(fileName,"block.xsd",Implementation);
+        validateXmlFile(fileName,"implementation.xsd",Implementation);
       }
       catch(Exception e) {
         throw(e);
       }
-      */
+
       // reading in into QDomDocument
       QDomDocument document ("FileXML");
       if (!implXML.open(QIODevice::ReadOnly)) {
@@ -690,6 +897,28 @@ void Parameters::loadImplementationsFromXml() throw(Exception) {
       QString refXml = implRoot.attribute("ref_name","none");
       QString refMd5 = implRoot.attribute("ref_md5","none");
       BlockImplementation* impl = new BlockImplementation(fileName,refXml,refMd5);
+
+      QDomNodeList archNode = implRoot.elementsByTagName("architecture");
+
+      if (archNode.isEmpty()) {
+        cout << "impl has no architecture" << endl;
+        return;
+      }
+      QDomElement archElt = archNode.at(0).toElement();
+      QString compList = archElt.attribute("comp_list","none");
+      if (compList != "none") {
+        QStringList compos = compList.split(",");
+        foreach(QString s, compos) {
+          impl->addResource(s);
+        }
+      }
+
+      try {
+        impl->loadPatterns(implRoot);
+      }
+      catch(int err) {
+        throw(err);
+      }
       availableImplementations.append(impl);
 
       ReferenceBlock* ref = NULL;
@@ -701,9 +930,12 @@ void Parameters::loadImplementationsFromXml() throw(Exception) {
       }
       if (ref == NULL) {
         cout << "Cannot find a reference block for impl :" << qPrintable(fileName) << endl;
-      }
-      ref->addImplementation(impl);
-      impl->setReference(ref);
+      }      
+      else {          
+        ref->addImplementation(impl);
+        impl->setReference(ref);
+        if (! impl->checkPatterns()) throw(Exception(IMPLFILE_CORRUPTED));
+      }      
       cout << "OK" << endl;
     }
   }
@@ -748,8 +980,11 @@ void Parameters::loadImplementationsFromLib() throw(Exception) {
     if (ref == NULL) {
       cout << "Cannot find a reference block for impl :" << qPrintable(impl->getXmlFile()) << endl;
     }
-    ref->addImplementation(impl);
-    impl->setReference(ref);
+    else {          
+      ref->addImplementation(impl);
+      impl->setReference(ref);
+      if (! impl->checkPatterns()) throw(Exception(IMPLFILE_CORRUPTED));
+    }
   }
   libFile.close();
 }
@@ -779,6 +1014,74 @@ void Parameters::saveImplementationsToLib() throw(Exception) {
   libFile.close();
 
 }
+
+
+void Parameters::loadSources() throw(Exception) {
+
+  for(int i=0;i<sourcePathes.size();i++) {
+    cout << "analyzing " << qPrintable(sourcePathes.at(i)) << endl;
+    QDir dir(sourcePathes.at(i));
+    QStringList filter;
+    filter << "*.vhd" << "*.ngc";
+    dir.setNameFilters(filter);
+    QStringList list = dir.entryList();
+    for(int j=0;j<list.size();j++) {
+      QString fileName = dir.absolutePath();
+      fileName.append("/"+list.at(j));
+
+      if (list.at(j).endsWith(".ngc")) {
+        QString netName = list.at(j);
+        netName.truncate(list.at(j).size() -4);
+        cout << "found netlist " << qPrintable(netName) << endl;
+        availableResources.append(new ExternalResource(netName,fileName,ExternalResource::Netlist));
+      }
+      else {
+        cout << "parsing " << qPrintable(fileName) << " ... ";
+        QFile srcXML(fileName);
+        if (!srcXML.open(QIODevice::ReadOnly)) {
+          throw(Exception(IMPLFILE_NOACCESS));
+        }
+        QTextStream in(&srcXML);
+
+        QString line = in.readLine();
+        while (!line.isNull()) {
+          if (line.contains("package", Qt::CaseInsensitive)) {
+            QRegularExpression rxPack("^package (.+) is$",QRegularExpression::CaseInsensitiveOption);
+            QRegularExpressionMatch matchPack = rxPack.match(line);
+            if (matchPack.hasMatch()) {
+              QString packName = matchPack.captured(1);
+              cout << "found package " << qPrintable(packName) << endl;
+              availableResources.append(new ExternalResource(packName,fileName,ExternalResource::Package));
+            }
+          }
+          else if (line.contains("entity", Qt::CaseInsensitive)) {
+            QRegularExpression rxEnt("^entity (.+) is$",QRegularExpression::CaseInsensitiveOption);
+            QRegularExpressionMatch matchEnt = rxEnt.match(line);
+            if (matchEnt.hasMatch()) {
+              QString entityName = matchEnt.captured(1);
+              cout << "found entity " << qPrintable(entityName) << endl;
+              availableResources.append(new ExternalResource(entityName,fileName,ExternalResource::Code));
+            }
+          }
+          line = in.readLine();
+        }
+        srcXML.close();
+        cout << "OK" << endl;
+      }
+    }
+  }
+}
+
+QList<ExternalResource *> Parameters::searchResourceByName(const QString& name) {
+  QList<ExternalResource*> listRes;
+  foreach(ExternalResource* s, availableResources) {
+    if (s->getName() == name) {
+      listRes.append(s);
+    }
+  }
+  return listRes;
+}
+
 void Parameters::addAvailableBlock(ReferenceBlock *block) {
   availableBlocks.append(block);
   foreach (int id,block->getCategories()) {
@@ -844,9 +1147,9 @@ QList<AbstractBlock *> Parameters::getBlocksToConfigure() {
 
 
 void Parameters::updateToolbar() {
-  int nb = currentScene->getBlockItems().length();
+  int nb = currentScene->getBoxItems().length();
   for(int i = 0; i<nb; i++){
-    if(currentScene->getBlockItems().at(i)->isSelected()){
+    if(currentScene->getBoxItems().at(i)->isSelected()){
       currentScene->getGroupWidget()->enableGroupButton(true);
       return;
     }
@@ -940,6 +1243,35 @@ void Parameters::save(QString confFile) {
     }
 
     writer.writeEndElement();    //</connections>
+
+    QList<InterfaceItem *> lstIfaceItem;
+    // search for modifiers
+    foreach(ConnectionItem* item, allConnections) {
+      InterfaceItem* fromIfaceItem = item->getFromInterfaceItem();
+      AbstractInputModifier* mod = fromIfaceItem->refInter->getInputModifier();
+      if (mod != NULL) {
+        if (!lstIfaceItem.contains(fromIfaceItem)) lstIfaceItem.append(fromIfaceItem);
+      }
+      InterfaceItem* toIfaceItem = item->getToInterfaceItem();
+      mod = toIfaceItem->refInter->getInputModifier();
+      if (mod != NULL) {
+        if (!lstIfaceItem.contains(toIfaceItem)) lstIfaceItem.append(toIfaceItem);
+      }
+    }
+    // write input modifiers
+    writer.writeStartElement("modifiers");
+    foreach(InterfaceItem* item, lstIfaceItem) {
+      AbstractInputModifier* mod = item->refInter->getInputModifier();
+      if (mod != NULL) {
+        writer.writeStartElement("modifier");
+        writer.writeAttribute("id", QString::number(item->getId()));
+        writer.writeAttribute("type",mod->getTypeStr());
+        writer.writeAttribute("params", mod->getParametersStr());
+        writer.writeEndElement();
+      }
+    }
+
+    writer.writeEndElement();    //</modifiers>
     writer.writeEndElement();      //</blast_project
 
     writer.writeEndDocument();
@@ -956,8 +1288,13 @@ void Parameters::setArrowPathes() {
   _inArrow.lineTo(arrowLineLength+arrowWidth,-arrowHeight/2);
   _inArrow.lineTo(arrowLineLength+arrowWidth,arrowHeight/2);
   _inArrow.lineTo(arrowLineLength,0);
-  _inArrow.closeSubpath();
-  inArrow = _inArrow;
+  //_inArrow.closeSubpath();
+  dataArrowIn = _inArrow;
+
+  QPainterPath _inArrowC;
+  _inArrowC.lineTo(arrowLineLength,0);
+  _inArrowC.addEllipse(arrowLineLength,-arrowHeight/2,arrowHeight-1,arrowHeight-1);
+  clkrstArrow = _inArrowC;
 
   QPainterPath _outArrow;
   _outArrow.lineTo(arrowLineLength,0);
@@ -965,8 +1302,8 @@ void Parameters::setArrowPathes() {
   _outArrow.lineTo(arrowLineLength+arrowWidth,0);
   _outArrow.lineTo(arrowLineLength,arrowHeight/2);
   _outArrow.lineTo(arrowLineLength,0);
-  _outArrow.closeSubpath();
-  outArrow = _outArrow;
+  //_outArrow.closeSubpath();
+  dataArrowOut = _outArrow;
 
 }
 
@@ -996,7 +1333,7 @@ GroupItem* Parameters::searchGroupItemById(int id, GroupScene *scene) {
 
 BoxItem* Parameters::searchBlockItemById(int id, GroupScene *scene) {
 
-  foreach(BoxItem *item, scene->getBlockItems()){
+  foreach(BoxItem *item, scene->getBoxItems()){
     if(item->getId() == id){
       return item;
     }
@@ -1010,6 +1347,27 @@ BoxItem* Parameters::searchBlockItemById(int id, GroupScene *scene) {
   return NULL;
 }
 
+BoxItem* Parameters::searchFunctionalBlock(AbstractBlock* block) {
+
+  return searchFunctionalBlockRecur(block,topScene);
+}
+
+BoxItem* Parameters::searchFunctionalBlockRecur(AbstractBlock* block, GroupScene* scene) {
+
+  foreach(BoxItem *item, scene->getBoxItems()){
+    if(item->getRefBlock() == block) {
+      return item;
+    }
+  }
+
+  BoxItem* item = NULL;
+  foreach(GroupScene *s, scene->getChildrenScene()) {
+    item = searchFunctionalBlockRecur(block,s);
+    if (item != NULL) return item;
+  }
+  return NULL;
+}
+
 InterfaceItem* Parameters::searchInterfaceItemById(int id, GroupScene* scene) {
 
   foreach(InterfaceItem *item, scene->getGroupItem()->getInterfaces()){
@@ -1017,7 +1375,16 @@ InterfaceItem* Parameters::searchInterfaceItemById(int id, GroupScene* scene) {
       return item;
     }
   }
-  foreach(BoxItem *block, scene->getBlockItems()){
+  if (scene->isTopScene()) {
+    foreach(StimuliItem *block, scene->getSourceItems()){
+      foreach(InterfaceItem *item, block->getInterfaces()){
+        if(item->getId() == id){
+          return item;
+        }
+      }
+    } 
+  }
+  foreach(BoxItem *block, scene->getBoxItems()){
     foreach(InterfaceItem *item, block->getInterfaces()){
       if(item->getId() == id){
         return item;
@@ -1031,3 +1398,10 @@ InterfaceItem* Parameters::searchInterfaceItemById(int id, GroupScene* scene) {
   }
   return NULL;
 }
+
+QString Parameters::normalizeName(const QString &name) {
+  QString s = name;
+  s.replace(QRegularExpression("[^a-zA-Z0-9_]"),"_");
+  s.replace(QRegularExpression("[_]+"),"_");
+  return s;
+}