[qet] qet/qet: [4969] update minor fix lwpolyline

[subversion@xxxxxxxxxxxxx]

Revision: 4969
Author:   rdsivd
Date:     2017-05-25 09:41:44 +0200 (Thu, 25 May 2017)
Log Message:
-----------
update minor fix lwpolyline

Modified Paths:
--------------
    branches/DXFtoQET3_DB/dxftoqet3db.cpp
    branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp
    branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp
    branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.h
    branches/DXFtoQET3_DB/src/ELMT_steps/elmt_tables.cpp
    branches/DXFtoQET3_DB/src/ELMT_steps/elmt_tables.h

Modified: branches/DXFtoQET3_DB/dxftoqet3db.cpp
===================================================================
--- branches/DXFtoQET3_DB/dxftoqet3db.cpp	2017-05-22 18:51:18 UTC (rev 4968)
+++ branches/DXFtoQET3_DB/dxftoqet3db.cpp	2017-05-25 07:41:44 UTC (rev 4969)
@@ -1948,6 +1948,13 @@
 	{
 		QSqlRecord Header_record=Tables_Query.record();
 
+		Read_Index=Header_record.value("Index_count").toString();
+		Read_Code=Header_record.value("Code").toString();
+		Read_Waarde=Header_record.value("Waarde").toString();
+		Read_Section=Header_record.value("Section").toString();
+		Read_Commando=Header_record.value("Commando").toString();
+		Read_AcadValue=Header_record.value("AcadValue").toString();
+
 		if (Header_record.value("Code").toInt()==0 )
 		{
 			x1++;

Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp	2017-05-22 18:51:18 UTC (rev 4968)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp	2017-05-25 07:41:44 UTC (rev 4969)
@@ -449,6 +449,7 @@
 					count_vertex=0;
 					readrecord=1;
 
+
 					while (end_seqend==0 and count_vertex<QET_L_POLYLINE)
 					{
 						readrecord=NewQueryBlock.next();
@@ -588,7 +589,8 @@
 						Logtext.append(" \n");
 					}
 
-					while (end_lwpoly==0 and count_vertex<max_vertex-1)
+					NewQueryBlock.previous();
+					while (end_lwpoly==0 and count_vertex<max_vertex)
 					{
 						readrecord=NewQueryBlock.next();
 						QSqlRecord Record4=NewQueryBlock.record();
@@ -772,6 +774,8 @@
 						Logtext.append(" \n");
 					}
 
+					NewQueryBlock.previous();
+
 					while (end_lwpoly==0 and count_vertex<max_vertex)
 					{
 						readrecord=NewQueryBlock.next();
@@ -905,6 +909,8 @@
 						Logtext.append(" \n");
 					}
 
+					//NewQueryBlock.previous();
+
 					while (end_lwpoly==0 and count_vertex<max_vertex-1)
 					{
 						readrecord=NewQueryBlock.next();

Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp	2017-05-22 18:51:18 UTC (rev 4968)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp	2017-05-25 07:41:44 UTC (rev 4969)
@@ -570,13 +570,16 @@
 			}
 
 
-
-			while (end_lwpoly==0 and count_vertex<max_vertex-1)
+			NewQuery.previous();
+			//while (end_lwpoly==0 and count_vertex<=max_vertex-1)
+			//while (end_lwpoly==0 and count_vertex<max_vertex)
+			while (end_lwpoly==0 and count_vertex<max_vertex)
 			{
 				readrecord=NewQuery.next();
 				QSqlRecord Record3=NewQuery.record();
 				Recordvalue2=Record3.value("Command").toString();
 				comand_count2=Record3.value("Command_count").toInt();
+				RecordID=Record3.value("Index_count").toString();
 
 				if (readrecord==true)
 				{
@@ -706,13 +709,8 @@
 			Signal_waarde1.append(Record2.value("Command").toString());
 			Signal_waarde1.append(" : ");
 			Signal_waarde1.append(Record2.value("dxf_5").toString());
-			//Signal_waarde1.append(" : maxvertex => ");
-			//Signal_waarde1.append(Record2.value("dxf_90").toString());
-			//Signal_waarde1.append(" : count vertex => ");
-			//Signal_waarde1.append(QString::number(count_vertex));
-			//Signal_waarde1.append(" : ");
-			//Signal_waarde1.append();
 
+
 			emit Signal1(Signal_waarde1);
 
 		}
@@ -764,6 +762,7 @@
 				Logtext.append(" \n");
 			}
 
+			NewQuery.previous();
 
 
 			while (end_lwpoly==0 and count_vertex<max_vertex)
@@ -895,7 +894,7 @@
 			}
 
 
-
+			//NewQuery.previous();
 			while (end_lwpoly==0 and count_vertex<max_vertex-1)
 			{
 				readrecord=NewQuery.next();

Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.h	2017-05-22 18:51:18 UTC (rev 4968)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.h	2017-05-25 07:41:44 UTC (rev 4969)
@@ -44,6 +44,7 @@
 	QString Logtext;
 	QString Recordvalue;
 	QString Recordvalue2;
+	QString RecordID;
 
 	QString Signal_waarde1;
 	QString Signal_log1;

Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_tables.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_tables.cpp	2017-05-22 18:51:18 UTC (rev 4968)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_tables.cpp	2017-05-25 07:41:44 UTC (rev 4969)
@@ -77,6 +77,7 @@
 
 		//QObject::connect(Logtext,SIGNAL(QString),,SLOT(insertPlainText()))
 	}
+
 	return Logtext;
 }
 

Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_tables.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_tables.h	2017-05-22 18:51:18 UTC (rev 4968)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_tables.h	2017-05-25 07:41:44 UTC (rev 4969)
@@ -18,6 +18,7 @@
 	int rowcount;
 
 	QString Logtext;
+	int db_error;
 
 	void Open_SQL_DB (QString ELMT_filename);
 	void Close_SQL_DB (QString ELMT_filename);