| [qet] [3714] added ellipse functionality (still needs tunning) |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 3714
Author: rdsivd
Date: 2015-02-12 21:36:10 +0100 (Thu, 12 Feb 2015)
Log Message:
-----------
added ellipse functionality (still needs tunning)
Modified Paths:
--------------
branches/dxftoelmt/ImportDXF.pro
branches/dxftoelmt/src/ui/dxf_data.h
branches/dxftoelmt/src/ui/dxf_ellipse.cpp
branches/dxftoelmt/src/ui/dxf_ellipse.h
branches/dxftoelmt/src/ui/dxf_elmt_output.cpp
branches/dxftoelmt/src/ui/dxftoelmt.cpp
branches/dxftoelmt/src/ui/dxftoelmt.h
branches/dxftoelmt/src/ui/mainwindow.cpp
branches/dxftoelmt/src/ui/mainwindow.h
branches/dxftoelmt/src/ui_mainwindow.h
branches/dxftoelmt/ui_mainwindow.h
Modified: branches/dxftoelmt/ImportDXF.pro
===================================================================
--- branches/dxftoelmt/ImportDXF.pro 2015-02-12 20:31:24 UTC (rev 3713)
+++ branches/dxftoelmt/ImportDXF.pro 2015-02-12 20:36:10 UTC (rev 3714)
@@ -14,6 +14,8 @@
INCLUDEPATH += src \
src/ui
+CONFIG += uitools
+
SOURCES += src/main.cpp \
src/ui/mainwindow.cpp \
src/ui/dxf_ltype.cpp \
@@ -77,5 +79,7 @@
FORMS += src/ui/mainwindow.ui
+
+
OTHER_FILES += \
src/ui/2
Modified: branches/dxftoelmt/src/ui/dxf_data.h
===================================================================
--- branches/dxftoelmt/src/ui/dxf_data.h 2015-02-12 20:31:24 UTC (rev 3713)
+++ branches/dxftoelmt/src/ui/dxf_data.h 2015-02-12 20:36:10 UTC (rev 3714)
@@ -2,6 +2,7 @@
#define DXF_DATA_H
#include <QtCore>
+//#include "mainwindow.h"
class DXF_Data
Modified: branches/dxftoelmt/src/ui/dxf_ellipse.cpp
===================================================================
--- branches/dxftoelmt/src/ui/dxf_ellipse.cpp 2015-02-12 20:31:24 UTC (rev 3713)
+++ branches/dxftoelmt/src/ui/dxf_ellipse.cpp 2015-02-12 20:36:10 UTC (rev 3714)
@@ -1,13 +1,32 @@
#include "dxf_ellipse.h"
+
+
DXF_Ellipse::DXF_Ellipse()
{
}
+double DXF_Ellipse::DegreesToRadians(double Degrees)
+{
+ double PI;
+ PI=3.14159265;
+ return Degrees*(PI/180);
+
+}
+
+double DXF_Ellipse::RadiansToDegrees(double Radians)
+{
+
+ double PI;
+ double result;
+ PI=3.14159265;
+ result=Radians*(180/PI);
+ return result;
+}
+
void DXF_Ellipse::ConvertEllipse(int Counter, int BlockCount, int Entitieswitch, struct _ReadLineDXF LineTable4[], struct _LType_ACAD LTypeDXF[], struct _Layer_ACAD LayerDXF[], struct _Block_ACAD BlockList[])
{
int x;
- int y;
QString Lineout;
QString x_center;
@@ -29,7 +48,7 @@
float major_radius_y;
float ratio_of_minor;
float start;
- float end;
+
float end2;
float begin1;
@@ -38,23 +57,12 @@
float begin;
float einde;
- float hoek;
+
float width;
float height;
- float N;
- float O;
- float J;
- float K;
- float L;
- float M;
- float R;
- float S;
- float T;
- float U;
- float V;
- float W;
+
float hoek2;
@@ -74,10 +82,23 @@
float sqrtwidth;
float sqrtheight;
- float s1;
- float e1;
+ float N;
+ float O;
+ float J;
+ float K;
+ float L;
+ float M;
+ float R;
+ float S;
+ float T;
+ float U;
+ float V;
+ float W;
+ QString msg;
+
+
a=0;
b=0;
i2=0;
@@ -94,12 +115,16 @@
end2=0;
start=0;
+ msg="ellipse function /n";
+
+ //get acad dxf values
+
for (x=0;x<Counter;x++)
{
if (LineTable4[x].Line1.contains(" 10", Qt::CaseSensitive) )
- {
+ {
center_x=LineTable4[x].Line2.toFloat();
}
@@ -125,10 +150,10 @@
{
start=LineTable4[x].Line2.toFloat();
}
+
if (LineTable4[x].Line1.contains(" 42", Qt::CaseSensitive))
{
end2=LineTable4[x].Line2.toFloat();
- //end=2*end2;
}
@@ -155,33 +180,23 @@
LineStyle1= Check_LineType.Check_LType(LTypeDXF, LayerDXF);
- powwidth=pow((major_radius_x-center_x),2)-pow((major_radius_y-center_y),2);
- powheight=(pow(((major_radius_x*ratio_of_minor)-center_x),2)-pow(((major_radius_y*ratio_of_minor)-center_y),2)) ;
- if (powwidth<0)
- {
- sqrtwidth=sqrt(-powwidth);
- }
- else
- {
- sqrtwidth=sqrt(powwidth);
- }
- if (powheight<0)
- {
- sqrtheight=sqrt(-powheight);
- }
+ /*
+ * width = qet arc width
+ * height = qet arc height
+ * start = code 41
+ * end2 = code 42
+ *
+ */
- else
- {
- sqrtheight=sqrt(powheight);
- }
- width=2*sqrtwidth;
- height=2*sqrtheight;
+ width=2*major_radius_x;
+ height=2*major_radius_x*ratio_of_minor;
+
a=width/2;
b=height/2;
@@ -190,178 +205,78 @@
Pstart=0;
Pend2=0;
- startcos=qAcos(start);
- startsin=qAsin(start);
- endcos=qCos(end2);
- endsin=qSin(end2);
- Pstart=((major_radius_x*startcos))+((major_radius_y*startsin));
-
- Pend2=major_radius_x+a*endcos+b*endsin;
-
- //begin=Pstart;
- //hoek=-Pend2;
-
- /* hoek ACAD omrekenen naar QET */
-
-
- /*begin1=450-Pstart;
- einde1=450-Pend2;
-
-
- if (begin1>360)
+ /*if (start<0)
{
- begin=begin1-360;
+ startsin=-RadiansToDegrees(qAsin(start));
+ startcos=-RadiansToDegrees(qAcos(start));
}
else
{
- if(begin1<0)
- {
- begin=360-begin1;
- }
- else
- {
- begin=begin1;
- }
+ startsin=RadiansToDegrees(qAsin(start));
+ startcos=RadiansToDegrees(qAcos(start));
}
- if (einde1>360)
- {
- einde=einde1-360;
- }
- else
- {
- if (einde1<0)
- {
- einde=einde1-360;
- }
- else
- {
- einde=einde1;
- }
- }*/
+ endcos=RadiansToDegrees(qCos(end2));
+ endsin=RadiansToDegrees(qSin(end2));*/
- /* calculate hoek */
+ /*
+ *
+ * p(u)=(Cx+a*cos(u))*i+(Cy+b*sin(u))*j
+ *
+ * Pstart = p(u41)
+ * Pend2 = p(u42)
+ * center_x= Cx
+ * center_y= Cy
+ *
+ *
+ */
- /*if (begin>einde)
- {
- N=einde-begin;
- }
- else
- {
- N=einde-begin-360;
- }
- if (N<0)
- {
- O=-N;
- }
- else
- {
- O=N;
- }
- //J=end_angle-start_angle+N;
- //K=360-end_angle;
- //L=360-start_angle;
- J=Pend2-Pstart+N;
- K=360-Pend2;
- L=360-Pstart;
- M=K-L;
- R=-O;
- S=J-O;
+ Pstart=(180*(start/3.141592654));
- if (S < -360)
- {
- T=S+360;
- }
- else
- {
- T=S;
- }
+ Pend2=(180*(end2/3.141592654));
- if (begin<einde)
- {
- U=M;
- }
- else
- {
- U=T;
- }
+ hoek2=Pstart-Pend2;
+ begin=Pstart-hoek2;
- if (U<0)
- {
- V=-U;
- }
- else
- {
- V=U;
- }
- W=U+V;
- if (W==0)
- {
- hoek2=-V;
- }
- else
- {
- hoek2=T;
- }
- hoek=hoek2;*/
+ //define center point of arc
+ //displacement forthe QET cords
- //<arc x="27.00" y="5.40" antialias="false" width="4.20" height="4.20" style="line-style:normal;line-weight:thin;filling:none;color:black" start="30" angle="299" />
-
- //width=2*(sqrt(pow((major_radius_x-center_x),2)-pow((major_radius_y-center_y),2)));
- //height=2*(sqrt(pow((major_radius_x-center_x),2)-pow((major_radius_y-center_y),2)) *ratio_of_minor);
-
-
x_center=QString::number ((center_x-(width/2) ),'f',2);
y_center=QString::number ((center_y-(height/2) ),'f',2);
+ //define width and heigth of arc
+
breedte=QString::number (width,'f',2);
hoogte=QString::number (height ,'f',2);
- s1=(start/((2*3.15)/360));
- e1=(end2/((2*3.15)/360));
+ //s1=(Pstart/((2*3.15)/360));
+ //e1=(end2/((2*3.15)/360));
//BeginHoek=QString::number ((s1 ),'f',0);
- BeginHoek=QString::number(Pstart,'f',0);
- Hoek2=QString::number (-(e1-s1),'f',0);
- if(BeginHoek=="nan")
- {
- BeginHoek="0";
- }
- if(Hoek2=="nan")
- {
- Hoek2="0";
- }
- if(x_center=="nan")
- {
- x_center="0";
- }
- if(y_center=="nan")
- {
- y_center="0";
- }
- if(hoogte=="nan")
- {
- hoogte="0";
- }
- if(breedte=="nan")
- {
- breedte="0";
- }
+ BeginHoek=QString::number(begin,'f',0);
+ Hoek2=QString::number (hoek2,'f',0);
+
+
+
+
+
+ // create QET arc defenition
+
Lineout=" ";
Lineout.append(" ");
Lineout.append(" ");
Modified: branches/dxftoelmt/src/ui/dxf_ellipse.h
===================================================================
--- branches/dxftoelmt/src/ui/dxf_ellipse.h 2015-02-12 20:31:24 UTC (rev 3713)
+++ branches/dxftoelmt/src/ui/dxf_ellipse.h 2015-02-12 20:36:10 UTC (rev 3714)
@@ -2,12 +2,16 @@
#define DXF_ELLIPSE_H
#include <QtCore>
+//#include <qmath.h>
#include <dxf_data.h>
#include "dxf_check_ltype.h"
#include "dxf_ltype.h"
+
class DXF_Ellipse: public DXF_Data
{
+
+
public:
@@ -16,6 +20,9 @@
DXF_Ellipse();
+ double RadiansToDegrees (double Radians);
+ double DegreesToRadians (double Degrees);
+
void ConvertEllipse(int Counter, int BlockCount, int Entitieswitch, struct _ReadLineDXF LineTable4[2000], struct _LType_ACAD LTypeDXF[200], struct _Layer_ACAD LayerDXF[200],struct _Block_ACAD BlockList[2000]);
};
Modified: branches/dxftoelmt/src/ui/dxf_elmt_output.cpp
===================================================================
--- branches/dxftoelmt/src/ui/dxf_elmt_output.cpp 2015-02-12 20:31:24 UTC (rev 3713)
+++ branches/dxftoelmt/src/ui/dxf_elmt_output.cpp 2015-02-12 20:36:10 UTC (rev 3714)
@@ -120,11 +120,55 @@
Lineout.append(" />");
Lineout.append('\n');
+ //<input x="3" y="1" size="9" rotate="true" text="_" tagg="label"/>
Lineout.append(" ");
+ Lineout.append(" ");
+ Lineout.append(" ");
+ Lineout.append("<input x=");
+
+ Lineout.append(QChar(34));
+ Lineout.append("-15");
+ Lineout.append(QChar(34));
+
+ Lineout.append(" y=");
+
+ Lineout.append(QChar(34));
+ Lineout.append("0");
+ Lineout.append(QChar(34));
+
+ Lineout.append(" size=");
+
+ Lineout.append(QChar(34));
+ Lineout.append("9");
+ Lineout.append(QChar(34));
+
+ Lineout.append(" rotate=");
+
+ Lineout.append(QChar(34));
+ Lineout.append("true");
+ Lineout.append(QChar(34));
+
+ Lineout.append(" text=");
+
+ Lineout.append(QChar(34));
+ Lineout.append("_");
+ Lineout.append(QChar(34));
+
+ Lineout.append(" tagg=");
+
+ Lineout.append(QChar(34));
+ Lineout.append("label");
+ Lineout.append(QChar(34));
+
+ Lineout.append(" />");
+ Lineout.append('\n');
+
+ Lineout.append(" ");
Lineout.append("</description>");
Lineout.append('\n');
+
return Lineout;
}
Modified: branches/dxftoelmt/src/ui/dxftoelmt.cpp
===================================================================
--- branches/dxftoelmt/src/ui/dxftoelmt.cpp 2015-02-12 20:31:24 UTC (rev 3713)
+++ branches/dxftoelmt/src/ui/dxftoelmt.cpp 2015-02-12 20:36:10 UTC (rev 3714)
@@ -7,16 +7,23 @@
QString dxfTOelmt::CreateElmt()
{
+ ProcesAddLog="Start convertion of dxf file /n";
+
+ ProcesAddLog.append("----------------------------------- /n");
+
+
+
QString StatusBarMessage;
- //DXF_Data Data1;
/* open file */
+ ProcesAddLog.append("opening dxf file /n");
+
QFile file(m_file_path);
if (!file.open(QFile::ReadOnly | QFile::Text))
{
@@ -663,9 +670,9 @@
Line2=ReadLine;
dxfLineCounter=dxfLineCounter+2;
- //LineTable4[LineCount4].Line1=Line1;
- //LineTable4[LineCount4].Line2=Line2;
- //LineCount4=LineCount4+1;
+ LineTable4[LineCount4].Line1=Line1;
+ LineTable4[LineCount4].Line2=Line2;
+ LineCount4=LineCount4+1;
//switch10=(Line1.contains(" 0",Qt::CaseSensitive) and 0);
@@ -684,9 +691,9 @@
Line2=ReadLine;
dxfLineCounter=dxfLineCounter+2;
- //LineTable4[LineCount4].Line1=Line1;
- //LineTable4[LineCount4].Line2=Line2;
- //LineCount4=LineCount4+1;
+ LineTable4[LineCount4].Line1=Line1;
+ LineTable4[LineCount4].Line2=Line2;
+ LineCount4=LineCount4+1;
//switch10=(Line1.contains(" 0",Qt::CaseSensitive)and 0);
Control10=Line1.toDouble();
@@ -702,6 +709,16 @@
}
+ DXF_Ellipse Load_Ellipse;
+
+ Load_Ellipse.LayerCount1=LayerCount;
+ Load_Ellipse.LTypeCount1=LtypeCount;
+
+
+ Load_Ellipse.ConvertEllipse(LineCount4, BlockCount, Entitieswitch, LineTable4,LTypeDXF, LayerDXF, BlockList);
+
+ LineCount4=1;
+
}
Aantal_Tekens = Line2.length();
@@ -2782,7 +2799,7 @@
Load_Ellipse.LTypeCount1=LtypeCount;
- //Load_Ellipse.ConvertEllipse(LineCount4, BlockCount, Entitieswitch, LineTable4,LTypeDXF, LayerDXF, BlockList);
+ Load_Ellipse.ConvertEllipse(LineCount4, BlockCount, Entitieswitch, LineTable4,LTypeDXF, LayerDXF, BlockList);
LineCount4=1;
Modified: branches/dxftoelmt/src/ui/dxftoelmt.h
===================================================================
--- branches/dxftoelmt/src/ui/dxftoelmt.h 2015-02-12 20:31:24 UTC (rev 3713)
+++ branches/dxftoelmt/src/ui/dxftoelmt.h 2015-02-12 20:36:10 UTC (rev 3714)
@@ -3,12 +3,11 @@
#include <QtCore>
#include <QFileDialog>
-//#include "ui_mainwindow.h"
-
+#include <QtUiTools>
+#include <qmainwindow.h>
#include "QTextStream"
-
#include <QMessageBox>
-
+#include "mainwindow.h"
#include "dxf_data.h"
#include "dxf_header.h"
#include "dxf_ltype.h"
@@ -32,11 +31,15 @@
+
class dxfTOelmt : public DXF_Data
{
+ //Q_OBJECT
+
public:
+ //Ui::MainWindow *ui;
struct _LType_ACAD LTypeDXF[200];
struct _Layer_ACAD LayerDXF[200];
@@ -64,6 +67,8 @@
QString Line1;
QString Line2;
+ QString ProcesAddLog;
+
QString ElmtResult;
dxfTOelmt();
Modified: branches/dxftoelmt/src/ui/mainwindow.cpp
===================================================================
--- branches/dxftoelmt/src/ui/mainwindow.cpp 2015-02-12 20:31:24 UTC (rev 3713)
+++ branches/dxftoelmt/src/ui/mainwindow.cpp 2015-02-12 20:36:10 UTC (rev 3714)
@@ -30,6 +30,8 @@
void MainWindow::loadFile()
{
+ ProcesLog2="loadfile";
+
QFileDialog dialog(this);
dialog.setNameFilter(tr("DXF files (*.dxf *.DXF)"));
dialog.setFileMode(QFileDialog::ExistingFile);
@@ -41,6 +43,8 @@
StatusBarMessage="Read DXF file for convertion";
+ ProcesLog2.append(StatusBarMessage);
+
ui->statusBar->clearMessage();
ui->statusBar->showMessage(StatusBarMessage );
ui->statusBar->repaint();
@@ -52,7 +56,7 @@
return;
}
- ui -> m_import_file_path_le -> setPlaceholderText(m_file_path);
+ ui->m_import_file_path_le -> setPlaceholderText(m_file_path);
ui->ExportFile->setPlaceholderText(m_path_dir);
@@ -68,7 +72,7 @@
ui->statusBar->clearMessage();
- ui->ExportToELMT->clear();
+ ui->ExportToELMT->clear();
//Filename=ui->m_elmt_name_le->placeholderText();
@@ -78,9 +82,12 @@
ui->statusBar->showMessage(StatusBarMessage );
ui->statusBar->repaint();
- dxfTOelmt ConvertDXF;
+ ui->ProcesLog->setPlainText(StatusBarMessage);
+ dxfTOelmt ConvertDXF;
+
+
ConvertDXF.m_file_path=m_file_path;
ConvertDXF.m_path_dir=m_path_dir;
ConvertDXF.Filename1=Filename;
@@ -96,6 +103,8 @@
ui->statusBar->showMessage(StatusBarMessage );
ui->statusBar->repaint();
+ ui->ProcesLog->setPlainText(ProcesLog2);
+ ui->ProcesLog->repaint();
return;
}
Modified: branches/dxftoelmt/src/ui/mainwindow.h
===================================================================
--- branches/dxftoelmt/src/ui/mainwindow.h 2015-02-12 20:31:24 UTC (rev 3713)
+++ branches/dxftoelmt/src/ui/mainwindow.h 2015-02-12 20:36:10 UTC (rev 3714)
@@ -27,10 +27,12 @@
QString StatusConvertion;
QString StatusBarMessage;
QString Filename;
+ QString ProcesLog1;
+ QString ProcesLog2;
+ Ui::MainWindow *ui;
-
private slots:
void on_m_save_elmt_pb_clicked();
@@ -40,12 +42,16 @@
void on_LineCountDXF_textEdited(const QString &arg1);
- private:
+signals:
- Ui::MainWindow *ui;
+private:
+ //Ui::MainWindow *ui;
+
+
+
void loadFile();
//void createElmt();
QString fillElmtName();
Modified: branches/dxftoelmt/src/ui_mainwindow.h
===================================================================
--- branches/dxftoelmt/src/ui_mainwindow.h 2015-02-12 20:31:24 UTC (rev 3713)
+++ branches/dxftoelmt/src/ui_mainwindow.h 2015-02-12 20:36:10 UTC (rev 3714)
@@ -145,7 +145,7 @@
ProcesLog = new QTextEdit(centralWidget);
- ProcesLog->setObjectName(QString::fromUtf8("ExportToELMT"));
+ ProcesLog->setObjectName(QString::fromUtf8("Proceslog"));
ProcesLog->setLineWrapMode(QTextEdit::NoWrap);
gridLayout_2->addWidget(ProcesLog, 4, 4, 1, 2);
@@ -188,7 +188,8 @@
label_3->setText(QApplication::translate("MainWindow", "", 0, QApplication::UnicodeUTF8));
m_save_elmt_pb->setText(QApplication::translate("MainWindow", "save to elmt file", 0, QApplication::UnicodeUTF8));
m_load_dxf_pb->setText(QApplication::translate("MainWindow", "Load DXF file", 0, QApplication::UnicodeUTF8));
- } // retranslateUi
+ //m_elmt_name_le->setText(QApplication::translate("MainWindow", "Load DXF file", 0, QApplication::UnicodeUTF8));
+ } //retranslateUi;
};
Modified: branches/dxftoelmt/ui_mainwindow.h
===================================================================
--- branches/dxftoelmt/ui_mainwindow.h 2015-02-12 20:31:24 UTC (rev 3713)
+++ branches/dxftoelmt/ui_mainwindow.h 2015-02-12 20:36:10 UTC (rev 3714)
@@ -26,6 +26,9 @@
#include <QtGui/QVBoxLayout>
#include <QtGui/QWidget>
+
+
+
QT_BEGIN_NAMESPACE
class Ui_MainWindow
@@ -34,7 +37,9 @@
QWidget *centralWidget;
QVBoxLayout *verticalLayout;
QGridLayout *gridLayout_2;
+ QTextEdit *ImportDXF;
QLineEdit *SectionCount1;
+ QLineEdit *LineCountDXF;
QLabel *label;
QLabel *label_2;
QLineEdit *m_import_file_path_le;
@@ -43,34 +48,50 @@
QLabel *label_4;
QLineEdit *m_elmt_name_le;
QPushButton *m_save_elmt_pb;
+ QTextEdit *ExportToELMT;
QPushButton *m_load_dxf_pb;
- QTextEdit *ImportDXF;
- QTextEdit *ExportToELMT;
QMenuBar *menuBar;
QToolBar *mainToolBar;
QStatusBar *statusBar;
+ QLabel *label_3;
+ QTextEdit *ProcesLog;
void setupUi(QMainWindow *MainWindow)
{
if (MainWindow->objectName().isEmpty())
MainWindow->setObjectName(QString::fromUtf8("MainWindow"));
- MainWindow->resize(758, 488);
+ MainWindow->resize(1088, 669);
+
centralWidget = new QWidget(MainWindow);
centralWidget->setObjectName(QString::fromUtf8("centralWidget"));
+
verticalLayout = new QVBoxLayout(centralWidget);
verticalLayout->setSpacing(6);
verticalLayout->setContentsMargins(11, 11, 11, 11);
verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
+
gridLayout_2 = new QGridLayout();
gridLayout_2->setSpacing(6);
gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2"));
+
+ label_3 = new QLabel(centralWidget);
+ label_3->setObjectName(QString::fromUtf8("label_3"));
+
+ gridLayout_2->addWidget(label_3, 0, 0, 2, 1);
+
+ ImportDXF = new QTextEdit(centralWidget);
+ ImportDXF->setObjectName(QString::fromUtf8("ImportDXF"));
+
+ gridLayout_2->addWidget(ImportDXF, 4, 0, 1, 2);
+
SectionCount1 = new QLineEdit(centralWidget);
SectionCount1->setObjectName(QString::fromUtf8("SectionCount1"));
- QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+ /*QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(SectionCount1->sizePolicy().hasHeightForWidth());
- SectionCount1->setSizePolicy(sizePolicy);
+ SectionCount1->setSizePolicy(sizePolicy);*/
gridLayout_2->addWidget(SectionCount1, 3, 1, 1, 1);
@@ -86,7 +107,7 @@
m_import_file_path_le = new QLineEdit(centralWidget);
m_import_file_path_le->setObjectName(QString::fromUtf8("m_import_file_path_le"));
- m_import_file_path_le->setMaximumSize(QSize(16777165, 16777215));
+ //m_import_file_path_le->setMaximumSize(QSize(16777165, 16777215));
gridLayout_2->addWidget(m_import_file_path_le, 2, 1, 1, 1);
@@ -105,6 +126,7 @@
gridLayout_2->addWidget(label_4, 3, 2, 1, 1);
+
m_elmt_name_le = new QLineEdit(centralWidget);
m_elmt_name_le->setObjectName(QString::fromUtf8("m_elmt_name_le"));
@@ -113,23 +135,8 @@
m_save_elmt_pb = new QPushButton(centralWidget);
m_save_elmt_pb->setObjectName(QString::fromUtf8("m_save_elmt_pb"));
- gridLayout_2->addWidget(m_save_elmt_pb, 1, 2, 1, 2);
+ gridLayout_2->addWidget(m_save_elmt_pb, 1, 2, 1, 1);
- m_load_dxf_pb = new QPushButton(centralWidget);
- m_load_dxf_pb->setObjectName(QString::fromUtf8("m_load_dxf_pb"));
-
- gridLayout_2->addWidget(m_load_dxf_pb, 1, 0, 1, 2);
-
- ImportDXF = new QTextEdit(centralWidget);
- ImportDXF->setObjectName(QString::fromUtf8("ImportDXF"));
- QSizePolicy sizePolicy1(QSizePolicy::Minimum, QSizePolicy::Expanding);
- sizePolicy1.setHorizontalStretch(0);
- sizePolicy1.setVerticalStretch(0);
- sizePolicy1.setHeightForWidth(ImportDXF->sizePolicy().hasHeightForWidth());
- ImportDXF->setSizePolicy(sizePolicy1);
-
- gridLayout_2->addWidget(ImportDXF, 4, 0, 1, 2);
-
ExportToELMT = new QTextEdit(centralWidget);
ExportToELMT->setObjectName(QString::fromUtf8("ExportToELMT"));
ExportToELMT->setLineWrapMode(QTextEdit::NoWrap);
@@ -137,16 +144,31 @@
gridLayout_2->addWidget(ExportToELMT, 4, 2, 1, 2);
+ ProcesLog = new QTextEdit(centralWidget);
+ ProcesLog->setObjectName(QString::fromUtf8("Proceslog"));
+ ProcesLog->setLineWrapMode(QTextEdit::NoWrap);
+
+ gridLayout_2->addWidget(ProcesLog, 4, 4, 1, 2);
+
+ m_load_dxf_pb = new QPushButton(centralWidget);
+ m_load_dxf_pb->setObjectName(QString::fromUtf8("m_load_dxf_pb"));
+
+ gridLayout_2->addWidget(m_load_dxf_pb, 1, 0, 1, 1);
+
+
verticalLayout->addLayout(gridLayout_2);
MainWindow->setCentralWidget(centralWidget);
+
menuBar = new QMenuBar(MainWindow);
menuBar->setObjectName(QString::fromUtf8("menuBar"));
- menuBar->setGeometry(QRect(0, 0, 758, 25));
+ menuBar->setGeometry(QRect(0, 0, 758, 20));
MainWindow->setMenuBar(menuBar);
+
mainToolBar = new QToolBar(MainWindow);
mainToolBar->setObjectName(QString::fromUtf8("mainToolBar"));
MainWindow->addToolBar(Qt::TopToolBarArea, mainToolBar);
+
statusBar = new QStatusBar(MainWindow);
statusBar->setObjectName(QString::fromUtf8("statusBar"));
MainWindow->setStatusBar(statusBar);
@@ -163,9 +185,11 @@
label_2->setText(QApplication::translate("MainWindow", "Export directory path :", 0, QApplication::UnicodeUTF8));
labelSectionCount->setText(QApplication::translate("MainWindow", "Section count", 0, QApplication::UnicodeUTF8));
label_4->setText(QApplication::translate("MainWindow", "element name :", 0, QApplication::UnicodeUTF8));
+ label_3->setText(QApplication::translate("MainWindow", "", 0, QApplication::UnicodeUTF8));
m_save_elmt_pb->setText(QApplication::translate("MainWindow", "save to elmt file", 0, QApplication::UnicodeUTF8));
m_load_dxf_pb->setText(QApplication::translate("MainWindow", "Load DXF file", 0, QApplication::UnicodeUTF8));
- } // retranslateUi
+ //m_elmt_name_le->setText(QApplication::translate("MainWindow", "Load DXF file", 0, QApplication::UnicodeUTF8));
+ } //retranslateUi;
};