moved vhdl gen. into block

[blast.git] / GroupBlock.cpp

diff --git a/GroupBlock.cpp b/GroupBlock.cpp
index 4746a7480b9db4d660c4e560eaa090e0533a5d8e..17b7bbada131ceca48d267eb6b056b427486e230 100644 (file)
--- a/GroupBlock.cpp
+++ b/GroupBlock.cpp
@@ -5,6 +5,7 @@
 #include "GroupInterface.h"
 #include "string.h"
 #include <sstream>
 #include "GroupInterface.h"
 #include "string.h"
 #include <sstream>

+#include "Parameters.h"

 
 int GroupBlock::counter = 1;
 
 
 int GroupBlock::counter = 1;
 


@@ -269,7 +270,7 @@ void GroupBlock::generateVHDL(const QString& path) throw(Exception) {
   QString coreFile = "";
 
   coreFile = path;
   QString coreFile = "";
 
   coreFile = path;

-  coreFile.append(normalizeName(name));
+  coreFile.append(Parameters::normalizeName(name));

   coreFile.append(".vhd");
 
   QFile vhdlCore(coreFile);
   coreFile.append(".vhd");
 
   QFile vhdlCore(coreFile);


@@ -280,11 +281,12 @@ void GroupBlock::generateVHDL(const QString& path) throw(Exception) {
 
   QTextStream outCore(&vhdlCore);
 
 
   QTextStream outCore(&vhdlCore);
 

+  QDomElement dummyElt;

   try {
   try {

-    generateComments(outCore);
-    generateLibraries(outCore);
+    generateComments(outCore,dummyElt,"");
+    generateLibraries(outCore,dummyElt);

     generateEntity(outCore);
     generateEntity(outCore);

-    generateArchitecture(outCore);
+    generateArchitecture(outCore,dummyElt);

   }
   catch(Exception err) {
     throw(err);
   }
   catch(Exception err) {
     throw(err);


@@ -294,11 +296,11 @@ void GroupBlock::generateVHDL(const QString& path) throw(Exception) {
 }
 
 
 }
 
 

-void GroupBlock::generateComments(QTextStream& out) throw(Exception) {
+void GroupBlock::generateComments(QTextStream& out, QDomElement &elt, QString coreFile) throw(Exception) {

   out << " -- VHDL generated automatically for " << name << " --" << endl << endl;
 }
 
   out << " -- VHDL generated automatically for " << name << " --" << endl << endl;
 }
 

-void GroupBlock::generateLibraries(QTextStream& out) throw(Exception) {
+void GroupBlock::generateLibraries(QTextStream& out, QDomElement &elt) throw(Exception) {

 
   out << "library IEEE;" << endl;
   out << "use IEEE.STD_LOGIC_1164.all;" << endl;
 
   out << "library IEEE;" << endl;
   out << "use IEEE.STD_LOGIC_1164.all;" << endl;


@@ -306,7 +308,7 @@ void GroupBlock::generateLibraries(QTextStream& out) throw(Exception) {
 
 }
 
 
 }
 

-void GroupBlock::generateEntity(QTextStream& out) throw(Exception) {
+void GroupBlock::generateEntity(QTextStream& out, bool hasController) throw(Exception) {

 
   int i;
 
 
   int i;
 


@@ -409,7 +411,11 @@ void GroupBlock::generateEntity(QTextStream& out) throw(Exception) {
 
 }
 
 
 }
 

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

 
 }
 
 
 }
 

+void GroupBlock::generateController(QTextStream &out) throw(Exception) {
+  
+}
+