finalized analysis with clkconvert + started testbench gen.

[blast.git] / AbstractBoxItem.cpp

diff --git a/AbstractBoxItem.cpp b/AbstractBoxItem.cpp
index 9fafc8fbc4b5b7dea39e0675b5c20913af3fdd0e..0a820554711e7a4aab27f35c9406bdcc01ff04de 100644 (file)
--- a/AbstractBoxItem.cpp
+++ b/AbstractBoxItem.cpp
@@ -12,8 +12,13 @@
 #include "AbstractInterface.h"
 #include "ConnectedInterface.h"
 
 #include "AbstractInterface.h"
 #include "ConnectedInterface.h"
 

+int AbstractBoxItem::NoLock = 0;
+int AbstractBoxItem::Position = 1;
+int AbstractBoxItem::Dimension = 2;
+int AbstractBoxItem::Interfaces = 4;
+int AbstractBoxItem::Names = 8;

 
 

-AbstractBoxItem::  AbstractBoxItem(AbstractBlock *_refBlock, Dispatcher *_dispatcher, Parameters *_params, LockType _lock, QGraphicsItem *parent) : QGraphicsItem(parent) {
+AbstractBoxItem::AbstractBoxItem(AbstractBlock *_refBlock, Dispatcher *_dispatcher, Parameters *_params, int _lock, QGraphicsItem *parent) : QGraphicsItem(parent) {

   dispatcher = _dispatcher;
   params = _params;
   refBlock = _refBlock;  
   dispatcher = _dispatcher;
   params = _params;
   refBlock = _refBlock;  


@@ -36,6 +41,7 @@ AbstractBoxItem::  AbstractBoxItem(AbstractBlock *_refBlock, Dispatcher *_dispat
 
   selected = false;
   currentInterface = NULL;
 
   selected = false;
   currentInterface = NULL;

+  visible = true;

   rstClkVisible = false;
   wishboneVisible = false;
 
   rstClkVisible = false;
   wishboneVisible = false;
 


@@ -44,7 +50,7 @@ AbstractBoxItem::  AbstractBoxItem(AbstractBlock *_refBlock, Dispatcher *_dispat
   // NOTE : initInterfaces() is only called in subclasses
 }
 
   // NOTE : initInterfaces() is only called in subclasses
 }
 

-AbstractBoxItem::AbstractBoxItem(Dispatcher *_dispatcher, Parameters *_params, LockType _lock, QGraphicsItem* parent) : QGraphicsItem(parent) {
+AbstractBoxItem::AbstractBoxItem(Dispatcher *_dispatcher, Parameters *_params, int _lock, QGraphicsItem* parent) : QGraphicsItem(parent) {

   dispatcher = _dispatcher;
   params = _params;  
   refBlock = NULL;
   dispatcher = _dispatcher;
   params = _params;  
   refBlock = NULL;


@@ -66,6 +72,7 @@ AbstractBoxItem::AbstractBoxItem(Dispatcher *_dispatcher, Parameters *_params, L
 
   selected = false;
   currentInterface = NULL;
 
   selected = false;
   currentInterface = NULL;

+  visible = true;

   rstClkVisible = false;
   wishboneVisible = false;
   
   rstClkVisible = false;
   wishboneVisible = false;
   


@@ -89,7 +96,7 @@ bool AbstractBoxItem::isGroupItem() {
   return false;
 }
 
   return false;
 }
 

-bool AbstractBoxItem::isSourceItem() {
+bool AbstractBoxItem::isStimuliItem() {

   return false;
 }
 
   return false;
 }
 


@@ -130,7 +137,7 @@ void AbstractBoxItem::setRefBlock(AbstractBlock* _refBlock) {
   nameHeight = fmId.height();
 }
 
   nameHeight = fmId.height();
 }
 

-void AbstractBoxItem::initInterfaceItems() {
+void AbstractBoxItem::createInterfaceItems(Parameters::Direction posInputs, Parameters::Direction posOutputs, Parameters::Direction posBidirs) {

   /* TO DO : creating all needed InterfaceItem, with by default, input at west and output at east */
   int orientation = Parameters::West;
 
   /* TO DO : creating all needed InterfaceItem, with by default, input at west and output at east */
   int orientation = Parameters::West;
 


@@ -141,11 +148,11 @@ void AbstractBoxItem::initInterfaceItems() {
     if (inter->getPurpose() != AbstractInterface::Control) {
       InterfaceItem *item;
       if(inter->getDirection() == AbstractInterface::Input){
     if (inter->getPurpose() != AbstractInterface::Control) {
       InterfaceItem *item;
       if(inter->getDirection() == AbstractInterface::Input){

-        orientation = Parameters::West;
+        orientation = posInputs;

       } else if(inter->getDirection() == AbstractInterface::Output){
       } else if(inter->getDirection() == AbstractInterface::Output){

-        orientation = Parameters::East;
+        orientation = posOutputs;

       } else if(inter->getDirection() == AbstractInterface::InOut){
       } else if(inter->getDirection() == AbstractInterface::InOut){

-        orientation = Parameters::North;
+        orientation = posBidirs;

       }
       item = new InterfaceItem(0.0 , orientation, (ConnectedInterface *)inter, this, params);
       interfaces.append(item);        
       }
       item = new InterfaceItem(0.0 , orientation, (ConnectedInterface *)inter, this, params);
       interfaces.append(item);        


@@ -297,7 +304,7 @@ QRectF AbstractBoxItem::boundingRectInScene() {
 */
 bool AbstractBoxItem::isInterfaces(int orientation) const {
   foreach(InterfaceItem* inter, interfaces) {
 */
 bool AbstractBoxItem::isInterfaces(int orientation) const {
   foreach(InterfaceItem* inter, interfaces) {

-    if (inter->getOrientation() == orientation) return true;
+    if ((inter->visible) && (inter->getOrientation() == orientation)) return true;

   }
   return false;
 }
   }
   return false;
 }