X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/60c13e8b4c7ea3d595969c1e7c0a28b068a17ca6..a13795fc34cd1e74f94695d35253c3d00abec9bc:/Parameters.cpp?ds=inline

diff --git a/Parameters.cpp b/Parameters.cpp
index 1195f51..ec0041f 100644
--- a/Parameters.cpp
+++ b/Parameters.cpp
@@ -52,6 +52,8 @@ Parameters::Parameters() {
   projectPath = "";
   projectName = "";
   projectFile = "";
+
+  graph = new Graph();
 }
 
 Parameters::~Parameters() {
@@ -69,8 +71,8 @@ void Parameters::clear() {
   refPathes.clear();
 }
 
-Graph* Parameters::createGraph(bool createTopGroupIfaces) {
-  graph = new Graph(createTopGroupIfaces);
+Graph* Parameters::initGraph(bool createTopGroupIfaces) {
+  graph->createTopGroup(createTopGroupIfaces);
   return graph;
 }
 
@@ -95,71 +97,6 @@ ReferenceBlock* Parameters::getHiddenReferenceBlock(QString blockName) {
   return ref;
 }
 
-double Parameters::getFeedingClockFrequency(AbstractInterface *iface) {
-
-  int idClock = 0;
-
-  if (iface->isReferenceInterface()) return 0.0;
-
-  if (iface->getClockIfaceType() == AbstractInterface::ParameterName) {
-    BlockParameter* param = iface->getOwner()->getParameterFromName(iface->getClockIfaceString());
-    if (!param->isUserParameter()) return 0.0;
-    bool ok;
-    double freq = param->getDoubleValue(&ok);
-    if (!ok) {
-      cerr << "Abnormal case: cannot retrieve clock id from parameter  " << qPrintable(param->getName()) << endl;
-    }
-    return freq;
-  }
-  else if ( (iface->getClockIfaceType() == AbstractInterface::ClockName) || ((iface->getDirection() == AbstractInterface::Input) && (iface->getPurpose() == AbstractInterface::Clock))) {
-
-    // if iface is not clock, retrieve the clock related to it
-    if (iface->getClockIfaceType() == AbstractInterface::ClockName) {
-      iface = iface->getClockIface();
-    }
-    // if iface is a group interface, then iface name is ext_clk_X, thus extract the X
-    if (iface->isGroupInterface()) {
-      QString name = iface->getName();
-      name.remove(0,8);
-      bool ok;
-      idClock = name.toInt(&ok);
-      if (!ok) {
-        cerr << "Abnormal case: cannot retrieve clock id from iface name " << qPrintable(iface->getName()) << endl;
-        return 0.0;
-      }
-    }
-    // if iface is a functional interface, it is connected to clkrstgen_X (in top group) or to ext_clk_X (in subgroup)
-    else if (iface->isFunctionalInterface()) {
-      FunctionalInterface* funIface = AI_TO_FUN(iface);
-      ConnectedInterface* connFrom = funIface->getConnectedFrom();
-      if (connFrom == NULL) {
-        cerr << "Abnormal case: input clock " << qPrintable(iface->getName()) << " is not connected" << endl;
-        return 0.0;
-      }
-      if (iface->getOwner()->isTopGroupBlock()) {
-        QString name = connFrom->getOwner()->getName();
-        name.remove(0,10);
-        bool ok;
-        idClock = name.toInt(&ok);
-        if (!ok) {
-          cerr << "Abnormal case: cannot retrieve clock id for " << qPrintable(iface->getName()) << endl;
-          return 0.0;
-        }
-      }
-      else {
-        QString name = connFrom->getName();
-        name.remove(0,8);
-        bool ok;
-        idClock = name.toInt(&ok);
-        if (!ok) {
-          cerr << "Abnormal case: cannot retrieve clock id for " << qPrintable(iface->getName()) << endl;
-          return 0.0;
-        }
-      }
-    }
-  }
-  return clocks.at(idClock);
-}
 
 void Parameters::createDelayBlock() {
   delayRef = new ReferenceBlock("no.xml");
@@ -346,6 +283,11 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
     else {
       cout << "trying to create scene n°" << idScene << " with upper scene n°" <<idUpperScene << endl;
       GroupScene* upperScene = searchSceneById(idUpperScene, topScene);
+      /* IMPORTANT: calling addNewEmptyGroup() leads to create a new GroupWidget
+       *            AND a BoxItem in upperScene that represents the GroupItem in the
+       *            newly created child scene. Thus, it has not to be created when
+       *            reading bi_group tags in the following but just searched
+       */
       groupWidget = dispatcher->addNewEmptyGroup(Dispatcher::Load, upperScene,false);
       groupWidget->getScene()->setId(idScene);
       groupItem = groupWidget->getScene()->getGroupItem();