finished testbench generation

[blast.git] / BlockLibraryWidget.cpp

diff --git a/BlockLibraryWidget.cpp b/BlockLibraryWidget.cpp
index d80a78ee795a8938d6b0998d5cfa2c763be367ea..47fd87573c594e9d96bf5c26ed2e956452ea1c53 100644 (file)
--- a/BlockLibraryWidget.cpp
+++ b/BlockLibraryWidget.cpp
@@ -1,5 +1,6 @@
 #include "BlockLibraryWidget.h"
 #include "BlockLibraryTree.h"
 #include "BlockLibraryWidget.h"
 #include "BlockLibraryTree.h"

+#include "Graph.h"

 
 BlockLibraryWidget::BlockLibraryWidget(Dispatcher* _dispatcher,
                                        Parameters* _params,
 
 BlockLibraryWidget::BlockLibraryWidget(Dispatcher* _dispatcher,
                                        Parameters* _params,


@@ -31,7 +32,7 @@ BlockLibraryWidget::BlockLibraryWidget(Dispatcher* _dispatcher,
 
 
   QString msg = "Connect to main clock/rst ext_clk/reset_0 (";
 
 
   QString msg = "Connect to main clock/rst ext_clk/reset_0 (";

-  msg += QString::number(params->clocks.at(0));
+  msg += QString::number(params->getGraph()->getClock(0));

   msg += ")";
   radAutoClk = new QRadioButton(msg);
   radChooseClk = new QRadioButton("Choose among available clk/rst");
   msg += ")";
   radAutoClk = new QRadioButton(msg);
   radChooseClk = new QRadioButton("Choose among available clk/rst");


@@ -135,7 +136,7 @@ void BlockLibraryWidget::addClicked() {
     cout << "adding block to scene " << v.toInt() << endl;
 
     QHash<QString, int> clkRstToGen;
     cout << "adding block to scene " << v.toInt() << endl;
 
     QHash<QString, int> clkRstToGen;

-    for(int i=1;i<nbClock+nbRst;i++) {
+    for(int i=1;i<=nbClock+nbRst;i++) {

       QLayoutItem* item = layClkRst->itemAtPosition(i,0);
       QLabel* lab = (QLabel *)(item->widget());
       item = layClkRst->itemAtPosition(i,1);
       QLayoutItem* item = layClkRst->itemAtPosition(i,0);
       QLabel* lab = (QLabel *)(item->widget());
       item = layClkRst->itemAtPosition(i,1);


@@ -198,7 +199,7 @@ void BlockLibraryWidget::updateBoxConn() {
     //enableAvailableClocks(true);
   }
   QString msg = "Auto-connect to main clk/rst (ext_clk_0 at ";
     //enableAvailableClocks(true);
   }
   QString msg = "Auto-connect to main clk/rst (ext_clk_0 at ";

-  msg += QString::number(params->clocks.at(0));
+  msg += QString::number(params->getGraph()->getClock(0));

   msg += " MHz)";
   radAutoClk->setText(msg);
 }
   msg += " MHz)";
   radAutoClk->setText(msg);
 }


@@ -243,7 +244,7 @@ void BlockLibraryWidget::updateClkRst(int idCat, int idBlock) {
     comboClkGen[i] = new QComboBox();
     QString name = "";
     int id = 0;
     comboClkGen[i] = new QComboBox();
     QString name = "";
     int id = 0;

-    foreach(double d, params->clocks) {
+    foreach(double d, params->getGraph()->getClocks()) {

       name = "ext_clk_"+QString::number(id)+" (";
       name += QString::number(d) + " MHz)";
       comboClkGen[i]->addItem(name);
       name = "ext_clk_"+QString::number(id)+" (";
       name += QString::number(d) + " MHz)";
       comboClkGen[i]->addItem(name);


@@ -255,7 +256,7 @@ void BlockLibraryWidget::updateClkRst(int idCat, int idBlock) {
   for(int i=0;i<lstRst.size();i++) {
     comboRstGen[i] = new QComboBox();
     QString name = "";
   for(int i=0;i<lstRst.size();i++) {
     comboRstGen[i] = new QComboBox();
     QString name = "";

-    for(int j=0;j<params->clocks.size();j++) {
+    for(int j=0;j<params->getGraph()->getClocks().size();j++) {

       name = "ext_rst_"+QString::number(j);
       comboRstGen[i]->addItem(name);
     }
       name = "ext_rst_"+QString::number(j);
       comboRstGen[i]->addItem(name);
     }