| [qet] [4335] dxftoqet : update block conversion |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4335
Author: rdsivd
Date: 2016-01-24 17:40:44 +0100 (Sun, 24 Jan 2016)
Log Message:
-----------
dxftoqet : update block conversion
Modified Paths:
--------------
branches/dxftoqet2/DXFtoQET.pro
branches/dxftoqet2/dxf_create_elmt.cpp
branches/dxftoqet2/dxf_create_elmt.h
branches/dxftoqet2/src/dxf/dxf_polyline.cpp
branches/dxftoqet2/src/dxf_data.h
branches/dxftoqet2/src/dxf_split.cpp
branches/dxftoqet2/src/dxf_split.h
Added Paths:
-----------
branches/dxftoqet2/src/dxf_block/
branches/dxftoqet2/src/dxf_block/dxf_block_arc.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_arc.h
branches/dxftoqet2/src/dxf_block/dxf_block_attdef.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_attdef.h
branches/dxftoqet2/src/dxf_block/dxf_block_attribute.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_attribute.h
branches/dxftoqet2/src/dxf_block/dxf_block_circle.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_circle.h
branches/dxftoqet2/src/dxf_block/dxf_block_ellipse.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_ellipse.h
branches/dxftoqet2/src/dxf_block/dxf_block_lines.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_lines.h
branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.h
branches/dxftoqet2/src/dxf_block/dxf_block_polyline.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_polyline.h
branches/dxftoqet2/src/dxf_block/dxf_block_text.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_text.h
Modified: branches/dxftoqet2/DXFtoQET.pro
===================================================================
--- branches/dxftoqet2/DXFtoQET.pro 2016-01-22 00:03:00 UTC (rev 4334)
+++ branches/dxftoqet2/DXFtoQET.pro 2016-01-24 16:40:44 UTC (rev 4335)
@@ -46,7 +46,16 @@
src/dxf_base_types/dxf_base_ellipse.cpp \
src/dxf_base_types/dxf_base_polyline.cpp \
src/dxf/dxf_polyline.cpp \
- src/dxf/dxf_lwpolyline.cpp
+ src/dxf/dxf_lwpolyline.cpp \
+ src/dxf_block/dxf_block_lines.cpp \
+ src/dxf_block/dxf_block_arc.cpp \
+ src/dxf_block/dxf_block_circle.cpp \
+ src/dxf_block/dxf_block_ellipse.cpp \
+ src/dxf_block/dxf_block_polyline.cpp \
+ src/dxf_block/dxf_block_lwpolyline.cpp \
+ src/dxf_block/dxf_block_attdef.cpp \
+ src/dxf_block/dxf_block_attribute.cpp \
+ src/dxf_block/dxf_block_text.cpp
HEADERS += dxftoqet_mainwindow.h \
src/dxf_data.h \
@@ -80,7 +89,16 @@
src/dxf_base_types/dxf_base_ellipse.h \
src/dxf_base_types/dxf_base_polyline.h \
src/dxf/dxf_polyline.h \
- src/dxf/dxf_lwpolyline.h
+ src/dxf/dxf_lwpolyline.h \
+ src/dxf_block/dxf_block_lines.h \
+ src/dxf_block/dxf_block_arc.h \
+ src/dxf_block/dxf_block_circle.h \
+ src/dxf_block/dxf_block_ellipse.h \
+ src/dxf_block/dxf_block_polyline.h \
+ src/dxf_block/dxf_block_lwpolyline.h \
+ src/dxf_block/dxf_block_attdef.h \
+ src/dxf_block/dxf_block_attribute.h \
+ src/dxf_block/dxf_block_text.h
FORMS += dxftoqet_mainwindow.ui
Modified: branches/dxftoqet2/dxf_create_elmt.cpp
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.cpp 2016-01-22 00:03:00 UTC (rev 4334)
+++ branches/dxftoqet2/dxf_create_elmt.cpp 2016-01-24 16:40:44 UTC (rev 4335)
@@ -761,6 +761,16 @@
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)
{
@@ -803,40 +813,159 @@
/* Block LINES */
- Result_insert.append(Make_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 */
- Result_insert.append(Make_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 */
- Result_insert.append(Make_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 */
- Result_insert.append(Make_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 */
- Result_insert.append(Make_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 */
- Result_insert.append(Make_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 */
- Result_insert.append(Make_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*/
- Result_insert.append(Make_Block_ATTR());
+ 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*/
- Result_insert.append(Make_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;
@@ -850,7 +979,7 @@
return Result_insert;
}
- QString DXF_create_elmt::Make_Block_LINES()
+/* QString DXF_create_elmt::Make_Block_LINES()
{
Result_Block_Lines="";
Count_lines_block2=0;
@@ -881,9 +1010,9 @@
return Result_Block_Lines;
- }
+ }*/
- QString DXF_create_elmt::Make_Block_ARC()
+/* QString DXF_create_elmt::Make_Block_ARC()
{
Result_Block_Arc="";
Count_lines_block2=0;
@@ -920,9 +1049,9 @@
return Result_Block_Arc;
- }
+ }*/
- QString DXF_create_elmt::Make_Block_CIRCLE()
+ /*QString DXF_create_elmt::Make_Block_CIRCLE()
{
Result_Block_Circle="";
Count_lines_block2=0;
@@ -954,9 +1083,9 @@
return Result_Block_Circle;
- }
+ }*/
- QString DXF_create_elmt::Make_block_ELLIPSE()
+ /*QString DXF_create_elmt::Make_block_ELLIPSE()
{
Result_Block_ellipse="";
Count_lines_block2=0;
@@ -992,9 +1121,9 @@
return Result_Block_ellipse;
- }
+ }*/
- QString DXF_create_elmt::Make_Block_POLYLINE()
+/* QString DXF_create_elmt::Make_Block_POLYLINE()
{
Result_Block_polyline="";
Count_lines_block2=0;
@@ -1067,11 +1196,11 @@
return Result_Block_polyline;
- }
+ }*/
- QString DXF_create_elmt::Make_Block_LWPOLYLINE()
+/* QString DXF_create_elmt::Make_Block_LWPOLYLINE()
{
- /* prepare polygon from block items */
+ // prepare polygon from block items
dxf_lwpolyline dxb_lwpolyline;
@@ -1155,9 +1284,9 @@
return Result_Block_lwpolyline;
- }
+ }*/
- QString DXF_create_elmt::Make_Block_ATTDEF()
+/* QString DXF_create_elmt::Make_Block_ATTDEF()
{
Count_lines_block2=0;
@@ -1190,9 +1319,9 @@
}
return Result_Block_attdef;
- }
+ }*/
- QString DXF_create_elmt::Make_Block_ATTR()
+ /*QString DXF_create_elmt::Make_Block_ATTR()
{
Count_lines_block2=0;
@@ -1223,9 +1352,9 @@
}
return Result_Block_attr;
- }
+ }*/
- QString DXF_create_elmt::Make_Block_TEXT()
+ /*QString DXF_create_elmt::Make_Block_TEXT()
{
Count_lines_block2=0;
Result_Block_Text="";
@@ -1251,4 +1380,101 @@
Count_lines_block2=Count_lines_block2+1;
}
return Result_Block_Text;
+ }*/
+
+ QString DXF_create_elmt::Make_Block_INSERT()
+ {
+ Result_insert2="";
+
+ Count_lines3=0;
+
+ /*while (Count_lines3<=Count_entitie_insert)
+ {
+
+ if (DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_2 == "")
+ {
+ Count_lines3=Count_lines3+1;
+
+ }
+ else
+ {
+
+ x_insert2=0;
+ y_insert2=0;
+ x_insert_scale2=1;
+ y_insert_scale2=1;
+
+
+ Insert_block_nr2=Count_lines3;
+
+ x_insert2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_10;
+ y_insert2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_20;
+ x_insert_scale2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_41;
+ y_insert_scale2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_42;
+
+ xy_rotation2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_50;
+ Name_insert2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_2;
+
+ for (Block_counter2=0;Block_counter2<=Count_entitie_insert;Block_counter2++)
+ {
+ if(Name_insert2==DXF_input_table_block_record[Block_counter2].dxf_table_block_record_code_2)
+ {
+ Insert_block_nr2=Block_counter2;
+ Block_counter2=Count_entitie_insert+1;
+ }
+
+
+ }*/
+
+
+
+ /* Block LINES */
+
+ //Result_insert.append(Make_Block_LINES());
+
+ /* Block ARC */
+
+ //Result_insert.append(Make_Block_ARC());
+
+ /* Block CIRCLE */
+
+ //Result_insert.append(Make_Block_CIRCLE());
+
+ /* Block ELLIPSE */
+
+ //Result_insert.append(Make_block_ELLIPSE());
+
+ /* Block POLYLINE */
+
+ //Result_insert.append(Make_Block_POLYLINE());
+
+ /* Block LWPOLYLINE */
+
+ //Result_insert.append(Make_Block_LWPOLYLINE());
+
+ /* Block ATTDEF */
+
+ //Result_insert.append(Make_Block_ATTDEF());
+
+ /* Block ATTRIB*/
+
+ //Result_insert.append(Make_Block_ATTR());
+
+ /* Block TEXT*/
+
+ //Result_insert.append(Make_Block_TEXT());
+
+ /* end of block */
+
+ //Count_lines2=Count_lines2+1;
+
+ //}
+
+
+
+ //}
+
+ return Result_insert2;
+
+
}
Modified: branches/dxftoqet2/dxf_create_elmt.h
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.h 2016-01-22 00:03:00 UTC (rev 4334)
+++ branches/dxftoqet2/dxf_create_elmt.h 2016-01-24 16:40:44 UTC (rev 4335)
@@ -2,21 +2,30 @@
#define DXF_CREATE_ELMT_H
#include <QMainWindow>
-#include "dxf_data.h"
-#include "qet_base_types/baseelmt.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
#include "dxftoqet_mainwindow.h"
#include "ui_dxftoqet_mainwindow.h"
-#include "dxf/dxf_line.h"
-#include "dxf/dxf_point.h"
-#include "dxf/dxf_attdef.h"
-#include "dxf/dxf_arc.h"
-#include "dxf/dxf_circle.h"
-#include "dxf/dxf_attr.h"
-#include "dxf/dxf_text.h"
-#include "dxf/dxf_ellipse.h"
-#include "dxf/dxf_polyline.h"
-#include "dxf/dxf_lwpolyline.h"
+#include "src/dxf/dxf_line.h"
+#include "src/dxf/dxf_point.h"
+#include "src/dxf/dxf_attdef.h"
+#include "src/dxf/dxf_arc.h"
+#include "src/dxf/dxf_circle.h"
+#include "src/dxf/dxf_attr.h"
+#include "src/dxf/dxf_text.h"
+#include "src/dxf/dxf_ellipse.h"
+#include "src/dxf/dxf_polyline.h"
+#include "src/dxf/dxf_lwpolyline.h"
+#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_create_elmt : public QMainWindow
{
@@ -39,7 +48,7 @@
QString Make_POLYLINE();
QString Make_LWPOLYLINE();
- QString Make_Block_LINES();
+ //QString Make_Block_LINES();
QString Make_Block_ARC();
QString Make_Block_ATTDEF();
QString Make_Block_ATTR();
@@ -51,6 +60,7 @@
QString Make_Block_POLYLINE();
QString Make_Block_LWPOLYLINE();
QString Make_Block_TEXT();
+ //QString Make_Block_INSERT();
QString Result;
QString Result_line;
@@ -65,6 +75,7 @@
QString Result_ellipse;
QString Result_ellipse2;
QString Result_insert;
+ QString Result_insert2;
QString Result_polyline;
QString Result_lwpolyline;
@@ -94,6 +105,7 @@
int count_vertex2;
int vector_max2;
int Count_lines2;
+ int Count_lines3;
int Count_block_polyline;
int Count_block_lwpolyline2;
@@ -113,10 +125,13 @@
int Count_lines;
int Count_lines_block;
int Count_lines_block2;
+ int Count_lines_block3;
int Count_for;
int Insert_block_nr;
+ int Insert_block_nr2;
int Block_counter;
+ int Block_counter2;
int32_t Polyline_vertex;
int Block_Polyline_vertex;
@@ -132,7 +147,16 @@
QString Name_insert;
+ double x_insert2;
+ double y_insert2;
+ double x_insert_scale2;
+ double y_insert_scale2;
+
+ double xy_rotation2;
+
+ QString Name_insert2;
+
signals:
public slots:
Modified: branches/dxftoqet2/src/dxf/dxf_polyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_polyline.cpp 2016-01-22 00:03:00 UTC (rev 4334)
+++ branches/dxftoqet2/src/dxf/dxf_polyline.cpp 2016-01-24 16:40:44 UTC (rev 4335)
@@ -21,6 +21,8 @@
db_polyline.QET_line_weight=line_weight;
db_polyline.QET_filling=filling;
db_polyline.QET_color=color;
+
+
if (closed==1)
{
db_polyline.QET_closed="true";
@@ -35,9 +37,9 @@
db_polyline.QET_x[count]=x_vector[count];
db_polyline.QET_y[count]=y_vector[count];
-
}
+
db_polyline.segments=vector_count;
Result_polyline.append(db_polyline.Create_polyline());
Added: branches/dxftoqet2/src/dxf_block/dxf_block_arc.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_arc.cpp (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_arc.cpp 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,50 @@
+#include "dxf_block_arc.h"
+
+extern struct DXF_base DXF_main_base[1];
+extern struct DXF_block_arc DXF_input_block_arc[100][50];
+
+dxf_block_arc::dxf_block_arc(QWidget *parent) : QMainWindow(parent)
+{
+
+}
+
+QString dxf_block_arc::Make_Block_Arc()
+{
+ Result_Block_Arc="";
+ Count_lines_block2=0;
+
+ dxf_arc dxb_arc;
+
+ while(Count_lines_block2<DXF_main_base[0].DXF_block_arc_count[Insert_block_nr])
+ {
+
+ dxb_arc.center_x=x_insert+(DXF_input_block_arc[Insert_block_nr][Count_lines_block2].DXF_block_arc_code_10*x_insert_scale);
+ dxb_arc.center_y=(-y_insert)+(-(DXF_input_block_arc[Insert_block_nr][Count_lines_block2].DXF_block_arc_code_20*y_insert_scale));
+ dxb_arc.radius=(DXF_input_block_arc[Insert_block_nr][Count_lines_block2].DXF_block_arc_code_40*x_insert_scale);
+
+ dxb_arc.start_angle=DXF_input_block_arc[Insert_block_nr][Count_lines_block2].DXF_block_arc_code_50;
+ dxb_arc.end_angle=DXF_input_block_arc[Insert_block_nr][Count_lines_block2].DXF_block_arc_code_51;
+
+ dxb_arc.layer=DXF_input_block_arc[Insert_block_nr][Count_lines_block2].DXF_block_arc_code_8;
+ dxb_arc.ltype=DXF_input_block_arc[Insert_block_nr][Count_lines_block2].DXF_block_arc_code_6;
+ dxb_arc.color_dxf=-1;
+ dxb_arc.color=block_color;
+ dxb_arc.antialias=block_antialias;
+ dxb_arc.filling=block_filling;
+ dxb_arc.line_weight=block_line_weight;
+
+
+
+ Result_Block_Arc.append(dxb_arc.Create_ARC());
+
+
+
+ Count_lines_block2=Count_lines_block2+1;
+
+ }
+
+
+ return Result_Block_Arc;
+
+
+}
Added: branches/dxftoqet2/src/dxf_block/dxf_block_arc.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_arc.h (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_arc.h 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,41 @@
+#ifndef DXF_BLOCK_ARC_H
+#define DXF_BLOCK_ARC_H
+
+#include <QMainWindow>
+#include "dxf/dxf_arc.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+
+class dxf_block_arc : public QMainWindow
+{
+ Q_OBJECT
+ public:
+ explicit dxf_block_arc(QWidget *parent = 0);
+
+ QString Result_Block_Arc;
+ int Count_lines_block2;
+ int Insert_block_nr;
+
+ double x_insert;
+ double y_insert;
+
+ double x_insert_scale;
+ double y_insert_scale;
+
+ double xy_rotation;
+
+ QString Name_insert;
+
+ QString block_color; //black
+ QString block_line_weight; //thin
+ QString block_filling; //none
+ QString block_antialias; // false
+
+ QString Make_Block_Arc();
+
+ signals:
+
+ public slots:
+};
+
+#endif // DCF_BLOCK_ARC_H
Added: branches/dxftoqet2/src/dxf_block/dxf_block_attdef.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_attdef.cpp (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_attdef.cpp 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,45 @@
+#include "dxf_block_attdef.h"
+
+extern struct DXF_base DXF_main_base[1];
+extern struct DXF_block_attdef DXF_input_block_attdef[100][50];
+
+dxf_block_attdef::dxf_block_attdef(QWidget *parent) : QMainWindow(parent)
+{
+
+
+}
+
+QString dxf_block_attdef::Make_Block_Attdef()
+{
+
+ Count_lines_block2=0;
+ Result_Block_attdef="";
+
+ dxf_attdef dxb_attdef3;
+ DXF_Text_control db_txt_check4;
+
+
+ while(Count_lines_block2<DXF_main_base[0].DXF_block_attdef_count[Insert_block_nr])
+ {
+
+ dxb_attdef3.x=DXF_input_block_attdef[Insert_block_nr][Count_lines_block2].DXF_block_attdef_code_10;
+ dxb_attdef3.y=-DXF_input_block_attdef[Insert_block_nr][Count_lines_block2].DXF_block_attdef_code_20;
+ dxb_attdef3.rotation=DXF_input_block_attdef[Insert_block_nr][Count_lines_block2].DXF_block_attdef_code_50;
+ dxb_attdef3.size=DXF_input_block_attdef[Insert_block_nr][Count_lines_block2].DXF_block_attdef_code_40*((x_insert_scale+y_insert_scale)/2);
+ dxb_attdef3.tag="label"; //DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_2;
+ dxb_attdef3.rotate=block_rotate;
+ dxb_attdef3.color_attdef=block_color_attdef;
+
+ db_txt_check4.TextToCheck=DXF_input_block_attdef[Insert_block_nr][Count_lines_block2].DXF_block_attdef_code_1;
+
+ dxb_attdef3.text=db_txt_check4.Text_control();
+
+ Result_Block_attdef.append(dxb_attdef3.Create_ATTDEF());
+
+ Count_lines_block2=Count_lines_block2+1;
+
+
+ }
+
+ return Result_Block_attdef;
+}
Added: branches/dxftoqet2/src/dxf_block/dxf_block_attdef.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_attdef.h (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_attdef.h 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,45 @@
+#ifndef DXF_BLOCK_ATTDEF_H
+#define DXF_BLOCK_ATTDEF_H
+
+#include <QMainWindow>
+#include "dxf/dxf_attdef.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+#include "src/dxf_control/dxf_text_control.h"
+
+class dxf_block_attdef : public QMainWindow
+{
+ Q_OBJECT
+ public:
+ explicit dxf_block_attdef(QWidget *parent = 0);
+
+ QString Result_Block_attdef;
+ int Count_lines_block2;
+ int Insert_block_nr;
+
+ double x_insert;
+ double y_insert;
+
+ double x_insert_scale;
+ double y_insert_scale;
+
+ double xy_rotation;
+
+ QString Name_insert;
+
+ QString block_color; //black
+ QString block_line_weight; //thin
+ QString block_filling; //none
+ QString block_antialias; // false
+ QString block_rotate; // true
+ QString block_color_attdef; //
+
+
+ QString Make_Block_Attdef();
+
+ signals:
+
+ public slots:
+};
+
+#endif // DXF_BLOCK_ATTDEF_H
Added: branches/dxftoqet2/src/dxf_block/dxf_block_attribute.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_attribute.cpp (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_attribute.cpp 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,41 @@
+#include "dxf_block_attribute.h"
+
+extern struct DXF_base DXF_main_base[1];
+extern struct DXF_block_attrib DXF_input_block_attrib[100][50];
+
+dxf_block_attribute::dxf_block_attribute(QWidget *parent) : QMainWindow(parent)
+{
+
+}
+
+QString dxf_block_attribute::Make_Block_Attri()
+{
+ Count_lines_block2=0;
+
+ Result_Block_attr="";
+
+ dxf_attr dxb_attr2;
+ DXF_Text_control db_txt_check3;
+
+ while(Count_lines_block2<DXF_main_base[0].DXF_block_attrib_count[Insert_block_nr])
+ {
+
+ dxb_attr2.x=DXF_input_block_attrib[Insert_block_nr][Count_lines_block2].DXF_block_attrib_code_10; // x start
+ dxb_attr2.y=-DXF_input_block_attrib[Insert_block_nr][Count_lines_block2].DXF_block_attrib_code_20; // y start
+ dxb_attr2.rotation=DXF_input_block_attrib[Insert_block_nr][Count_lines_block2].DXF_block_attrib_code_50; //text rotation
+ dxb_attr2.size=DXF_input_block_attrib[Insert_block_nr][Count_lines_block2].DXF_block_attrib_code_40*((x_insert_scale+y_insert_scale)/2); //text height
+ dxb_attr2.tag="label"; //DXF_input_entities_attrib[Count_lines_block2].DXF_entities_attrib_code_2; // tag
+ dxb_attr2.rotate=block_rotate;
+ dxb_attr2.color_attrib=block_color_attrib;
+
+ db_txt_check3.TextToCheck=DXF_input_block_attrib[Insert_block_nr][Count_lines_block2].DXF_block_attrib_code_1; // value
+
+ dxb_attr2.text=db_txt_check3.Text_control();
+
+ Result_Block_attr.append(dxb_attr2.Create_ATTR());
+
+ Count_lines_block2=Count_lines_block2+1;
+ }
+
+ return Result_Block_attr;
+}
Added: branches/dxftoqet2/src/dxf_block/dxf_block_attribute.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_attribute.h (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_attribute.h 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,44 @@
+#ifndef DXF_BLOCK_ATTRIBUTE_H
+#define DXF_BLOCK_ATTRIBUTE_H
+
+#include <QMainWindow>
+#include "src/dxf/dxf_attr.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+#include "src/dxf_control/dxf_text_control.h"
+
+class dxf_block_attribute : public QMainWindow
+{
+ Q_OBJECT
+ public:
+ explicit dxf_block_attribute(QWidget *parent = 0);
+
+ QString Result_Block_attr;
+ int Count_lines_block2;
+ int Insert_block_nr;
+
+ double x_insert;
+ double y_insert;
+
+ double x_insert_scale;
+ double y_insert_scale;
+
+ double xy_rotation;
+
+ QString Name_insert;
+
+ QString block_color; // black
+ QString block_line_weight; // thin
+ QString block_filling; // none
+ QString block_antialias; // false
+ QString block_rotate; // true
+ QString block_color_attrib; // black
+
+ QString Make_Block_Attri();
+
+ signals:
+
+ public slots:
+};
+
+#endif // DXF_BLOCK_ATTRIBUTE_H
Added: branches/dxftoqet2/src/dxf_block/dxf_block_circle.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_circle.cpp (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_circle.cpp 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,44 @@
+#include "dxf_block_circle.h"
+
+extern struct DXF_base DXF_main_base[1];
+extern struct DXF_block_circle DXF_input_block_circle[100][50];
+
+dxf_block_circle::dxf_block_circle(QWidget *parent) : QMainWindow(parent)
+{
+
+}
+
+QString dxf_block_circle::Make_Block_Circle()
+{
+
+ Result_Block_Circle="";
+ Count_lines_block2=0;
+
+ dxf_circle dxb_circle2;
+
+ while(Count_lines_block2<DXF_main_base[0].DXF_block_circle_count[Insert_block_nr])
+ {
+
+ dxb_circle2.x=x_insert+(DXF_input_block_circle[Insert_block_nr][Count_lines_block2].DXF_block_circle_code_10*x_insert_scale);
+ dxb_circle2.y=(-y_insert)+(-(DXF_input_block_circle[Insert_block_nr][Count_lines_block2].DXF_block_circle_code_20*y_insert_scale));
+ dxb_circle2.diameter=((DXF_input_block_circle[Insert_block_nr][Count_lines_block2].DXF_block_circle_code_40*2)*x_insert_scale);
+
+ dxb_circle2.layer=DXF_input_block_circle[Insert_block_nr][Count_lines_block2].DXF_block_circle_code_8;
+ dxb_circle2.ltype=DXF_input_block_circle[Insert_block_nr][Count_lines_block2].DXF_block_circle_code_6;
+ dxb_circle2.color=block_color;
+ dxb_circle2.antialias=block_antialias;
+ dxb_circle2.line_weight=block_line_weight;
+ dxb_circle2.filling=block_filling;
+
+
+
+ Result_Block_Circle.append(dxb_circle2.Create_CIRCLE());
+
+
+ Count_lines_block2=Count_lines_block2+1;
+
+ }
+
+
+ return Result_Block_Circle;
+}
Added: branches/dxftoqet2/src/dxf_block/dxf_block_circle.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_circle.h (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_circle.h 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,41 @@
+#ifndef DXF_BLOCK_CIRCLE_H
+#define DXF_BLOCK_CIRCLE_H
+
+#include <QMainWindow>
+#include "dxf/dxf_circle.h"
+#include "dxf_data.h"
+#include "qet_base_types/baseelmt.h"
+
+class dxf_block_circle : public QMainWindow
+{
+ Q_OBJECT
+ public:
+ explicit dxf_block_circle(QWidget *parent = 0);
+
+ QString Result_Block_Circle;
+ int Count_lines_block2;
+ int Insert_block_nr;
+
+ double x_insert;
+ double y_insert;
+
+ double x_insert_scale;
+ double y_insert_scale;
+
+ double xy_rotation;
+
+ QString Name_insert;
+
+ QString block_color; //black
+ QString block_line_weight; //thin
+ QString block_filling; //none
+ QString block_antialias; // false
+
+ QString Make_Block_Circle();
+
+ signals:
+
+ public slots:
+};
+
+#endif // DXF_BLOCK_CIRCLE_H
Added: branches/dxftoqet2/src/dxf_block/dxf_block_ellipse.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_ellipse.cpp (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_ellipse.cpp 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,46 @@
+#include "dxf_block_ellipse.h"
+
+extern struct DXF_base DXF_main_base[1];
+extern struct DXF_block_ellipse DXF_input_block_ellipse[100][50];
+
+dxf_block_ellipse::dxf_block_ellipse(QWidget *parent) : QMainWindow(parent)
+{
+
+}
+
+QString dxf_block_ellipse::Make_Block_Ellipse()
+{
+
+ Result_Block_ellipse="";
+ Count_lines_block2=0;
+
+ dxf_ellipse dxb_ellipse2;
+
+ while(Count_lines_block2<DXF_main_base[0].DXF_block_ellipse_count[Insert_block_nr])
+ {
+
+ dxb_ellipse2.center_x=x_insert+DXF_input_block_ellipse[Insert_block_nr][Count_lines_block2].DXF_block_ellipse_code_10;
+ dxb_ellipse2.center_y=(-y_insert)+(-DXF_input_block_ellipse[Insert_block_nr][Count_lines_block2].DXF_block_ellipse_code_20);
+ dxb_ellipse2.major_radius_x=DXF_input_block_ellipse[Insert_block_nr][Count_lines_block2].DXF_block_ellipse_code_11;
+ dxb_ellipse2.major_radius_y=-DXF_input_block_ellipse[Insert_block_nr][Count_lines_block2].DXF_block_ellipse_code_21;
+ dxb_ellipse2.ratio_of_minor=DXF_input_block_ellipse[Insert_block_nr][Count_lines_block2].DXF_block_ellipse_code_40;
+ //dxb_ellipse2.rotation=DXF_input_block_ellipse[Insert_block_nr][Count_lines_block2].DXF_block_ellipse_code_50;
+ dxb_ellipse2.start=DXF_input_block_ellipse[Insert_block_nr][Count_lines_block2].DXF_block_ellipse_code_41;
+ dxb_ellipse2.end2=DXF_input_block_ellipse[Insert_block_nr][Count_lines_block2].DXF_block_ellipse_code_42;
+ dxb_ellipse2.LineTypeOFLine=DXF_input_block_ellipse[Insert_block_nr][Count_lines_block2].DXF_block_ellipse_code_6;
+ dxb_ellipse2.LayerNameOFLine=DXF_input_block_ellipse[Insert_block_nr][Count_lines_block2].DXF_block_ellipse_code_8;
+ dxb_ellipse2.Color=block_color;
+ dxb_ellipse2.Line_weight=block_line_weight;
+ dxb_ellipse2.Filling=block_filling;
+
+
+ Result_Block_ellipse.append(dxb_ellipse2.Create_ELLIPSE());
+
+
+ Count_lines_block2=Count_lines_block2+1;
+
+ }
+
+
+ return Result_Block_ellipse;
+}
Added: branches/dxftoqet2/src/dxf_block/dxf_block_ellipse.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_ellipse.h (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_ellipse.h 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,41 @@
+#ifndef DXF_BLOCK_ELLIPSE_H
+#define DXF_BLOCK_ELLIPSE_H
+
+#include <QMainWindow>
+#include "src/dxf/dxf_ellipse.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+
+class dxf_block_ellipse : public QMainWindow
+{
+ Q_OBJECT
+ public:
+ explicit dxf_block_ellipse(QWidget *parent = 0);
+
+ QString Result_Block_ellipse;
+ int Count_lines_block2;
+ int Insert_block_nr;
+
+ double x_insert;
+ double y_insert;
+
+ double x_insert_scale;
+ double y_insert_scale;
+
+ double xy_rotation;
+
+ QString Name_insert;
+
+ QString block_color; //black
+ QString block_line_weight; //thin
+ QString block_filling; //none
+ QString block_antialias; // false
+
+ QString Make_Block_Ellipse();
+
+ signals:
+
+ public slots:
+};
+
+#endif // DXF_BLOCK_ELLIPSE_H
Added: branches/dxftoqet2/src/dxf_block/dxf_block_lines.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_lines.cpp (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_lines.cpp 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,43 @@
+#include "dxf_block_lines.h"
+
+extern struct DXF_base DXF_main_base[1];
+extern struct DXF_block_line DXF_input_block_line[100][50];
+
+dxf_block_lines::dxf_block_lines(QWidget *parent) : QMainWindow(parent)
+{
+
+
+}
+
+QString dxf_block_lines::Make_Block_Lines()
+{
+ Result_Block_Lines="";
+ Count_lines_block2=0;
+
+ DXF_LINE dxb_line;
+
+ while(Count_lines_block2<DXF_main_base[0].DXF_block_line_count[Insert_block_nr])
+ {
+
+
+ dxb_line.x1=x_insert+((DXF_input_block_line[Insert_block_nr][Count_lines_block2].DXF_block_line_code_10)*x_insert_scale);
+ dxb_line.x2=x_insert+((DXF_input_block_line[Insert_block_nr][Count_lines_block2].DXF_block_line_code_11)*x_insert_scale);
+ dxb_line.y1=(-y_insert)+(-(DXF_input_block_line[Insert_block_nr][Count_lines_block2].DXF_block_line_code_20*y_insert_scale));
+ dxb_line.y2=(-y_insert)+(-(DXF_input_block_line[Insert_block_nr][Count_lines_block2].DXF_block_line_code_21*y_insert_scale));
+ dxb_line.ltype=DXF_input_block_line[Insert_block_nr][Count_lines_block2].DXF_block_line_code_6;
+ dxb_line.layer=DXF_input_block_line[Insert_block_nr][Count_lines_block2].DXF_block_line_code_8;
+ dxb_line.color=block_color;
+ dxb_line.line_weight=block_line_weight;
+ dxb_line.filling=block_filling;
+
+
+ Result_Block_Lines.append(dxb_line.Create_LINE());
+
+
+ Count_lines_block2=Count_lines_block2+1;
+
+ }
+
+
+ return Result_Block_Lines;
+}
Added: branches/dxftoqet2/src/dxf_block/dxf_block_lines.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_lines.h (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_lines.h 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,40 @@
+#ifndef DXF_BLOCK_LINES_H
+#define DXF_BLOCK_LINES_H
+
+#include <QMainWindow>
+#include "dxf/dxf_line.h"
+#include "dxf_data.h"
+#include "qet_base_types/baseelmt.h"
+
+class dxf_block_lines : public QMainWindow
+{
+ Q_OBJECT
+ public:
+ explicit dxf_block_lines(QWidget *parent = 0);
+
+ QString Result_Block_Lines;
+ int Count_lines_block2;
+ int Insert_block_nr;
+
+ double x_insert;
+ double y_insert;
+
+ double x_insert_scale;
+ double y_insert_scale;
+
+ double xy_rotation;
+
+ QString Name_insert;
+
+ QString block_color;
+ QString block_line_weight;
+ QString block_filling;
+
+ QString Make_Block_Lines();
+
+ signals:
+
+ public slots:
+};
+
+#endif // DXF_BLOCK_LINES_H
Added: branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.cpp (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.cpp 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,100 @@
+#include "dxf_block_lwpolyline.h"
+
+extern struct DXF_base DXF_main_base[1];
+extern struct DXF_block_lwpolyline DXF_input_block_lwpolyline[100][50];
+
+
+dxf_block_lwpolyline::dxf_block_lwpolyline(QWidget *parent) : QMainWindow(parent)
+{
+
+}
+
+QString dxf_block_lwpolyline::Make_Block_Lwpolyline()
+{
+
+ /* prepare polygon from block items */
+
+ dxf_lwpolyline dxb_lwpolyline;
+
+ Count_lines_block2=0;
+ Count_lines2=0;
+
+ Result_Block_lwpolyline="";
+
+ while(Count_lines_block2<DXF_main_base[0].DXF_block_lwpolyline_count[Insert_block_nr])
+ {
+
+
+ Count_block_lwpolyline2=DXF_main_base[0].DXF_block_lwpolyline_count[Insert_block_nr];
+
+ while (Count_lines2<Count_block_lwpolyline2)
+ {
+ vector_max=DXF_input_block_lwpolyline[Insert_block_nr][Count_lines2].DXF_block_lwpolyline_code_90; // max number of vectors
+
+ if(vector_max>0)
+ {
+ //vector_max=vector_max+1;
+
+
+ for(counter_x=0;counter_x<vector_max;counter_x++)
+ {
+
+
+ dxb_lwpolyline.x_vector[count_vertex]=x_insert+DXF_input_block_lwpolyline[Insert_block_nr][Count_lines_block2].DXF_block_lwpolyline_code_10[counter_x];
+ dxb_lwpolyline.y_vector[count_vertex]=(-y_insert)+(-DXF_input_block_lwpolyline[Insert_block_nr][Count_lines_block2].DXF_block_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;
+ }
+
+ }
+
+ dxb_lwpolyline.vector_count=vector_max;
+
+ dxb_lwpolyline.antialias=block_antialias;
+ dxb_lwpolyline.line_style=block_line_style;
+ dxb_lwpolyline.line_weight=block_line_weight;
+ dxb_lwpolyline.filling=block_filling;
+ dxb_lwpolyline.color=block_color;
+ dxb_lwpolyline.closed=DXF_input_block_lwpolyline[Insert_block_nr][Count_lines_block2].DXF_block_lwpolyline_code_70;
+
+
+ dxb_lwpolyline.ltype=DXF_input_block_lwpolyline[Insert_block_nr][Count_lines_block2].DXF_block_lwpolyline_code_6;
+ dxb_lwpolyline.layer=DXF_input_block_lwpolyline[Insert_block_nr][Count_lines_block2].DXF_block_lwpolyline_code_8;
+
+
+
+
+ Result_Block_lwpolyline.append(dxb_lwpolyline.Create_LWPOLYLINE());
+
+ Count_lines_block2=Count_lines_block2+1;
+ count_vertex=1;
+ counter_x=0;
+ Count_lines2=Count_lines2+1;
+
+ }
+ else
+ {
+ Count_lines2=Count_lines2+1;
+ }
+
+
+
+ }
+
+
+
+
+ }
+
+
+
+ return Result_Block_lwpolyline;
+
+}
Added: branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.h (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.h 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,47 @@
+#ifndef DXF_BLOCK_LWPOLYLINE_H
+#define DXF_BLOCK_LWPOLYLINE_H
+
+#include <QMainWindow>
+#include "src/dxf/dxf_lwpolyline.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+
+class dxf_block_lwpolyline : public QMainWindow
+{
+ Q_OBJECT
+ public:
+ explicit dxf_block_lwpolyline(QWidget *parent = 0);
+
+ QString Result_Block_lwpolyline;
+ int Count_lines_block2;
+ int Insert_block_nr;
+ int Count_lines2;
+ int Count_block_lwpolyline2;
+ int vector_max;
+ int counter_x;
+ int count_vertex;
+
+ double x_insert;
+ double y_insert;
+
+ double x_insert_scale;
+ double y_insert_scale;
+
+ double xy_rotation;
+
+ QString Name_insert;
+
+ QString block_color; // black
+ QString block_line_weight; // thin
+ QString block_filling; // none
+ QString block_antialias; // false
+ QString block_line_style; // normal
+
+ QString Make_Block_Lwpolyline();
+
+ signals:
+
+ public slots:
+};
+
+#endif // DXF_BLOCK_LWPOLYLINE_H
Added: branches/dxftoqet2/src/dxf_block/dxf_block_polyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_polyline.cpp (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_polyline.cpp 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,93 @@
+#include "dxf_block_polyline.h"
+
+extern struct DXF_base DXF_main_base[1];
+extern struct DXF_block_polyline DXF_input_block_polyline[100][50];
+extern struct DXF_block_vertex DXF_input_block_vertex[100][500];
+
+dxf_block_polyline::dxf_block_polyline(QWidget *parent) : QMainWindow(parent)
+{
+
+}
+
+QString dxf_block_polyline::Make_Block_Polyline()
+{
+ Result_Block_polyline="";
+ Count_lines_block2=0;
+ Polyline_vertex=DXF_main_base[0].DXF_block_vertex_count[Insert_block_nr];
+
+ dxf_polyline dxb_polyline2;
+
+ while(Count_lines_block2<DXF_main_base[0].DXF_block_polyline_count[Insert_block_nr])
+ {
+
+ Count_lines2=0;
+ count_vertex2=1;
+
+ Count_block_polyline=DXF_main_base[0].DXF_block_polyline_count[Insert_block_nr];
+
+ while (Count_lines2<=Count_block_polyline)
+ {
+
+ for(counter_x=1;counter_x<=Polyline_vertex;counter_x++)
+ {
+
+ for (int clean=0;clean>=49;clean++)
+ {
+ dxb_polyline2.x_vector[clean]=0;
+ dxb_polyline2.y_vector[clean]=0;
+
+ }
+
+ if (DXF_input_block_vertex[Insert_block_nr][counter_x].Master_block_handle_id==DXF_input_block_polyline[Insert_block_nr][Count_lines2].DXF_block_polyline_code_5)
+ {
+ dxb_polyline2.x_vector[count_vertex2]=x_insert+DXF_input_block_vertex[Insert_block_nr][counter_x].DXF_block_vertex_code_10;
+ dxb_polyline2.y_vector[count_vertex2]=(-y_insert)+(-DXF_input_block_vertex[Insert_block_nr][counter_x].DXF_block_vertex_code_20);
+ count_vertex2=count_vertex2+1;
+ }
+ if (count_vertex2>49)
+ {
+ counter_x=Polyline_vertex+1;
+ count_vertex2=49;
+ }
+ if (count_vertex2>Polyline_vertex)
+ {
+ counter_x=Polyline_vertex+1;
+ }
+
+ }
+
+ dxb_polyline2.vector_count=count_vertex2-1;
+
+ dxb_polyline2.antialias=block_antialias;
+ dxb_polyline2.line_style=block_line_style;
+ dxb_polyline2.line_weight=block_line_weight;
+ dxb_polyline2.filling=block_filling;
+ dxb_polyline2.color=block_color;
+ dxb_polyline2.closed=DXF_input_block_polyline[Insert_block_nr][Count_lines2].DXF_block_polyline_code_70;
+
+
+ dxb_polyline2.ltype=DXF_input_block_polyline[Insert_block_nr][Count_lines2].DXF_block_polyline_code_6;
+ dxb_polyline2.layer=DXF_input_block_polyline[Insert_block_nr][Count_lines2].DXF_block_polyline_code_8;
+
+
+
+
+ Result_Block_polyline.append(dxb_polyline2.Create_POLYLINE());
+
+ Count_lines2=Count_lines2+1;
+ count_vertex2=1;
+ counter_x=0;
+
+
+
+
+
+ }
+ Count_lines_block2=Count_lines_block2+1;
+
+ }
+
+
+
+ return Result_Block_polyline;
+}
Added: branches/dxftoqet2/src/dxf_block/dxf_block_polyline.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_polyline.h (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_polyline.h 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,47 @@
+#ifndef DXF_BLOCK_POLYLINE_H
+#define DXF_BLOCK_POLYLINE_H
+
+#include <QMainWindow>
+#include "src/dxf/dxf_polyline.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+
+class dxf_block_polyline : public QMainWindow
+{
+ Q_OBJECT
+ public:
+ explicit dxf_block_polyline(QWidget *parent = 0);
+
+ QString Result_Block_polyline;
+ int Count_lines_block2;
+ int Insert_block_nr;
+ int Polyline_vertex;
+ int Count_lines2;
+ int count_vertex2;
+ int Count_block_polyline;
+ int counter_x;
+
+
+ double x_insert;
+ double y_insert;
+
+ double x_insert_scale;
+ double y_insert_scale;
+
+ double xy_rotation;
+
+ QString Name_insert;
+
+ QString block_color; // black
+ QString block_line_weight; // thin
+ QString block_filling; // none
+ QString block_antialias; // false
+ QString block_line_style; // normal
+
+ QString Make_Block_Polyline();
+ signals:
+
+ public slots:
+};
+
+#endif // DXF_BLOCK_POLYLINE_H
Added: branches/dxftoqet2/src/dxf_block/dxf_block_text.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_text.cpp (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_text.cpp 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,39 @@
+#include "dxf_block_text.h"
+
+extern struct DXF_base DXF_main_base[1];
+extern struct DXF_block_text DXF_input_block_text[100][50];
+
+dxf_block_text::dxf_block_text(QWidget *parent) : QMainWindow(parent)
+{
+
+}
+
+QString dxf_block_text::Make_Block_Text()
+{
+ Count_lines_block2=0;
+ Result_Block_text="";
+
+ dxf_text db_text_block;
+ DXF_Text_control db_txt_check_block;
+
+ while(Count_lines_block2<DXF_main_base[0].DXF_block_text_count[Insert_block_nr])
+ {
+ db_text_block.QET_x=DXF_input_block_text[Insert_block_nr][Count_lines_block2].DXF_block_text_code_10;
+ db_text_block.QET_y=-DXF_input_block_text[Insert_block_nr][Count_lines_block2].DXF_block_text_code_20;
+ db_text_block.QET_rotation=DXF_input_block_text[Insert_block_nr][Count_lines_block2].DXF_block_text_code_50;
+ db_text_block.QET_size=DXF_input_block_text[Insert_block_nr][Count_lines_block2].DXF_block_text_code_40*((x_insert_scale+y_insert_scale)/2);
+
+ db_text_block.QET_color=block_color;
+
+ db_txt_check_block.TextToCheck=DXF_input_block_text[Insert_block_nr][Count_lines_block2].DXF_block_text_code_1;
+
+ db_text_block.QET_text=db_txt_check_block.Text_control();
+
+ Result_Block_text.append(db_text_block.Create_Text());
+
+ Count_lines_block2=Count_lines_block2+1;
+ }
+
+ return Result_Block_text;
+
+}
Added: branches/dxftoqet2/src/dxf_block/dxf_block_text.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_text.h (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_text.h 2016-01-24 16:40:44 UTC (rev 4335)
@@ -0,0 +1,41 @@
+#ifndef DXF_BLOCK_TEXT_H
+#define DXF_BLOCK_TEXT_H
+
+#include <QMainWindow>
+#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_block_text : public QMainWindow
+{
+ Q_OBJECT
+ public:
+ explicit dxf_block_text(QWidget *parent = 0);
+
+ QString Result_Block_text;
+ int Count_lines_block2;
+ int Insert_block_nr;
+
+ double x_insert;
+ double y_insert;
+
+ double x_insert_scale;
+ double y_insert_scale;
+
+ double xy_rotation;
+
+ QString Name_insert;
+
+ QString block_color; // black
+ QString block_line_weight; // thin
+ QString block_filling; // none
+ QString block_antialias; // false
+
+ QString Make_Block_Text();
+ signals:
+
+ public slots:
+};
+
+#endif // DXF_BLOCK_TEXT_H
Modified: branches/dxftoqet2/src/dxf_data.h
===================================================================
--- branches/dxftoqet2/src/dxf_data.h 2016-01-22 00:03:00 UTC (rev 4334)
+++ branches/dxftoqet2/src/dxf_data.h 2016-01-24 16:40:44 UTC (rev 4335)
@@ -1355,18 +1355,21 @@
struct DXF_block_insert
{
+ QString DXF_block_insert_code_1;
+ QString DXF_block_insert_code_2;
+ QString DXF_block_insert_code_3;
QString DXF_block_insert_code_5;
QString DXF_block_insert_code_6;
QString DXF_block_insert_code_8;
- double DXF_block_insert_code_10;
+ double DXF_block_insert_code_10[4];
double DXF_block_insert_code_11;
double DXF_block_insert_code_12;
double DXF_block_insert_code_13;
double DXF_block_insert_code_14[5];
- double DXF_block_insert_code_20;
+ double DXF_block_insert_code_20[4];
double DXF_block_insert_code_21;
double DXF_block_insert_code_22;
double DXF_block_insert_code_23;
@@ -1395,9 +1398,23 @@
int16_t DXF_block_insert_code_283;
QString DXF_block_insert_code_310;
- QString DXF_block_insert_code_330;
+ QString DXF_block_insert_code_330[2];
QString DXF_block_insert_code_340;
QString DXF_block_insert_code_360;
+
+ QString DXF_block_insert_code_1000[30];
+ QString DXF_block_insert_code_1001[30];
+ QString DXF_block_insert_code_1002[10];
+
+ double DXF_block_insert_code_1010[10];
+ double DXF_block_insert_code_1011[10];
+ double DXF_block_insert_code_1020[10];
+ double DXF_block_insert_code_1021[10];
+ double DXF_block_insert_code_1030[10];
+ double DXF_block_insert_code_1031[10];
+ double DXF_block_insert_code_1040[10];
+ int16_t DXF_block_insert_code_1070[10];
+ int16_t DXF_block_insert_code_1071[10];
};
struct DXF_block_leader
Modified: branches/dxftoqet2/src/dxf_split.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_split.cpp 2016-01-22 00:03:00 UTC (rev 4334)
+++ branches/dxftoqet2/src/dxf_split.cpp 2016-01-24 16:40:44 UTC (rev 4335)
@@ -13029,10 +13029,45 @@
if (line4=="INSERT" and line4.length()==6)
{
Log_1.append("Start reading BLOCK code INSERT \n");
+ Log_1.append(QString::number(block_count1));
+ Log_1.append ("item n°: ");
+ Log_1.append(QString::number(block_line_count));
+ Log_1.append("\n");
block_st5=0;
block_count5=0;
+ for (sw_cleaner=0; sw_cleaner<1072;++sw_cleaner)
+ {
+ sw_block_line[sw_cleaner]=0;
+
+ }
+
+
+ count_block_insert_10=0;
+ count_block_insert_20=0;
+
+ count_block_insert_100=0;
+ count_block_insert_102=0;
+ count_block_insert_330=0;
+
+ count_block_insert_1002=0;
+ count_block_insert_1010=0;
+ count_block_insert_1011=0;
+
+ count_block_insert_1020=0;
+ count_block_insert_1021=0;
+
+ count_block_insert_1030=0;
+ count_block_insert_1031=0;
+
+
+ count_block_insert_1040=0;
+
+ count_block_insert_1070=0;
+ count_block_insert_1071=0;
+
+
while (block_st5==0 and block_count5<49)
{
@@ -13058,9 +13093,767 @@
break;
+
+ case 1:
+
+ if(sw_block_line[1]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_1=line8;
+ sw_block_line[1]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 2:
+
+ if(sw_block_line[2]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_2=line8;
+ sw_block_line[2]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 3:
+
+ if(sw_block_line[3]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_3=line8;
+ sw_block_line[3]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+
+
+ case 5:
+
+ if(sw_block_line[5]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_5=line8;
+ sw_block_line[5]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 6:
+
+ if(sw_block_line[6]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_6=line8;
+ sw_block_line[6]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 8:
+
+ if(sw_block_line[8]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_8=line8;
+ sw_block_line[8]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 10:
+
+ if (count_block_insert_10>3)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_10[count_block_insert_10]=line8.toDouble();
+ count_block_insert_10=count_block_insert_10+1;
+ }
+ break;
+
+
+
+ case 11:
+
+ if(sw_block_line[11]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_11=line8.toDouble();
+ sw_block_line[11]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ /*case 12:
+
+ if(sw_block_line[12]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_12=line8.toDouble();
+ sw_block_line[12]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 13:
+
+ if(sw_block_line[13]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_13=line8.toDouble();
+ sw_block_line[13]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 14:
+
+ if (count_block_insert_14>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_line_count].DXF_block_insert_code_14[count_block_insert_14]=line8.toDouble();
+ count_block_insert_14=count_block_insert_14+1;
+ }
+ break;*/
+
+ case 20:
+
+ if (count_block_insert_20>3)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_20[count_block_insert_20]=line8.toDouble();
+ count_block_insert_20=count_block_insert_20+1;
+ }
+ break;
+
+
+ case 21:
+
+ if(sw_block_line[21]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_21=line8.toDouble();
+ sw_block_line[21]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ /*case 22:
+
+ if(sw_block_line[22]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_22=line8.toDouble();
+ sw_block_line[22]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 23:
+
+ if(sw_block_line[23]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_23=line8.toDouble();
+ sw_block_line[23]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 24:
+
+ if (count_block_insert_24>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_line_count].DXF_block_insert_code_24[count_block_insert_24]=line8.toDouble();
+ count_block_insert_24=count_block_insert_24+1;
+ }
+ break;*/
+
+ case 30:
+
+ if(sw_block_line[30]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_30=line8.toDouble();
+ sw_block_line[30]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 31:
+
+ if(sw_block_line[31]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_31=line8.toDouble();
+ sw_block_line[31]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ /*case 32:
+
+ if(sw_block_line[32]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_32=line8.toDouble();
+ sw_block_line[32]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;*/
+
+ /*case 43:
+
+ if(sw_block_line[43]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_43=line8.toDouble();
+ sw_block_line[43]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 48:
+
+ if(sw_block_line[48]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_48=line8.toDouble();
+ sw_block_line[48]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;*/
+
+ case 62:
+
+ if(sw_block_line[62]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_62=line8.toInt();
+ sw_block_line[62]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 70:
+
+ if(sw_block_line[70]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_70=line8.toInt();
+ sw_block_line[70]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ /*case 71:
+
+ if(sw_block_line[71]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_71=line8.toInt();
+ sw_block_line[71]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 72:
+
+ if(sw_block_line[72]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_72=line8.toInt();
+ sw_block_line[72]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 74:
+
+ if(sw_block_line[74]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_74=line8.toInt();
+ sw_block_line[74]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;*/
+
+ case 90:
+
+ if(sw_block_line[90]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_90=line8.toInt();
+ sw_block_line[90]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ /*case 91:
+
+ if(sw_block_line[91]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_91=line8.toInt();
+ sw_block_line[91]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 92:
+
+ if(sw_block_line[92]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_92=line8.toInt();
+ sw_block_line[92]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;*/
+
+ case 100:
+
+ if (count_block_insert_100>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_100[count_block_insert_100]=line8;
+ count_block_insert_100=count_block_insert_100+1;
+ }
+ break;
+
+ /*case 102:
+
+ if (count_block_insert_102>1)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_102[count_block_insert_102]=line8;
+ count_block_insert_102=count_block_insert_102+1;
+ }
+ break;*/
+
+ /*case 280:
+
+ if(sw_block_line[280]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_280=line8.toInt();
+ sw_block_line[280]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 281:
+
+ if(sw_block_line[281]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_281=line8.toInt();
+ sw_block_line[281]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 282:
+
+ if(sw_block_line[282]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_282=line8.toInt();
+ sw_block_line[282]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 283:
+
+ if(sw_block_line[283]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_283=line8.toInt();
+ sw_block_line[283]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;*/
+
+ /*case 310:
+
+ if(sw_block_line[310]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_310=line8;
+ sw_block_line[310]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;*/
+
+ case 330:
+
+ if (count_block_insert_330>1)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_330[count_block_insert_330]=line8;
+ count_block_insert_330=count_block_insert_330+1;
+ }
+ break;
+
+
+
+ /*case 340:
+
+ if(sw_block_line[340]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_340=line8;
+ sw_block_line[340]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;
+
+ case 360:
+
+ if(sw_block_line[360]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_360=line8;
+ sw_block_line[360]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;*/
+
+ /*case 370:
+
+ if(sw_block_line[370]==0)
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_370=line8.toInt();
+ sw_block_line[370]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_insert());
+
+ }
+
+ break;*/
+
+ case 1000:
+
+ if (count_block_insert_1000>29)
+ {
+ Log_1.append(found_block_insert());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_1000[count_block_insert_1000]=line8;
+ count_block_insert_1000=count_block_insert_1000+1;
+ }
+ break;
+
+ case 1001:
+
+ if (count_block_insert_1001>29)
+ {
+ Log_1.append(found_block_insert());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_1001[count_block_insert_1001]=line8;
+ count_block_insert_1001=count_block_insert_1001+1;
+ }
+ break;
+
+
+ case 1002:
+
+ if (count_block_insert_1002>9)
+ {
+ Log_1.append(found_block_insert());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_1000[count_block_insert_1002]=line8;
+ count_block_insert_1002=count_block_insert_1002+1;
+ }
+ break;
+
+
+ case 1010:
+
+ if (count_block_insert_1010>9)
+ {
+ Log_1.append(found_block_insert());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_1010[count_block_insert_1010]=line8.toDouble();
+ count_block_insert_1010=count_block_insert_1010+1;
+ }
+ break;
+
+
+ case 1011:
+
+ if (count_block_insert_1011>9)
+ {
+ Log_1.append(found_block_insert());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_1011[count_block_insert_1011]=line8.toDouble();
+ count_block_insert_1011=count_block_insert_1011+1;
+ }
+ break;
+
+ case 1020:
+
+ if (count_block_insert_1020>9)
+ {
+ Log_1.append(found_block_insert());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_1020[count_block_insert_1020]=line8.toDouble();
+ count_block_insert_1020=count_block_insert_1020+1;
+ }
+ break;
+
+ case 1021:
+
+ if (count_block_insert_1021>9)
+ {
+ Log_1.append(found_block_insert());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_1021[count_block_insert_1021]=line8.toDouble();
+ count_block_insert_1021=count_block_insert_1021+1;
+ }
+ break;
+
+ case 1030:
+
+ if (count_block_insert_1030>9)
+ {
+ Log_1.append(found_block_insert());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_1030[count_block_insert_1030]=line8.toDouble();
+ count_block_insert_1030=count_block_insert_1030+1;
+ }
+ break;
+
+ case 1031:
+
+ if (count_block_insert_1031>9)
+ {
+ Log_1.append(found_block_insert());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_1031[count_block_insert_1031]=line8.toDouble();
+ count_block_insert_1031=count_block_insert_1031+1;
+ }
+ break;
+
+ case 1040:
+
+ if (count_block_insert_1040>9)
+ {
+ Log_1.append(found_block_insert());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_1040[count_block_insert_1040]=line8.toDouble();
+ count_block_insert_1040=count_block_insert_1040+1;
+ }
+ break;
+
+ case 1070:
+
+ if (count_block_insert_1070>9)
+ {
+ Log_1.append(found_block_insert());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_1070[count_block_insert_1070]=line8.toInt();
+ count_block_insert_1070=count_block_insert_1070+1;
+ }
+ break;
+
+ case 1071:
+
+ if (count_block_insert_1071>9)
+ {
+ Log_1.append(found_block_insert());
+ }
+ else
+ {
+ DXF_input_block_insert[block_count1][block_insert_count].DXF_block_insert_code_1071[count_block_insert_1071]=line8.toInt();
+ count_block_insert_1071=count_block_insert_1071+1;
+ }
+ break;
+
+
+
+
+
default:
Log_1.append(found_block_insert());
+
}
@@ -31613,6 +32406,7 @@
}
+/* entitie section */
QString dxf_split::found_entities_circle()
{
@@ -31879,7 +32673,7 @@
return Log_2;
}
-/* bock text */
+/* block text */
QString dxf_split::found_block_image()
{
Modified: branches/dxftoqet2/src/dxf_split.h
===================================================================
--- branches/dxftoqet2/src/dxf_split.h 2016-01-22 00:03:00 UTC (rev 4334)
+++ branches/dxftoqet2/src/dxf_split.h 2016-01-24 16:40:44 UTC (rev 4335)
@@ -416,6 +416,25 @@
int count_block_line_102;
int count_block_line_330;
+ int count_block_insert_10;
+ int count_block_insert_20;
+
+ int count_block_insert_100;
+ int count_block_insert_102;
+ int count_block_insert_330;
+ int count_block_insert_1000;
+ int count_block_insert_1001;
+ int count_block_insert_1002;
+ int count_block_insert_1010;
+ int count_block_insert_1011;
+ int count_block_insert_1020;
+ int count_block_insert_1021;
+ int count_block_insert_1030;
+ int count_block_insert_1031;
+ int count_block_insert_1040;
+ int count_block_insert_1070;
+ int count_block_insert_1071;
+
int count_end_block_100;
int line1;