| [qet] [4339] DXFtoQET update function of elmt creation |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4339
Author: rdsivd
Date: 2016-02-01 21:38:39 +0100 (Mon, 01 Feb 2016)
Log Message:
-----------
DXFtoQET update function of elmt creation
Modified Paths:
--------------
branches/dxftoqet2/DXFtoQET.pro
branches/dxftoqet2/dxf_create_elmt.cpp
branches/dxftoqet2/dxf_create_elmt.h
branches/dxftoqet2/dxftoqet_mainwindow.h
branches/dxftoqet2/dxftoqet_mainwindow.ui
branches/dxftoqet2/src/dxf_block/dxf_block_attdef.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attrinute.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_circle.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_circle.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_ellipse.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_ellipse.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_text.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_text.h
Added Paths:
-----------
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_point.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_point.h
Removed Paths:
-------------
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_pint.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_pint.h
Modified: branches/dxftoqet2/DXFtoQET.pro
===================================================================
--- branches/dxftoqet2/DXFtoQET.pro 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/DXFtoQET.pro 2016-02-01 20:38:39 UTC (rev 4339)
@@ -61,13 +61,13 @@
src/dxf_entitie/dxf_entitie_attdef.cpp \
src/dxf_entitie/dxf_entitie_attrinute.cpp \
src/dxf_entitie/dxf_entitie_circle.cpp \
- src/dxf_entitie/dxf_entitie_pint.cpp \
src/dxf_entitie/dxf_entitie_text.cpp \
src/dxf_entitie/dxf_entitie_ellipse.cpp \
src/dxf_entitie/dxf_entitie_polyline.cpp \
src/dxf_entitie/dxf_entitie_insert.cpp \
src/dxf_entitie/dxf_entitie_lwpolyline.cpp \
- src/dxf_block/dxf_block_insert.cpp
+ src/dxf_block/dxf_block_insert.cpp \
+ src/dxf_entitie/dxf_entitie_point.cpp
HEADERS += dxftoqet_mainwindow.h \
src/dxf_data.h \
@@ -116,13 +116,13 @@
src/dxf_entitie/dxf_entitie_attdef.h \
src/dxf_entitie/dxf_entitie_attrinute.h \
src/dxf_entitie/dxf_entitie_circle.h \
- src/dxf_entitie/dxf_entitie_pint.h \
src/dxf_entitie/dxf_entitie_text.h \
src/dxf_entitie/dxf_entitie_ellipse.h \
src/dxf_entitie/dxf_entitie_polyline.h \
src/dxf_entitie/dxf_entitie_insert.h \
src/dxf_entitie/dxf_entitie_lwpolyline.h \
- src/dxf_block/dxf_block_insert.h
+ src/dxf_block/dxf_block_insert.h \
+ src/dxf_entitie/dxf_entitie_point.h
FORMS += dxftoqet_mainwindow.ui
Modified: branches/dxftoqet2/dxf_create_elmt.cpp
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.cpp 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/dxf_create_elmt.cpp 2016-02-01 20:38:39 UTC (rev 4339)
@@ -239,7 +239,15 @@
dxf_entitie_arc Make_entitie_arc;
dxf_entitie_attdef Make_entitie_attdef;
dxf_entitie_attrinute Make_entitie_attribute;
+ dxf_entitie_circle Make_entitie_circle;
+ dxf_entitie_point Make_entitie_point;
+ dxf_entitie_text Make_entitie_text;
+ dxf_entitie_ellipse Make_entitie_ellipse;
+ dxf_entitie_polyline Make_entitie_polyline;
+ dxf_entitie_insert Make_entitie_insert;
+ dxf_entitie_lwpolyline Make_entitie_lwpolyline;
+
/* LINE */
Make_entitie_line.Count_entitie_line=DXF_main_base[0].DXF_entities_line_count;
@@ -279,41 +287,65 @@
/* CIRCLE */
- Count_entitie_circle=DXF_main_base[0].DXF_entities_circle_count;
+ Make_entitie_circle.Count_entitie_circle=DXF_main_base[0].DXF_entities_circle_count;
+ Make_entitie_circle.Entitie_color="red";
+ Make_entitie_circle.Entitie_antialias="true";
+ Make_entitie_circle.Entitie_filling="none";
+ Make_entitie_circle.Entitie_line_weight="thin";
- Result.append(Make_CIRCLE());
+ Result.append(Make_entitie_circle.dxf_entitie_make_circle());
/* POINT */
- Count_entitie_point=DXF_main_base[0].DXF_entities_point_count;
+ Make_entitie_point.Count_entitie_point=DXF_main_base[0].DXF_entities_point_count;
+ Make_entitie_point.Entitie_orientation="n";
- Result.append(Make_POINT());
+ Result.append(Make_entitie_point.dxf_entitie_make_point());
/* TEXT */
- Count_entitie_text=DXF_main_base[0].DXF_entities_text_count;
- Result.append(Make_TEXT());
+ Make_entitie_text.Count_entitie_text=DXF_main_base[0].DXF_entities_text_count;
+ Make_entitie_text.Entitie_color="black";
+ Result.append(Make_entitie_text.dxf_entitie_make_text());
+
/* ELLIPSE */
- Count_entitie_ellipse=DXF_main_base[0].DXF_entities_ellipse_count;
- Result.append(Make_ELLIPSE());
+ Make_entitie_ellipse.Count_entitie_ellipse=DXF_main_base[0].DXF_entities_ellipse_count;
+ Make_entitie_ellipse.Entitie_color="red";
+ Make_entitie_ellipse.Entitie_antialias="true";
+ Make_entitie_ellipse.Entitie_filling="none";
+ Make_entitie_ellipse.Entitie_line_weight="thin";
+ Result.append(Make_entitie_ellipse.dxf_entitie_make_ellipse());
+
/* POLYLINE */
- Count_entitie_polyline=DXF_main_base[0].DXF_entities_polyline_count;
- Result.append(Make_POLYLINE());
+ Make_entitie_polyline.Count_entitie_polyline=DXF_main_base[0].DXF_entities_polyline_count;
+ Make_entitie_polyline.Entitie_color="red";
+ Make_entitie_polyline.Entitie_antialias="false";
+ Make_entitie_polyline.Entitie_filling="none";
+ Make_entitie_polyline.Entitie_line_weight="thin";
+ Make_entitie_polyline.Entitie_line_style="normal";
+
+ Result.append(Make_entitie_polyline.dxf_entitie_make_polyline());
+
/* INSERT */
- Count_entitie_insert=DXF_main_base[0].DXF_entities_insert_count;
- Result.append(Make_INSERT());
+ Make_entitie_insert.Count_entitie_insert=DXF_main_base[0].DXF_entities_insert_count;
+ Result.append(Make_entitie_insert.dxf_entitie_make_insert());
/* LWPOLYLINE */
- Count_entitie_lwpolyline=DXF_main_base[0].DXF_entities_lwpolyline_count;
- Result.append(Make_LWPOLYLINE());
+ Make_entitie_lwpolyline.Count_entitie_lwpolyline=DXF_main_base[0].DXF_entities_lwpolyline_count;
+ Make_entitie_lwpolyline.Entitie_color="red";
+ Make_entitie_lwpolyline.Entitie_antialias="false";
+ Make_entitie_lwpolyline.Entitie_filling="none";
+ Make_entitie_lwpolyline.Entitie_line_weight="thin";
+ Make_entitie_lwpolyline.Entitie_line_style="normal";
+ Result.append(Make_entitie_lwpolyline.dxf_entitie_make_lwpolyline());
/* Close elmt description */
@@ -503,7 +535,7 @@
}*/
- QString DXF_create_elmt::Make_CIRCLE()
+ /*QString DXF_create_elmt::Make_CIRCLE()
{
dxf_circle db_circle;
@@ -538,9 +570,9 @@
return Result_circle;
-}
+}*/
- QString DXF_create_elmt::Make_POINT()
+ /*QString DXF_create_elmt::Make_POINT()
{
Result_point="";
@@ -561,9 +593,9 @@
}
return Result_point;
-}
+}*/
- QString DXF_create_elmt::Make_TEXT()
+/* QString DXF_create_elmt::Make_TEXT()
{
dxf_text db_text;
@@ -595,9 +627,9 @@
}
return Result_text;
- }
+ }*/
- QString DXF_create_elmt::Make_ELLIPSE()
+ /*QString DXF_create_elmt::Make_ELLIPSE()
{
dxf_ellipse db_ellipse;
@@ -632,12 +664,12 @@
}
return Result_ellipse2;
- }
+ }*/
- QString DXF_create_elmt::Make_POLYLINE()
+ /*QString DXF_create_elmt::Make_POLYLINE()
{
- /* read out table and pas values to xml creator */
+ // read out table and pas values to xml creator
dxf_polyline db_polyline;
@@ -699,9 +731,9 @@
}
return Result_polyline;
- }
+ }*/
- QString DXF_create_elmt::Make_LWPOLYLINE()
+ /*QString DXF_create_elmt::Make_LWPOLYLINE()
{
dxf_lwpolyline db_lwpolyline;
@@ -773,9 +805,9 @@
}
return Result_lwpolyline;
- }
+ }*/
- QString DXF_create_elmt::Make_INSERT()
+/*QString DXF_create_elmt::Make_INSERT()
{
Result_insert="";
@@ -831,7 +863,7 @@
- /* Block LINES */
+ // Block LINES
insert_Make_Block_Lines.x_insert=x_insert;
insert_Make_Block_Lines.y_insert=y_insert;
@@ -848,7 +880,7 @@
Result_insert.append(insert_Make_Block_Lines.Make_Block_Lines());
- /* Block ARC */
+ // Block ARC
insert_Make_Block_Arc.x_insert=x_insert;
insert_Make_Block_Arc.y_insert=y_insert;
@@ -865,7 +897,7 @@
Result_insert.append(insert_Make_Block_Arc.Make_Block_Arc());
- /* Block CIRCLE */
+ // Block CIRCLE
insert_Make_Block_Circle.x_insert=x_insert;
insert_Make_Block_Circle.y_insert=y_insert;
@@ -882,7 +914,7 @@
Result_insert.append(insert_Make_Block_Circle.Make_Block_Circle());
- /* Block ELLIPSE */
+ // Block ELLIPSE
insert_Make_Block_Ellipse.x_insert=x_insert;
insert_Make_Block_Ellipse.y_insert=y_insert;
@@ -900,7 +932,7 @@
Result_insert.append(insert_Make_Block_Ellipse.Make_Block_Ellipse());
- /* Block POLYLINE */
+ // Block POLYLINE
insert_Make_Block_Polyline.x_insert=x_insert;
insert_Make_Block_Polyline.y_insert=y_insert;
@@ -917,7 +949,7 @@
Result_insert.append(insert_Make_Block_Polyline.Make_Block_Polyline());
- /* Block LWPOLYLINE */
+ // Block LWPOLYLINE
insert_Make_Block_Lwpolyline.x_insert=x_insert;
insert_Make_Block_Lwpolyline.y_insert=y_insert;
@@ -934,7 +966,7 @@
Result_insert.append(insert_Make_Block_Lwpolyline.Make_Block_Lwpolyline());
- /* Block ATTDEF */
+ // Block ATTDEF
insert_Make_Block_Attdef.x_insert=x_insert;
insert_Make_Block_Attdef.y_insert=y_insert;
@@ -951,7 +983,7 @@
Result_insert.append(insert_Make_Block_Attdef.Make_Block_Attdef());
- /* Block ATTRIB*/
+ // Block ATTRIB
insert_Make_Block_Attribute.x_insert=x_insert;
insert_Make_Block_Attribute.y_insert=y_insert;
@@ -969,7 +1001,7 @@
Result_insert.append(insert_Make_Block_Attribute.Make_Block_Attri());
- /* Block TEXT*/
+ // Block TEXT
insert_Make_Block_Text.x_insert=x_insert;
insert_Make_Block_Text.y_insert=y_insert;
@@ -986,7 +1018,7 @@
Result_insert.append(insert_Make_Block_Text.Make_Block_Text());
- /* end of block */
+ // end of block
Count_lines=Count_lines+1;
@@ -997,7 +1029,7 @@
}
return Result_insert;
- }
+ }*/
/* QString DXF_create_elmt::Make_Block_LINES()
{
Modified: branches/dxftoqet2/dxf_create_elmt.h
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.h 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/dxf_create_elmt.h 2016-02-01 20:38:39 UTC (rev 4339)
@@ -34,6 +34,13 @@
#include "src/dxf_entitie/dxf_entitie_arc.h"
#include "src/dxf_entitie/dxf_entitie_attdef.h"
#include "src/dxf_entitie/dxf_entitie_attrinute.h"
+#include "src/dxf_entitie/dxf_entitie_circle.h"
+#include "src/dxf_entitie/dxf_entitie_point.h"
+#include "src/dxf_entitie/dxf_entitie_text.h"
+#include "src/dxf_entitie/dxf_entitie_ellipse.h"
+#include "src/dxf_entitie/dxf_entitie_polyline.h"
+#include "src/dxf_entitie/dxf_entitie_insert.h"
+#include "src/dxf_entitie/dxf_entitie_lwpolyline.h"
class DXF_create_elmt : public QWidget // QMainWindow
{
Modified: branches/dxftoqet2/dxftoqet_mainwindow.h
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.h 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/dxftoqet_mainwindow.h 2016-02-01 20:38:39 UTC (rev 4339)
@@ -5,7 +5,7 @@
#include <QWidget>
#include <QObject>
#include <QMessageBox>
-//#include <QtWidgets>
+#include <QtWidgets>
#include <QTableView>
#include "src/dxf_data.h"
@@ -69,9 +69,9 @@
QString Result;
QString Result4;
- QAbstractItemModel *model;
- QAbstractItemModel *model2;
- QAbstractItemModel *model3;
+ QStandardItemModel *model;
+ QStandardItemModel *model2;
+ QStandardItemModel *model3;
QAbstractItemModel *model4;
QStringList List2;
Modified: branches/dxftoqet2/dxftoqet_mainwindow.ui
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.ui 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/dxftoqet_mainwindow.ui 2016-02-01 20:38:39 UTC (rev 4339)
@@ -2,13 +2,13 @@
<ui version="4.0">
<author>Ronny Desmedt</author>
<class>DXFtoQET_MainWindow</class>
- <widget class="QMainWindow" name="DXFtoQET_MainWindow">
+ <widget class="QWidget" name="DXFtoQET_MainWindow">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>1222</width>
- <height>950</height>
+ <width>1224</width>
+ <height>903</height>
</rect>
</property>
<property name="sizePolicy">
@@ -23,14 +23,22 @@
<property name="styleSheet">
<string notr="true">qlineargradient:(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(58, 91, 113, 255), stop:1 rgba(255, 255, 255, 255))</string>
</property>
- <widget class="QWidget" name="centralWidget">
+ <widget class="QWidget" name="centralWidget" native="true">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>1211</width>
+ <height>978</height>
+ </rect>
+ </property>
<widget class="QWidget" name="layoutWidget0">
<property name="geometry">
<rect>
<x>10</x>
- <y>11</y>
+ <y>30</y>
<width>1191</width>
- <height>956</height>
+ <height>861</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
@@ -2989,48 +2997,30 @@
</item>
</layout>
</item>
- <item>
- <spacer name="verticalSpacer_6">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</item>
</layout>
</widget>
</widget>
- <widget class="QMenuBar" name="menuBar">
+ <widget class="QStatusBar" name="statusBar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>1222</width>
- <height>25</height>
+ <width>3</width>
+ <height>22</height>
</rect>
</property>
- <property name="nativeMenuBar">
- <bool>false</bool>
- </property>
- <widget class="QMenu" name="menuFile">
- <property name="title">
- <string>&File</string>
- </property>
- <addaction name="actionOpen"/>
- <addaction name="actionSave_as_elmt"/>
- <addaction name="actionSave_as_qet"/>
- </widget>
- <addaction name="menuFile"/>
</widget>
- <widget class="QStatusBar" name="statusBar"/>
<widget class="QToolBar" name="toolBar">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>252</width>
+ <height>29</height>
+ </rect>
+ </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -3046,12 +3036,6 @@
<height>46</height>
</size>
</property>
- <attribute name="toolBarArea">
- <enum>TopToolBarArea</enum>
- </attribute>
- <attribute name="toolBarBreak">
- <bool>false</bool>
- </attribute>
<addaction name="actionOpen"/>
<addaction name="separator"/>
<addaction name="actionSave_as_elmt"/>
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_attdef.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_attdef.h 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_attdef.h 2016-02-01 20:38:39 UTC (rev 4339)
@@ -8,7 +8,7 @@
#include "src/qet_base_types/baseelmt.h"
#include "src/dxf_control/dxf_text_control.h"
-class dxf_block_attdef : public QMainWindow
+class dxf_block_attdef : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attrinute.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attrinute.h 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attrinute.h 2016-02-01 20:38:39 UTC (rev 4339)
@@ -2,7 +2,7 @@
#define DXF_ENTITIE_ATTRINUTE_H
//#include <QMainWindow>
-#include <qwidget.h>
+#include <QWidget>
#include "src/dxf/dxf_attr.h"
#include "src/dxf_data.h"
#include "src/qet_base_types/baseelmt.h"
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_circle.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_circle.cpp 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_circle.cpp 2016-02-01 20:38:39 UTC (rev 4339)
@@ -1,7 +1,47 @@
#include "dxf_entitie_circle.h"
+extern struct DXF_base DXF_main_base[1];
+extern struct DXF_entities_circle DXF_input_entities_circle[1000];
+
dxf_entitie_circle::dxf_entitie_circle(QWidget *parent) : QWidget(parent)
{
}
+QString dxf_entitie_circle::dxf_entitie_make_circle()
+{
+
+ dxf_circle db_circle;
+
+ Result_circle="";
+
+ Count_lines=0;
+
+ while (Count_lines<=Count_entitie_circle)
+ {
+
+ db_circle.x=DXF_input_entities_circle[Count_lines].DXF_entities_circle_code_10;
+ db_circle.y=-DXF_input_entities_circle[Count_lines].DXF_entities_circle_code_20;
+ db_circle.diameter=DXF_input_entities_circle[Count_lines].DXF_entities_circle_code_40*2;
+
+
+ db_circle.layer=DXF_input_entities_circle[Count_lines].DXF_entities_circle_code_8;
+ db_circle.ltype=DXF_input_entities_circle[Count_lines].DXF_entities_circle_code_6;
+ db_circle.color=Entitie_color;
+ db_circle.antialias=Entitie_antialias;
+ db_circle.line_weight=Entitie_line_weight;
+ db_circle.filling=Entitie_filling;
+
+
+ Result_circle.append(db_circle.Create_CIRCLE());
+
+
+ Count_lines=Count_lines+1;
+
+
+ }
+
+
+ return Result_circle;
+
+}
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_circle.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_circle.h 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_circle.h 2016-02-01 20:38:39 UTC (rev 4339)
@@ -3,6 +3,10 @@
//#include <QMainWindow>
#include <QWidget>
+#include "src/dxf/dxf_circle.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+#include "src/dxf_control/dxf_text_control.h"
class dxf_entitie_circle : public QWidget // QMainWindow
{
@@ -10,6 +14,18 @@
public:
explicit dxf_entitie_circle(QWidget *parent = 0);
+ QString Result_circle;
+ QString Entitie_color; // black
+ QString Entitie_line_weight; // thin
+ QString Entitie_filling; // none
+ QString Entitie_antialias; // true
+ QString Entitie_rotate; // true
+ QString Entitie_tag; // label
+
+ int Count_lines;
+ int Count_entitie_circle;
+
+ QString dxf_entitie_make_circle();
signals:
public slots:
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_ellipse.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_ellipse.cpp 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_ellipse.cpp 2016-02-01 20:38:39 UTC (rev 4339)
@@ -1,7 +1,45 @@
#include "dxf_entitie_ellipse.h"
+extern struct DXF_base DXF_main_base[1];
+extern struct DXF_entities_ellipse DXF_input_entities_ellipse[1000];
+
dxf_entitie_ellipse::dxf_entitie_ellipse(QWidget *parent) : QWidget(parent)
{
}
+QString dxf_entitie_ellipse::dxf_entitie_make_ellipse()
+{
+ dxf_ellipse db_ellipse;
+
+
+ Result_ellipse2="";
+
+ Count_lines=0;
+
+ while (Count_lines<=Count_entitie_ellipse)
+ {
+
+ db_ellipse.center_x=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_10;
+ db_ellipse.center_y=-DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_20;
+ db_ellipse.major_radius_x=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_11;
+ db_ellipse.major_radius_y=-DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_21;
+ db_ellipse.ratio_of_minor=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_40;
+ //db_ellipse.rotation=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_50;
+ db_ellipse.start=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_41;
+ db_ellipse.end2=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_42;
+ db_ellipse.LineTypeOFLine=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_6;
+ db_ellipse.LayerNameOFLine=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_8;
+ db_ellipse.Color=Entitie_color;
+ db_ellipse.Line_weight=Entitie_line_weight;
+ db_ellipse.Filling=Entitie_filling;
+
+
+ Result_ellipse2.append(db_ellipse.Create_ELLIPSE());
+ Count_lines=Count_lines+1;
+
+
+ }
+
+ return Result_ellipse2;
+}
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_ellipse.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_ellipse.h 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_ellipse.h 2016-02-01 20:38:39 UTC (rev 4339)
@@ -3,6 +3,10 @@
//#include <QMainWindow>
#include <QWidget>
+#include "src/dxf/dxf_ellipse.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+#include "src/dxf_control/dxf_text_control.h"
class dxf_entitie_ellipse : public QWidget // QMainWindow
{
@@ -10,6 +14,18 @@
public:
explicit dxf_entitie_ellipse(QWidget *parent = 0);
+ QString Result_ellipse2;
+ QString Entitie_color; // black
+ QString Entitie_line_weight;
+ QString Entitie_filling;
+ QString Entitie_antialias;
+ QString Entitie_rotate; // true
+ QString Entitie_tag; // label
+
+ int Count_lines;
+ int Count_entitie_ellipse;
+
+ QString dxf_entitie_make_ellipse();
signals:
public slots:
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.cpp 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.cpp 2016-02-01 20:38:39 UTC (rev 4339)
@@ -1,7 +1,253 @@
#include "dxf_entitie_insert.h"
+extern struct DXF_base DXF_main_base[1];
+
+extern struct DXF_block_line DXF_input_block_line[100][50];
+extern struct DXF_block_arc DXF_input_block_arc[100][50];
+extern struct DXF_block_attdef DXF_input_block_attdef[100][50];
+extern struct DXF_block_attrib DXF_input_block_attrib[100][50];
+extern struct DXF_block_circle DXF_input_block_circle[100][50];
+extern struct DXF_block_ellipse DXF_input_block_ellipse[100][50];
+extern struct DXF_block_attdef DXF_input_block_attdef[100][50];
+extern struct DXF_block_attrib DXF_input_block_attrib[100][50];
+extern struct DXF_block_lwpolyline DXF_input_block_lwpolyline[100][50];
+extern struct DXF_block_point DXF_input_block_point[100][50];
+extern struct DXF_block_polyline DXF_input_block_polyline[100][50];
+extern struct DXF_block_seqend DXF_input_block_seqend[100][50];
+extern struct DXF_block_text DXF_input_block_text[100][50];
+extern struct DXF_block_vertex DXF_input_block_vertex[100][500];
+
+extern struct DXF_entities_insert DXF_input_entities_insert[1000];
+
+extern struct DXF_table_block_record DXF_input_table_block_record[500];
+
+
dxf_entitie_insert::dxf_entitie_insert(QWidget *parent) : QWidget(parent)
{
}
+QString dxf_entitie_insert::dxf_entitie_make_insert()
+{
+ Result_insert="";
+
+ Count_lines=0;
+
+ dxf_block_lines insert_Make_Block_Lines;
+ dxf_block_arc insert_Make_Block_Arc;
+ dxf_block_circle insert_Make_Block_Circle;
+ dxf_block_ellipse insert_Make_Block_Ellipse;
+ dxf_block_polyline insert_Make_Block_Polyline;
+ dxf_block_lwpolyline insert_Make_Block_Lwpolyline;
+ dxf_block_attdef insert_Make_Block_Attdef;
+ dxf_block_attribute insert_Make_Block_Attribute;
+ dxf_block_text insert_Make_Block_Text;
+
+ while (Count_lines<=Count_entitie_insert)
+ {
+
+ if (DXF_input_entities_insert[Count_lines].DXF_entities_insert_code_2 == "")
+ {
+ Count_lines=Count_lines+1;
+
+ }
+ else
+ {
+
+ x_insert=0;
+ y_insert=0;
+ x_insert_scale=1;
+ y_insert_scale=1;
+
+
+ Insert_block_nr=Count_lines;
+
+ x_insert=DXF_input_entities_insert[Count_lines].DXF_entities_insert_code_10;
+ y_insert=DXF_input_entities_insert[Count_lines].DXF_entities_insert_code_20;
+ x_insert_scale=DXF_input_entities_insert[Count_lines].DXF_entities_insert_code_41;
+ y_insert_scale=DXF_input_entities_insert[Count_lines].DXF_entities_insert_code_42;
+
+ xy_rotation=DXF_input_entities_insert[Count_lines].DXF_entities_insert_code_50;
+ Name_insert=DXF_input_entities_insert[Count_lines].DXF_entities_insert_code_2;
+
+ for (Block_counter=0;Block_counter<=Count_entitie_insert;Block_counter++)
+ {
+ if(Name_insert==DXF_input_table_block_record[Block_counter].dxf_table_block_record_code_2)
+ {
+ Insert_block_nr=Block_counter;
+ Block_counter=Count_entitie_insert+1;
+ }
+
+
+ }
+
+
+
+ /* Block LINES */
+
+ insert_Make_Block_Lines.x_insert=x_insert;
+ insert_Make_Block_Lines.y_insert=y_insert;
+ insert_Make_Block_Lines.x_insert_scale=x_insert_scale;
+ insert_Make_Block_Lines.y_insert_scale=y_insert_scale;
+ insert_Make_Block_Lines.xy_rotation=xy_rotation;
+ insert_Make_Block_Lines.Name_insert=Name_insert;
+ insert_Make_Block_Lines.Insert_block_nr=Insert_block_nr;
+
+ insert_Make_Block_Lines.block_color="green";
+ insert_Make_Block_Lines.block_filling="none";
+ insert_Make_Block_Lines.block_line_weight="thin";
+
+
+ Result_insert.append(insert_Make_Block_Lines.Make_Block_Lines());
+
+ /* Block ARC */
+
+ insert_Make_Block_Arc.x_insert=x_insert;
+ insert_Make_Block_Arc.y_insert=y_insert;
+ insert_Make_Block_Arc.x_insert_scale=x_insert_scale;
+ insert_Make_Block_Arc.y_insert_scale=y_insert_scale;
+ insert_Make_Block_Arc.xy_rotation=xy_rotation;
+ insert_Make_Block_Arc.Name_insert=Name_insert;
+ insert_Make_Block_Arc.Insert_block_nr=Insert_block_nr;
+
+ insert_Make_Block_Arc.block_color="green";
+ insert_Make_Block_Arc.block_filling="none";
+ insert_Make_Block_Arc.block_line_weight="thin";
+ insert_Make_Block_Arc.block_antialias="false";
+
+ Result_insert.append(insert_Make_Block_Arc.Make_Block_Arc());
+
+ /* Block CIRCLE */
+
+ insert_Make_Block_Circle.x_insert=x_insert;
+ insert_Make_Block_Circle.y_insert=y_insert;
+ insert_Make_Block_Circle.x_insert_scale=x_insert_scale;
+ insert_Make_Block_Circle.y_insert_scale=y_insert_scale;
+ insert_Make_Block_Circle.xy_rotation=xy_rotation;
+ insert_Make_Block_Circle.Name_insert=Name_insert;
+ insert_Make_Block_Circle.Insert_block_nr=Insert_block_nr;
+
+ insert_Make_Block_Circle.block_color="green";
+ insert_Make_Block_Circle.block_filling="none";
+ insert_Make_Block_Circle.block_line_weight="thin";
+ insert_Make_Block_Circle.block_antialias="false";
+
+ Result_insert.append(insert_Make_Block_Circle.Make_Block_Circle());
+
+ /* Block ELLIPSE */
+
+ insert_Make_Block_Ellipse.x_insert=x_insert;
+ insert_Make_Block_Ellipse.y_insert=y_insert;
+ insert_Make_Block_Ellipse.x_insert_scale=x_insert_scale;
+ insert_Make_Block_Ellipse.y_insert_scale=y_insert_scale;
+ insert_Make_Block_Ellipse.xy_rotation=xy_rotation;
+ insert_Make_Block_Ellipse.Name_insert=Name_insert;
+ insert_Make_Block_Ellipse.Insert_block_nr=Insert_block_nr;
+
+ insert_Make_Block_Ellipse.block_color="green";
+ insert_Make_Block_Ellipse.block_filling="none";
+ insert_Make_Block_Ellipse.block_line_weight="thin";
+ insert_Make_Block_Ellipse.block_antialias="false";
+
+
+ Result_insert.append(insert_Make_Block_Ellipse.Make_Block_Ellipse());
+
+ /* Block POLYLINE */
+
+ insert_Make_Block_Polyline.x_insert=x_insert;
+ insert_Make_Block_Polyline.y_insert=y_insert;
+ insert_Make_Block_Polyline.x_insert_scale=x_insert_scale;
+ insert_Make_Block_Polyline.y_insert_scale=y_insert_scale;
+ insert_Make_Block_Polyline.xy_rotation=xy_rotation;
+ insert_Make_Block_Polyline.Name_insert=Name_insert;
+ insert_Make_Block_Polyline.Insert_block_nr=Insert_block_nr;
+
+ insert_Make_Block_Polyline.block_color="cyan";
+ insert_Make_Block_Polyline.block_filling="none";
+ insert_Make_Block_Polyline.block_line_weight="thin";
+ insert_Make_Block_Polyline.block_line_style="normal";
+
+ Result_insert.append(insert_Make_Block_Polyline.Make_Block_Polyline());
+
+ /* Block LWPOLYLINE */
+
+ insert_Make_Block_Lwpolyline.x_insert=x_insert;
+ insert_Make_Block_Lwpolyline.y_insert=y_insert;
+ insert_Make_Block_Lwpolyline.x_insert_scale=x_insert_scale;
+ insert_Make_Block_Lwpolyline.y_insert_scale=y_insert_scale;
+ insert_Make_Block_Lwpolyline.xy_rotation=xy_rotation;
+ insert_Make_Block_Lwpolyline.Name_insert=Name_insert;
+ insert_Make_Block_Lwpolyline.Insert_block_nr=Insert_block_nr;
+
+ insert_Make_Block_Lwpolyline.block_color="orange";
+ insert_Make_Block_Lwpolyline.block_filling="none";
+ insert_Make_Block_Lwpolyline.block_line_weight="thin";
+ insert_Make_Block_Lwpolyline.block_line_style="normal";
+
+ Result_insert.append(insert_Make_Block_Lwpolyline.Make_Block_Lwpolyline());
+
+ /* Block ATTDEF */
+
+ insert_Make_Block_Attdef.x_insert=x_insert;
+ insert_Make_Block_Attdef.y_insert=y_insert;
+ insert_Make_Block_Attdef.x_insert_scale=x_insert_scale;
+ insert_Make_Block_Attdef.y_insert_scale=y_insert_scale;
+ insert_Make_Block_Attdef.xy_rotation=xy_rotation;
+ insert_Make_Block_Attdef.Name_insert=Name_insert;
+ insert_Make_Block_Attdef.Insert_block_nr=Insert_block_nr;
+
+ insert_Make_Block_Attdef.block_color="green";
+ insert_Make_Block_Attdef.block_filling="none";
+ insert_Make_Block_Attdef.block_line_weight="thin";
+ insert_Make_Block_Attdef.block_color_attdef="green";
+
+ Result_insert.append(insert_Make_Block_Attdef.Make_Block_Attdef());
+
+ /* Block ATTRIB*/
+
+ insert_Make_Block_Attribute.x_insert=x_insert;
+ insert_Make_Block_Attribute.y_insert=y_insert;
+ insert_Make_Block_Attribute.x_insert_scale=x_insert_scale;
+ insert_Make_Block_Attribute.y_insert_scale=y_insert_scale;
+ insert_Make_Block_Attribute.xy_rotation=xy_rotation;
+ insert_Make_Block_Attribute.Name_insert=Name_insert;
+ insert_Make_Block_Attribute.Insert_block_nr=Insert_block_nr;
+
+ insert_Make_Block_Attribute.block_color="green";
+ insert_Make_Block_Attribute.block_filling="none";
+ insert_Make_Block_Attribute.block_line_weight="thin";
+ insert_Make_Block_Attribute.block_rotate="true";
+ insert_Make_Block_Attribute.block_color_attrib="green";
+
+ Result_insert.append(insert_Make_Block_Attribute.Make_Block_Attri());
+
+ /* Block TEXT*/
+
+ insert_Make_Block_Text.x_insert=x_insert;
+ insert_Make_Block_Text.y_insert=y_insert;
+ insert_Make_Block_Text.x_insert_scale=x_insert_scale;
+ insert_Make_Block_Text.y_insert_scale=y_insert_scale;
+ insert_Make_Block_Text.xy_rotation=xy_rotation;
+ insert_Make_Block_Text.Name_insert=Name_insert;
+ insert_Make_Block_Text.Insert_block_nr=Insert_block_nr;
+
+ insert_Make_Block_Text.block_color="green";
+ insert_Make_Block_Text.block_filling="none";
+ insert_Make_Block_Text.block_line_weight="thin";
+
+
+ Result_insert.append(insert_Make_Block_Text.Make_Block_Text());
+
+ /* end of block */
+
+ Count_lines=Count_lines+1;
+
+ }
+
+
+
+ }
+
+ return Result_insert;
+
+}
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.h 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.h 2016-02-01 20:38:39 UTC (rev 4339)
@@ -4,12 +4,39 @@
//#include <QMainWindow>
#include <QWidget>
+#include "src/dxf_block/dxf_block_lines.h"
+#include "src/dxf_block/dxf_block_arc.h"
+#include "src/dxf_block/dxf_block_circle.h"
+#include "src/dxf_block/dxf_block_ellipse.h"
+#include "src/dxf_block/dxf_block_polyline.h"
+#include "src/dxf_block/dxf_block_lwpolyline.h"
+#include "src/dxf_block/dxf_block_attdef.h"
+#include "src/dxf_block/dxf_block_attribute.h"
+#include "src/dxf_block/dxf_block_text.h"
+
class dxf_entitie_insert : public QWidget // QMainWindow
{
Q_OBJECT
public:
explicit dxf_entitie_insert(QWidget *parent = 0);
+ QString Result_insert;
+ QString Name_insert;
+
+ int Count_lines;
+ int Count_entitie_insert;
+ int Insert_block_nr;
+ int Block_counter;
+
+ double x_insert;
+ double y_insert;
+
+ double x_insert_scale;
+ double y_insert_scale;
+
+ double xy_rotation;
+
+ QString dxf_entitie_make_insert();
signals:
public slots:
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.cpp 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.cpp 2016-02-01 20:38:39 UTC (rev 4339)
@@ -1,7 +1,84 @@
#include "dxf_entitie_lwpolyline.h"
+
+extern struct DXF_base DXF_main_base[1];
+extern struct DXF_entities_lwpolyline DXF_input_entities_lwpolyline[1000];
+extern struct DXF_entities_vertex DXF_input_entities_vertex[5000];
+
dxf_entitie_lwpolyline::dxf_entitie_lwpolyline(QWidget *parent) : QWidget(parent)
{
}
+QString dxf_entitie_lwpolyline::dxf_entitie_make_lwpolyline()
+{
+ dxf_lwpolyline db_lwpolyline;
+
+
+ Result_lwpolyline="";
+
+ Count_lines=0;
+ count_vertex=1;
+
+ while (Count_lines<=Count_entitie_lwpolyline)
+ {
+ vector_max=DXF_input_entities_lwpolyline[Count_lines].DXF_entities_lwpolyline_code_90;
+
+ if(vector_max>0)
+ {
+ //vector_max=vector_max+1;
+
+
+ for(counter_x=0;counter_x<vector_max;counter_x++)
+ {
+
+
+ db_lwpolyline.x_vector[count_vertex]=DXF_input_entities_lwpolyline[Count_lines].DXF_entities_lwpolyline_code_10[counter_x];
+ db_lwpolyline.y_vector[count_vertex]=-DXF_input_entities_lwpolyline[Count_lines].DXF_entities_lwpolyline_code_20[counter_x];
+ count_vertex=count_vertex+1;
+
+ if (count_vertex>49)
+ {
+ counter_x=vector_max+2;
+ }
+ if (count_vertex>vector_max+1)
+ {
+ counter_x=vector_max+2;
+ }
+
+ }
+
+ db_lwpolyline.vector_count=vector_max;
+
+ db_lwpolyline.antialias=Entitie_antialias; // false
+ db_lwpolyline.line_style=Entitie_line_style; // normal
+ db_lwpolyline.line_weight=Entitie_line_weight; // thin
+ db_lwpolyline.filling=Entitie_filling; // none
+ db_lwpolyline.color=Entitie_color; // orange
+ db_lwpolyline.closed=DXF_input_entities_lwpolyline[Count_lines].DXF_entities_lwpolyline_code_70;
+
+
+ db_lwpolyline.ltype=DXF_input_entities_lwpolyline[Count_lines].DXF_entities_lwpolyline_code_6;
+ db_lwpolyline.layer=DXF_input_entities_lwpolyline[Count_lines].DXF_entities_lwpolyline_code_8;
+
+
+
+
+ Result_lwpolyline.append(db_lwpolyline.Create_LWPOLYLINE());
+
+ Count_lines=Count_lines+1;
+ count_vertex=1;
+ counter_x=0;
+
+ }
+ else
+ {
+ Count_lines=Count_lines+1;
+ }
+
+
+
+ }
+
+ return Result_lwpolyline;
+}
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.h 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.h 2016-02-01 20:38:39 UTC (rev 4339)
@@ -3,6 +3,10 @@
//#include <QMainWindow>
#include <QWidget>
+#include "src/dxf/dxf_lwpolyline.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+#include "src/dxf_control/dxf_text_control.h"
class dxf_entitie_lwpolyline : public QWidget // QMainWindow
{
@@ -10,6 +14,24 @@
public:
explicit dxf_entitie_lwpolyline(QWidget *parent = 0);
+ QString Result_lwpolyline;
+ QString Entitie_color; // black
+ QString Entitie_line_weight;
+ QString Entitie_line_style;
+ QString Entitie_filling;
+ QString Entitie_antialias;
+ QString Entitie_rotate; // true
+ QString Entitie_tag; // label
+
+ int Count_lines;
+ int Count_entitie_lwpolyline;
+
+ int count_vertex;
+ int Polyline_vertex;
+ int counter_x;
+ int vector_max;
+
+ QString dxf_entitie_make_lwpolyline();
signals:
public slots:
Deleted: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_pint.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_pint.cpp 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_pint.cpp 2016-02-01 20:38:39 UTC (rev 4339)
@@ -1,7 +0,0 @@
-#include "dxf_entitie_pint.h"
-
-dxf_entitie_pint::dxf_entitie_pint(QWidget *parent) : QWidget(parent)
-{
-
-}
-
Deleted: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_pint.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_pint.h 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_pint.h 2016-02-01 20:38:39 UTC (rev 4339)
@@ -1,18 +0,0 @@
-#ifndef DXF_ENTITIE_PINT_H
-#define DXF_ENTITIE_PINT_H
-
-//#include <QMainWindow>
-#include <QWidget>
-
-class dxf_entitie_pint : public QWidget // QMainWindow
-{
- Q_OBJECT
- public:
- explicit dxf_entitie_pint(QWidget *parent = 0);
-
- signals:
-
- public slots:
-};
-
-#endif // DXF_ENTITIE_PINT_H
Added: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_point.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_point.cpp (rev 0)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_point.cpp 2016-02-01 20:38:39 UTC (rev 4339)
@@ -0,0 +1,33 @@
+#include "dxf_entitie_point.h"
+
+extern struct DXF_base DXF_main_base[1];
+extern struct DXF_entities_point DXF_input_entities_point[1000];
+
+dxf_entitie_point::dxf_entitie_point(QWidget *parent) : QWidget(parent)
+{
+
+}
+
+QString dxf_entitie_point::dxf_entitie_make_point()
+{
+ Result_point="";
+
+ dxf_point db_point;
+
+ Count_lines=0;
+
+ while (Count_lines<=Count_entitie_point)
+ {
+
+ db_point.x1=DXF_input_entities_point[Count_lines].DXF_entities_point_code_10;
+ db_point.y1=-DXF_input_entities_point[Count_lines].DXF_entities_point_code_20;
+ db_point.orientation=Entitie_orientation;
+
+ Result_point.append(db_point.Create_POINT());
+
+ Count_lines=Count_lines+1;
+ }
+
+ return Result_point;
+
+}
Added: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_point.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_point.h (rev 0)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_point.h 2016-02-01 20:38:39 UTC (rev 4339)
@@ -0,0 +1,34 @@
+#ifndef DXF_ENTITIE_POINT_H
+#define DXF_ENTITIE_POINT_H
+
+#include <QWidget>
+#include "src/dxf/dxf_point.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+#include "src/dxf_control/dxf_text_control.h"
+
+class dxf_entitie_point : public QWidget
+{
+ Q_OBJECT
+ public:
+ explicit dxf_entitie_point(QWidget *parent = 0);
+
+ QString Result_point;
+ QString Entitie_color; // black
+ QString Entitie_line_weight;
+ QString Entitie_filling;
+ QString Entitie_antialias;
+ QString Entitie_rotate; // true
+ QString Entitie_tag; // label
+ QString Entitie_orientation; // n
+
+ int Count_lines;
+ int Count_entitie_point;
+
+ QString dxf_entitie_make_point();
+ signals:
+
+ public slots:
+};
+
+#endif // DXF_ENTITIE_POINT_H
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.cpp 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.cpp 2016-02-01 20:38:39 UTC (rev 4339)
@@ -1,7 +1,77 @@
#include "dxf_entitie_polyline.h"
+extern struct DXF_base DXF_main_base[1];
+extern struct DXF_entities_polyline DXF_input_entities_polyline[1000];
+extern struct DXF_entities_vertex DXF_input_entities_vertex[5000];
+
dxf_entitie_polyline::dxf_entitie_polyline(QWidget *parent) : QWidget(parent)
{
}
+QString dxf_entitie_polyline::dxf_entitie_make_polyline()
+{
+
+ /* read out table and pas values to xml creator */
+
+ dxf_polyline db_polyline;
+
+ Polyline_vertex=DXF_main_base[0].DXF_entities_vertex_count;
+
+ Result_polyline="";
+
+ Count_lines=0;
+ count_vertex=1;
+
+ while (Count_lines<Count_entitie_polyline)
+ {
+
+ for(counter_x=0;counter_x<Polyline_vertex;counter_x++)
+ {
+
+ if (DXF_input_entities_vertex[counter_x].Master_handle_id==DXF_input_entities_polyline[Count_lines].DXF_entities_polyline_code_5)
+ {
+ db_polyline.x_vector[count_vertex]=DXF_input_entities_vertex[counter_x].DXF_entities_vertex_code_10;
+ db_polyline.y_vector[count_vertex]=-DXF_input_entities_vertex[counter_x].DXF_entities_vertex_code_20;
+ count_vertex=count_vertex+1;
+ }
+ if (count_vertex>499)
+ {
+ counter_x=Polyline_vertex+1;
+ }
+ if (count_vertex>Polyline_vertex)
+ {
+ counter_x=Polyline_vertex+1;
+ }
+
+ }
+
+ db_polyline.vector_count=count_vertex-1;
+
+ db_polyline.antialias=Entitie_antialias; // false
+ db_polyline.line_style=Entitie_line_style; // normal
+ db_polyline.line_weight=Entitie_line_weight; // thin
+ db_polyline.filling=Entitie_filling; // none
+ db_polyline.color=Entitie_color; // red
+ db_polyline.closed=DXF_input_entities_polyline[Count_lines].DXF_entities_polyline_code_70;
+
+
+ db_polyline.ltype=DXF_input_entities_polyline[Count_lines].DXF_entities_polyline_code_6;
+ db_polyline.layer=DXF_input_entities_polyline[Count_lines].DXF_entities_polyline_code_8;
+
+
+
+
+ Result_polyline.append(db_polyline.Create_POLYLINE());
+
+ Count_lines=Count_lines+1;
+ count_vertex=1;
+ counter_x=0;
+
+
+
+
+ }
+
+ return Result_polyline;
+}
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.h 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.h 2016-02-01 20:38:39 UTC (rev 4339)
@@ -3,6 +3,10 @@
//#include <QMainWindow>
#include <QWidget>
+#include "src/dxf/dxf_polyline.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+#include "src/dxf_control/dxf_text_control.h"
class dxf_entitie_polyline : public QWidget // QMainWindow
{
@@ -10,6 +14,24 @@
public:
explicit dxf_entitie_polyline(QWidget *parent = 0);
+ QString Result_polyline;
+ QString Entitie_color; // black
+ QString Entitie_line_weight;
+ QString Entitie_line_style;
+ QString Entitie_filling;
+ QString Entitie_antialias;
+ QString Entitie_rotate; // true
+ QString Entitie_tag; // label
+
+ int Count_lines;
+ int Count_entitie_polyline;
+
+ int count_vertex;
+ int Polyline_vertex;
+ int counter_x;
+
+
+ QString dxf_entitie_make_polyline();
signals:
public slots:
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_text.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_text.cpp 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_text.cpp 2016-02-01 20:38:39 UTC (rev 4339)
@@ -1,7 +1,43 @@
#include "dxf_entitie_text.h"
+extern struct DXF_base DXF_main_base[1];
+extern struct DXF_entities_text DXF_input_entities_text[1000];
+
dxf_entitie_text::dxf_entitie_text(QWidget *parent) : QWidget(parent)
{
}
+QString dxf_entitie_text::dxf_entitie_make_text()
+{
+ dxf_text db_text;
+ DXF_Text_control db_txt_check;
+
+ Result_text="";
+
+ Count_lines=0;
+
+ while (Count_lines<=Count_entitie_text)
+ {
+
+ db_text.QET_x=DXF_input_entities_text[Count_lines].DXF_entities_text_code_10;
+ db_text.QET_y=-DXF_input_entities_text[Count_lines].DXF_entities_text_code_20;
+ db_text.QET_rotation=DXF_input_entities_text[Count_lines].DXF_entities_text_code_50;
+ db_text.QET_size=DXF_input_entities_text[Count_lines].DXF_entities_text_code_40;
+ db_text.QET_color=Entitie_color;
+
+
+ db_txt_check.TextToCheck=DXF_input_entities_text[Count_lines].DXF_entities_text_code_1;
+
+ db_text.QET_text=db_txt_check.Text_control();
+
+ Result_text.append(db_text.Create_Text());
+
+ Count_lines=Count_lines+1;
+
+
+ }
+
+ return Result_text;
+
+}
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_text.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_text.h 2016-01-31 19:06:36 UTC (rev 4338)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_text.h 2016-02-01 20:38:39 UTC (rev 4339)
@@ -3,6 +3,10 @@
//#include <QMainWindow>
#include <QWidget>
+#include "src/dxf/dxf_text.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+#include "src/dxf_control/dxf_text_control.h"
class dxf_entitie_text : public QWidget // QMainWindow
{
@@ -10,6 +14,18 @@
public:
explicit dxf_entitie_text(QWidget *parent = 0);
+ QString Result_text;
+ QString Entitie_color; // black
+ QString Entitie_line_weight;
+ QString Entitie_filling;
+ QString Entitie_antialias;
+ QString Entitie_rotate; // true
+ QString Entitie_tag; // label
+
+ int Count_lines;
+ int Count_entitie_text;
+
+ QString dxf_entitie_make_text();
signals:
public slots: