added new project dialog

[blast.git] / BlockImplementation.cpp

diff --git a/BlockImplementation.cpp b/BlockImplementation.cpp
index f71297f1440f8a82845469d9ed9b84126dba3d06..46c97229ab07479a59057949a2c87f616573898b 100644 (file)
--- a/BlockImplementation.cpp
+++ b/BlockImplementation.cpp
@@ -127,6 +127,7 @@ void BlockImplementation::generateVHDL(FunctionalBlock* _block, const QString &p
   if (reference->isWBConfigurable()) {\r
     genController = true;\r
     controllerFile = path;\r
   if (reference->isWBConfigurable()) {\r
     genController = true;\r
     controllerFile = path;\r

+    controllerFile += "/";\r

     controllerFile.append(block->getName());\r
     controllerFile.append("_ctrl.vhd");    \r
   }\r
     controllerFile.append(block->getName());\r
     controllerFile.append("_ctrl.vhd");    \r
   }\r


@@ -134,6 +135,7 @@ void BlockImplementation::generateVHDL(FunctionalBlock* _block, const QString &p
     controllerFile = "nofile.vhd";    \r
   }\r
   coreFile = path;\r
     controllerFile = "nofile.vhd";    \r
   }\r
   coreFile = path;\r

+  coreFile += "/";\r

   coreFile.append(block->getName());\r
   coreFile.append(".vhd");\r
 \r
   coreFile.append(block->getName());\r
   coreFile.append(".vhd");\r
 \r


@@ -185,38 +187,38 @@ void BlockImplementation::generateComments(QDomElement &elt, QString coreFile, Q
   for(int i = 0; i < 50; i++) {\r
     out << "--";\r
   }\r
   for(int i = 0; i < 50; i++) {\r
     out << "--";\r
   }\r

-  out << "\n--\n";\r
+  out << "\n--" << endl;\r

   QString fileName = coreFile;\r
   QString fileName = coreFile;\r

-  out << "--  File        : " << fileName << "\n";\r
-  out << "--\n";\r
+  out << "--  File        : " << fileName << endl;\r
+  out << "--" << endl;\r

   QDomElement eltAuthor = elt.firstChildElement("author");\r
   QString firstName = eltAuthor.attribute("firstname","");\r
   QString lastName = eltAuthor.attribute("lastname","");\r
   QString mail = eltAuthor.attribute("mail","");\r
   QDomElement eltAuthor = elt.firstChildElement("author");\r
   QString firstName = eltAuthor.attribute("firstname","");\r
   QString lastName = eltAuthor.attribute("lastname","");\r
   QString mail = eltAuthor.attribute("mail","");\r

-  out << "--  Author(s)   : "<<firstName+" "<<lastName<<" ("<<mail<<")\n";\r
-  out << "--\n";\r
+  out << "--  Author(s)   : "<<firstName+" "<<lastName<<" ("<<mail<<")" << endl;\r
+  out << "--" << endl;\r

   QDomElement eltDate = eltAuthor.nextSiblingElement("date");\r
   QString crea = eltDate.attribute("creation","");\r
   QDomElement eltDate = eltAuthor.nextSiblingElement("date");\r
   QString crea = eltDate.attribute("creation","");\r

-  out << "--  Creation Date   : "<<crea<<"\n";\r
-  out << "--\n";\r
+  out << "--  Creation Date   : "<<crea<< endl;\r
+  out << "--" << endl;\r

   QDomElement eltRelated = eltDate.nextSiblingElement("related_files");\r
   QString relateds = eltRelated.attribute("list","");\r
   QDomElement eltRelated = eltDate.nextSiblingElement("related_files");\r
   QString relateds = eltRelated.attribute("list","");\r

-  out << "--  Related files   :\n"<<relateds<<"\n";\r
-  out << "--\n";\r
+  out << "--  Related files   :\n"<<relateds<<endl;\r
+  out << "--" << endl;\r

   QDomElement eltDesc = eltRelated.nextSiblingElement("description");\r
   QDomElement desc = eltDesc.firstChildElement();\r
   QString descTxt = desc.text();\r
   QDomElement eltDesc = eltRelated.nextSiblingElement("description");\r
   QDomElement desc = eltDesc.firstChildElement();\r
   QString descTxt = desc.text();\r

-  out << "--  Decription      :\n"<<descTxt<<"\n";\r
-  out << "--\n";\r
+  out << "--  Decription      :\n"<<descTxt<<endl;\r
+  out << "--" << endl;\r

   QDomElement eltNote = eltDesc.nextSiblingElement("description");\r
   QDomElement note = eltNote.firstChildElement();\r
   QString noteTxt = note.text();\r
   QDomElement eltNote = eltDesc.nextSiblingElement("description");\r
   QDomElement note = eltNote.firstChildElement();\r
   QString noteTxt = note.text();\r

-  out << "--  Note          :\n"<<noteTxt<<"\n";\r
-  out << "--\n";\r
+  out << "--  Note          :\n"<<noteTxt<<endl;\r
+  out << "--" << endl;\r

   for(int i = 0; i < 50; i++) {\r
     out << "--";\r
   }\r
   for(int i = 0; i < 50; i++) {\r
     out << "--";\r
   }\r

-  out << "\n\n";\r
+  out << endl << endl;\r

 }\r
 \r
 // This function generates the library part of the VHDL document\r
 }\r
 \r
 // This function generates the library part of the VHDL document\r


@@ -227,7 +229,7 @@ void BlockImplementation::generateLibraries(QDomElement &elt, QTextStream& out)
     QDomNode nodeLib = listLib.item(i);\r
     QDomElement eltLib = nodeLib.toElement();\r
     QString nameLib = eltLib.attribute("name","none");\r
     QDomNode nodeLib = listLib.item(i);\r
     QDomElement eltLib = nodeLib.toElement();\r
     QString nameLib = eltLib.attribute("name","none");\r

-    out << "library " << nameLib << ";\n";\r
+    out << "library " << nameLib << ";" << endl;\r

     QDomNodeList listPack = eltLib.elementsByTagName("package");\r
     for(int j = 0; j < listPack.length(); j++) {\r
       QDomNode nodePack = listPack.item(j);\r
     QDomNodeList listPack = eltLib.elementsByTagName("package");\r
     for(int j = 0; j < listPack.length(); j++) {\r
       QDomNode nodePack = listPack.item(j);\r


@@ -251,7 +253,7 @@ void BlockImplementation::generateEntity(QTextStream& out, bool hasController) t
   QList<AbstractInterface*> listBidirs = block->getBidirs();\r
   QString typePort, namePort;\r
 \r
   QList<AbstractInterface*> listBidirs = block->getBidirs();\r
   QString typePort, namePort;\r
 \r

-  out << "entity " << nameEnt << " is\n";\r
+  out << "entity " << nameEnt << " is" << endl;\r

 \r
 \r
   /* TODO : rewrite the generation to take into acocunt the new object hierarchy */\r
 \r
 \r
   /* TODO : rewrite the generation to take into acocunt the new object hierarchy */\r