[qet] qet/qet: [4970] minor fix

[subversion@xxxxxxxxxxxxx]

Revision: 4970
Author:   rdsivd
Date:     2017-05-25 11:39:21 +0200 (Thu, 25 May 2017)
Log Message:
-----------
minor fix

Modified Paths:
--------------
    branches/DXFtoQET3_DB/data.h
    branches/DXFtoQET3_DB/dxftoqet3db.cpp
    branches/DXFtoQET3_DB/dxftoqet3db.ui

Modified: branches/DXFtoQET3_DB/data.h
===================================================================
--- branches/DXFtoQET3_DB/data.h	2017-05-25 07:41:44 UTC (rev 4969)
+++ branches/DXFtoQET3_DB/data.h	2017-05-25 09:39:21 UTC (rev 4970)
@@ -7,7 +7,7 @@
 //#include "db/dbmanager.h"
 
 #define DXF_base_set 1
-#define DXF_item_split 10000 //dxf split tables
+#define DXF_item_split 30000 //dxf split tables
 #define DXF_codes_set 10000
 #define DXF_codeset_copies 10000
 #define QET_L_POLYLINE 100

Modified: branches/DXFtoQET3_DB/dxftoqet3db.cpp
===================================================================
--- branches/DXFtoQET3_DB/dxftoqet3db.cpp	2017-05-25 07:41:44 UTC (rev 4969)
+++ branches/DXFtoQET3_DB/dxftoqet3db.cpp	2017-05-25 09:39:21 UTC (rev 4970)
@@ -1158,7 +1158,7 @@
 		Read_Commando=Header_record.value("Cmmando").toString();
 		Read_AcadValue=Header_record.value("AcadValue").toString();
 
-		if (Header_record.value("Code").toInt()==9 )
+		if ((Header_record.value("Code").toInt()==9) and (x1<DXF_item_split))
 		{
 			x1++;
 			split_tables_list[x1].append(Header_record.value("Code").toString() );
@@ -1619,7 +1619,7 @@
 		Read_Commando=Header_record.value("Cmmando").toString();
 		Read_AcadValue=Header_record.value("AcadValue").toString();
 
-		if (Header_record.value("Code").toInt()==0 )
+		if ((Header_record.value("Code").toInt()==0) and (x1<DXF_item_split))
 		{
 			x1++;
 			split_tables_list[x1].append(Header_record.value("Code").toString() );
@@ -1955,7 +1955,7 @@
 		Read_Commando=Header_record.value("Commando").toString();
 		Read_AcadValue=Header_record.value("AcadValue").toString();
 
-		if (Header_record.value("Code").toInt()==0 )
+		if ((Header_record.value("Code").toInt()==0) and (x1<DXF_item_split))
 		{
 			x1++;
 			split_tables_list[x1].append(Header_record.value("Code").toString() );
@@ -2296,7 +2296,7 @@
 
 	x1=-1;
 
-	while (Tables_Query.next())
+	while ((Tables_Query.next()) and (x1<DXF_item_split))
 	{
 		QSqlRecord Header_record=Tables_Query.record();
 
@@ -2304,10 +2304,10 @@
 		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("Cmmando").toString();
+		Read_Commando=Header_record.value("Commando").toString();
 		Read_AcadValue=Header_record.value("AcadValue").toString();
 
-		if (Header_record.value("Code").toInt()==0 )
+		if ((Header_record.value("Code").toInt()==0) and (x1<DXF_item_split))
 		{
 			x1++;
 			split_tables_list[x1].append(Header_record.value("Code").toString() );
@@ -2379,8 +2379,8 @@
 	ui->dxf_section_count->clear();
 	ui->dxf_section_count->insert(text1);
 
-
-	while (count_tables< blocks_max_items)
+	while (count_tables<= x1)
+	//while (count_tables< blocks_max_items)
 	{
 		/*text1=QString::number(count_tables);
 		ui->dxf_section_count->clear();
@@ -2633,7 +2633,7 @@
 		Read_AcadValue=Header_record.value("AcadValue").toString();
 
 
-		if (Header_record.value("Code").toInt()==0 )
+		if ((Header_record.value("Code").toInt()==0) and (x1<DXF_item_split))
 		{
 			x1++;
 			split_tables_list[x1].append(Header_record.value("Code").toString() );
@@ -2812,7 +2812,7 @@
 	for (x2=0;x2<objects_max_count and objects_max_items<DXF_item_split;x2++)
 	{
 
-		if ( QString( dxf_objects[x2]).toInt()==0)
+		if ( (QString( dxf_objects[x2]).toInt()==0) and (x1<DXF_item_split))
 		{
 			x1=x1+1;
 			split_tables_list[x1].append(dxf_objects[x2]);

Modified: branches/DXFtoQET3_DB/dxftoqet3db.ui
===================================================================
--- branches/DXFtoQET3_DB/dxftoqet3db.ui	2017-05-25 07:41:44 UTC (rev 4969)
+++ branches/DXFtoQET3_DB/dxftoqet3db.ui	2017-05-25 09:39:21 UTC (rev 4970)
@@ -601,13 +601,6 @@
       </property>
      </widget>
     </item>
-    <item row="0" column="4">
-     <widget class="QPushButton" name="Choose_DB">
-      <property name="text">
-       <string>Choose DB to proces</string>
-      </property>
-     </widget>
-    </item>
     <item row="0" column="1">
      <widget class="QPushButton" name="Button_Open_DXF">
       <property name="enabled">
@@ -627,6 +620,13 @@
       </property>
      </widget>
     </item>
+    <item row="1" column="5">
+     <widget class="QPushButton" name="Choose_DB">
+      <property name="text">
+       <string>Choose DB to proces</string>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QWidget" name="layoutWidget">