| [qet] qet/qet: [4837] update screen layout |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4837
Author: rdsivd
Date: 2017-01-08 12:25:30 +0100 (Sun, 08 Jan 2017)
Log Message:
-----------
update screen layout
Modified Paths:
--------------
branches/DXFtoQET3_DB/dxftoqet3db.cpp
branches/DXFtoQET3_DB/dxftoqet3db.h
branches/DXFtoQET3_DB/dxftoqet3db.ui
branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp
branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.h
Modified: branches/DXFtoQET3_DB/dxftoqet3db.cpp
===================================================================
--- branches/DXFtoQET3_DB/dxftoqet3db.cpp 2017-01-08 11:01:03 UTC (rev 4836)
+++ branches/DXFtoQET3_DB/dxftoqet3db.cpp 2017-01-08 11:25:30 UTC (rev 4837)
@@ -36,11 +36,8 @@
settings.sync();
-
-
DXF_main_base[0].dxf_filepath = settings.value("dxf_path").toString();
-
DXF_main_base[0].dxf_savepath = settings.value("qet_element_path").toString();
ui->dxf_file_path_save->setText(DXF_main_base[0].dxf_filepath);
@@ -54,7 +51,7 @@
ui->progressBar1->setValue(0);
ui->progressBar1->repaint();
- connect (elmt_entities::elmt_entities ,SIGNAL (Signal1(const QString &Waarde1 )),this,SLOT(update_proces(const QString &waarde1)));
+ //connect (elmt_entities::elmt_entities ,SIGNAL (Signal1(&)),this,SLOT(update_proces(&)));
}
@@ -5605,9 +5602,9 @@
ui->ELMT_Result->clear();
- elmt_entities NewEntity;
+ elmt_entities NewEntity(this);
- //connect(NewEntity ,SIGNAL (Signal1(const QString &)),this ,SLOT(update_proces(const QString &)));
+ connect(&NewEntity ,SIGNAL (Signal1(const QString &)),this ,SLOT(update_proces(const QString &)));
ui->dxf_log->insertPlainText("Add DXF entities to ELMT file \n");
ui->dxf_log->moveCursor(QTextCursor::End);
@@ -5761,8 +5758,8 @@
ui->progressBar1->repaint();
}
-void DXFtoQET3DB::update_proces(QString &waarde1)
+void DXFtoQET3DB::update_proces(const QString &Waarde_receve1)
{
- ui->Procesing_dxf->setPlainText(waarde1);
+ ui->Procesing_dxf->setPlainText(Waarde_receve1);
ui->Procesing_dxf->repaint();
}
Modified: branches/DXFtoQET3_DB/dxftoqet3db.h
===================================================================
--- branches/DXFtoQET3_DB/dxftoqet3db.h 2017-01-08 11:01:03 UTC (rev 4836)
+++ branches/DXFtoQET3_DB/dxftoqet3db.h 2017-01-08 11:25:30 UTC (rev 4837)
@@ -270,14 +270,9 @@
QStringList thumbnailimage_split;
//QStringList split_tables_list;
- void on_OpenFile_clicked();
- void on_savepath_2_clicked();
+ public:
- void on_Load_dxf_into_tables_clicked();
-
- void on_Delete_DB_clicked();
-
void split_header();
void split_classes();
@@ -321,13 +316,6 @@
//QString Calc_Width();
//QString Calc_Height();
-
- void on_Create_QET_ELMT_clicked();
- void on_Choose_DB_clicked();
- void on_SavetoELMT_clicked();
- void on_Convert_dxf_blocks_clicked();
- void on_Convert_dxf_entities_clicked();
-
signals:
void send_text (const QString &text2);
@@ -338,13 +326,27 @@
public slots:
+ void on_OpenFile_clicked();
+ void on_savepath_2_clicked();
+
+ void on_Load_dxf_into_tables_clicked();
+
+ void on_Delete_DB_clicked();
+
+ void on_Create_QET_ELMT_clicked();
+ void on_Choose_DB_clicked();
+ void on_SavetoELMT_clicked();
+ void on_Convert_dxf_blocks_clicked();
+ void on_Convert_dxf_entities_clicked();
+
+
void on_progressBar_valueChanged(int value1);
void on_progressBar_valueMin(int value1);
void on_progressBar_valueMax(int value1);
void on_progressBar_text(QString text1);
- void update_proces(QString &waarde1);
+ void update_proces(const QString &Waarde_receve1);
protected:
void changeEvent(QEvent *e);
Modified: branches/DXFtoQET3_DB/dxftoqet3db.ui
===================================================================
--- branches/DXFtoQET3_DB/dxftoqet3db.ui 2017-01-08 11:01:03 UTC (rev 4836)
+++ branches/DXFtoQET3_DB/dxftoqet3db.ui 2017-01-08 11:25:30 UTC (rev 4837)
@@ -19,317 +19,472 @@
<property name="windowTitle">
<string>DXFtoQET3DB</string>
</property>
- <widget class="QTabWidget" name="MainTab">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>100</y>
- <width>1031</width>
- <height>571</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="tabPosition">
- <enum>QTabWidget::West</enum>
- </property>
- <property name="currentIndex">
- <number>1</number>
- </property>
- <widget class="QWidget" name="Log">
- <attribute name="title">
- <string>Log</string>
- </attribute>
- <widget class="QPlainTextEdit" name="dxf_log">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>981</width>
- <height>551</height>
- </rect>
+ <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>
+ </property>
+ <property name="text">
+ <string>Convert DXF entities</string>
+ </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>
+ </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="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="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="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>
+ <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="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>
</property>
- <property name="verticalScrollBarPolicy">
- <enum>Qt::ScrollBarAlwaysOn</enum>
+ <property name="tabPosition">
+ <enum>QTabWidget::West</enum>
</property>
- <property name="horizontalScrollBarPolicy">
- <enum>Qt::ScrollBarAlwaysOn</enum>
+ <property name="currentIndex">
+ <number>3</number>
</property>
- </widget>
- </widget>
- <widget class="QWidget" name="tab_ELMT">
- <attribute name="title">
- <string>ELMT</string>
- </attribute>
- <widget class="QPlainTextEdit" name="ELMT_Result">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>621</width>
- <height>551</height>
- </rect>
- </property>
- <property name="lineWrapMode">
- <enum>QPlainTextEdit::NoWrap</enum>
- </property>
- </widget>
- <widget class="QPlainTextEdit" name="Procesing_dxf">
- <property name="geometry">
- <rect>
- <x>640</x>
- <y>10</y>
- <width>351</width>
- <height>551</height>
- </rect>
- </property>
- <property name="frameShape">
- <enum>QFrame::Panel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- </widget>
- </widget>
- <widget class="QWidget" name="Home">
- <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">
- <attribute name="title">
- <string>Open File</string>
- </attribute>
- <widget class="QPlainTextEdit" name="dxf_file_loaded">
- <property name="geometry">
- <rect>
- <x>13</x>
- <y>7</y>
- <width>971</width>
- <height>551</height>
- </rect>
- </property>
- </widget>
- </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>
- <widget class="QPlainTextEdit" name="plainTextEdit">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>981</width>
- <height>551</height>
- </rect>
- </property>
- <property name="plainText">
- <string>
+ <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>
+ <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>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
==============================================================================================================
@@ -373,182 +528,78 @@
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>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</widget>
- </widget>
- </widget>
- <widget class="QWidget" name="layoutWidget">
- <property name="geometry">
- <rect>
- <x>40</x>
- <y>680</y>
- <width>1001</width>
- <height>29</height>
- </rect>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label_8">
- <property name="text">
- <string>Dxf section</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>
- </widget>
- <widget class="QWidget" name="layoutWidget">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>1031</width>
- <height>71</height>
- </rect>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <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>
- </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="6">
- <widget class="QPushButton" name="SavetoELMT">
- <property name="text">
- <string>Save to ELMT file</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="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="3">
- <widget class="QPushButton" name="Convert_dxf_blocks">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Convert DXF blocks</string>
- </property>
- </widget>
- </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="1" column="1">
- <widget class="QPushButton" name="Delete_DB">
- <property name="text">
- <string>Delete SQL DB</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>Dxf section</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>
<layoutdefault spacing="6" margin="11"/>
<resources/>
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp 2017-01-08 11:01:03 UTC (rev 4836)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp 2017-01-08 11:25:30 UTC (rev 4837)
@@ -12,7 +12,7 @@
elmt_entities::elmt_entities(QWidget *parent) : QWidget(parent)
{
- //connect (this ,SIGNAL (Signal1(const QString &)),DXFtoQET3DB,SLOT(update_proces(const QString &)));
+ //connect (this ,SIGNAL (Signal1(const QString &)),DXF_main_base,SLOT(update_proces(const QString &)));
}
void elmt_entities::Open_SQL_DB (QString ELMT_filename)
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.h 2017-01-08 11:01:03 UTC (rev 4836)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.h 2017-01-08 11:25:30 UTC (rev 4837)
@@ -56,7 +56,7 @@
signals:
- void Signal1 (QString &Waarde1);
+ void Signal1 (const QString &Waarde1);
public slots:
};