nearly finished GroupBlock VHDL gen

[blast.git] / ReferenceBlock.cpp

diff --git a/ReferenceBlock.cpp b/ReferenceBlock.cpp
index 70677dfa233020f9cfea9d9ee9b70c8e95a2dc81..9d6eb537984c3a6f2295ce73d11c5038a7e827a7 100644 (file)
--- a/ReferenceBlock.cpp
+++ b/ReferenceBlock.cpp
@@ -424,7 +424,7 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
     if (iface->getPurpose() == AbstractInterface::Control) {
       toWrite << iface->getName();
       toWrite << iface->getType();
     if (iface->getPurpose() == AbstractInterface::Control) {
       toWrite << iface->getName();
       toWrite << iface->getType();

-      toWrite << iface->getWidth();
+      toWrite << iface->getWidthString();

       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();
       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();


@@ -436,7 +436,7 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
     if (iface->getPurpose() != AbstractInterface::Control) {
       toWrite << iface->getName();
       toWrite << iface->getType();
     if (iface->getPurpose() != AbstractInterface::Control) {
       toWrite << iface->getName();
       toWrite << iface->getType();

-      toWrite << iface->getWidth();
+      toWrite << iface->getWidthString();

       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();
       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();


@@ -449,7 +449,7 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
     if (iface->getPurpose() == AbstractInterface::Control) {
       toWrite << iface->getName();
       toWrite << iface->getType();
     if (iface->getPurpose() == AbstractInterface::Control) {
       toWrite << iface->getName();
       toWrite << iface->getType();

-      toWrite << iface->getWidth();
+      toWrite << iface->getWidthString();

       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();
       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();


@@ -461,7 +461,7 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
     if (iface->getPurpose() != AbstractInterface::Control) {
       toWrite << iface->getName();
       toWrite << iface->getType();
     if (iface->getPurpose() != AbstractInterface::Control) {
       toWrite << iface->getName();
       toWrite << iface->getType();

-      toWrite << iface->getWidth();
+      toWrite << iface->getWidthString();

       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();
       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();


@@ -472,7 +472,7 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
     ReferenceInterface *iface = (ReferenceInterface *)(b.bidirs.at(i));
     toWrite << iface->getName();
     toWrite << iface->getType();
     ReferenceInterface *iface = (ReferenceInterface *)(b.bidirs.at(i));
     toWrite << iface->getName();
     toWrite << iface->getType();

-    toWrite << iface->getWidth();
+    toWrite << iface->getWidthString();

     toWrite << iface->getPurpose();
     toWrite << iface->getDirection();    
     toWrite << iface->getMultiplicity();
     toWrite << iface->getPurpose();
     toWrite << iface->getDirection();    
     toWrite << iface->getMultiplicity();


@@ -648,15 +648,15 @@ void ReferenceBlock::generateLibraries(QTextStream& out, QDomElement &elt) throw
   throw(Exception(INVALID_REFBLOCK_USE));
 }
 
   throw(Exception(INVALID_REFBLOCK_USE));
 }
 

-void ReferenceBlock::generateEntity(QTextStream& out, bool hasController) throw(Exception) {
+void ReferenceBlock::generateArchitecture(QTextStream& out, QDomElement &elt ) throw(Exception) {

   throw(Exception(INVALID_REFBLOCK_USE));
 }
 
   throw(Exception(INVALID_REFBLOCK_USE));
 }
 

-void ReferenceBlock::generateArchitecture(QTextStream& out, QDomElement &elt ) throw(Exception) {
+void ReferenceBlock::generateController(QTextStream& out) throw(Exception) {

   throw(Exception(INVALID_REFBLOCK_USE));
 }
 
   throw(Exception(INVALID_REFBLOCK_USE));
 }
 

-void ReferenceBlock::generateController(QTextStream& out) throw(Exception) {
+void ReferenceBlock::generateEntityOrComponentBody(QTextStream &out, int indentLevel, bool hasController) throw(Exception) {

   throw(Exception(INVALID_REFBLOCK_USE));
 }
 
   throw(Exception(INVALID_REFBLOCK_USE));
 }