finished conn mode of library

[blast.git] / Parameters.cpp

diff --git a/Parameters.cpp b/Parameters.cpp
index 46437c34bc0dcd1aa3cd36bca0ce9cf98379648f..60d7971c07e228dc849b2f7875f652b77a0dc696 100644 (file)
--- a/Parameters.cpp
+++ b/Parameters.cpp
@@ -69,8 +69,8 @@ void Parameters::clear() {
   refPathes.clear();\r
 }\r
 \r
   refPathes.clear();\r
 }\r
 \r

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

   return graph;\r
 }\r
 \r
   return graph;\r
 }\r
 \r


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

-      topGroup = dispatcher->createTopScene();\r
+      topGroup = dispatcher->createTopScene(Dispatcher::Load);\r

       topScene->setId(idScene);\r
       groupItem = topScene->getGroupItem();      \r
       cout << "top group added to scene n°" << idScene << endl;\r
       topScene->setId(idScene);\r
       groupItem = topScene->getGroupItem();      \r
       cout << "top group added to scene n°" << idScene << endl;\r


@@ -280,7 +280,7 @@ 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

-      groupWidget = dispatcher->addNewEmptyGroup(upperScene,false);\r
+      groupWidget = dispatcher->addNewEmptyGroup(Dispatcher::Load, upperScene,false);\r

       groupWidget->getScene()->setId(idScene);\r
       groupItem = groupWidget->getScene()->getGroupItem();      \r
     }\r
       groupWidget->getScene()->setId(idScene);\r
       groupItem = groupWidget->getScene()->getGroupItem();      \r
     }\r


@@ -302,7 +302,7 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
       cout << qPrintable(groupItem->getRefBlock()->getName()) << " has upper box item in " << qPrintable(groupItem->getParentItem()->getScene()->getGroupItem()->getRefBlock()->getName()) << endl;\r
     }    \r
   }\r
       cout << qPrintable(groupItem->getRefBlock()->getName()) << " has upper box item in " << qPrintable(groupItem->getParentItem()->getScene()->getGroupItem()->getRefBlock()->getName()) << endl;\r
     }    \r
   }\r

-  dispatcher->setSceneCounter(maxIdScene+1);\r
+  dispatcher->setSceneCounter(Dispatcher::Load, maxIdScene+1);\r

   cout << "groupItems loaded and windows created succefully!" << endl;\r
 \r
   /**********************************************************\r
   cout << "groupItems loaded and windows created succefully!" << endl;\r
 \r
   /**********************************************************\r


@@ -457,7 +457,7 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
     InterfaceItem *iface2 = searchInterfaceItemById(to,topScene);\r
 \r
     if(iface1 != NULL && iface2 != NULL){\r
     InterfaceItem *iface2 = searchInterfaceItemById(to,topScene);\r
 \r
     if(iface1 != NULL && iface2 != NULL){\r

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

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


@@ -574,10 +574,27 @@ void Parameters::loadBlastConfiguration(QString confFile) throw(Exception) {
     implPathes.append(path);\r
     cout << "impl path : " << qPrintable(path) << endl << endl;\r
   }\r
     implPathes.append(path);\r
     cout << "impl path : " << qPrintable(path) << endl << endl;\r
   }\r

+\r
+  QDomElement eltSource = eltImpl.nextSiblingElement("sources");\r
+  nbPathesStr = eltSource.attribute("nb","none");\r
+  nbPathes = nbPathesStr.toInt(&ok);\r
+  QDomNodeList listSourceDir = eltSource.elementsByTagName("source_lib");\r
+  if ((!ok) || (nbPathes != listSourceDir.size())) throw(Exception(CONFIGFILE_CORRUPTED));\r
+\r
+  for(int i=0;i<listSourceDir.size();i++) {\r
+    QDomNode nodeSourceDir = listSourceDir.at(i);\r
+    QDomElement eltSourceDir = nodeSourceDir.toElement();\r
+    if (eltSourceDir.isNull()) throw(Exception(CONFIGFILE_CORRUPTED));\r
+    QString path = eltSourceDir.attribute("path","none");\r
+    if (path == "none") throw(Exception(CONFIGFILE_CORRUPTED));\r
+    sourcePathes.append(path);\r
+    cout << "core path : " << qPrintable(path) << endl << endl;\r
+  }\r
+\r

   // getting elt = the element <defaults>\r
   // for each child element, initialize the associated attributes of Parameters\r
 \r
   // getting elt = the element <defaults>\r
   // for each child element, initialize the associated attributes of Parameters\r
 \r

-  QDomElement eltDefaults = eltImpl.nextSiblingElement("defaults");\r
+  QDomElement eltDefaults = eltSource.nextSiblingElement("defaults");\r

 \r
   QDomElement eltBlocks = eltDefaults.firstChildElement("blocks");\r
   QString attributeStr = eltBlocks.attribute("width", "none");\r
 \r
   QDomElement eltBlocks = eltDefaults.firstChildElement("blocks");\r
   QString attributeStr = eltBlocks.attribute("width", "none");\r


@@ -807,6 +824,22 @@ void Parameters::loadImplementationsFromXml() throw(Exception) {
       QString refXml = implRoot.attribute("ref_name","none");\r
       QString refMd5 = implRoot.attribute("ref_md5","none");\r
       BlockImplementation* impl = new BlockImplementation(fileName,refXml,refMd5);\r
       QString refXml = implRoot.attribute("ref_name","none");\r
       QString refMd5 = implRoot.attribute("ref_md5","none");\r
       BlockImplementation* impl = new BlockImplementation(fileName,refXml,refMd5);\r

+\r
+      QDomNodeList archNode = implRoot.elementsByTagName("architecture");\r
+\r
+      if (archNode.isEmpty()) {\r
+        cout << "impl has no architecture" << endl;\r
+        return;\r
+      }\r
+      QDomElement archElt = archNode.at(0).toElement();\r
+      QString compList = archElt.attribute("comp_list","none");\r
+      if (compList != "none") {\r
+        QStringList compos = compList.split(",");\r
+        foreach(QString s, compos) {\r
+          impl->addResource(s);\r
+        }\r
+      }\r
+\r

       try {\r
         impl->loadPatterns(implRoot);\r
       }\r
       try {\r
         impl->loadPatterns(implRoot);\r
       }\r


@@ -908,6 +941,74 @@ void Parameters::saveImplementationsToLib() throw(Exception) {
   libFile.close();\r
 \r
 }\r
   libFile.close();\r
 \r
 }\r

+\r
+\r
+void Parameters::loadSources() throw(Exception) {\r
+\r
+  for(int i=0;i<sourcePathes.size();i++) {\r
+    cout << "analyzing " << qPrintable(sourcePathes.at(i)) << endl;\r
+    QDir dir(sourcePathes.at(i));\r
+    QStringList filter;\r
+    filter << "*.vhd" << "*.ngc";\r
+    dir.setNameFilters(filter);\r
+    QStringList list = dir.entryList();\r
+    for(int j=0;j<list.size();j++) {\r
+      QString fileName = dir.absolutePath();\r
+      fileName.append("/"+list.at(j));\r
+\r
+      if (list.at(j).endsWith(".ngc")) {\r
+        QString netName = list.at(j);\r
+        netName.truncate(list.at(j).size() -4);\r
+        cout << "found netlist " << qPrintable(netName) << endl;\r
+        availableResources.append(new ExternalResource(netName,fileName,ExternalResource::Netlist));\r
+      }\r
+      else {\r
+        cout << "parsing " << qPrintable(fileName) << " ... ";\r
+        QFile srcXML(fileName);\r
+        if (!srcXML.open(QIODevice::ReadOnly)) {\r
+          throw(Exception(IMPLFILE_NOACCESS));\r
+        }\r
+        QTextStream in(&srcXML);\r
+\r
+        QString line = in.readLine();\r
+        while (!line.isNull()) {\r
+          if (line.contains("package", Qt::CaseInsensitive)) {\r
+            QRegularExpression rxPack("^package (.+) is$",QRegularExpression::CaseInsensitiveOption);\r
+            QRegularExpressionMatch matchPack = rxPack.match(line);\r
+            if (matchPack.hasMatch()) {\r
+              QString packName = matchPack.captured(1);\r
+              cout << "found package " << qPrintable(packName) << endl;\r
+              availableResources.append(new ExternalResource(packName,fileName,ExternalResource::Package));\r
+            }\r
+          }\r
+          else if (line.contains("entity", Qt::CaseInsensitive)) {\r
+            QRegularExpression rxEnt("^entity (.+) is$",QRegularExpression::CaseInsensitiveOption);\r
+            QRegularExpressionMatch matchEnt = rxEnt.match(line);\r
+            if (matchEnt.hasMatch()) {\r
+              QString entityName = matchEnt.captured(1);\r
+              cout << "found entity " << qPrintable(entityName) << endl;\r
+              availableResources.append(new ExternalResource(entityName,fileName,ExternalResource::Code));\r
+            }\r
+          }\r
+          line = in.readLine();\r
+        }\r
+        srcXML.close();\r
+        cout << "OK" << endl;\r
+      }\r
+    }\r
+  }\r
+}\r
+\r
+QList<ExternalResource *> Parameters::searchResourceByName(const QString& name) {\r
+  QList<ExternalResource*> listRes;\r
+  foreach(ExternalResource* s, availableResources) {\r
+    if (s->getName() == name) {\r
+      listRes.append(s);\r
+    }\r
+  }\r
+  return listRes;\r
+}\r
+\r

 void Parameters::addAvailableBlock(ReferenceBlock *block) {\r
   availableBlocks.append(block);\r
   foreach (int id,block->getCategories()) {\r
 void Parameters::addAvailableBlock(ReferenceBlock *block) {\r
   availableBlocks.append(block);\r
   foreach (int id,block->getCategories()) {\r