clkconvert OP compute done

diff --git a/AbstractBlock.cpp b/AbstractBlock.cpp
index 0f3f8015920df89b13bc3b19c4c2157913203519..218ea61840fa9352149afb8f3520b3a7213a85c7 100644 (file)
--- a/AbstractBlock.cpp
+++ b/AbstractBlock.cpp
@@ -278,73 +278,6 @@ QList<BlockParameter *> AbstractBlock::getWishboneParameters() {
   return lst;\r
 }\r
 \r
   return lst;\r
 }\r
 \r

-void AbstractBlock::connectClock(QString clkName, int idGen) throw(Exception) {\r
-\r
-  GroupBlock* parentBlock = AB_TO_GRP(parent);  \r
-  ConnectedInterface* fromClk = NULL;\r
-  ConnectedInterface* toClk = AI_TO_CON(getIfaceFromName(clkName));\r
-\r
-  if (parentBlock->isTop()) {\r
-    QString genName = "clkrstgen_" + QString::number(idGen);\r
-    AbstractBlock* clkrstgen = parentBlock->getFunctionalBlockByName(genName);\r
-    if (clkrstgen == NULL) {\r
-      throw(Exception(IFACE_TOP_NOCLKRSTGEN,this));\r
-    }\r
-    else {\r
-      fromClk = AI_TO_CON(clkrstgen->getIfaceFromName("clk"));      \r
-    }\r
-    cout << "connecting clock for " << qPrintable(name) << " to " << qPrintable(genName) << endl;\r
-  }\r
-  else {\r
-    // searching for ext_clk_idGen\r
-    QString name = "ext_clk_"+QString::number(idGen);\r
-    fromClk = AI_TO_CON(parentBlock->getIfaceFromName(name));\r
-    cout << "connecting clk for child " << qPrintable(name) << " of " << qPrintable(parentBlock->getName()) << endl;\r
-  }\r
-\r
-  if (fromClk == NULL) {\r
-    throw(Exception(IFACE_GROUP_NOCLKRST,parentBlock));\r
-  }\r
-  else {\r
-    fromClk->connectTo(toClk);\r
-    cout << "connection done between " << qPrintable(toClk->getConnectedFrom()->getOwner()->getName()) << "/" << qPrintable(toClk->getConnectedFrom()->getName());\r
-    cout << " and " << qPrintable(toClk->getOwner()->getName()) << "/" << qPrintable(toClk->getName()) << endl;\r
-  }\r
-}\r
-\r
-void AbstractBlock::connectReset(QString rstName, int idGen) throw(Exception) {\r
-\r
-  GroupBlock* parentBlock = AB_TO_GRP(parent);\r
-  ConnectedInterface* fromRst = NULL;\r
-  ConnectedInterface* toRst = AI_TO_CON(getIfaceFromName(rstName));\r
-\r
-  if (parentBlock->isTop()) {\r
-    QString genName = "clkrstgen_" + QString::number(idGen);\r
-    AbstractBlock* clkrstgen = parentBlock->getFunctionalBlockByName(genName);\r
-    if (clkrstgen == NULL) {\r
-      throw(Exception(IFACE_TOP_NOCLKRSTGEN,this));\r
-    }\r
-    else {\r
-      fromRst = AI_TO_CON(clkrstgen->getIfaceFromName("reset"));\r
-    }\r
-    cout << "connecting reset for " << qPrintable(name) << " to " << qPrintable(genName) << endl;\r
-  }\r
-  else {\r
-    QString name = "ext_reset_"+QString::number(idGen);\r
-    fromRst = AI_TO_CON(parentBlock->getIfaceFromName(name));\r
-    cout << "connecting reset for child " << qPrintable(name) << " of " << qPrintable(parentBlock->getName()) << endl;\r
-  }\r
-\r
-  if (fromRst == NULL) {\r
-    throw(Exception(IFACE_GROUP_NOCLKRST,parentBlock));\r
-  }\r
-  else {\r
-    fromRst->connectTo(toRst);\r
-    cout << "connection done between " << qPrintable(toRst->getConnectedFrom()->getOwner()->getName()) << "/" << qPrintable(toRst->getConnectedFrom()->getName());\r
-    cout << " and " << qPrintable(toRst->getOwner()->getName()) << "/" << qPrintable(toRst->getName()) << endl;\r
-  }\r
-}\r
-\r

 void AbstractBlock::generateEntity(QTextStream& out, bool hasController) throw(Exception) {\r
 \r
   out << "entity " << name << " is" << endl;\r
 void AbstractBlock::generateEntity(QTextStream& out, bool hasController) throw(Exception) {\r
 \r
   out << "entity " << name << " is" << endl;\r

diff --git a/AbstractBlock.h b/AbstractBlock.h
index fad9b53ecfbf0167781f74a4c20ffc1bfdc1f361..efbd47471f19144261fc6968792129c9d1e6b4b3 100644 (file)
--- a/AbstractBlock.h
+++ b/AbstractBlock.h
@@ -86,9 +86,7 @@ public:
    * \brief connectClkReset connects the clock and reset inputs to a clkrstgen block or the the group ifaces\r
    * \param idBlockClk is the id of the clock interface (there may be severals)\r
    * \param idGen is the id of the clkrstgen block\r
    * \brief connectClkReset connects the clock and reset inputs to a clkrstgen block or the the group ifaces\r
    * \param idBlockClk is the id of the clock interface (there may be severals)\r
    * \param idGen is the id of the clkrstgen block\r

-  */\r
-  void connectClock(QString clkName, int idGen = 0) throw(Exception);\r
-  void connectReset(QString rstName, int idGen = 0) throw(Exception);\r
+  */  \r

   virtual QList<QString> getExternalResources() = 0; // returns the list of all external files needed for VHDL generation\r
   virtual void generateVHDL(const QString& path) throw(Exception) = 0; // main entry to generate the VHDL code\r
   void generateComponent(QTextStream& out, bool hasController=false) throw(Exception); // generate the component using reference\r
   virtual QList<QString> getExternalResources() = 0; // returns the list of all external files needed for VHDL generation\r
   virtual void generateVHDL(const QString& path) throw(Exception) = 0; // main entry to generate the VHDL code\r
   void generateComponent(QTextStream& out, bool hasController=false) throw(Exception); // generate the component using reference\r

diff --git a/BoxItem.cpp b/BoxItem.cpp
index ae15002120d4596156879144c449e905b5dcc3f4..783716c76b6b7b367b8a864808f65dc49bce729f 100644 (file)
--- a/BoxItem.cpp
+++ b/BoxItem.cpp
@@ -906,6 +906,12 @@ void BoxItem::loadFunctional(QDomElement funcElement) throw(Exception) {
   if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));
   int dimY = dimensionStr.at(1).toInt(&ok);
   if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));
   if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));
   int dimY = dimensionStr.at(1).toInt(&ok);
   if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));

+
+  QString visStr = funcElement.attribute("visible","none");
+  bool showItem = true;
+  if (visStr == "false") {
+    showItem = false;
+  }

   
   ReferenceBlock *referenceMd5 = NULL;
   ReferenceBlock *referenceXml = NULL;
   
   ReferenceBlock *referenceMd5 = NULL;
   ReferenceBlock *referenceXml = NULL;


@@ -927,7 +933,7 @@ void BoxItem::loadFunctional(QDomElement funcElement) throw(Exception) {
   }
   
   GroupBlock* parentGroupBlock = AB_TO_GRP(((GroupItem *)parentItem())->getRefBlock());
   }
   
   GroupBlock* parentGroupBlock = AB_TO_GRP(((GroupItem *)parentItem())->getRefBlock());

-  FunctionalBlock* functionalBlock = params->getGraph()->createFunctionalBlock(parentGroupBlock, reference);
+  FunctionalBlock* functionalBlock = params->getGraph()->createFunctionalBlock(parentGroupBlock, reference, false);

   /* NB: addFunctionalBlock creates all interfaces from the reference, which is annoying when
     reading bif_iface tags. Thus interface are all removed.
   */
   /* NB: addFunctionalBlock creates all interfaces from the reference, which is annoying when
     reading bif_iface tags. Thus interface are all removed.
   */


@@ -958,7 +964,7 @@ void BoxItem::loadFunctional(QDomElement funcElement) throw(Exception) {
   }  
 
   // recreate all (non-control) interfaces because of some may have a multiplicity>1 with several examplars
   }  
 
   // recreate all (non-control) interfaces because of some may have a multiplicity>1 with several examplars

-  functionalBlock->removeAllInterfaces();
+  //functionalBlock->removeAllInterfaces();

   QDomNodeList interfaceNodes = funcElement.elementsByTagName("bif_iface");
   // setting interfaces (user name, and for multiplicity>1 may be create some new ones)
   for(int i=0; i<interfaceNodes.length(); i++) {
   QDomNodeList interfaceNodes = funcElement.elementsByTagName("bif_iface");
   // setting interfaces (user name, and for multiplicity>1 may be create some new ones)
   for(int i=0; i<interfaceNodes.length(); i++) {


@@ -1017,6 +1023,7 @@ void BoxItem::loadFunctional(QDomElement funcElement) throw(Exception) {
     interfaceItem->setOrientation(orientation);
     interfaceItem->setPositionRatio(position);
   }
     interfaceItem->setOrientation(orientation);
     interfaceItem->setPositionRatio(position);
   }

+  setVisible(showItem);

   updateGeometry(Resize);
 }
 
   updateGeometry(Resize);
 }
 


@@ -1032,6 +1039,9 @@ void BoxItem::save(QXmlStreamWriter &writer) {
     writer.writeAttribute("position",attrPos);
     QString attrDim = QString::number(getWidth()).append(",").append(QString::number(getHeight()));
     writer.writeAttribute("dimension",attrDim);
     writer.writeAttribute("position",attrPos);
     QString attrDim = QString::number(getWidth()).append(",").append(QString::number(getHeight()));
     writer.writeAttribute("dimension",attrDim);

+    if (!isVisible()) {
+      writer.writeAttribute("visible","false");
+    }

 
     writer.writeStartElement("bif_parameters");
     foreach(BlockParameter *param,refBlock->getParameters()){
 
     writer.writeStartElement("bif_parameters");
     foreach(BlockParameter *param,refBlock->getParameters()){

diff --git a/ConnectionItem.cpp b/ConnectionItem.cpp
index c3a7ada6d0fc2d1b1d15f4ec9e35accfa828c2dc..61af6c83e1a893d96477f245bd413acd4c29ab43 100644 (file)
--- a/ConnectionItem.cpp
+++ b/ConnectionItem.cpp
@@ -9,24 +9,30 @@
 
 //int ConnectionItem::counter = 0;
 
 
 //int ConnectionItem::counter = 0;
 

-ConnectionItem::ConnectionItem(InterfaceItem* _iface1,
-                               InterfaceItem* _iface2,
+ConnectionItem::ConnectionItem(InterfaceItem* _fromInterfaceItem,
+                               InterfaceItem* _toInterfaceItem,

                                Dispatcher* _dispatcher,
                                Parameters* _params) : QGraphicsItem() {
 
 
   dispatcher = _dispatcher;
   params = _params;
                                Dispatcher* _dispatcher,
                                Parameters* _params) : QGraphicsItem() {
 
 
   dispatcher = _dispatcher;
   params = _params;

+  fromInterfaceItem = _fromInterfaceItem;
+  toInterfaceItem = _toInterfaceItem;
+
+  /* NOTE: originally, the following was testing the correct order
+   * to connect the 2 interfaces. Presently, the order is predetermined
+   * when testing the AbstractInterface objets that must be connected.

 
   ConnectedInterface* ref1 = _iface1->refInter;
   ConnectedInterface* ref2 = _iface2->refInter;
 
   ConnectedInterface* ref1 = _iface1->refInter;
   ConnectedInterface* ref2 = _iface2->refInter;

-  /* ref. note in .h
+   ref. note in .h

      case 1 : ref1 is group interface, and ref2 block interface of a block within the group
      case 2 : the opposite of case 1
      case 3 : ref1 and ref2 are block interface of blocks that are both within the same parent group.
      case 1 : ref1 is group interface, and ref2 block interface of a block within the group
      case 2 : the opposite of case 1
      case 3 : ref1 and ref2 are block interface of blocks that are both within the same parent group.

-     case 4 : ref1 is source interface and ref2 interface of top group
+     case 4 : ref1 is stimuli interface and ref2 interface of top group

      case 5 : the opposite of case 4
      case 5 : the opposite of case 4

-   */
+

   if (ref1->getOwner() == ref2->getOwner()->getParent()) {
 
     if (ref1->getDirection() == AbstractInterface::Input) {
   if (ref1->getOwner() == ref2->getOwner()->getParent()) {
 
     if (ref1->getDirection() == AbstractInterface::Input) {


@@ -74,13 +80,15 @@ ConnectionItem::ConnectionItem(InterfaceItem* _iface1,
     }
   }
   else if ((ref1->getOwner()->isStimuliBlock()) && (ref2->getOwner()->isTopGroupBlock())) {    
     }
   }
   else if ((ref1->getOwner()->isStimuliBlock()) && (ref2->getOwner()->isTopGroupBlock())) {    

-    fromInterfaceItem = _iface1;    
+    fromInterfaceItem = _iface1;

     toInterfaceItem = _iface2;
   }
   else if ((ref2->getOwner()->isStimuliBlock()) && (ref1->getOwner()->isTopGroupBlock())) {    
     toInterfaceItem = _iface2;
   }
   else if ((ref2->getOwner()->isStimuliBlock()) && (ref1->getOwner()->isTopGroupBlock())) {    

-    fromInterfaceItem = _iface2;    
+    fromInterfaceItem = _iface2;

     toInterfaceItem = _iface1;
   }
     toInterfaceItem = _iface1;
   }

+
+  */

   // adding this to interface items
   fromInterfaceItem->addConnectionItem(this);
   toInterfaceItem->addConnectionItem(this);
   // adding this to interface items
   fromInterfaceItem->addConnectionItem(this);
   toInterfaceItem->addConnectionItem(this);

diff --git a/ConnectionItem.h b/ConnectionItem.h
index 55487156239f489a4cbbb2e85fb80fbc864eb386..13bf8a79f409a4627809288b85014cd1f4ff3386 100644 (file)
--- a/ConnectionItem.h
+++ b/ConnectionItem.h
@@ -38,8 +38,8 @@ class ConnectionItem : public QGraphicsItem {
 
 public:
 
 
 public:
 

-  ConnectionItem(InterfaceItem* _iface1,
-                 InterfaceItem* _iface2,
+  ConnectionItem(InterfaceItem* _fromInterfaceItem,
+                 InterfaceItem* _toInterfaceItem,

                  Dispatcher* _dispatcher,
                  Parameters* _params);
   ConnectionItem (const ConnectionItem & copy);
                  Dispatcher* _dispatcher,
                  Parameters* _params);
   ConnectionItem (const ConnectionItem & copy);

diff --git a/Dispatcher.cpp b/Dispatcher.cpp
index b1625593cedad52154794e4b67dd91ecbbbbfc4f..e1857c326c27322dcbf0a915c0b83bf215916a53 100644 (file)
--- a/Dispatcher.cpp
+++ b/Dispatcher.cpp
@@ -120,11 +120,20 @@ bool Dispatcher::createConnection(Context context, InterfaceItem *iface1, Interf
   }
   if ((ok1 == true) || (ok2 == true)) {
 
   }
   if ((ok1 == true) || (ok2 == true)) {
 

-    iface1->getOwner()->getScene()->createConnectionItem(iface1,iface2, visible);
+    cout << "trying to create a connection from " << qPrintable(ref1->getOwner()->getName()) << "/" << qPrintable(ref1->getName());
+    cout << " to " << qPrintable(ref2->getOwner()->getName()) << "/" << qPrintable(ref2->getName());
+
+    if (ok1) {
+      iface1->getOwner()->getScene()->createConnectionItem(iface1,iface2, visible);
+    }
+    else {
+      iface2->getOwner()->getScene()->createConnectionItem(iface2,iface1, visible);
+    }
+
+    cout << " ... done." << endl;

 
     unselectAllItems(context);
 
     unselectAllItems(context);

-    params->unsaveModif = true;
-    cout << "created a connection from " << qPrintable(ref1->getName()) << " to " << qPrintable(ref2->getName()) << endl;
+    params->unsaveModif = true;    

     return true;
   }
   return false;
     return true;
   }
   return false;


@@ -623,13 +632,12 @@ void Dispatcher::duplicateInterfaceItem(Context context, InterfaceItem *item) {
 }
 
 
 }
 
 

-BoxItem* Dispatcher::addBlock(Context context, int idCategory, int idBlock, int idScene, QHash<QString, int> clkRstToGen) {
+void Dispatcher::addBlock(Context context, int idCategory, int idBlock, int idScene, QHash<QString, int> clkRstToGen) {

   static QString fctName = "Dispatcher::addBlock()";
 #ifdef DEBUG_FCTNAME
   cout << "call to " << qPrintable(fctName) << endl;
 #endif
   static QString fctName = "Dispatcher::addBlock()";
 #ifdef DEBUG_FCTNAME
   cout << "call to " << qPrintable(fctName) << endl;
 #endif

-  bool newStimuli = false;
-  BoxItem* item = NULL;
+  bool newStimuli = false;  

 
   /* For now, this method is only used while designing and not loading */
   if (context == Design) {
 
   /* For now, this method is only used while designing and not loading */
   if (context == Design) {


@@ -644,7 +652,18 @@ BoxItem* Dispatcher::addBlock(Context context, int idCategory, int idBlock, int
     }
     if (newStimuli) {
       FunctionalBlock* newOne = params->getGraph()->createStimuliBlock(ref, true);
     }
     if (newStimuli) {
       FunctionalBlock* newOne = params->getGraph()->createStimuliBlock(ref, true);

-      scene->createStimuliItem(newOne);
+      StimuliItem* item = scene->createStimuliItem(newOne);
+      QHashIterator<QString,int> iter(clkRstToGen);
+      while (iter.hasNext()) {
+        iter.next();
+        AbstractInterface* iface = newOne->getIfaceFromName(iter.key());
+        if (iface->getPurpose() == AbstractInterface::Clock) {
+          connectStimuliItemClock(context,item,iface->getName(),iter.value());
+        }
+        else if (iface->getPurpose() == AbstractInterface::Reset) {
+          connectStimuliItemReset(context,item,iface->getName(),iter.value());
+        }
+      }

     }
     else {
 
     }
     else {
 


@@ -652,27 +671,24 @@ BoxItem* Dispatcher::addBlock(Context context, int idCategory, int idBlock, int
       FunctionalBlock* newOne = params->getGraph()->createFunctionalBlock(group, ref, true);
 
       // creating the box item
       FunctionalBlock* newOne = params->getGraph()->createFunctionalBlock(group, ref, true);
 
       // creating the box item

-      item = scene->createBoxItem(newOne);
-      if (params->autoConnMainClk) {
-        // for now just use the first one
-        QHashIterator<QString,int> iter(clkRstToGen);
-        while (iter.hasNext()) {
-          iter.next();
-          AbstractInterface* iface = newOne->getIfaceFromName(iter.key());
-          if (iface->getPurpose() == AbstractInterface::Clock) {
-            newOne->connectClock(iface->getName(), iter.value());
-          }
-          else if (iface->getPurpose() == AbstractInterface::Reset) {
-            newOne->connectReset(iface->getName(), iter.value());
-          }
+      BoxItem* item = scene->createBoxItem(newOne);
+
+      QHashIterator<QString,int> iter(clkRstToGen);
+      while (iter.hasNext()) {
+        iter.next();
+        AbstractInterface* iface = newOne->getIfaceFromName(iter.key());
+        if (iface->getPurpose() == AbstractInterface::Clock) {
+          connectBoxItemClock(context,item,iface->getName(),iter.value());
+        }
+        else if (iface->getPurpose() == AbstractInterface::Reset) {
+          connectBoxItemReset(context,item,iface->getName(),iter.value());

         }
       }
         }
       }

+

       params->blockToItem.insert(newOne,item);
     }
     params->unsaveModif = true;
   }
       params->blockToItem.insert(newOne,item);
     }
     params->unsaveModif = true;
   }

-
-  return item;

 }
 
 void Dispatcher::addClkRstGenBlock(Context context, double frequency) {
 }
 
 void Dispatcher::addClkRstGenBlock(Context context, double frequency) {


@@ -1259,6 +1275,122 @@ void Dispatcher::removeConnection(Context context, ConnectionItem *connItem) {
   }
 }
 
   }
 }
 

+void Dispatcher::connectBoxItemClock(Context context, BoxItem *item, QString clkName, int idGen) throw(Exception) {
+
+  InterfaceItem* fromIfaceItemClk = NULL;
+  InterfaceItem* toIfaceItemClk = item->searchInterfaceItemByName(clkName);
+  GroupItem* parentGroup = item->getScene()->getGroupItem();
+  BoxItem* clkrstItem = NULL;
+
+  if (parentGroup->getRefBlock()->isTopGroupBlock()) {
+    QString genName = "clkrstgen_" + QString::number(idGen);
+    clkrstItem = item->getScene()->searchBoxItemByName(genName);
+    if (clkrstItem == NULL) {
+      throw(Exception(IFACE_TOP_NOCLKRSTGEN));
+    }
+    else {
+      fromIfaceItemClk = clkrstItem->searchInterfaceItemByName("clk");
+    }
+    cout << "connecting clock of " << qPrintable(item->getRefBlock()->getName()) << " to clk of " << qPrintable(genName) << endl;
+  }
+  else {
+    // searching for ext_clk_idGen
+    QString name = "ext_clk_"+QString::number(idGen);
+    fromIfaceItemClk = parentGroup->searchInterfaceItemByName(name);
+    cout << "connecting clock of " << qPrintable(item->getRefBlock()->getName()) << " to " << qPrintable(name) << " of parent group " << qPrintable(parentGroup->getRefBlock()->getName()) << endl;
+  }
+
+  if (fromIfaceItemClk == NULL) {
+    throw(Exception(IFACE_GROUP_NOCLKRST));
+  }
+  else {
+    createConnection(context, fromIfaceItemClk, toIfaceItemClk, false);
+    cout << "connection done."  << endl;
+  }
+}
+
+void Dispatcher::connectBoxItemReset(Context context, BoxItem *item, QString rstName, int idGen) throw(Exception) {
+  InterfaceItem* fromIfaceItemRst = NULL;
+  InterfaceItem* toIfaceItemRst = item->searchInterfaceItemByName(rstName);
+  GroupItem* parentGroup = item->getScene()->getGroupItem();
+  BoxItem* clkrstItem = NULL;
+
+  if (parentGroup->getRefBlock()->isTopGroupBlock()) {
+    QString genName = "clkrstgen_" + QString::number(idGen);
+    clkrstItem = item->getScene()->searchBoxItemByName(genName);
+    if (clkrstItem == NULL) {
+      throw(Exception(IFACE_TOP_NOCLKRSTGEN));
+    }
+    else {
+      fromIfaceItemRst = clkrstItem->searchInterfaceItemByName("reset");
+    }
+    cout << "connecting reset of " << qPrintable(item->getRefBlock()->getName()) << " to reset of " << qPrintable(genName) << endl;
+  }
+  else {
+    // searching for ext_rst_idGen
+    QString name = "ext_rst_"+QString::number(idGen);
+    fromIfaceItemRst = parentGroup->searchInterfaceItemByName(name);
+    cout << "connecting reset of " << qPrintable(item->getRefBlock()->getName()) << " to " << qPrintable(name) << " of parent group " << qPrintable(parentGroup->getRefBlock()->getName()) << endl;
+  }
+
+  if (fromIfaceItemRst == NULL) {
+    throw(Exception(IFACE_GROUP_NOCLKRST));
+  }
+  else {
+    createConnection(context, fromIfaceItemRst, toIfaceItemRst, false);
+    cout << "connection done."  << endl;
+  }
+}
+
+void Dispatcher::connectStimuliItemClock(Context context, StimuliItem *item, QString clkName, int idGen) throw(Exception) {
+  InterfaceItem* fromIfaceItemClk = NULL;
+  InterfaceItem* toIfaceItemClk = item->searchInterfaceItemByName(clkName);
+  BoxItem* clkrstItem = NULL;
+
+  QString genName = "clkrstgen_" + QString::number(idGen);
+  clkrstItem = item->getScene()->searchBoxItemByName(genName);
+  if (clkrstItem == NULL) {
+    throw(Exception(IFACE_TOP_NOCLKRSTGEN));
+  }
+  else {
+    fromIfaceItemClk = clkrstItem->searchInterfaceItemByName("clk");
+  }
+  cout << "connecting clock of " << qPrintable(item->getRefBlock()->getName()) << " to clock of " << qPrintable(genName) << endl;
+
+  if (fromIfaceItemClk == NULL) {
+    throw(Exception(IFACE_GROUP_NOCLKRST));
+  }
+  else {
+    createConnection(context, fromIfaceItemClk, toIfaceItemClk, false);
+    cout << "connection done."  << endl;
+  }
+}
+
+void Dispatcher::connectStimuliItemReset(Context context, StimuliItem *item, QString rstName, int idGen) throw(Exception) {
+  InterfaceItem* fromIfaceItemRst = NULL;
+  InterfaceItem* toIfaceItemRst = item->searchInterfaceItemByName(rstName);
+  BoxItem* clkrstItem = NULL;
+
+  QString genName = "clkrstgen_" + QString::number(idGen);
+  clkrstItem = item->getScene()->searchBoxItemByName(genName);
+  if (clkrstItem == NULL) {
+    throw(Exception(IFACE_TOP_NOCLKRSTGEN));
+  }
+  else {
+    fromIfaceItemRst = clkrstItem->searchInterfaceItemByName("reset");
+  }
+  cout << "connecting reset of " << qPrintable(item->getRefBlock()->getName()) << " to reset of " << qPrintable(genName) << endl;
+
+  if (fromIfaceItemRst == NULL) {
+    throw(Exception(IFACE_GROUP_NOCLKRST));
+  }
+  else {
+    createConnection(context, fromIfaceItemRst, toIfaceItemRst, false);
+    cout << "connection done."  << endl;
+  }
+}
+
+

 void Dispatcher::showBlocksLibrary(){
   cout << "showing block library" << endl;
   mainWindow->getLibrary()->show();
 void Dispatcher::showBlocksLibrary(){
   cout << "showing block library" << endl;
   mainWindow->getLibrary()->show();

diff --git a/Dispatcher.h b/Dispatcher.h
index 46db9b523476c1081b9ef7feeb1366d2ff7670dc..425c1582a9f4f50a68acc35b0df15d8e38d38ce1 100644 (file)
--- a/Dispatcher.h
+++ b/Dispatcher.h
@@ -94,7 +94,7 @@ public:
   /**************************
    *  block ops
    *************************/
   /**************************
    *  block ops
    *************************/

-  BoxItem* addBlock(Context context, int idCategory, int idBlock, int idScene, QHash<QString,int> clkRstToGen );
+  void addBlock(Context context, int idCategory, int idBlock, int idScene, QHash<QString,int> clkRstToGen );

   void addClkRstGenBlock(Context context, double frequency);
   void removeBoxItem(Context context, BoxItem* item);
   void duplicateBoxItem(Context context, BoxItem* item);
   void addClkRstGenBlock(Context context, double frequency);
   void removeBoxItem(Context context, BoxItem* item);
   void duplicateBoxItem(Context context, BoxItem* item);


@@ -146,6 +146,10 @@ public:
   bool createConnection(Context context, InterfaceItem *iface1, InterfaceItem *iface2, bool visible = true);
   void removeAllBlockConnections(Context context, AbstractBoxItem *item);
   void removeConnection(Context context, ConnectionItem *conn);
   bool createConnection(Context context, InterfaceItem *iface1, InterfaceItem *iface2, bool visible = true);
   void removeAllBlockConnections(Context context, AbstractBoxItem *item);
   void removeConnection(Context context, ConnectionItem *conn);

+  void connectBoxItemClock(Context context, BoxItem* item, QString clkName, int idGen = 0) throw(Exception);
+  void connectBoxItemReset(Context context, BoxItem* item, QString rstName, int idGen = 0) throw(Exception);
+  void connectStimuliItemClock(Context context, StimuliItem* item, QString clkName, int idGen = 0) throw(Exception);
+  void connectStimuliItemReset(Context context, StimuliItem* item, QString rstName, int idGen = 0) throw(Exception);

 
 
   // analysis ops
 
 
   // analysis ops

diff --git a/FunctionalBlock.cpp b/FunctionalBlock.cpp
index 925a0f96027795486d704ac9834d03694746c5b4..0eb4036a2be16f5ebb59fe2f0dd7bf4f465719ca 100644 (file)
--- a/FunctionalBlock.cpp
+++ b/FunctionalBlock.cpp
@@ -30,10 +30,17 @@ FunctionalBlock::FunctionalBlock(Graph *_graph, GroupBlock *_parent, ReferenceBl
   delta = -1;\r
   evaluator = NULL;\r
 \r
   delta = -1;\r
   evaluator = NULL;\r
 \r

+  BlockParameter* p;\r
+  // create parameters from reference block\r
+  QList<BlockParameter*> lstParam = reference->getParameters();\r
+  for(int i=0;i<lstParam.size();i++) {\r
+    p = lstParam.at(i)->clone();\r
+    addParameter(p);\r
+  }\r
+\r

   if (createIfaces) {\r
     populate();\r
   }\r
   if (createIfaces) {\r
     populate();\r
   }\r

-\r

 }\r
 \r
 FunctionalBlock::~FunctionalBlock() {\r
 }\r
 \r
 FunctionalBlock::~FunctionalBlock() {\r


@@ -71,17 +78,9 @@ bool FunctionalBlock::isStimuliBlock() {
 }\r
 \r
 void FunctionalBlock::populate() {\r
 }\r
 \r
 void FunctionalBlock::populate() {\r

-  int i;\r
-  BlockParameter* p;\r
-  AbstractInterface* inter;\r
-\r
-  // create parameters from reference block\r
-  QList<BlockParameter*> lstParam = reference->getParameters();\r
-  for(i=0;i<lstParam.size();i++) {\r
-    p = lstParam.at(i)->clone();\r
-    addParameter(p);\r
-  }\r
+  int i;  \r

 \r
 \r

+  AbstractInterface* inter;\r

   ConnectedInterface* toClk = NULL;\r
   ConnectedInterface* toRst = NULL;\r
   // create interfaces from reference block\r
   ConnectedInterface* toClk = NULL;\r
   ConnectedInterface* toRst = NULL;\r
   // create interfaces from reference block\r

diff --git a/FunctionalInterface.cpp b/FunctionalInterface.cpp
index 7d1217a88a31bec7c76f89fca1632e432ec0f16f..55f65ec48c076bb01ece044e5a35594c4e416245 100644 (file)
--- a/FunctionalInterface.cpp
+++ b/FunctionalInterface.cpp
@@ -90,7 +90,7 @@ bool FunctionalInterface::canConnectTo(AbstractInterface *iface) {
         - iface type must be functional or group interface\r
         - iface->connectedFrom must be NULL\r
 \r
         - iface type must be functional or group interface\r
         - iface->connectedFrom must be NULL\r
 \r

-     valid cases:\r
+     valid "normal" cases:\r

      1 - iface is owned by a block (group or func) that is within the same group as the block that own this\r
         1.1 - this is output and iface is input\r
         1.2 - both are inout\r
      1 - iface is owned by a block (group or func) that is within the same group as the block that own this\r
         1.1 - this is output and iface is input\r
         1.2 - both are inout\r


@@ -99,11 +99,21 @@ bool FunctionalInterface::canConnectTo(AbstractInterface *iface) {
         2.2 - both are inout\r
      3 - this is owned by a source block and iface is owned by the top group\r
 \r
         2.2 - both are inout\r
      3 - this is owned by a source block and iface is owned by the top group\r
 \r

+     special case : clk/reset from clkrstgen can connect to stimuli clk/reset\r
+\r

   */\r
   if (direction == Input) return false;\r
   if (iface->isReferenceInterface()) return false;\r
   ConnectedInterface* connIface = AI_TO_CON(iface);\r
   if (connIface->getConnectedFrom() != NULL) return false;\r
   */\r
   if (direction == Input) return false;\r
   if (iface->isReferenceInterface()) return false;\r
   ConnectedInterface* connIface = AI_TO_CON(iface);\r
   if (connIface->getConnectedFrom() != NULL) return false;\r

+  // special case\r
+  if ((getOwner()->getName().startsWith("clkrstgen")) && (iface->getOwner()->isStimuliBlock())) {\r
+    if ((direction == Output) && (iface->getDirection() == Input)) {\r
+      if ((purpose == AbstractInterface::Clock) && (iface->getPurpose() == AbstractInterface::Clock)) return true;\r
+      else if ((purpose == AbstractInterface::Reset) && (iface->getPurpose() == AbstractInterface::Reset)) return true;\r
+    }\r
+  }\r
+\r

   // first case: interface of blocks within the same group\r
   if (getOwner()->getParent() == iface->getOwner()->getParent()) {\r
 \r
   // first case: interface of blocks within the same group\r
   if (getOwner()->getParent() == iface->getOwner()->getParent()) {\r
 \r


@@ -138,11 +148,21 @@ bool FunctionalInterface::canConnectFrom(AbstractInterface *iface) {
      2 - iface is owned by the parent group of the block that owns this\r
         2.1 - this is an input, iface is an input of the group\r
         2.2 - both are inout\r
      2 - iface is owned by the parent group of the block that owns this\r
         2.1 - this is an input, iface is an input of the group\r
         2.2 - both are inout\r

+\r
+     special case : clk/reset of stimuli can connect from clk/reset of clkrstgen\r

   */\r
   if (direction == Output) return false;\r
   if (iface->isReferenceInterface()) return false;\r
   if (connectedFrom != NULL) return false;\r
 \r
   */\r
   if (direction == Output) return false;\r
   if (iface->isReferenceInterface()) return false;\r
   if (connectedFrom != NULL) return false;\r
 \r

+  // special case\r
+  if ((iface->getOwner()->getName().startsWith("clkrstgen")) && (getOwner()->isStimuliBlock())) {\r
+    if ((direction == Input) && (iface->getDirection() == Output)) {\r
+      if ((purpose == AbstractInterface::Clock) && (iface->getPurpose() == AbstractInterface::Clock)) return true;\r
+      else if ((purpose == AbstractInterface::Reset) && (iface->getPurpose() == AbstractInterface::Reset)) return true;\r
+    }\r
+  }\r
+\r

   if (getOwner()->getParent() == iface->getOwner()->getParent()) {\r
 \r
     if ((direction == Input) && (iface->getDirection() == Output) && (purpose == iface->getPurpose())) return true;\r
   if (getOwner()->getParent() == iface->getOwner()->getParent()) {\r
 \r
     if ((direction == Input) && (iface->getDirection() == Output) && (purpose == iface->getPurpose())) return true;\r

diff --git a/GroupItem.cpp b/GroupItem.cpp
index f275f8ebc25865556bfce20b001e99612cf1d720..283e6b44187370e56adac0462b672f675cd8148e 100644 (file)
--- a/GroupItem.cpp
+++ b/GroupItem.cpp
@@ -814,7 +814,12 @@ void GroupItem::load(QDomElement groupElement) throw(Exception) {
     
     GroupInterface *groupIface = new GroupInterface(groupBlock,name,direction,purpose);
     groupBlock->addInterface(groupIface);
     
     GroupInterface *groupIface = new GroupInterface(groupBlock,name,direction,purpose);
     groupBlock->addInterface(groupIface);

-    InterfaceItem *interfaceItem = new InterfaceItem(position,orientation,groupIface,this,params);
+    bool show = false;
+    if ((groupBlock->isTopGroupBlock()) && (purpose == AbstractInterface::Clock)) {
+      show = true;
+    }
+
+    InterfaceItem *interfaceItem = new InterfaceItem(position,orientation,groupIface,this,params,show);

     interfaceItem->setId(id);
     addInterfaceItem(interfaceItem, false);
 
     interfaceItem->setId(id);
     addInterfaceItem(interfaceItem, false);
 


@@ -823,7 +828,7 @@ void GroupItem::load(QDomElement groupElement) throw(Exception) {
       groupCtlIface->setAssociatedIface(groupIface);
       groupBlock->addInterface(groupCtlIface);
     }
       groupCtlIface->setAssociatedIface(groupIface);
       groupBlock->addInterface(groupCtlIface);
     }

-    cout << "interface add to " << groupBlock->getName().toStdString() << endl;
+    cout << "interface " << qPrintable(name) << " added to " << groupBlock->getName().toStdString() << endl;

   }
 
 }
   }
 
 }

diff --git a/GroupScene.cpp b/GroupScene.cpp
index 70c88e25f1e8c96a4fcec0ec45d1d4e9dcd743c0..13b6e112b05834328d1fd1c7c7508a12b15fdd86 100644 (file)
--- a/GroupScene.cpp
+++ b/GroupScene.cpp
@@ -9,6 +9,7 @@
 #include "ConnectionItem.h"
 #include "InterfaceItem.h"
 #include "AbstractBlock.h"
 #include "ConnectionItem.h"
 #include "InterfaceItem.h"
 #include "AbstractBlock.h"

+#include "Graph.h"

 
 GroupScene::GroupScene(GroupScene *_parentScene, GroupWidget *_window, Dispatcher* _dispatcher, Parameters* _params, bool _topScene, QObject *parent) : QGraphicsScene(parent) {
   dispatcher = _dispatcher;
 
 GroupScene::GroupScene(GroupScene *_parentScene, GroupWidget *_window, Dispatcher* _dispatcher, Parameters* _params, bool _topScene, QObject *parent) : QGraphicsScene(parent) {
   dispatcher = _dispatcher;


@@ -156,6 +157,15 @@ void GroupScene::removeBoxItem(BoxItem* item) {
   groupItem->updateShape();
 }
 
   groupItem->updateShape();
 }
 

+BoxItem* GroupScene::searchBoxItemByName(QString name) {
+  foreach(BoxItem* item, boxItems) {
+    if (item->getRefBlock()->getName() == name) {
+      return item;
+    }
+  }
+  return NULL;
+}
+

 StimuliItem *GroupScene::createStimuliItem(AbstractBlock *block) {
 
   StimuliItem* item = new StimuliItem(block,dispatcher,params);
 StimuliItem *GroupScene::createStimuliItem(AbstractBlock *block) {
 
   StimuliItem* item = new StimuliItem(block,dispatcher,params);


@@ -268,6 +278,16 @@ void GroupScene::save(QXmlStreamWriter &writer) {
   else {
     writer.writeAttribute("upper_scene",QString::number(parentScene->getId()));
   }
   else {
     writer.writeAttribute("upper_scene",QString::number(parentScene->getId()));
   }

+  if (isTopScene()) {
+    QString clkList = "";
+    QList<double> lst = params->getGraph()->getClocks();
+    foreach(double d, lst) {
+      clkList += QString::number(d)+",";
+    }
+    clkList.chop(1);
+    writer.writeAttribute("clkList",clkList);
+
+  }

   groupItem->save(writer);
 
   if (isTopScene()) {
   groupItem->save(writer);
 
   if (isTopScene()) {

diff --git a/GroupScene.h b/GroupScene.h
index d5a485ebcd7ceeffa05358e6460af8c94489d203..10a5a90692db3a1c8a1edd935f71c9cafc4d861c 100644 (file)
--- a/GroupScene.h
+++ b/GroupScene.h
@@ -79,6 +79,7 @@ public:
   BoxItem* createBoxItem(AbstractBlock* block, BoxItem::Position position = BoxItem::Free, int lock = AbstractBoxItem::NoLock, BoxItem::SpanType span = BoxItem::NoSpan); //! create a new BoxItem and place it at the center of the scene
   void addBoxItem(BoxItem* item); //! add an already configured BoxItem in the scene.
   void removeBoxItem(BoxItem* item);
   BoxItem* createBoxItem(AbstractBlock* block, BoxItem::Position position = BoxItem::Free, int lock = AbstractBoxItem::NoLock, BoxItem::SpanType span = BoxItem::NoSpan); //! create a new BoxItem and place it at the center of the scene
   void addBoxItem(BoxItem* item); //! add an already configured BoxItem in the scene.
   void removeBoxItem(BoxItem* item);

+  BoxItem* searchBoxItemByName(QString name);

   
   // ConnectionItem related
   void createConnectionItem(InterfaceItem* iface1, InterfaceItem* iface2, bool visible = true);
   
   // ConnectionItem related
   void createConnectionItem(InterfaceItem* iface1, InterfaceItem* iface2, bool visible = true);

diff --git a/Makefile-isim b/Makefile-isim
deleted file mode 100644 (file)
index 15319a1..0000000
--- a/Makefile-isim
+++ /dev/null
@@ -1,33 +0,0 @@
-OPT := params-isim.txt
-
-include $(OPT)
-
-ISIM_DIR := isim
-
-ISIM_LIB := work
-
-all : project compile 
-
-project : $(PROJECT_NAME).prj
-
-compile : $(PROJECT_NAME).prj $(VHDL_SRC)
-       tb_name=$$( echo $(TB_SRC) | sed 's,.*/,,' | sed 's,[.].*,,'); \
-       fuse $(ISIM_LIB).$$tb_name $(ISIM_LIB).glbl -prj $(PROJECT_NAME).prj -L unisim -L secureip -timeprecision_vhdl ps -o $(SIMU_EXE)
-
-view :
-       $(SIMU_EXE) -gui -wdb $(SIMU_EXE).wdb
-
-$(PROJECT_NAME).prj :
-       if [ -f $@ ]; then rm $@; fi
-       echo "### VHDL sources"
-       for fich in $(VHDL_SRC); do echo vhdl $(ISIM_LIB) $$fich >> $@; done
-       echo "### verilog sources"
-       for fich in $(VL_SRC); do echo verilog $(ISIM_LIB) $$fich >> $@; done
-       echo "### test bench sources"
-       for fich in $(TB_SRC); do echo vhdl $(ISIM_LIB) $$fich >> $@; done
-
-clean :
-       rm -f *~
-       rm -f $(PROJECT_NAME).prj
-       cd $(SRC_DIR); rm -f *~
-       cd $(TB_DIR); rm -f *~

diff --git a/Parameters.cpp b/Parameters.cpp
index ec0041f48c3432062533f54779382fae3fb4a5c6..23b798f1a47e54d16bb6a91fad8508b7ba31661b 100644 (file)
--- a/Parameters.cpp
+++ b/Parameters.cpp
@@ -78,6 +78,7 @@ Graph* Parameters::initGraph(bool createTopGroupIfaces) {
 \r
 void Parameters::destroyGraph() {\r
   delete graph;\r
 \r
 void Parameters::destroyGraph() {\r
   delete graph;\r

+  graph = new Graph();\r

 }\r
 \r
 ReferenceBlock* Parameters::getReferenceBlock(int idCategory, int idBlock) {\r
 }\r
 \r
 ReferenceBlock* Parameters::getReferenceBlock(int idCategory, int idBlock) {\r


@@ -275,6 +276,14 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
     if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));\r
 \r
     if (idUpperScene == -1) {\r
     if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));\r
 \r
     if (idUpperScene == -1) {\r

+      QString clkList = currentSceneNode.attribute("clklist","none");\r
+      if (clkList == "none") throw(Exception(PROJECTFILE_CORRUPTED));\r
+      QStringList clks = clkList.split(",");\r
+      for(int j=0;j<clks.size();j++) {\r
+        double freq = clks.at(j).toDouble(&ok);\r
+        if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));\r
+        graph->addClock(freq);\r
+      }\r

       topGroup = dispatcher->createTopScene(Dispatcher::Load);\r
       topScene->setId(idScene);\r
       groupItem = topScene->getGroupItem();      \r
       topGroup = dispatcher->createTopScene(Dispatcher::Load);\r
       topScene->setId(idScene);\r
       groupItem = topScene->getGroupItem();      \r


@@ -460,12 +469,16 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
     int to = currentConnectionNode.attribute("to","none").toInt(&ok);\r
     if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));\r
 \r
     int to = currentConnectionNode.attribute("to","none").toInt(&ok);\r
     if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));\r
 \r

-\r
+    bool showConn = true;\r
+    QString visStr = currentConnectionNode.attribute("visible","none");\r
+    if (visStr == "false") {\r
+      showConn = false;\r
+    }\r

     InterfaceItem *iface1 = searchInterfaceItemById(from,topScene);\r
     InterfaceItem *iface2 = searchInterfaceItemById(to,topScene);\r
 \r
     if(iface1 != NULL && iface2 != NULL){\r
     InterfaceItem *iface1 = searchInterfaceItemById(from,topScene);\r
     InterfaceItem *iface2 = searchInterfaceItemById(to,topScene);\r
 \r
     if(iface1 != NULL && iface2 != NULL){\r

-      dispatcher->createConnection(Dispatcher::Load, iface1,iface2);\r
+      dispatcher->createConnection(Dispatcher::Load, iface1,iface2,showConn);\r

     } else {\r
       cout << "interfaces not found, connect canceled!" << endl;\r
     }\r
     } else {\r
       cout << "interfaces not found, connect canceled!" << endl;\r
     }\r


@@ -1173,7 +1186,9 @@ void Parameters::save(QString confFile) {
 \r
       writer.writeAttribute("from",QString::number(item->getFromInterfaceItem()->getId()));\r
       writer.writeAttribute("to", QString::number(item->getToInterfaceItem()->getId()));\r
 \r
       writer.writeAttribute("from",QString::number(item->getFromInterfaceItem()->getId()));\r
       writer.writeAttribute("to", QString::number(item->getToInterfaceItem()->getId()));\r

-\r
+      if (!item->isVisible()) {\r
+        writer.writeAttribute("visible","false");\r
+      }\r

       writer.writeEndElement();\r
     }\r
 \r
       writer.writeEndElement();\r
     }\r
 \r

diff --git a/SpecialBlock.cpp b/SpecialBlock.cpp
index 9576dc96184cfab349f8ddc4de4cc8b86b780e8e..be9452ecf2d6f61017f0fd67fd0bbc246326ffb8 100644 (file)
--- a/SpecialBlock.cpp
+++ b/SpecialBlock.cpp
@@ -68,7 +68,7 @@ void SpecialBlock::computeOutputPatternSource(int nbExec) throw(Exception) {
     // assign pattern to interface\r
     connIface->setOutputPattern(pattern);\r
     // store it in QMap\r
     // assign pattern to interface\r
     connIface->setOutputPattern(pattern);\r
     // store it in QMap\r

-    outputPattern.insert(connIface,pattern);\r
+    outputPattern.insert(connIface,pattern);    \r

   }\r
   setOutputPatternComputed(true);\r
 }\r
   }\r
   setOutputPatternComputed(true);\r
 }\r


@@ -105,36 +105,61 @@ void SpecialBlock::computeOutputPatternClockConvert(int nbExec) throw(Exception)
   AbstractInterface* clkIn = getIfaceFromName("clk_in");\r
   AbstractInterface* clkOut = getIfaceFromName("clk_out");\r
   cout << "freq clk_in = " << clkIn->getClockFrequency() << endl;\r
   AbstractInterface* clkIn = getIfaceFromName("clk_in");\r
   AbstractInterface* clkOut = getIfaceFromName("clk_out");\r
   cout << "freq clk_in = " << clkIn->getClockFrequency() << endl;\r

-  cout << "freq clk_out = " << clkOut->getClockFrequency() << endl;\r
-\r
-  // in case of inputPattern not created, do it\r
-  if (lengthIP <= 0) {\r
-\r
-    cout << "Strange case: input pattern is not created while it is time to compute output pattern !" << endl;\r
-    // collect the input patterns for each input\r
-    try {\r
-      createInputPattern();\r
+  cout << "freq clk_out = " << clkOut->getClockFrequency() << endl;  \r
+  double periodIn = 1000.0/clkIn->getClockFrequency();\r
+  double periodOut = 1000.0/clkOut->getClockFrequency();\r
+  cout << "period clk_in = " << periodIn << endl;\r
+  cout << "period clk_out = " << periodOut << endl;\r
+  // starts with 1 data in FIFO\r
+  int latency = 1+(int)((periodIn+5.0*periodOut)/periodOut);\r
+  QList<char> pattern;\r
+  for(int i=0;i<latency;i++) {\r
+    pattern.append(0);\r
+  }\r
+  int inFifo = 1;\r
+  int idIn = 1;\r
+  int idOut = 1;\r
+  while (idIn < lengthIP) {\r
+    double tIn = (double)idIn * periodIn;\r
+    double tOut = (double)idOut * periodOut;\r
+    if (fabs(tIn-tOut) < 0.001) {\r
+      if (inFifo > 0) {\r
+        pattern.append(1);\r
+      }\r
+      else {\r
+        pattern.append(0);\r
+        inFifo ++;\r
+      }\r
+      idIn ++;\r
+      idOut ++;\r
+    }\r
+    else if (tIn < tOut) {\r
+      inFifo++;\r
+      idIn ++;\r

     }\r
     }\r

-    catch(Exception e) {\r
-      throw(e);\r
+    else {\r
+      if (inFifo > 0) {\r
+        pattern.append(1);\r
+        inFifo--;\r
+      }\r
+      else {\r
+        pattern.append(0);\r
+      }\r
+      idOut++;\r

     }\r
     }\r

-    cout << "input pattern array initialized with min. len " << lengthIP << endl;\r

   }\r
   }\r

+  foreach(char c, pattern) cout << (int)c;\r
+  cout << endl;\r

 \r
   // initialize the output pattern\r
 \r
   // initialize the output pattern\r

-  lengthOP = 0;\r
+  lengthOP = pattern.size();\r

   foreach(AbstractInterface* iface, getControlOutputs()) {\r
   foreach(AbstractInterface* iface, getControlOutputs()) {\r

-    FunctionalInterface* connIface = AI_TO_FUN(iface);\r
-    lengthOP = lengthIP+productionPattern.value(connIface)->size();\r
-    QList<char>* pattern = new QList<char>();\r
-    for(int i=0;i<lengthOP;i++) pattern->append(0);\r
-    connIface->setOutputPattern(pattern);\r
-    outputPattern.insert(connIface,pattern);\r
+    FunctionalInterface* connIface = AI_TO_FUN(iface);    \r
+    QList<char>* pat = new QList<char>(pattern);\r
+    connIface->setOutputPattern(pat);\r
+    outputPattern.insert(connIface,pat);\r

   }\r
   }\r

-  cout << "output pattern array initialized" << endl;\r
-\r
-  int clock = 0;\r
-\r
+  cout << "output pattern computed" << endl;\r

 }\r
 \r
 \r
 }\r
 \r
 \r

diff --git a/StimuliItem.cpp b/StimuliItem.cpp
index dff524702658977813d4adee702e6a0997b6fb29..4bc4f31249fc3518cb5ebef894a1932d4a2505ee 100644 (file)
--- a/StimuliItem.cpp
+++ b/StimuliItem.cpp
@@ -614,7 +614,7 @@ void StimuliItem::load(QDomElement funcElement) throw(Exception) {
     reference = referenceMd5;
   }
     
     reference = referenceMd5;
   }
     

-  FunctionalBlock* functionalBlock = params->getGraph()->createStimuliBlock(reference);
+  FunctionalBlock* functionalBlock = params->getGraph()->createStimuliBlock(reference, false);

   /* NB: createSourceBlock creates all interfaces from the reference, which is annoying when
     reading bif_iface tags. Thus interface are all removed.
   */
   /* NB: createSourceBlock creates all interfaces from the reference, which is annoying when
     reading bif_iface tags. Thus interface are all removed.
   */


@@ -644,7 +644,7 @@ void StimuliItem::load(QDomElement funcElement) throw(Exception) {
   }  
 
   // recreate all (non-control) interfaces because of some may have a multiplicity>1 with several examplars
   }  
 
   // recreate all (non-control) interfaces because of some may have a multiplicity>1 with several examplars

-  functionalBlock->removeAllInterfaces();
+  //functionalBlock->removeAllInterfaces();

   QDomNodeList interfaceNodes = funcElement.elementsByTagName("source_iface");
   // setting interfaces (user name, and for multiplicity>1 may be create some new ones)
   for(int i=0; i<interfaceNodes.length(); i++) {
   QDomNodeList interfaceNodes = funcElement.elementsByTagName("source_iface");
   // setting interfaces (user name, and for multiplicity>1 may be create some new ones)
   for(int i=0; i<interfaceNodes.length(); i++) {

diff --git a/blast.creator.user b/blast.creator.user
index 1890744c499a74469e765ff095c25e7bc31164eb..b5a367859baff44812e706c933b8f303c4859e53 100644 (file)
--- a/blast.creator.user
+++ b/blast.creator.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>

-<!-- Written by QtCreator 4.2.0, 2018-05-04T14:41:26. -->
+<!-- Written by QtCreator 4.2.0, 2018-05-07T18:17:25. -->

 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

diff --git a/projectfile.xsd b/projectfile.xsd
index 02ba8fd19a8475b24844559e5d0dd0ddd8105322..336d2aca8234bd250d5ba9867985f5ad44649815 100644 (file)
--- a/projectfile.xsd
+++ b/projectfile.xsd
@@ -47,6 +47,7 @@
     <xs:attribute ref="name" />
     <xs:attribute ref="position" />
     <xs:attribute ref="dimension" />
     <xs:attribute ref="name" />
     <xs:attribute ref="position" />
     <xs:attribute ref="dimension" />

+    <xs:attribute ref="visible" use="optional"/>    

   </xs:attributeGroup>
 
   <xs:attributeGroup name="source_parameterAttrGroup">
   </xs:attributeGroup>
 
   <xs:attributeGroup name="source_parameterAttrGroup">


@@ -96,6 +97,7 @@
   <xs:attributeGroup name="connectionAttrGroup">
     <xs:attribute ref="from" />
     <xs:attribute ref="to" />
   <xs:attributeGroup name="connectionAttrGroup">
     <xs:attribute ref="from" />
     <xs:attribute ref="to" />

+    <xs:attribute ref="visible" use="optional" />

   </xs:attributeGroup>
 
   <xs:attributeGroup name="modifierAttrGroup">
   </xs:attributeGroup>
 
   <xs:attributeGroup name="modifierAttrGroup">


@@ -147,6 +149,15 @@
     </xs:simpleType>
   </xs:attribute>
 
     </xs:simpleType>
   </xs:attribute>
 

+  <xs:attribute name="visible">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+       <xs:enumeration value="true"/>
+       <xs:enumeration value="false"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:attribute>
+  

   <xs:attribute name="inside_group">
     <xs:simpleType>
       <xs:restriction base="xs:nonNegativeInteger">
   <xs:attribute name="inside_group">
     <xs:simpleType>
       <xs:restriction base="xs:nonNegativeInteger">


@@ -295,6 +306,7 @@
       <xs:group ref="sceneElmtGroup"/>
       <xs:attribute ref="id"/>
       <xs:attribute ref="upper_scene"/>
       <xs:group ref="sceneElmtGroup"/>
       <xs:attribute ref="id"/>
       <xs:attribute ref="upper_scene"/>

+      <xs:attribute name="clklist" type="xs:string" use="optional" />

     </xs:complexType>
   </xs:element>
 
     </xs:complexType>
   </xs:element>