[qet] [3768] adding convertion to qet format, stil under test

[subversion@xxxxxxxxxxxxx]

Revision: 3768
Author:   rdsivd
Date:     2015-02-26 00:05:27 +0100 (Thu, 26 Feb 2015)
Log Message:
-----------
adding convertion to qet format, stil under test

Modified Paths:
--------------
    branches/dxftoelmt/src/ui/dxf_elmt_output.cpp
    branches/dxftoelmt/src/ui/dxf_elmt_output.h

Modified: branches/dxftoelmt/src/ui/dxf_elmt_output.cpp
===================================================================
--- branches/dxftoelmt/src/ui/dxf_elmt_output.cpp	2015-02-25 22:16:27 UTC (rev 3767)
+++ branches/dxftoelmt/src/ui/dxf_elmt_output.cpp	2015-02-25 23:05:27 UTC (rev 3768)
@@ -184,7 +184,7 @@
 	x=0;
 
 
-	Lineout2="";
+	Lineout3="";
 
 
 	for (x=0 ;x<BlockCount;x++)
@@ -192,56 +192,56 @@
 
 		if (x==0 )
 		{
-			Lineout2.append("   ");
-			Lineout2.append("   ");
-			Lineout2.append("   ");
-			Lineout2.append("   ");
-			Lineout2.append("<element");
-			Lineout2.append(" name=");
-			Lineout2.append(QChar(34));
-			Lineout2.append(Filename1);
-			Lineout2.append(QChar(34));
-			Lineout2.append(">");
+			Lineout3.append("   ");
+			Lineout3.append("   ");
+			Lineout3.append("   ");
+			Lineout3.append("   ");
+			Lineout3.append("<element");
+			Lineout3.append(" name=");
+			Lineout3.append(QChar(34));
+			Lineout3.append(Filename1);
+			Lineout3.append(QChar(34));
+			Lineout3.append(">");
 
-			Lineout2.append('\n');
+			Lineout3.append('\n');
 
-			Lineout2.append("   ");
-			Lineout2.append("   ");
-			Lineout2.append("   ");
-			Lineout2.append("   ");
-			Lineout2.append("   ");
+			Lineout3.append("   ");
+			Lineout3.append("   ");
+			Lineout3.append("   ");
+			Lineout3.append("   ");
+			Lineout3.append("   ");
 
-			Lineout2.append(elmt_Begin());
+			Lineout3.append(elmt_Begin());
 
-			Lineout2.append(elmt_Taal());
+			Lineout3.append(elmt_Taal());
 
-			Lineout2.append(elmt_Info());
+			Lineout3.append(elmt_Info());
 
-			Lineout2.append(BlockList[0].BlockDef);
+			Lineout3.append(BlockList[0].BlockDef);
 
-			Lineout2.append(elmt_Einde());
+			Lineout3.append(elmt_Einde());
 
 
 
-			Lineout2.append("</element>");
+			//Lineout3.append("</element>");
 
-			Lineout2.append('\n');
+			Lineout3.append('\n');
 
 		}
 		else
 		{
-			Lineout2.append("   ");
-			Lineout2.append("   ");
-			Lineout2.append("   ");
-			Lineout2.append("   ");
-			Lineout2.append("<element");
-			Lineout2.append(" name=");
-			Lineout2.append(QChar(34));
-			Lineout2.append(BlockList[x].BlockName);
-			Lineout2.append(QChar(34));
-			Lineout2.append(">");
+			Lineout3.append("   ");
+			Lineout3.append("   ");
+			Lineout3.append("   ");
+			Lineout3.append("   ");
+			Lineout3.append("<element");
+			Lineout3.append(" name=");
+			Lineout3.append(QChar(34));
+			Lineout3.append(BlockList[x].BlockName);
+			Lineout3.append(QChar(34));
+			Lineout3.append(">");
 
-			Lineout2.append('\n');
+			Lineout3.append('\n');
 
 
 
@@ -253,19 +253,19 @@
 			Part.replace(QString("part"),QString("definition"));
 
 
-			Lineout2.append(Part);
-			Lineout2.append('\n');
+			Lineout3.append(Part);
+			//Lineout3.append('\n');
 
 
 
-			Lineout2.append("   ");
-			Lineout2.append("   ");
-			Lineout2.append("   ");
-			Lineout2.append("   ");
+			Lineout3.append("   ");
+			Lineout3.append("   ");
+			Lineout3.append("   ");
+			Lineout3.append("   ");
 
-			Lineout2.append("</element>");
+			Lineout3.append("</element>");
 
-			Lineout2.append('\n');
+			Lineout3.append('\n');
 		}
 
 
@@ -274,7 +274,7 @@
 
 //
 
-	return Lineout2;
+	return Lineout3;
 }
 
 QString dxf_elmt_output::qet_collection_einde(int BlockCount, int Flag, _Block_ACAD BlockList[], QString Filename1)
@@ -335,11 +335,13 @@
 
 	Lineout2.append(">");
 	Lineout2.append('\n');
-	Lineout2.append(qet_elements_einde(BlockCount,  Flag,  BlockList,  Filename1));
+	Lineout4.append(qet_elements_einde(BlockCount,  Flag,  BlockList,  Filename1));
 
+	Lineout2.append(Lineout4);
+
 	Lineout3="";
 
-	for (x=0;x<sp1;x++)
+	for (x=1;x<sp1;x++)
 	{
 		Part2=ElementsLine1[x];
 		sp2=0;
@@ -399,14 +401,14 @@
 
 QString dxf_elmt_output::qet_elements_einde(int BlockCount, int Flag, _Block_ACAD BlockList[], QString Filename1)
 {
-	Lineout2="";
+	Lineout5="";
 
-	Lineout2.append("   ");
-	Lineout2.append("   ");
-	Lineout2.append("</element>");
-	Lineout2.append('\n');
+	Lineout5.append("   ");
+	Lineout5.append("   ");
+	Lineout5.append("</element>");
+	Lineout5.append('\n');
 
-	return Lineout2;
+	return Lineout5;
 }
 
 QString dxf_elmt_output::qet_diagram_einde(int BlockCount, int Flag, _Block_ACAD BlockList[], QString Filename1)

Modified: branches/dxftoelmt/src/ui/dxf_elmt_output.h
===================================================================
--- branches/dxftoelmt/src/ui/dxf_elmt_output.h	2015-02-25 22:16:27 UTC (rev 3767)
+++ branches/dxftoelmt/src/ui/dxf_elmt_output.h	2015-02-25 23:05:27 UTC (rev 3768)
@@ -24,6 +24,8 @@
 
 	QString Lineout2;
 	QString Lineout3;
+	QString Lineout4;
+	QString Lineout5;
 	QString Part;
 	QString ElementsPart;
 	QString ElementsName;