[qet] qet/qet: [4934] update info tab

[ Thread Index | Date Index | More lists.tuxfamily.org/qet Archives ]


Revision: 4934
Author:   rdsivd
Date:     2017-03-19 23:38:17 +0100 (Sun, 19 Mar 2017)
Log Message:
-----------
update info tab

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

Modified: branches/DXFtoQET3_DB/data.h
===================================================================
--- branches/DXFtoQET3_DB/data.h	2017-03-19 15:23:07 UTC (rev 4933)
+++ branches/DXFtoQET3_DB/data.h	2017-03-19 22:38:17 UTC (rev 4934)
@@ -8,8 +8,8 @@
 
 #define DXF_base_set 1
 #define DXF_item_split 100000 //dxf split tables
-#define DXF_codes_set 50000
-#define DXF_codeset_copies 50000
+#define DXF_codes_set 300000
+#define DXF_codeset_copies 300000
 #define QET_L_POLYLINE 100
 
 #define DXF_layers_set 500

Modified: branches/DXFtoQET3_DB/dxftoqet3db.cpp
===================================================================
--- branches/DXFtoQET3_DB/dxftoqet3db.cpp	2017-03-19 15:23:07 UTC (rev 4933)
+++ branches/DXFtoQET3_DB/dxftoqet3db.cpp	2017-03-19 22:38:17 UTC (rev 4934)
@@ -15,6 +15,8 @@
 
 	ui->setupUi(this);
 
+
+
 	QCoreApplication::setOrganizationName("rds");
 	QCoreApplication::setApplicationName("DXFtoQET3_DB");
 
@@ -57,6 +59,9 @@
 	connect (this,SIGNAL(send_max(const int &)),this,SLOT(on_progressBar_valueMax(const int &)));
 	connect (this,SIGNAL(send_actual(const int &)),this,SLOT(on_progressBar_valueChanged(const int &)));
 
+	ui->MainTab->setCurrentIndex(5);
+	ui->MainTab->repaint();
+
 }
 
 DXFtoQET3DB::~DXFtoQET3DB()
@@ -170,12 +175,18 @@
 
 		ui->dxf_line_count1->setText(QString::number(dxf_line_count1,'f',0));
 
+		ui->dxf_line_count1_2->clear();
+
+		ui->dxf_line_count1_2->setText(QString::number(dxf_line_count1,'f',0));
+
 		Signal_log1.clear();
 		Signal_log1.append("check file for correct type of file ");
 
 		emit send_log(Signal_log1);
 
+		ui->Processing_dxf_file_2->insert(FileName);
 
+
 		dxf_load dxf_lf(this);
 
 		dxf_lf.dxf_header_split();
@@ -287,6 +298,9 @@
 	Filename_db=DXF_main_base[0].dxf_savepath + "/" +FileName;
 	Filename_db.append(".db3");
 
+	ui->dxf_line_count1_2->clear();
+	ui->Processing_dxf_file_2->insert(FileName);
+
 	on_Delete_DB_clicked();
 
 	ui->dxf_log->activateWindow();

Modified: branches/DXFtoQET3_DB/dxftoqet3db.ui
===================================================================
--- branches/DXFtoQET3_DB/dxftoqet3db.ui	2017-03-19 15:23:07 UTC (rev 4933)
+++ branches/DXFtoQET3_DB/dxftoqet3db.ui	2017-03-19 22:38:17 UTC (rev 4934)
@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1054</width>
-    <height>722</height>
+    <width>1055</width>
+    <height>724</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -19,486 +19,447 @@
   <property name="windowTitle">
    <string>DXFtoQET3DB</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <item row="1" column="3">
-      <widget class="QPushButton" name="Convert_dxf_entities">
-       <property name="enabled">
-        <bool>false</bool>
+  <widget class="QTabWidget" name="MainTab">
+   <property name="geometry">
+    <rect>
+     <x>9</x>
+     <y>77</y>
+     <width>1037</width>
+     <height>547</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="tabPosition">
+    <enum>QTabWidget::West</enum>
+   </property>
+   <property name="currentIndex">
+    <number>2</number>
+   </property>
+   <widget class="QWidget" name="Log">
+    <attribute name="title">
+     <string>Log</string>
+    </attribute>
+    <layout class="QVBoxLayout" name="verticalLayout_2">
+     <item>
+      <widget class="QPlainTextEdit" name="dxf_log">
+       <property name="verticalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOn</enum>
        </property>
-       <property name="text">
-        <string>Convert DXF entities</string>
+       <property name="horizontalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOn</enum>
        </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
       </widget>
      </item>
-     <item row="0" column="5">
-      <widget class="QPushButton" name="Create_QET_ELMT">
-       <property name="text">
-        <string>Create QET elmt</string>
+    </layout>
+   </widget>
+   <widget class="QWidget" name="tab_ELMT">
+    <attribute name="title">
+     <string>ELMT</string>
+    </attribute>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QPlainTextEdit" name="ELMT_Result">
+       <property name="minimumSize">
+        <size>
+         <width>481</width>
+         <height>571</height>
+        </size>
        </property>
-      </widget>
-     </item>
-     <item row="0" column="6">
-      <widget class="QPushButton" name="SavetoELMT">
-       <property name="text">
-        <string>Save to ELMT file</string>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>16777215</height>
+        </size>
        </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <widget class="QPushButton" name="OpenFile">
-       <property name="text">
-        <string>Open dxf file</string>
+       <property name="verticalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOn</enum>
        </property>
+       <property name="horizontalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOn</enum>
+       </property>
+       <property name="lineWrapMode">
+        <enum>QPlainTextEdit::WidgetWidth</enum>
+       </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">
+     <item>
+      <widget class="QPlainTextEdit" name="Procesing_dxf">
+       <property name="minimumSize">
         <size>
-         <width>40</width>
-         <height>20</height>
+         <width>491</width>
+         <height>571</height>
         </size>
        </property>
-      </spacer>
-     </item>
-     <item row="1" column="0">
-      <widget class="QPushButton" name="Load_dxf_into_tables">
-       <property name="text">
-        <string>Load dxf into DB</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="4">
-      <spacer name="horizontalSpacer_4">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
+       <property name="maximumSize">
         <size>
-         <width>40</width>
-         <height>20</height>
+         <width>16777215</width>
+         <height>16777215</height>
         </size>
        </property>
-      </spacer>
-     </item>
-     <item row="0" column="3">
-      <widget class="QPushButton" name="Convert_dxf_blocks">
-       <property name="enabled">
-        <bool>false</bool>
+       <property name="frameShape">
+        <enum>QFrame::Panel</enum>
        </property>
-       <property name="text">
-        <string>Convert DXF blocks</string>
+       <property name="frameShadow">
+        <enum>QFrame::Sunken</enum>
        </property>
-       <property name="flat">
-        <bool>true</bool>
+       <property name="verticalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOn</enum>
        </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QPushButton" name="Choose_DB">
-       <property name="text">
-        <string>Choose DB to proces</string>
+       <property name="horizontalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOn</enum>
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
-      <widget class="QPushButton" name="Delete_DB">
-       <property name="text">
-        <string>Delete SQL DB</string>
-       </property>
-      </widget>
-     </item>
     </layout>
-   </item>
-   <item>
-    <widget class="QTabWidget" name="MainTab">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+   </widget>
+   <widget class="QWidget" name="Home">
+    <property name="maximumSize">
+     <size>
+      <width>1003</width>
+      <height>597</height>
+     </size>
+    </property>
+    <attribute name="title">
+     <string>Home</string>
+    </attribute>
+    <widget class="QLineEdit" name="dxf_file_path_save">
+     <property name="geometry">
+      <rect>
+       <x>140</x>
+       <y>60</y>
+       <width>351</width>
+       <height>27</height>
+      </rect>
      </property>
-     <property name="tabPosition">
-      <enum>QTabWidget::West</enum>
+    </widget>
+    <widget class="QLabel" name="label">
+     <property name="geometry">
+      <rect>
+       <x>30</x>
+       <y>60</y>
+       <width>101</width>
+       <height>31</height>
+      </rect>
      </property>
-     <property name="currentIndex">
-      <number>3</number>
+     <property name="text">
+      <string>Save path elmt</string>
      </property>
-     <widget class="QWidget" name="Log">
-      <attribute name="title">
-       <string>Log</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QPlainTextEdit" name="dxf_log">
-         <property name="verticalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOn</enum>
-         </property>
-         <property name="horizontalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOn</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tab_ELMT">
-      <attribute name="title">
-       <string>ELMT</string>
-      </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <widget class="QPlainTextEdit" name="ELMT_Result">
-         <property name="minimumSize">
-          <size>
-           <width>481</width>
-           <height>571</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="verticalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOn</enum>
-         </property>
-         <property name="horizontalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOn</enum>
-         </property>
-         <property name="lineWrapMode">
-          <enum>QPlainTextEdit::WidgetWidth</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPlainTextEdit" name="Procesing_dxf">
-         <property name="minimumSize">
-          <size>
-           <width>491</width>
-           <height>571</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="frameShape">
-          <enum>QFrame::Panel</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Sunken</enum>
-         </property>
-         <property name="verticalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOn</enum>
-         </property>
-         <property name="horizontalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOn</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="Home">
-      <property name="maximumSize">
-       <size>
-        <width>1003</width>
-        <height>597</height>
-       </size>
-      </property>
-      <attribute name="title">
-       <string>Home</string>
-      </attribute>
-      <widget class="QLineEdit" name="dxf_file_path_save">
-       <property name="geometry">
-        <rect>
-         <x>140</x>
-         <y>60</y>
-         <width>351</width>
-         <height>27</height>
-        </rect>
-       </property>
-      </widget>
-      <widget class="QLabel" name="label">
-       <property name="geometry">
-        <rect>
-         <x>30</x>
-         <y>60</y>
-         <width>101</width>
-         <height>31</height>
-        </rect>
-       </property>
-       <property name="text">
-        <string>Save path elmt</string>
-       </property>
-      </widget>
-      <widget class="QLineEdit" name="dxf_file_path">
-       <property name="geometry">
-        <rect>
-         <x>140</x>
-         <y>100</y>
-         <width>351</width>
-         <height>27</height>
-        </rect>
-       </property>
-      </widget>
-      <widget class="QLabel" name="label_2">
-       <property name="geometry">
-        <rect>
-         <x>30</x>
-         <y>100</y>
-         <width>91</width>
-         <height>31</height>
-        </rect>
-       </property>
-       <property name="text">
-        <string>Directory</string>
-       </property>
-      </widget>
-      <widget class="QLineEdit" name="dxf_open_file">
-       <property name="geometry">
-        <rect>
-         <x>140</x>
-         <y>140</y>
-         <width>351</width>
-         <height>27</height>
-        </rect>
-       </property>
-      </widget>
-      <widget class="QLabel" name="label_3">
-       <property name="geometry">
-        <rect>
-         <x>30</x>
-         <y>140</y>
-         <width>91</width>
-         <height>31</height>
-        </rect>
-       </property>
-       <property name="text">
-        <string>Open file</string>
-       </property>
-      </widget>
-      <widget class="QLabel" name="label_4">
-       <property name="geometry">
-        <rect>
-         <x>70</x>
-         <y>330</y>
-         <width>51</width>
-         <height>31</height>
-        </rect>
-       </property>
-       <property name="text">
-        <string>CSV</string>
-       </property>
-      </widget>
-      <widget class="QLabel" name="label_5">
-       <property name="geometry">
-        <rect>
-         <x>70</x>
-         <y>290</y>
-         <width>51</width>
-         <height>31</height>
-        </rect>
-       </property>
-       <property name="text">
-        <string>DXF</string>
-       </property>
-      </widget>
-      <widget class="QLineEdit" name="dxf_line_count1">
-       <property name="geometry">
-        <rect>
-         <x>130</x>
-         <y>290</y>
-         <width>141</width>
-         <height>27</height>
-        </rect>
-       </property>
-      </widget>
-      <widget class="QLineEdit" name="dxf_line_count2">
-       <property name="geometry">
-        <rect>
-         <x>130</x>
-         <y>330</y>
-         <width>141</width>
-         <height>27</height>
-        </rect>
-       </property>
-      </widget>
-      <widget class="QLabel" name="label_6">
-       <property name="geometry">
-        <rect>
-         <x>280</x>
-         <y>330</y>
-         <width>131</width>
-         <height>31</height>
-        </rect>
-       </property>
-       <property name="text">
-        <string>nr of lines</string>
-       </property>
-      </widget>
-      <widget class="QLabel" name="label_7">
-       <property name="geometry">
-        <rect>
-         <x>280</x>
-         <y>290</y>
-         <width>131</width>
-         <height>31</height>
-        </rect>
-       </property>
-       <property name="text">
-        <string>nr of lines</string>
-       </property>
-      </widget>
-     </widget>
-     <widget class="QWidget" name="Open_file">
-      <property name="maximumSize">
-       <size>
-        <width>1003</width>
-        <height>597</height>
-       </size>
-      </property>
-      <attribute name="title">
-       <string>Open File</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <item>
-        <widget class="QPlainTextEdit" name="dxf_file_loaded">
-         <property name="minimumSize">
-          <size>
-           <width>985</width>
-           <height>579</height>
-          </size>
-         </property>
-         <property name="verticalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOn</enum>
-         </property>
-         <property name="horizontalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOn</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="Settings">
-      <attribute name="title">
-       <string>Settings</string>
-      </attribute>
-      <widget class="QLabel" name="dxf_line_counter_4">
-       <property name="geometry">
-        <rect>
-         <x>20</x>
-         <y>60</y>
-         <width>163</width>
-         <height>27</height>
-        </rect>
-       </property>
-       <property name="text">
-        <string>Path user symbols QET : </string>
-       </property>
-      </widget>
-      <widget class="QLineEdit" name="QET_user_symbole_path_save">
-       <property name="geometry">
-        <rect>
-         <x>190</x>
-         <y>60</y>
-         <width>450</width>
-         <height>27</height>
-        </rect>
-       </property>
+    </widget>
+    <widget class="QLineEdit" name="dxf_file_path">
+     <property name="geometry">
+      <rect>
+       <x>140</x>
+       <y>100</y>
+       <width>351</width>
+       <height>27</height>
+      </rect>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_2">
+     <property name="geometry">
+      <rect>
+       <x>30</x>
+       <y>100</y>
+       <width>91</width>
+       <height>31</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Directory</string>
+     </property>
+    </widget>
+    <widget class="QLineEdit" name="dxf_open_file">
+     <property name="geometry">
+      <rect>
+       <x>140</x>
+       <y>140</y>
+       <width>351</width>
+       <height>27</height>
+      </rect>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_3">
+     <property name="geometry">
+      <rect>
+       <x>30</x>
+       <y>140</y>
+       <width>91</width>
+       <height>31</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Open file</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_4">
+     <property name="geometry">
+      <rect>
+       <x>70</x>
+       <y>330</y>
+       <width>51</width>
+       <height>31</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>CSV</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_5">
+     <property name="geometry">
+      <rect>
+       <x>70</x>
+       <y>290</y>
+       <width>51</width>
+       <height>31</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>DXF</string>
+     </property>
+    </widget>
+    <widget class="QLineEdit" name="dxf_line_count1">
+     <property name="geometry">
+      <rect>
+       <x>130</x>
+       <y>290</y>
+       <width>141</width>
+       <height>27</height>
+      </rect>
+     </property>
+    </widget>
+    <widget class="QLineEdit" name="dxf_line_count2">
+     <property name="geometry">
+      <rect>
+       <x>130</x>
+       <y>330</y>
+       <width>141</width>
+       <height>27</height>
+      </rect>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_6">
+     <property name="geometry">
+      <rect>
+       <x>280</x>
+       <y>330</y>
+       <width>131</width>
+       <height>31</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>nr of lines</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_7">
+     <property name="geometry">
+      <rect>
+       <x>280</x>
+       <y>290</y>
+       <width>131</width>
+       <height>31</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>nr of lines</string>
+     </property>
+    </widget>
+   </widget>
+   <widget class="QWidget" name="Open_file">
+    <property name="maximumSize">
+     <size>
+      <width>1003</width>
+      <height>597</height>
+     </size>
+    </property>
+    <attribute name="title">
+     <string>Open File</string>
+    </attribute>
+    <layout class="QVBoxLayout" name="verticalLayout_3">
+     <item>
+      <widget class="QPlainTextEdit" name="dxf_file_loaded">
        <property name="minimumSize">
         <size>
-         <width>450</width>
-         <height>0</height>
+         <width>985</width>
+         <height>579</height>
         </size>
        </property>
+       <property name="verticalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOn</enum>
+       </property>
+       <property name="horizontalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOn</enum>
+       </property>
       </widget>
-      <widget class="QPushButton" name="savepath_2">
-       <property name="geometry">
-        <rect>
-         <x>640</x>
-         <y>60</y>
-         <width>20</width>
-         <height>27</height>
-        </rect>
+     </item>
+    </layout>
+   </widget>
+   <widget class="QWidget" name="Settings">
+    <attribute name="title">
+     <string>Settings</string>
+    </attribute>
+    <widget class="QLabel" name="dxf_line_counter_4">
+     <property name="geometry">
+      <rect>
+       <x>20</x>
+       <y>60</y>
+       <width>163</width>
+       <height>27</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Path user symbols QET : </string>
+     </property>
+    </widget>
+    <widget class="QLineEdit" name="QET_user_symbole_path_save">
+     <property name="geometry">
+      <rect>
+       <x>190</x>
+       <y>60</y>
+       <width>450</width>
+       <height>27</height>
+      </rect>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>450</width>
+       <height>0</height>
+      </size>
+     </property>
+    </widget>
+    <widget class="QPushButton" name="savepath_2">
+     <property name="geometry">
+      <rect>
+       <x>640</x>
+       <y>60</y>
+       <width>20</width>
+       <height>27</height>
+      </rect>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>20</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>...</string>
+     </property>
+    </widget>
+   </widget>
+   <widget class="QWidget" name="Info">
+    <attribute name="title">
+     <string>Info</string>
+    </attribute>
+    <layout class="QVBoxLayout" name="verticalLayout_4">
+     <item>
+      <widget class="QPlainTextEdit" name="Info_2">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
-         <width>0</width>
-         <height>0</height>
+         <width>981</width>
+         <height>581</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
-         <width>20</width>
+         <width>16777215</width>
          <height>16777215</height>
         </size>
        </property>
-       <property name="text">
-        <string>...</string>
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
        </property>
-      </widget>
-     </widget>
-     <widget class="QWidget" name="Info">
-      <attribute name="title">
-       <string>Info</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_4">
-       <item>
-        <widget class="QPlainTextEdit" name="Info_2">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>981</width>
-           <height>581</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
-         </property>
-         <property name="verticalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOn</enum>
-         </property>
-         <property name="horizontalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOn</enum>
-         </property>
-         <property name="plainText">
-          <string>
-DXF to QET ELMT converter V3.0 use SQlite
+       <property name="verticalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOn</enum>
+       </property>
+       <property name="horizontalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOn</enum>
+       </property>
+       <property name="plainText">
+        <string>DXF to QET ELMT converter V3.0 uses SQlite (text updated 2017 03 19)
 ==============================================================================================================
 
 This converter converts only ASCII dxf files
 binary dxf files are not converted.
 
-when having problems with a dxf file, copy paste the log tab into a email
-with a description of the problem you have found
+==============================================================================================================
 
-if you have a drawing with block inside blocks, open this drawing with a cad program and 
-explode this blocks into one level blocks.
+When having problems with a dxf file, copy paste the log tab into a email and add the dxf file,
+with a description of the problem you have found.
 
 ==============================================================================================================
+!!!! Not converted or not correct converted !!!!
 
+ - Rotate ellipse are not correct converted to ELMT, this is not support in QET.
+ - spline not with curved lines
+
+==============================================================================================================
+DXF items that will be converted :
+
+DXF 3DFACE
+DXF 3DSOLID
+DXF ACAD_PROXY_ENTITY
+DXF ARC ---------------&gt; ELMT
+DXF ATTDEF 
+DXF ATTRIB ------------&gt; ELMT
+DXF BODY
+DXF CIRCLE ------------&gt; ELMT
+DXF DIMENSION 
+DXF ELLIPSE -----------&gt; ELMT
+DXF HATCH -------------&gt; under development
+DXF HELIX
+DXF IMAGE
+DXF INSERT ------------&gt; first and second inserts
+DXF LEADER
+DXF LIGHT
+DXF LINE --------------&gt; ELMT
+DXF LWPOLYLINE --------&gt; ELMT
+DXF MESH 
+DXF MLINE 
+DXF MLEADERSTYLE 
+DXF MLEADER
+DXF MTEXT -------------&gt; ELMT
+DXF OLEFRAME
+DXF OLE2FRAME (DXF)
+DXF POINT -------------&gt; ELMT
+DXF POLYLINE ----------&gt; ELMT
+DXF RAY 
+DXF REGION 
+DXF SECTION
+DXF SEQEND 
+DXF SHAPE
+DXF SOLID -------------&gt; ELMT
+DXF SPLINE ------------&gt; ELMT not curved
+DXF SUN
+DXF SURFACE
+DXF TABLE 
+DXF TEXT --------------&gt; ELMT
+DXF TOLERANCE
+DXF TRACE
+DXF UNDERLAY
+DXF VERTEX ------------&gt; ELMT
+DXF VIEWPORT
+DXF WIPEOUT
+DXF XLINE
+
+
+==============================================================================================================
 A few steps to follow
 
 Click on &quot;Open dxf file&quot; to search the dxf file you want to convert
@@ -505,7 +466,7 @@
 
 next click on &quot;Load dxf into DB&quot;, this starts splitting and loading the dxf code into the different db tables
 
-is this is don you dont need everityme to do the &quot;load dxf into DB&quot;
+is this is don you dont need everityme to do the &quot;load dxf into DB&quot; (except when the structure of the DB file changes)
 
 you can then click on &quot;Choose DB to proces&quot;
 
@@ -527,79 +488,287 @@
 entities items :397
 End loading into db 21:31:25
 
-the creation of the ELMT file is faster and depents on the amount of ENTITIES and BLOCKS in the dxf file.</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="label_8">
-       <property name="text">
-        <string>Dxf section</string>
+the creation of the ELMT file is faster and depents on the amount of ENTITIES and BLOCKS in the dxf file.
+</string>
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QLineEdit" name="dxf_section">
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>200</width>
-         <height>16777215</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_9">
-       <property name="text">
-        <string>Count</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="dxf_section_count">
-       <property name="maximumSize">
-        <size>
-         <width>100</width>
-         <height>16777215</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <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>
-      <widget class="QProgressBar" name="progressBar1">
-       <property name="value">
-        <number>24</number>
-       </property>
-      </widget>
-     </item>
     </layout>
-   </item>
-  </layout>
+   </widget>
+  </widget>
+  <widget class="QWidget" name="">
+   <property name="geometry">
+    <rect>
+     <x>9</x>
+     <y>9</y>
+     <width>1031</width>
+     <height>62</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="1">
+     <widget class="QPushButton" name="Choose_DB">
+      <property name="text">
+       <string>Choose DB to proces</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="0">
+     <widget class="QPushButton" name="OpenFile">
+      <property name="text">
+       <string>Open dxf 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">
+      <property name="text">
+       <string>Load dxf into DB</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="3">
+     <widget class="QPushButton" name="Convert_dxf_entities">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+      <property name="text">
+       <string>Convert DXF entities</string>
+      </property>
+      <property name="flat">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="6">
+     <widget class="QPushButton" name="SavetoELMT">
+      <property name="text">
+       <string>Save to ELMT file</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="1">
+     <widget class="QPushButton" name="Delete_DB">
+      <property name="text">
+       <string>Delete SQL DB</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="5">
+     <widget class="QPushButton" name="Create_QET_ELMT">
+      <property name="text">
+       <string>Create QET elmt</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="3">
+     <widget class="QPushButton" name="Convert_dxf_blocks">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+      <property name="text">
+       <string>Convert DXF blocks</string>
+      </property>
+      <property name="flat">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" name="">
+   <property name="geometry">
+    <rect>
+     <x>9</x>
+     <y>630</y>
+     <width>1031</width>
+     <height>29</height>
+    </rect>
+   </property>
+   <layout class="QHBoxLayout" name="horizontalLayout">
+    <item>
+     <widget class="QLabel" name="label_8">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>150</width>
+        <height>16777215</height>
+       </size>
+      </property>
+      <property name="text">
+       <string>Dxf section</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLineEdit" name="dxf_section">
+      <property name="minimumSize">
+       <size>
+        <width>200</width>
+        <height>0</height>
+       </size>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>200</width>
+        <height>16777215</height>
+       </size>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLabel" name="label_9">
+      <property name="text">
+       <string>Count</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLineEdit" name="dxf_section_count">
+      <property name="maximumSize">
+       <size>
+        <width>100</width>
+        <height>16777215</height>
+       </size>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <spacer name="horizontalSpacer">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeType">
+       <enum>QSizePolicy::Minimum</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>40</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item>
+     <widget class="QProgressBar" name="progressBar1">
+      <property name="value">
+       <number>24</number>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" name="">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>670</y>
+     <width>1031</width>
+     <height>29</height>
+    </rect>
+   </property>
+   <layout class="QHBoxLayout" name="horizontalLayout_3">
+    <item>
+     <widget class="QLabel" name="LBL_Processing_dxf_file">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>150</width>
+        <height>16777215</height>
+       </size>
+      </property>
+      <property name="text">
+       <string>Processing dxf file </string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLineEdit" name="Processing_dxf_file_2">
+      <property name="minimumSize">
+       <size>
+        <width>200</width>
+        <height>0</height>
+       </size>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <spacer name="horizontalSpacer_2">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeType">
+       <enum>QSizePolicy::Expanding</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>200</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item>
+     <widget class="QLineEdit" name="dxf_line_count1_2"/>
+    </item>
+    <item>
+     <widget class="QLabel" name="label_10">
+      <property name="text">
+       <string>nr of lines</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <spacer name="horizontalSpacer_5">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>40</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+   </layout>
+  </widget>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>

Modified: branches/DXFtoQET3_DB/main.cpp
===================================================================
--- branches/DXFtoQET3_DB/main.cpp	2017-03-19 15:23:07 UTC (rev 4933)
+++ branches/DXFtoQET3_DB/main.cpp	2017-03-19 22:38:17 UTC (rev 4934)
@@ -11,5 +11,7 @@
 	DXFtoQET3DB w;
 	w.show();
 
+	//ui->Info_2->activateWindow();
+
 	return a.exec();
 }

Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp	2017-03-19 15:23:07 UTC (rev 4933)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp	2017-03-19 22:38:17 UTC (rev 4934)
@@ -754,7 +754,7 @@
 						Logtext.append(" \n");
 					}
 
-					while (end_lwpoly==0 and count_vertex<max_vertex-1)
+					while (end_lwpoly==0 and count_vertex<max_vertex)
 					{
 						NewQueryBlock.next();
 						QSqlRecord Record4=NewQueryBlock.record();
@@ -827,7 +827,7 @@
 					//DXF_Block_Value.append(New_DXF_Text.Create_text());
 				}
 
-				/*if (Record3.value("Command").toString()=="HATCH" and Record3.value("Command_count").toInt()==0)
+				if (Record3.value("Command").toString()=="HATCH" and Record3.value("Command_count").toInt()==0)
 				{
 
 					New_DXF_LWPolyline.QET_layer=Record3.value("dxf_8").toString();
@@ -864,7 +864,7 @@
 					max_vertex=0;
 					count_vertex=0;
 
-					max_vertex=Record3.value("dxf_96").toInt();
+					max_vertex=Record3.value("dxf_96").toInt()*Record3.value("dxf_91").toInt();
 
 					//New_DXF_LWPolyline.QET_x[count_vertex]=(Record4.value("dxf_10").toDouble()*Block_scale_x)+Block_X;
 					//New_DXF_LWPolyline.QET_y[count_vertex]=(Record4.value("dxf_20").toDouble()*Block_scale_y)+Block_Y;
@@ -915,7 +915,7 @@
 					//DXF_Block_Value.append(New_DXF_LWPolyline.Create_polyline());
 
 
-				}*/
+				}
 
 				if (Record3.value("Command").toString()=="ENDBLK" and Record3.value("Command_count").toInt()==0)
 				{

Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp	2017-03-19 15:23:07 UTC (rev 4933)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp	2017-03-19 22:38:17 UTC (rev 4934)
@@ -746,7 +746,7 @@
 
 
 
-			while (end_lwpoly==0 and count_vertex<max_vertex-1)
+			while (end_lwpoly==0 and count_vertex<max_vertex)
 			{
 				NewQuery.next();
 				QSqlRecord Record3=NewQuery.record();
@@ -826,7 +826,7 @@
 			DXF_Entities_List.DXF_Result.append(New_DXF_Text.Create_text());
 		}
 
-		/*if (Record2.value("Command").toString()=="HATCH" and Record2.value("Command_count").toInt()==0)
+		if (Record2.value("Command").toString()=="HATCH" and Record2.value("Command_count").toInt()==0)
 		{
 
 			New_DXF_LWPolyline.QET_layer=Record2.value("dxf_8").toString();
@@ -854,7 +854,7 @@
 			max_vertex=0;
 			count_vertex=0;
 
-			max_vertex=Record2.value("dxf_96").toInt();
+			max_vertex=Record2.value("dxf_96").toInt()*Record2.value("dxf_91").toInt();
 
 			if (max_vertex >=QET_L_POLYLINE)
 			{
@@ -915,7 +915,7 @@
 
 			emit Signal1(Signal_waarde1);
 
-		}*/
+		}
 	}
 
 


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/