clkconvert OP compute done

[blast.git] / Parameters.cpp

diff --git a/Parameters.cpp b/Parameters.cpp
index 60d7971c07e228dc849b2f7875f652b77a0dc696..23b798f1a47e54d16bb6a91fad8508b7ba31661b 100644 (file)
--- a/Parameters.cpp
+++ b/Parameters.cpp
@@ -9,7 +9,7 @@
 #include "GroupScene.h"\r
 #include "GroupItem.h"\r
 #include "BoxItem.h"\r
 #include "GroupScene.h"\r
 #include "GroupItem.h"\r
 #include "BoxItem.h"\r

-#include "SourceItem.h"\r
+#include "StimuliItem.h"\r

 #include "InterfaceItem.h"\r
 #include "ConnectionItem.h"\r
 \r
 #include "InterfaceItem.h"\r
 #include "ConnectionItem.h"\r
 \r


@@ -52,6 +52,8 @@ Parameters::Parameters() {
   projectPath = "";\r
   projectName = "";\r
   projectFile = "";\r
   projectPath = "";\r
   projectName = "";\r
   projectFile = "";\r

+\r
+  graph = new Graph();\r

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


@@ -69,13 +71,14 @@ void Parameters::clear() {
   refPathes.clear();\r
 }\r
 \r
   refPathes.clear();\r
 }\r
 \r

-Graph* Parameters::createGraph(bool createTopGroupIfaces) {\r
-  graph = new Graph(createTopGroupIfaces);\r
+Graph* Parameters::initGraph(bool createTopGroupIfaces) {\r
+  graph->createTopGroup(createTopGroupIfaces);\r

   return graph;\r
 }\r
 \r
 void Parameters::destroyGraph() {\r
   delete graph;\r
   return graph;\r
 }\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


@@ -95,6 +98,7 @@ ReferenceBlock* Parameters::getHiddenReferenceBlock(QString blockName) {
   return ref;\r
 }\r
 \r
   return ref;\r
 }\r
 \r

+\r

 void Parameters::createDelayBlock() {\r
   delayRef = new ReferenceBlock("no.xml");\r
   delayRef->addCategory(100);\r
 void Parameters::createDelayBlock() {\r
   delayRef = new ReferenceBlock("no.xml");\r
   delayRef->addCategory(100);\r


@@ -272,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


@@ -280,6 +292,11 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
     else {\r
       cout << "trying to create scene n°" << idScene << " with upper scene n°" <<idUpperScene << endl;\r
       GroupScene* upperScene = searchSceneById(idUpperScene, topScene);\r
     else {\r
       cout << "trying to create scene n°" << idScene << " with upper scene n°" <<idUpperScene << endl;\r
       GroupScene* upperScene = searchSceneById(idUpperScene, topScene);\r

+      /* IMPORTANT: calling addNewEmptyGroup() leads to create a new GroupWidget\r
+       *            AND a BoxItem in upperScene that represents the GroupItem in the\r
+       *            newly created child scene. Thus, it has not to be created when\r
+       *            reading bi_group tags in the following but just searched\r
+       */\r

       groupWidget = dispatcher->addNewEmptyGroup(Dispatcher::Load, upperScene,false);\r
       groupWidget->getScene()->setId(idScene);\r
       groupItem = groupWidget->getScene()->getGroupItem();      \r
       groupWidget = dispatcher->addNewEmptyGroup(Dispatcher::Load, upperScene,false);\r
       groupWidget->getScene()->setId(idScene);\r
       groupItem = groupWidget->getScene()->getGroupItem();      \r


@@ -325,7 +342,7 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
       cout << "top scene has " << sourceNodes.length() << " sources" << endl;\r
       for(int j=0; j<sourceNodes.length(); j++) {\r
         QDomElement currentSBNode = sourceNodes.at(j).toElement();      \r
       cout << "top scene has " << sourceNodes.length() << " sources" << endl;\r
       for(int j=0; j<sourceNodes.length(); j++) {\r
         QDomElement currentSBNode = sourceNodes.at(j).toElement();      \r

-        SourceItem* sourceItem = new SourceItem(dispatcher,this);\r
+        StimuliItem* sourceItem = new StimuliItem(dispatcher,this);\r

         try {\r
           sourceItem->load(currentSBNode);\r
         }\r
         try {\r
           sourceItem->load(currentSBNode);\r
         }\r


@@ -334,7 +351,7 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
         }\r
         cout << "source item has been read, add it to the scene" << endl;\r
         // add the block to the GroupScene\r
         }\r
         cout << "source item has been read, add it to the scene" << endl;\r
         // add the block to the GroupScene\r

-        currentScene->addSourceItem(sourceItem);\r
+        currentScene->addStimuliItem(sourceItem);\r

       } \r
     }\r
     /**********************************************************\r
       } \r
     }\r
     /**********************************************************\r


@@ -452,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


@@ -1165,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


@@ -1303,7 +1326,7 @@ InterfaceItem* Parameters::searchInterfaceItemById(int id, GroupScene* scene) {
     }\r
   }\r
   if (scene->isTopScene()) {\r
     }\r
   }\r
   if (scene->isTopScene()) {\r

-    foreach(SourceItem *block, scene->getSourceItems()){\r
+    foreach(StimuliItem *block, scene->getSourceItems()){\r

       foreach(InterfaceItem *item, block->getInterfaces()){\r
         if(item->getId() == id){\r
           return item;\r
       foreach(InterfaceItem *item, block->getInterfaces()){\r
         if(item->getId() == id){\r
           return item;\r