X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/4cf57e6db08da791233d75237f62e74bc88dd427..77e28a24d444098399304f0175b1aba43c83017f:/BlockImplementation.cpp

diff --git a/BlockImplementation.cpp b/BlockImplementation.cpp
index f71297f..46c9722 100644
--- a/BlockImplementation.cpp
+++ b/BlockImplementation.cpp
@@ -127,6 +127,7 @@ void BlockImplementation::generateVHDL(FunctionalBlock* _block, const QString &p
   if (reference->isWBConfigurable()) {
     genController = true;
     controllerFile = path;
+    controllerFile += "/";
     controllerFile.append(block->getName());
     controllerFile.append("_ctrl.vhd");    
   }
@@ -134,6 +135,7 @@ void BlockImplementation::generateVHDL(FunctionalBlock* _block, const QString &p
     controllerFile = "nofile.vhd";    
   }
   coreFile = path;
+  coreFile += "/";
   coreFile.append(block->getName());
   coreFile.append(".vhd");
 
@@ -185,38 +187,38 @@ void BlockImplementation::generateComments(QDomElement &elt, QString coreFile, Q
   for(int i = 0; i < 50; i++) {
     out << "--";
   }
-  out << "\n--\n";
+  out << "\n--" << endl;
   QString fileName = coreFile;
-  out << "--  File        : " << fileName << "\n";
-  out << "--\n";
+  out << "--  File        : " << fileName << endl;
+  out << "--" << endl;
   QDomElement eltAuthor = elt.firstChildElement("author");
   QString firstName = eltAuthor.attribute("firstname","");
   QString lastName = eltAuthor.attribute("lastname","");
   QString mail = eltAuthor.attribute("mail","");
-  out << "--  Author(s)   : "<<firstName+" "<<lastName<<" ("<<mail<<")\n";
-  out << "--\n";
+  out << "--  Author(s)   : "<<firstName+" "<<lastName<<" ("<<mail<<")" << endl;
+  out << "--" << endl;
   QDomElement eltDate = eltAuthor.nextSiblingElement("date");
   QString crea = eltDate.attribute("creation","");
-  out << "--  Creation Date   : "<<crea<<"\n";
-  out << "--\n";
+  out << "--  Creation Date   : "<<crea<< endl;
+  out << "--" << endl;
   QDomElement eltRelated = eltDate.nextSiblingElement("related_files");
   QString relateds = eltRelated.attribute("list","");
-  out << "--  Related files   :\n"<<relateds<<"\n";
-  out << "--\n";
+  out << "--  Related files   :\n"<<relateds<<endl;
+  out << "--" << endl;
   QDomElement eltDesc = eltRelated.nextSiblingElement("description");
   QDomElement desc = eltDesc.firstChildElement();
   QString descTxt = desc.text();
-  out << "--  Decription      :\n"<<descTxt<<"\n";
-  out << "--\n";
+  out << "--  Decription      :\n"<<descTxt<<endl;
+  out << "--" << endl;
   QDomElement eltNote = eltDesc.nextSiblingElement("description");
   QDomElement note = eltNote.firstChildElement();
   QString noteTxt = note.text();
-  out << "--  Note          :\n"<<noteTxt<<"\n";
-  out << "--\n";
+  out << "--  Note          :\n"<<noteTxt<<endl;
+  out << "--" << endl;
   for(int i = 0; i < 50; i++) {
     out << "--";
   }
-  out << "\n\n";
+  out << endl << endl;
 }
 
 // This function generates the library part of the VHDL document
@@ -227,7 +229,7 @@ void BlockImplementation::generateLibraries(QDomElement &elt, QTextStream& out)
     QDomNode nodeLib = listLib.item(i);
     QDomElement eltLib = nodeLib.toElement();
     QString nameLib = eltLib.attribute("name","none");
-    out << "library " << nameLib << ";\n";
+    out << "library " << nameLib << ";" << endl;
     QDomNodeList listPack = eltLib.elementsByTagName("package");
     for(int j = 0; j < listPack.length(); j++) {
       QDomNode nodePack = listPack.item(j);
@@ -251,7 +253,7 @@ void BlockImplementation::generateEntity(QTextStream& out, bool hasController) t
   QList<AbstractInterface*> listBidirs = block->getBidirs();
   QString typePort, namePort;
 
-  out << "entity " << nameEnt << " is\n";
+  out << "entity " << nameEnt << " is" << endl;
 
 
   /* TODO : rewrite the generation to take into acocunt the new object hierarchy */