moved clocks list to graph

[blast.git] / Parameters.cpp

diff --git a/Parameters.cpp b/Parameters.cpp
index 1195f51f7e776e54ed30c22f92df709e10db207f..d7621d232a1afa54f59d2a4078eeba3bac0f521b 100644 (file)
--- a/Parameters.cpp
+++ b/Parameters.cpp
@@ -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,8 +71,8 @@ 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
   return graph;\r
 }\r
 \r


@@ -158,7 +160,7 @@ double Parameters::getFeedingClockFrequency(AbstractInterface *iface) {
       }\r
     }\r
   }\r
       }\r
     }\r
   }\r

-  return clocks.at(idClock);\r
+  return graph->getClock(idClock);\r

 }\r
 \r
 void Parameters::createDelayBlock() {\r
 }\r
 \r
 void Parameters::createDelayBlock() {\r


@@ -346,6 +348,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