[qet] qet/qet: [4972] minir update dxftoqet

[subversion@xxxxxxxxxxxxx]

Revision: 4972
Author:   rdsivd
Date:     2017-05-27 10:37:55 +0200 (Sat, 27 May 2017)
Log Message:
-----------
minir update dxftoqet

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

Modified: branches/DXFtoQET3_DB/dxftoqet3db.cpp
===================================================================
--- branches/DXFtoQET3_DB/dxftoqet3db.cpp	2017-05-27 08:07:24 UTC (rev 4971)
+++ branches/DXFtoQET3_DB/dxftoqet3db.cpp	2017-05-27 08:37:55 UTC (rev 4972)
@@ -1351,7 +1351,7 @@
 	max3=0;
 	clear_sw_header();
 
-	for (int xy=0;xy <1075;xy++)
+	for (int xy=0;xy <1200;xy++)
 	{
 		if(DXF_main_base[0].split_list_1[xy].count()>0)
 		{
@@ -2369,11 +2369,11 @@
 	//clear_dxf_code_tables();
 
 	ui->dxf_section->clear();
-	ui->dxf_section->insert("Section Blokcs");
+	ui->dxf_section->insert("Section Blocks Split");
 
 	emit send_text("dxf_blocks");
 	emit send_min(0);
-	emit send_max(blocks_max_items-1);
+	emit send_max(x1-1);
 
 	text1=QString::number(blocks_max_items);
 	ui->dxf_section_count->clear();

Modified: branches/DXFtoQET3_DB/dxftoqet3db.ui
===================================================================
--- branches/DXFtoQET3_DB/dxftoqet3db.ui	2017-05-27 08:07:24 UTC (rev 4971)
+++ branches/DXFtoQET3_DB/dxftoqet3db.ui	2017-05-27 08:37:55 UTC (rev 4972)
@@ -501,53 +501,27 @@
   <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
-     <x>9</x>
-     <y>9</y>
+     <x>10</x>
+     <y>10</y>
      <width>1031</width>
-     <height>62</height>
+     <height>61</height>
     </rect>
    </property>
    <layout class="QGridLayout" name="gridLayout">
-    <item row="1" column="4">
-     <spacer name="horizontalSpacer_4">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>40</width>
-        <height>20</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-    <item row="0" column="0">
-     <widget class="QPushButton" name="OpenFile">
+    <item row="0" column="7">
+     <widget class="QPushButton" name="SavetoELMT">
       <property name="text">
-       <string>Open dxf file</string>
+       <string>Save to ELMT file</string>
       </property>
      </widget>
     </item>
-    <item row="1" column="2">
-     <spacer name="horizontalSpacer_3">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>40</width>
-        <height>20</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-    <item row="1" column="0">
-     <widget class="QPushButton" name="Load_dxf_into_tables">
+    <item row="0" column="4">
+     <widget class="QPushButton" name="Convert_dxf_blocks">
       <property name="enabled">
        <bool>false</bool>
       </property>
       <property name="text">
-       <string>Load dxf into DB</string>
+       <string>Convert DXF blocks</string>
       </property>
       <property name="flat">
        <bool>true</bool>
@@ -554,7 +528,7 @@
       </property>
      </widget>
     </item>
-    <item row="1" column="3">
+    <item row="1" column="4">
      <widget class="QPushButton" name="Convert_dxf_entities">
       <property name="enabled">
        <bool>false</bool>
@@ -568,46 +542,72 @@
      </widget>
     </item>
     <item row="0" column="6">
-     <widget class="QPushButton" name="SavetoELMT">
+     <widget class="QPushButton" name="Create_QET_ELMT">
       <property name="text">
-       <string>Save to ELMT file</string>
+       <string>Create QET elmt</string>
       </property>
      </widget>
     </item>
-    <item row="1" column="1">
-     <widget class="QPushButton" name="Delete_DB">
-      <property name="text">
-       <string>Delete SQL DB</string>
+    <item row="1" column="5">
+     <spacer name="horizontalSpacer_4">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
       </property>
-     </widget>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>40</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
     </item>
-    <item row="0" column="5">
-     <widget class="QPushButton" name="Create_QET_ELMT">
+    <item row="1" column="3">
+     <spacer name="horizontalSpacer_3">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>40</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item row="0" column="2">
+     <widget class="QPushButton" name="OpenFile">
       <property name="text">
-       <string>Create QET elmt</string>
+       <string>Open dxf file</string>
       </property>
      </widget>
     </item>
-    <item row="0" column="3">
-     <widget class="QPushButton" name="Convert_dxf_blocks">
+    <item row="0" column="1">
+     <widget class="QPushButton" name="Load_dxf_into_tables">
       <property name="enabled">
-       <bool>false</bool>
+       <bool>true</bool>
       </property>
       <property name="text">
-       <string>Convert DXF blocks</string>
+       <string>Load dxf into proces</string>
       </property>
       <property name="flat">
-       <bool>true</bool>
+       <bool>false</bool>
       </property>
      </widget>
     </item>
-    <item row="0" column="1">
+    <item row="0" column="0">
+     <widget class="QPushButton" name="Delete_DB">
+      <property name="text">
+       <string>Delete SQL DB</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="2">
      <widget class="QPushButton" name="Button_Open_DXF">
       <property name="enabled">
        <bool>true</bool>
       </property>
       <property name="text">
-       <string>Load DXF to DB</string>
+       <string>DXFDB to DB</string>
       </property>
       <property name="autoDefault">
        <bool>false</bool>
@@ -616,11 +616,11 @@
        <bool>false</bool>
       </property>
       <property name="flat">
-       <bool>false</bool>
+       <bool>true</bool>
       </property>
      </widget>
     </item>
-    <item row="1" column="5">
+    <item row="0" column="5">
      <widget class="QPushButton" name="Choose_DB">
       <property name="text">
        <string>Choose DB to proces</string>

Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp	2017-05-27 08:07:24 UTC (rev 4971)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp	2017-05-27 08:37:55 UTC (rev 4972)
@@ -774,7 +774,7 @@
 						Logtext.append(" \n");
 					}
 
-					NewQueryBlock.previous();
+					//NewQueryBlock.previous();
 
 					while (end_lwpoly==0 and count_vertex<max_vertex)
 					{

Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp	2017-05-27 08:07:24 UTC (rev 4971)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp	2017-05-27 08:37:55 UTC (rev 4972)
@@ -762,7 +762,7 @@
 				Logtext.append(" \n");
 			}
 
-			NewQuery.previous();
+			//NewQuery.previous();
 
 
 			while (end_lwpoly==0 and count_vertex<max_vertex)