changed connection process

[blast.git] / Parameters.cpp

diff --git a/Parameters.cpp b/Parameters.cpp
index af8eb220462f28523e0584f026633c7300659ba3..848ef7fd09e16e28e9a2483c9c0a4208a18f847c 100644 (file)
--- a/Parameters.cpp
+++ b/Parameters.cpp
@@ -43,6 +43,8 @@ Parameters::Parameters() {
   isRstClkShown = false;\r
 \r
   projectPath = QDir::currentPath();\r
   isRstClkShown = false;\r
 \r
   projectPath = QDir::currentPath();\r

+  \r
+  validityExtension = "_enb";\r

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


@@ -79,15 +81,6 @@ ReferenceBlock* Parameters::getReferenceBlock(int idCategory, int idBlock) {
 }\r
 \r
 \r
 }\r
 \r
 \r

-FunctionalBlock* Parameters::duplicateFunctionalBlock(FunctionalBlock *block) {\r
-\r
-  ReferenceBlock* ref = block->getReference();\r
-  GroupBlock* group = AB_TO_GRP(block->getParent());\r
-\r
-  // adding to the graph\r
-  FunctionalBlock* newBlock = graph->addFunctionalBlock(group,ref);\r
-  return newBlock;\r
-}\r

 \r
 void Parameters::validateXmlFile(const QString& xmlFileName, const QString& xsdFileName, XmlFileType fileType) throw(Exception) {\r
   // opening configFile\r
 \r
 void Parameters::validateXmlFile(const QString& xmlFileName, const QString& xsdFileName, XmlFileType fileType) throw(Exception) {\r
   // opening configFile\r


@@ -269,7 +262,7 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
         throw(err);\r
       }\r
       // add the block to the GroupScene\r
         throw(err);\r
       }\r
       // add the block to the GroupScene\r

-      currentScene->addBlockItem(funcItem);\r
+      currentScene->addBoxItem(funcItem);\r

     }\r
   }\r
   cout << "functional blocks loaded and created succefully!" << endl;\r
     }\r
   }\r
   cout << "functional blocks loaded and created succefully!" << endl;\r


@@ -315,7 +308,7 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
       BoxItem* upperItem = NULL;\r
       if(insideGroup == NULL) cout << "group null" << endl;\r
       // now search within the scene which BoxItem has a childItem that is = to insideGroup\r
       BoxItem* upperItem = NULL;\r
       if(insideGroup == NULL) cout << "group null" << endl;\r
       // now search within the scene which BoxItem has a childItem that is = to insideGroup\r

-      QList<BoxItem *> lst = currentScene->getBlockItems();\r
+      QList<BoxItem *> lst = currentScene->getBoxItems();\r

       foreach(BoxItem* item, lst) {\r
         if (item->getChildGroupItem() == insideGroup) {\r
           upperItem = item;\r
       foreach(BoxItem* item, lst) {\r
         if (item->getChildGroupItem() == insideGroup) {\r
           upperItem = item;\r


@@ -374,7 +367,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->connect(iface1,iface2);\r
+      dispatcher->createConnection(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


@@ -844,9 +837,9 @@ QList<AbstractBlock *> Parameters::getBlocksToConfigure() {
 \r
 \r
 void Parameters::updateToolbar() {\r
 \r
 \r
 void Parameters::updateToolbar() {\r

-  int nb = currentScene->getBlockItems().length();\r
+  int nb = currentScene->getBoxItems().length();\r

   for(int i = 0; i<nb; i++){\r
   for(int i = 0; i<nb; i++){\r

-    if(currentScene->getBlockItems().at(i)->isSelected()){\r
+    if(currentScene->getBoxItems().at(i)->isSelected()){\r

       currentScene->getGroupWidget()->enableGroupButton(true);\r
       return;\r
     }\r
       currentScene->getGroupWidget()->enableGroupButton(true);\r
       return;\r
     }\r


@@ -996,7 +989,7 @@ GroupItem* Parameters::searchGroupItemById(int id, GroupScene *scene) {
 \r
 BoxItem* Parameters::searchBlockItemById(int id, GroupScene *scene) {\r
 \r
 \r
 BoxItem* Parameters::searchBlockItemById(int id, GroupScene *scene) {\r
 \r

-  foreach(BoxItem *item, scene->getBlockItems()){\r
+  foreach(BoxItem *item, scene->getBoxItems()){\r

     if(item->getId() == id){\r
       return item;\r
     }\r
     if(item->getId() == id){\r
       return item;\r
     }\r


@@ -1017,7 +1010,7 @@ InterfaceItem* Parameters::searchInterfaceItemById(int id, GroupScene* scene) {
       return item;\r
     }\r
   }\r
       return item;\r
     }\r
   }\r

-  foreach(BoxItem *block, scene->getBlockItems()){\r
+  foreach(BoxItem *block, scene->getBoxItems()){\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