[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4248
Author: rdsivd
Date: 2015-11-07 09:28:15 +0100 (Sat, 07 Nov 2015)
Log Message:
-----------
DXFtoQET
update split dxf file
Modified Paths:
--------------
branches/dxftoqet2/dxf_create_elmt.cpp
branches/dxftoqet2/dxf_create_elmt.h
branches/dxftoqet2/dxftoqet_mainwindow.cpp
branches/dxftoqet2/dxftoqet_mainwindow.ui
branches/dxftoqet2/src/dxf_data.h
branches/dxftoqet2/src/dxf_split.cpp
branches/dxftoqet2/src/dxf_split.h
Modified: branches/dxftoqet2/dxf_create_elmt.cpp
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.cpp 2015-11-02 19:33:42 UTC (rev 4247)
+++ branches/dxftoqet2/dxf_create_elmt.cpp 2015-11-07 08:28:15 UTC (rev 4248)
@@ -14,7 +14,7 @@
extern struct DXF_entities_insert DXF_input_entities_insert[1000];
extern struct DXF_entities_polyline DXF_input_entities_polyline[1000];
extern struct DXF_entities_seqend DXF_input_entities_seqend[1000];
-extern struct DXF_entities_vertex DXF_input_entities_vertex[1000];
+extern struct DXF_entities_vertex DXF_input_entities_vertex[5000];
extern struct DXF_block_line DXF_input_block_line[100][50];
extern struct DXF_block_arc DXF_input_block_arc[100][50];
@@ -24,7 +24,7 @@
extern struct DXF_block_attrib DXF_input_block_attrib[100][50];
extern struct DXF_block_point DXF_input_block_point[100][50];
extern struct DXF_block_seqend DXF_input_block_seqend[100][50];
-extern struct DXF_block_vertex DXF_input_block_vertex[100][50];
+extern struct DXF_block_vertex DXF_input_block_vertex[100][500];
DXF_create_elmt::DXF_create_elmt(QWidget *parent) :
QMainWindow(parent)
@@ -690,9 +690,6 @@
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;
@@ -863,3 +860,14 @@
}
+
+ QString DXF_create_elmt::Make_Block_POLYLINE()
+ {
+ Result_Block_polyline="";
+
+
+
+
+
+ return Result_Block_polyline;
+ }
Modified: branches/dxftoqet2/dxf_create_elmt.h
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.h 2015-11-02 19:33:42 UTC (rev 4247)
+++ branches/dxftoqet2/dxf_create_elmt.h 2015-11-07 08:28:15 UTC (rev 4248)
@@ -46,6 +46,7 @@
QString Make_block_TEXT();
QString Make_block_ELLIPSE();
QString Make_Block_INSERT();
+ QString Make_Block_POLYLINE();
QString Result;
QString Result_line;
@@ -66,6 +67,7 @@
QString Result_Block_Arc;
QString Result_Block_Circle;
QString Result_Block_ellipse;
+ QString Result_Block_polyline;
double DXF_LIMMAX_x;
@@ -99,6 +101,7 @@
int Insert_block_nr;
int Polyline_vertex;
+ int Block_Polyline_vertex;
double x_insert;
double y_insert;
Modified: branches/dxftoqet2/dxftoqet_mainwindow.cpp
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.cpp 2015-11-02 19:33:42 UTC (rev 4247)
+++ branches/dxftoqet2/dxftoqet_mainwindow.cpp 2015-11-07 08:28:15 UTC (rev 4248)
@@ -65,7 +65,7 @@
struct DXF_block_tolerance DXF_input_block_tolerance[100][50];
struct DXF_block_trace DXF_input_block_trace[100][50];
struct DXF_block_underlay DXF_input_block_underlay[100][50];
-struct DXF_block_vertex DXF_input_block_vertex[100][50];
+struct DXF_block_vertex DXF_input_block_vertex[100][500];
struct DXF_block_viewport DXF_input_block_viewport[100][50];
struct DXF_block_wipeout DXF_input_block_wipeout[100][50];
struct DXF_block_xline DXF_input_block_xline[100][50];
@@ -111,7 +111,7 @@
struct DXF_entities_tolerance DXF_input_entities_tolerance[1000];
struct DXF_entities_trace DXF_input_entities_trace[1000];
struct DXF_entities_underlay DXF_input_entities_underlay[1000];
-struct DXF_entities_vertex DXF_input_entities_vertex[1000];
+struct DXF_entities_vertex DXF_input_entities_vertex[5000];
struct DXF_entities_viewport DXF_input_entities_viewport[1000];
struct DXF_entities_wipeout DXF_input_entities_wipeout[1000];
struct DXF_entities_xline DXF_input_entities_xline[1000];
@@ -940,7 +940,7 @@
ui->DXF_VERTEX->setText(QString::number(DXF_main_base[0].DXF_entities_vertex_count));
- if (DXF_main_base[0].DXF_entities_vertex_count>999)
+ if (DXF_main_base[0].DXF_entities_vertex_count>4999)
{
ui->DXF_VERTEX->setStyleSheet("QLineEdit { background-color:rgb(255,0,0)}");
Modified: branches/dxftoqet2/dxftoqet_mainwindow.ui
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.ui 2015-11-02 19:33:42 UTC (rev 4247)
+++ branches/dxftoqet2/dxftoqet_mainwindow.ui 2015-11-07 08:28:15 UTC (rev 4248)
@@ -470,7 +470,7 @@
<enum>QTabWidget::Rounded</enum>
</property>
<property name="currentIndex">
- <number>6</number>
+ <number>2</number>
</property>
<widget class="QWidget" name="tab_ELMT">
<property name="sizePolicy">
@@ -757,7 +757,7 @@
<string notr="true">BACKGROUND:rgb(225, 225, 225)</string>
</property>
<property name="currentIndex">
- <number>2</number>
+ <number>3</number>
</property>
<widget class="QWidget" name="tab_dxf_sections">
<attribute name="title">
@@ -1875,6 +1875,9 @@
<property name="text">
<string>POLYLINE</string>
</property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
</widget>
</item>
<item row="3" column="5">
Modified: branches/dxftoqet2/src/dxf_data.h
===================================================================
--- branches/dxftoqet2/src/dxf_data.h 2015-11-02 19:33:42 UTC (rev 4247)
+++ branches/dxftoqet2/src/dxf_data.h 2015-11-07 08:28:15 UTC (rev 4248)
@@ -1060,7 +1060,7 @@
int16_t DXF_block_circle_code_283;
QString DXF_block_circle_code_310;
- QString DXF_block_circle_code_330[2];
+ QString DXF_block_circle_code_330[20];
QString DXF_block_circle_code_340;
QString DXF_block_circle_code_360;
@@ -1181,28 +1181,43 @@
QString DXF_block_hatch_code_6;
QString DXF_block_hatch_code_8;
- double DXF_block_hatch_code_10;
+ double DXF_block_hatch_code_10[200];
double DXF_block_hatch_code_11;
double DXF_block_hatch_code_12;
double DXF_block_hatch_code_13;
double DXF_block_hatch_code_14[5];
- double DXF_block_hatch_code_20;
+ double DXF_block_hatch_code_20[200];
double DXF_block_hatch_code_21;
double DXF_block_hatch_code_22;
double DXF_block_hatch_code_23;
double DXF_block_hatch_code_24[5];
- double DXF_block_hatch_code_30;
+ double DXF_block_hatch_code_30[200];
double DXF_block_hatch_code_31;
double DXF_block_hatch_code_32;
+ double DXF_block_hatch_code_40[200];
+ double DXF_block_hatch_code_41;
+ double DXF_block_hatch_code_42;
+ double DXF_block_hatch_code_43;
+ double DXF_block_hatch_code_44;
+ double DXF_block_hatch_code_45;
+ double DXF_block_hatch_code_48;
+
+ double DXF_block_hatch_code_50;
+ double DXF_block_hatch_code_51;
+
int16_t DXF_block_hatch_code_62;
int16_t DXF_block_hatch_code_70;
int16_t DXF_block_hatch_code_71;
+ int16_t DXF_block_hatch_code_72;
+ int16_t DXF_block_hatch_code_73;
+ int16_t DXF_block_hatch_code_74;
+ int16_t DXF_block_hatch_code_75;
int32_t DXF_block_hatch_code_90;
int32_t DXF_block_hatch_code_91;
@@ -1210,16 +1225,23 @@
QString DXF_block_hatch_code_100[2];
+ double DXF_block_hatch_code_210;
+ double DXF_block_hatch_code_220;
+
+ double DXF_block_hatch_code_230;
+
int16_t DXF_block_hatch_code_280;
int16_t DXF_block_hatch_code_281;
int16_t DXF_block_hatch_code_282;
int16_t DXF_block_hatch_code_283;
QString DXF_block_hatch_code_310;
- QString DXF_block_hatch_code_330;
+ QString DXF_block_hatch_code_330[2];
QString DXF_block_hatch_code_340;
QString DXF_block_hatch_code_360;
+
+ int16_t DXF_block_hatch_code_370;
};
struct DXF_block_helix
@@ -1921,7 +1943,14 @@
double DXF_block_polyline_code_31;
double DXF_block_polyline_code_32;
+ double DXF_block_polyline_code_40;
+ double DXF_block_polyline_code_48;
+ double DXF_block_polyline_code_50;
+ double DXF_block_polyline_code_51;
+
+
+
int16_t DXF_block_polyline_code_62;
int16_t DXF_block_polyline_code_66;
@@ -1933,17 +1962,19 @@
int32_t DXF_block_polyline_code_92;
QString DXF_block_polyline_code_100[2];
+ QString DXF_block_polyline_code_102[3];
-
int16_t DXF_block_polyline_code_280;
int16_t DXF_block_polyline_code_281;
int16_t DXF_block_polyline_code_282;
int16_t DXF_block_polyline_code_283;
QString DXF_block_polyline_code_310;
- QString DXF_block_polyline_code_330;
+ QString DXF_block_polyline_code_330[2];
QString DXF_block_polyline_code_340;
QString DXF_block_polyline_code_360;
+
+ int16_t DXF_block_polyline_code_370;
};
struct DXF_block_ray
@@ -2093,28 +2124,43 @@
QString DXF_block_seqend_code_6;
QString DXF_block_seqend_code_8;
- double DXF_block_seqend_code_10;
+ double DXF_block_seqend_code_10[200];
double DXF_block_seqend_code_11;
double DXF_block_seqend_code_12;
double DXF_block_seqend_code_13;
double DXF_block_seqend_code_14[5];
- double DXF_block_seqend_code_20;
+ double DXF_block_seqend_code_20[200];
double DXF_block_seqend_code_21;
double DXF_block_seqend_code_22;
double DXF_block_seqend_code_23;
double DXF_block_seqend_code_24[5];
- double DXF_block_seqend_code_30;
+ double DXF_block_seqend_code_30[200];
double DXF_block_seqend_code_31;
double DXF_block_seqend_code_32;
+ double DXF_block_seqend_code_40[200];
+ double DXF_block_seqend_code_41;
+ double DXF_block_seqend_code_42;
+ double DXF_block_seqend_code_43;
+ double DXF_block_seqend_code_44;
+ double DXF_block_seqend_code_45;
+ double DXF_block_seqend_code_48;
+
+ double DXF_block_seqend_code_50;
+ double DXF_block_seqend_code_51;
+
int16_t DXF_block_seqend_code_62;
int16_t DXF_block_seqend_code_70;
int16_t DXF_block_seqend_code_71;
+ int16_t DXF_block_seqend_code_72;
+ int16_t DXF_block_seqend_code_73;
+ int16_t DXF_block_seqend_code_74;
+ int16_t DXF_block_seqend_code_75;
int32_t DXF_block_seqend_code_90;
int32_t DXF_block_seqend_code_91;
@@ -2122,16 +2168,23 @@
QString DXF_block_seqend_code_100[2];
+ double DXF_block_seqend_code_210;
+ double DXF_block_seqend_code_220;
+
+ double DXF_block_seqend_code_230;
+
int16_t DXF_block_seqend_code_280;
int16_t DXF_block_seqend_code_281;
int16_t DXF_block_seqend_code_282;
int16_t DXF_block_seqend_code_283;
QString DXF_block_seqend_code_310;
- QString DXF_block_seqend_code_330;
+ QString DXF_block_seqend_code_330[2];
QString DXF_block_seqend_code_340;
QString DXF_block_seqend_code_360;
+
+ int16_t DXF_block_seqend_code_370;
};
struct DXF_block_shape
@@ -2183,18 +2236,71 @@
struct DXF_block_solid
{
+ QString DXF_block_solid_code_5;
QString DXF_block_solid_code_6;
QString DXF_block_solid_code_8;
- double DXF_block_solid_code_10;
+ double DXF_block_solid_code_10[200];
double DXF_block_solid_code_11;
double DXF_block_solid_code_12;
double DXF_block_solid_code_13;
+ double DXF_block_solid_code_14[5];
- double DXF_block_solid_code_20;
+
+ double DXF_block_solid_code_20[200];
double DXF_block_solid_code_21;
double DXF_block_solid_code_22;
double DXF_block_solid_code_23;
+ double DXF_block_solid_code_24[5];
+
+ double DXF_block_solid_code_30[200];
+ double DXF_block_solid_code_31;
+ double DXF_block_solid_code_32;
+
+ double DXF_block_solid_code_40[200];
+ double DXF_block_solid_code_41;
+ double DXF_block_solid_code_42;
+ double DXF_block_solid_code_43;
+ double DXF_block_solid_code_44;
+ double DXF_block_solid_code_45;
+
+ double DXF_block_solid_code_48;
+
+ double DXF_block_solid_code_50;
+ double DXF_block_solid_code_51;
+
+ int16_t DXF_block_solid_code_62;
+
+ int16_t DXF_block_solid_code_70;
+ int16_t DXF_block_solid_code_71;
+ int16_t DXF_block_solid_code_72;
+ int16_t DXF_block_solid_code_73;
+ int16_t DXF_block_solid_code_74;
+ int16_t DXF_block_solid_code_75;
+
+ int32_t DXF_block_solid_code_90;
+ int32_t DXF_block_solid_code_91;
+ int32_t DXF_block_solid_code_92;
+
+ QString DXF_block_solid_code_100[2];
+
+ double DXF_block_solid_code_210;
+
+ double DXF_block_solid_code_220;
+
+ double DXF_block_solid_code_230;
+
+ int16_t DXF_block_solid_code_280;
+ int16_t DXF_block_solid_code_281;
+ int16_t DXF_block_solid_code_282;
+ int16_t DXF_block_solid_code_283;
+
+ QString DXF_block_solid_code_310;
+ QString DXF_block_solid_code_330[2];
+ QString DXF_block_solid_code_340;
+ QString DXF_block_solid_code_360;
+
+ int16_t DXF_block_solid_code_370;
};
struct DXF_block_spline
@@ -2203,28 +2309,43 @@
QString DXF_block_spline_code_6;
QString DXF_block_spline_code_8;
- double DXF_block_spline_code_10;
+ double DXF_block_spline_code_10[200];
double DXF_block_spline_code_11;
double DXF_block_spline_code_12;
double DXF_block_spline_code_13;
double DXF_block_spline_code_14[5];
- double DXF_block_spline_code_20;
+ double DXF_block_spline_code_20[200];
double DXF_block_spline_code_21;
double DXF_block_spline_code_22;
double DXF_block_spline_code_23;
double DXF_block_spline_code_24[5];
- double DXF_block_spline_code_30;
+ double DXF_block_spline_code_30[200];
double DXF_block_spline_code_31;
double DXF_block_spline_code_32;
+ double DXF_block_spline_code_40[200];
+ double DXF_block_spline_code_41;
+ double DXF_block_spline_code_42;
+ double DXF_block_spline_code_43;
+ double DXF_block_spline_code_44;
+ double DXF_block_spline_code_45;
+ double DXF_block_spline_code_48;
+
+ double DXF_block_spline_code_50;
+ double DXF_block_spline_code_51;
+
int16_t DXF_block_spline_code_62;
int16_t DXF_block_spline_code_70;
int16_t DXF_block_spline_code_71;
+ int16_t DXF_block_spline_code_72;
+ int16_t DXF_block_spline_code_73;
+ int16_t DXF_block_spline_code_74;
+ int16_t DXF_block_spline_code_75;
int32_t DXF_block_spline_code_90;
int32_t DXF_block_spline_code_91;
@@ -2232,16 +2353,23 @@
QString DXF_block_spline_code_100[2];
+ double DXF_block_spline_code_210;
+ double DXF_block_spline_code_220;
+
+ double DXF_block_spline_code_230;
+
int16_t DXF_block_spline_code_280;
int16_t DXF_block_spline_code_281;
int16_t DXF_block_spline_code_282;
int16_t DXF_block_spline_code_283;
QString DXF_block_spline_code_310;
- QString DXF_block_spline_code_330;
+ QString DXF_block_spline_code_330[2];
QString DXF_block_spline_code_340;
QString DXF_block_spline_code_360;
+
+ int16_t DXF_block_spline_code_370;
};
struct DXF_block_sun
@@ -2561,6 +2689,8 @@
struct DXF_block_vertex
{
+
+ QString Master_block_handle_id;
QString DXF_block_vertex_code_5;
QString DXF_block_vertex_code_6;
QString DXF_block_vertex_code_8;
@@ -2582,7 +2712,14 @@
double DXF_block_vertex_code_31;
double DXF_block_vertex_code_32;
+ double DXF_block_vertex_code_40;
+ double DXF_block_vertex_code_41;
+ double DXF_block_vertex_code_48;
+
+ double DXF_block_vertex_code_50;
+ double DXF_block_vertex_code_51;
+
int16_t DXF_block_vertex_code_62;
int16_t DXF_block_vertex_code_70;
@@ -2592,7 +2729,8 @@
int32_t DXF_block_vertex_code_91;
int32_t DXF_block_vertex_code_92;
- QString DXF_block_vertex_code_100[2];
+ QString DXF_block_vertex_code_100[5];
+ QString DXF_block_vertex_code_102[2];
int16_t DXF_block_vertex_code_280;
@@ -2601,13 +2739,19 @@
int16_t DXF_block_vertex_code_283;
QString DXF_block_vertex_code_310;
- QString DXF_block_vertex_code_330;
+ QString DXF_block_vertex_code_330[2];
QString DXF_block_vertex_code_340;
QString DXF_block_vertex_code_360;
+
+ int16_t DXF_block_vertex_code_370;
};
struct DXF_block_viewport
{
+ QString DXF_block_viewport_code_1;
+ QString DXF_block_viewport_code_2;
+ QString DXF_block_viewport_code_3;
+ QString DXF_block_viewport_code_4;
QString DXF_block_viewport_code_5;
QString DXF_block_viewport_code_6;
QString DXF_block_viewport_code_8;
@@ -2617,40 +2761,84 @@
double DXF_block_viewport_code_12;
double DXF_block_viewport_code_13;
double DXF_block_viewport_code_14[5];
+ double DXF_block_viewport_code_15;
+ double DXF_block_viewport_code_16;
+ double DXF_block_viewport_code_17;
-
double DXF_block_viewport_code_20;
double DXF_block_viewport_code_21;
double DXF_block_viewport_code_22;
double DXF_block_viewport_code_23;
- double DXF_block_viewport_code_24[5];
+ double DXF_block_viewport_code_24;
+ double DXF_block_viewport_code_25;
+ double DXF_block_viewport_code_26;
+ double DXF_block_viewport_code_27;
double DXF_block_viewport_code_30;
double DXF_block_viewport_code_31;
double DXF_block_viewport_code_32;
+ double DXF_block_viewport_code_33;
+ double DXF_block_viewport_code_34;
+ double DXF_block_viewport_code_35;
+ double DXF_block_viewport_code_36;
+ double DXF_block_viewport_code_37;
+ double DXF_block_viewport_code_40;
+ double DXF_block_viewport_code_41;
+ double DXF_block_viewport_code_42;
+ double DXF_block_viewport_code_43;
+ double DXF_block_viewport_code_44;
+ double DXF_block_viewport_code_45;
+ double DXF_block_viewport_code_46;
+ double DXF_block_viewport_code_48;
+ double DXF_block_viewport_code_50;
+ double DXF_block_viewport_code_51;
+
int16_t DXF_block_viewport_code_62;
+ int16_t DXF_block_viewport_code_68;
+ int16_t DXF_block_viewport_code_69;
int16_t DXF_block_viewport_code_70;
int16_t DXF_block_viewport_code_71;
+ int16_t DXF_block_viewport_code_72;
+ int16_t DXF_block_viewport_code_74;
+ int16_t DXF_block_viewport_code_79;
int32_t DXF_block_viewport_code_90;
int32_t DXF_block_viewport_code_91;
int32_t DXF_block_viewport_code_92;
QString DXF_block_viewport_code_100[2];
+ QString DXF_block_viewport_code_102[2];
+ double DXF_block_viewport_code_110;
+ double DXF_block_viewport_code_111;
+ double DXF_block_viewport_code_112;
+ double DXF_block_viewport_code_120;
+ double DXF_block_viewport_code_121;
+ double DXF_block_viewport_code_122;
+
+ double DXF_block_viewport_code_130;
+ double DXF_block_viewport_code_131;
+ double DXF_block_viewport_code_132;
+
+ double DXF_block_viewport_code_146;
+
+
int16_t DXF_block_viewport_code_280;
int16_t DXF_block_viewport_code_281;
int16_t DXF_block_viewport_code_282;
int16_t DXF_block_viewport_code_283;
QString DXF_block_viewport_code_310;
- QString DXF_block_viewport_code_330;
+ QString DXF_block_viewport_code_330[2];
QString DXF_block_viewport_code_340;
QString DXF_block_viewport_code_360;
+
+ int16_t DXF_block_viewport_code_370;
+
};
struct DXF_block_wipeout
@@ -2999,6 +3187,7 @@
double DXF_entities_ellipse_code_41;
double DXF_entities_ellipse_code_42;
+ int16_t DXF_entities_ellipse_code_62;
int16_t DXF_entities_ellipse_code_70;
QString DXF_entities_ellipse_code_100[3];
@@ -3529,17 +3718,32 @@
QString DXF_entities_spline_code_8;
- double DXF_entities_spline_code_10;
+ double DXF_entities_spline_code_10[50];
double DXF_entities_spline_code_11;
- double DXF_entities_spline_code_20;
+ double DXF_entities_spline_code_20[50];
double DXF_entities_spline_code_21;
- double DXF_entities_spline_code_30;
+ double DXF_entities_spline_code_30[50];
double DXF_entities_spline_code_31;
+ double DXF_entities_spline_code_40[50];
+
+ double DXF_entities_spline_code_42;
+ double DXF_entities_spline_code_43;
+
int16_t DXF_entities_spline_code_62;
+ int16_t DXF_entities_spline_code_70;
+ int16_t DXF_entities_spline_code_71;
+ int16_t DXF_entities_spline_code_72;
+ int16_t DXF_entities_spline_code_73;
+ int16_t DXF_entities_spline_code_74;
+
QString DXF_entities_spline_code_100[3];
+ double DXF_entities_spline_code_210;
+ double DXF_entities_spline_code_220;
+ double DXF_entities_spline_code_230;
+
QString DXF_entities_spline_code_330;
};
Modified: branches/dxftoqet2/src/dxf_split.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_split.cpp 2015-11-02 19:33:42 UTC (rev 4247)
+++ branches/dxftoqet2/src/dxf_split.cpp 2015-11-07 08:28:15 UTC (rev 4248)
@@ -58,7 +58,7 @@
extern struct DXF_block_tolerance DXF_input_block_tolerance[100][50];
extern struct DXF_block_trace DXF_input_block_trace[100][50];
extern struct DXF_block_underlay DXF_input_block_underlay[100][50];
-extern struct DXF_block_vertex DXF_input_block_vertex[100][50];
+extern struct DXF_block_vertex DXF_input_block_vertex[100][500];
extern struct DXF_block_viewport DXF_input_block_viewport[100][50];
extern struct DXF_block_wipeout DXF_input_block_wipeout[100][50];
extern struct DXF_block_xline DXF_input_block_xline[100][50];
@@ -104,7 +104,7 @@
extern struct DXF_entities_tolerance DXF_input_entities_tolerance[1000];
extern struct DXF_entities_trace DXF_input_entities_trace[1000];
extern struct DXF_entities_underlay DXF_input_entities_underlay[1000];
-extern struct DXF_entities_vertex DXF_input_entities_vertex[1000];
+extern struct DXF_entities_vertex DXF_input_entities_vertex[5000];
extern struct DXF_entities_viewport DXF_input_entities_viewport[1000];
extern struct DXF_entities_wipeout DXF_input_entities_wipeout[1000];
extern struct DXF_entities_xline DXF_input_entities_xline[1000];
@@ -8241,9 +8241,9 @@
case 0:
- Log_1.append ("<| BLOCK section n°: ");
- Log_1.append (block_count1);
- Log_1.append ("|>\n");
+ Log_1.append ("<BLOCK section n°: ");
+ Log_1.append (QString::number(block_count1));
+ Log_1.append (">\n");
for_count1=for_count1-2;
block_st3=1;
@@ -8444,9 +8444,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code 3DFACE block n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_3dface_count);
+ Log_1.append(QString::number(block_3dface_count));
Log_1.append("\n");
block_3dface_count=block_3dface_count+1;
@@ -8484,9 +8484,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code 3DSOLID n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_3dsolid_count);
+ Log_1.append(QString::number(block_3dsolid_count));
Log_1.append("\n");
block_3dsolid_count=block_3dsolid_count+1;
@@ -8525,9 +8525,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code ACAD_PROXY_ENTITY n°: ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_acad_proxy_entity_count);
+ Log_1.append(QString::number(block_acad_proxy_entity_count));
Log_1.append("\n");
block_acad_proxy_entity_count=block_acad_proxy_entity_count+1;
@@ -8578,9 +8578,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code ARC n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_arc_count);
+ Log_1.append(QString::number(block_arc_count));
Log_1.append("\n");
block_arc_count=block_arc_count+1;
@@ -9181,9 +9181,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code ATTDEF n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_attdef_count);
+ Log_1.append(QString::number(block_attdef_count));
Log_1.append("\n");
block_attdef_count=block_attdef_count+1;
@@ -9773,9 +9773,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code ATTRIB n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_attrib_count);
+ Log_1.append(QString::number(block_attrib_count));
Log_1.append("\n");
block_attrib_count=block_attrib_count+1;
@@ -9814,9 +9814,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code BODY n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_body_count);
+ Log_1.append(QString::number(block_body_count));
Log_1.append("\n");
block_body_count=block_body_count+1;
@@ -9867,9 +9867,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code CIRCLE n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_circle_count);
+ Log_1.append(QString::number(block_circle_count));
Log_1.append("\n");
block_circle_count=block_circle_count+1;
@@ -10399,7 +10399,7 @@
break;
case 330:
- if (count_block_circle_100>1)
+ if (count_block_circle_100>19)
{
Log_1.append(found_block_line());
}
@@ -10488,9 +10488,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code DIMENSION n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_dimension_count);
+ Log_1.append(QString::number(block_dimension_count));
Log_1.append("\n");
block_dimension_count=block_dimension_count+1;
@@ -10529,9 +10529,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code ELLIPSE n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_ellipse_count);
+ Log_1.append(QString::number(block_ellipse_count));
Log_1.append("\n");
block_ellipse_count=block_ellipse_count+1;
@@ -11135,6 +11135,22 @@
block_st5=0;
block_count5=0;
+ for (sw_cleaner=0; sw_cleaner<1072;++sw_cleaner)
+ {
+ sw_block_line[sw_cleaner]=0;
+
+ }
+
+ count_block_hatch_100=0;
+ count_block_hatch_102=0;
+ count_block_hatch_14=0;
+ count_block_hatch_10=0;
+ count_block_hatch_20=0;
+ count_block_hatch_30=0;
+ count_block_hatch_40=0;
+ count_block_hatch_330=0;
+
+
while (block_st5==0 and block_count5<49)
{
@@ -11150,9 +11166,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code HATCH n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_hatch_count);
+ Log_1.append(QString::number(block_hatch_count));
Log_1.append("\n");
block_hatch_count=block_hatch_count+1;
@@ -11160,9 +11176,681 @@
break;
+ case 5:
+
+ if(sw_block_line[5]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_5=line8;
+ sw_block_line[5]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+
+ case 6:
+
+ if(sw_block_line[6]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_6=line8;
+ sw_block_line[6]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+
+ case 8:
+
+ if(sw_block_line[8]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_8=line8;
+ sw_block_line[8]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 10:
+
+ if (count_block_hatch_10>199)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_hatch[block_count1][block_line_count].DXF_block_hatch_code_10[count_block_hatch_10]=line8.toDouble();
+ count_block_hatch_10=count_block_hatch_10+1;
+ }
+ break;
+
+ case 11:
+
+ if(sw_block_line[11]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_11=line8.toDouble();
+ sw_block_line[11]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 12:
+
+ if(sw_block_line[12]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_12=line8.toDouble();
+ sw_block_line[12]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 13:
+
+ if(sw_block_line[13]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_13=line8.toDouble();
+ sw_block_line[13]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 14:
+
+ if (count_block_hatch_14>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_hatch[block_count1][block_line_count].DXF_block_hatch_code_14[count_block_hatch_14]=line8.toDouble();
+ count_block_hatch_14=count_block_hatch_14+1;
+ }
+ break;
+
+ case 20:
+
+ if (count_block_hatch_20>199)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_hatch[block_count1][block_line_count].DXF_block_hatch_code_20[count_block_hatch_20]=line8.toDouble();
+ count_block_hatch_20=count_block_hatch_20+1;
+ }
+ break;
+
+ case 21:
+
+ if(sw_block_line[21]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_21=line8.toDouble();
+ sw_block_line[21]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 22:
+
+ if(sw_block_line[22]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_22=line8.toDouble();
+ sw_block_line[22]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 23:
+
+ if(sw_block_line[23]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_23=line8.toDouble();
+ sw_block_line[23]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 24:
+
+ if (count_block_hatch_24>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_hatch[block_count1][block_line_count].DXF_block_hatch_code_24[count_block_hatch_24]=line8.toDouble();
+ count_block_hatch_24=count_block_hatch_24+1;
+ }
+ break;
+
+ case 30:
+
+ if (count_block_hatch_30>199)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_hatch[block_count1][block_line_count].DXF_block_hatch_code_30[count_block_hatch_30]=line8.toDouble();
+ count_block_hatch_30=count_block_hatch_30+1;
+ }
+ break;
+
+ case 31:
+
+ if(sw_block_line[31]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_31=line8.toDouble();
+ sw_block_line[31]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 32:
+
+ if(sw_block_line[32]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_32=line8.toDouble();
+ sw_block_line[32]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 40:
+
+ if (count_block_hatch_40>199)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_hatch[block_count1][block_line_count].DXF_block_hatch_code_40[count_block_hatch_40]=line8.toDouble();
+ count_block_hatch_40=count_block_hatch_40+1;
+ }
+ break;
+
+ case 42:
+
+ if(sw_block_line[42]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_42=line8.toDouble();
+ sw_block_line[42]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 43:
+
+ if(sw_block_line[43]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_43=line8.toDouble();
+ sw_block_line[43]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 44:
+
+ if(sw_block_line[44]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_44=line8.toDouble();
+ sw_block_line[44]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+
+
+
+ case 48:
+
+ if(sw_block_line[48]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_48=line8.toDouble();
+ sw_block_line[48]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 50:
+
+ if(sw_block_line[50]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_50=line8.toDouble();
+ sw_block_line[50]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 51:
+
+ if(sw_block_line[51]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_51=line8.toDouble();
+ sw_block_line[51]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 62:
+
+ if(sw_block_line[62]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_62=line8.toInt();
+ sw_block_line[62]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 70:
+
+ if(sw_block_line[70]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_70=line8.toInt();
+ sw_block_line[70]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 71:
+
+ if(sw_block_line[71]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_71=line8.toInt();
+ sw_block_line[71]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 72:
+
+ if(sw_block_line[72]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_72=line8.toInt();
+ sw_block_line[72]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+
+ case 73:
+
+ if(sw_block_line[73]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_73=line8.toInt();
+ sw_block_line[73]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+
+ case 74:
+
+ if(sw_block_line[74]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_74=line8.toInt();
+ sw_block_line[74]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 90:
+
+ if(sw_block_line[90]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_90=line8.toInt();
+ sw_block_line[90]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 91:
+
+ if(sw_block_line[91]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_91=line8.toInt();
+ sw_block_line[91]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 92:
+
+ if(sw_block_line[92]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_92=line8.toInt();
+ sw_block_line[92]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 100:
+
+ if (count_block_hatch_100>2)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_100[count_block_hatch_100]=line8;
+ count_block_hatch_100=count_block_hatch_100+1;
+ }
+ break;
+
+
+ case 210:
+
+ if(sw_block_line[210]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_210=line8.toInt();
+ sw_block_line[210]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+
+ case 220:
+
+ if(sw_block_line[220]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_220=line8.toInt();
+ sw_block_line[220]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+
+ case 230:
+
+ if(sw_block_line[230]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_230=line8.toInt();
+ sw_block_line[230]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+
+
+ case 280:
+
+ if(sw_block_line[280]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_280=line8.toInt();
+ sw_block_line[280]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 281:
+
+ if(sw_block_line[281]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_281=line8.toInt();
+ sw_block_line[281]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 282:
+
+ if(sw_block_line[282]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_282=line8.toInt();
+ sw_block_line[282]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 283:
+
+ if(sw_block_line[283]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_283=line8.toInt();
+ sw_block_line[283]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 310:
+
+ if(sw_block_line[310]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_310=line8;
+ sw_block_line[310]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 330:
+
+ if (count_block_hatch_330>1)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_330[count_block_hatch_330]=line8;
+ count_block_hatch_330=count_block_hatch_330+1;
+ }
+ break;
+
+ case 340:
+
+ if(sw_block_line[340]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_340=line8;
+ sw_block_line[340]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 360:
+
+ if(sw_block_line[360]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_360=line8;
+ sw_block_line[360]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
+ case 370:
+
+ if(sw_block_line[370]==0)
+ {
+ DXF_input_block_hatch[block_count1][block_hatch_count].DXF_block_hatch_code_370=line8.toInt();
+ sw_block_line[370]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_hatch());
+
+ }
+
+ break;
+
default:
Log_1.append(found_block_hatch());
+
}
@@ -11192,9 +11880,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code HELIX \n");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_helix_count);
+ Log_1.append(QString::number(block_helix_count));
Log_1.append("\n");
block_helix_count=block_helix_count+1;
@@ -11247,9 +11935,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code IMAGE n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_image_count);
+ Log_1.append(QString::number(block_image_count));
Log_1.append("\n");
block_image_count=block_image_count+1;
@@ -11733,9 +12421,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code INSERT n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_insert_count);
+ Log_1.append(QString::number(block_insert_count));
Log_1.append("\n");
block_insert_count=block_insert_count+1;
@@ -11774,9 +12462,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code LEADER n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_leader_count);
+ Log_1.append(QString::number(block_leader_count));
Log_1.append("\n");
block_leader_count=block_leader_count+1;
@@ -11815,9 +12503,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code LIGHT n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_light_count);
+ Log_1.append(QString::number(block_light_count));
Log_1.append("\n");
block_light_count=block_light_count+1;
@@ -11837,9 +12525,9 @@
if (line4=="LINE" and line4.length()==4)
{
Log_1.append("Start reading BLOCK code LINE n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_line_count);
+ Log_1.append(QString::number(block_line_count));
Log_1.append("\n");
@@ -11874,9 +12562,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code LINE n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_line_count);
+ Log_1.append(QString::number(block_line_count));
Log_1.append(" \n");
block_line_count=block_line_count+1;
@@ -12148,9 +12836,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code LWPOLYLINE n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_lwpolyline_count);
+ Log_1.append(QString::number(block_lwpolyline_count));
Log_1.append("\n");
block_lwpolyline_count=block_lwpolyline_count+1;
@@ -12767,9 +13455,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code MESH n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_mesh_count);
+ Log_1.append(QString::number(block_mesh_count));
Log_1.append("\n");
block_mesh_count=block_mesh_count+1;
@@ -12808,9 +13496,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code MLINE n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_mline_count);
+ Log_1.append(QString::number(block_mline_count));
Log_1.append("\n");
block_mline_count=block_mline_count+1;
@@ -12849,9 +13537,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code MLEADERSTYLE n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_mleaderstyle_count);
+ Log_1.append(QString::number(block_mleaderstyle_count));
Log_1.append("\n");
block_mleaderstyle_count=block_mleaderstyle_count+1;
@@ -12890,9 +13578,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code MLEADER n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_mleader_count);
+ Log_1.append(QString::number(block_mleader_count));
Log_1.append("\n");
block_mleader_count=block_mleader_count+1;
@@ -12931,9 +13619,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code MTEXT n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_mtext_count);
+ Log_1.append(QString::number(block_mtext_count));
Log_1.append("\n");
block_mtext_count=block_mtext_count+1;
@@ -12972,9 +13660,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code OLEFRAME n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_oleframe_count);
+ Log_1.append(QString::number(block_oleframe_count));
Log_1.append("\n");
block_oleframe_count=block_oleframe_count+1;
@@ -13013,9 +13701,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code OLE2FRAME n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_ole2frame_count);
+ Log_1.append(QString::number(block_ole2frame_count));
Log_1.append("\n");
block_ole2frame_count=block_ole2frame_count+1;
@@ -13053,9 +13741,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code POINT n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_point_count);
+ Log_1.append(QString::number(block_point_count));
Log_1.append("\n");
block_point_count=block_point_count+1;
@@ -13079,6 +13767,19 @@
block_st5=0;
block_count5=0;
+ for (sw_cleaner=0; sw_cleaner<1072;++sw_cleaner)
+ {
+ sw_block_line[sw_cleaner]=0;
+
+ }
+
+ count_block_polyline_100=0;
+ count_block_polyline_102=0;
+ count_block_polyline_14=0;
+ count_block_polyline_10=0;
+ count_block_polyline_330=0;
+
+
while (block_st5==0 and block_count5<49)
{
@@ -13094,16 +13795,597 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code POLYLINE n : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_polyline_count);
+ Log_1.append(QString::number(block_polyline_count));
Log_1.append("\n");
- block_point_count=block_point_count+1;
+ block_polyline_count=block_polyline_count+1;
break;
+ case 5:
+
+ if(sw_block_line[5]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_5=line8;
+ Master_block_handle_id=line8;
+
+ sw_block_line[5]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+
+ case 6:
+
+ if(sw_block_line[6]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_6=line8;
+ sw_block_line[6]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+
+ case 8:
+
+ if(sw_block_line[8]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_8=line8;
+ sw_block_line[8]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 10:
+
+ if(sw_block_line[10]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_10=line8.toDouble();
+ sw_block_line[10]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 11:
+
+ if(sw_block_line[11]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_11=line8.toDouble();
+ sw_block_line[11]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 12:
+
+ if(sw_block_line[12]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_12=line8.toDouble();
+ sw_block_line[12]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 13:
+
+ if(sw_block_line[13]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_13=line8.toDouble();
+ sw_block_line[13]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 14:
+
+ if (count_block_polyline_14>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_polyline[block_count1][block_line_count].DXF_block_polyline_code_14[count_block_polyline_14]=line8.toDouble();
+ count_block_polyline_14=count_block_polyline_14+1;
+ }
+ break;
+
+ case 20:
+
+ if(sw_block_line[20]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_20=line8.toDouble();
+ sw_block_line[20]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 21:
+
+ if(sw_block_line[21]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_21=line8.toDouble();
+ sw_block_line[21]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 22:
+
+ if(sw_block_line[22]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_22=line8.toDouble();
+ sw_block_line[22]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 23:
+
+ if(sw_block_line[23]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_23=line8.toDouble();
+ sw_block_line[23]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 24:
+
+ if (count_block_polyline_24>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_polyline[block_count1][block_line_count].DXF_block_polyline_code_24[count_block_polyline_24]=line8.toDouble();
+ count_block_polyline_24=count_block_polyline_24+1;
+ }
+ break;
+
+ case 30:
+
+ if(sw_block_line[30]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_30=line8.toDouble();
+ sw_block_line[30]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 31:
+
+ if(sw_block_line[31]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_31=line8.toDouble();
+ sw_block_line[31]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 32:
+
+ if(sw_block_line[32]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_32=line8.toDouble();
+ sw_block_line[32]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 40:
+
+ if(sw_block_line[40]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_40=line8.toDouble();
+ sw_block_line[40]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 48:
+
+ if(sw_block_line[48]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_48=line8.toDouble();
+ sw_block_line[48]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 50:
+
+ if(sw_block_line[50]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_50=line8.toDouble();
+ sw_block_line[50]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 51:
+
+ if(sw_block_line[51]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_51=line8.toDouble();
+ sw_block_line[51]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 62:
+
+ if(sw_block_line[62]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_62=line8.toInt();
+ sw_block_line[62]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 66:
+
+ if(sw_block_line[66]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_66=line8.toInt();
+ sw_block_line[66]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 70:
+
+ if(sw_block_line[70]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_70=line8.toInt();
+ sw_block_line[70]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 71:
+
+ if(sw_block_line[71]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_71=line8.toInt();
+ sw_block_line[71]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ /*case 72:
+
+ if(sw_block_line[72]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_72=line8.toInt();
+ sw_block_line[72]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;*/
+
+ case 90:
+
+ if(sw_block_line[90]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_90=line8.toInt();
+ sw_block_line[90]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 91:
+
+ if(sw_block_line[91]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_91=line8.toInt();
+ sw_block_line[91]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 92:
+
+ if(sw_block_line[92]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_92=line8.toInt();
+ sw_block_line[92]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 100:
+
+ if (count_block_polyline_100>3)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_100[count_block_polyline_100]=line8;
+ count_block_polyline_100=count_block_polyline_100+1;
+ }
+ break;
+
+ case 102:
+
+ if (count_block_polyline_102>3)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_102[count_block_polyline_102]=line8;
+ count_block_polyline_102=count_block_polyline_102+1;
+ }
+ break;
+
+
+
+ case 280:
+
+ if(sw_block_line[280]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_280=line8.toInt();
+ sw_block_line[280]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 281:
+
+ if(sw_block_line[281]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_281=line8.toInt();
+ sw_block_line[281]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 282:
+
+ if(sw_block_line[282]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_282=line8.toInt();
+ sw_block_line[282]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 283:
+
+ if(sw_block_line[283]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_283=line8.toInt();
+ sw_block_line[283]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 310:
+
+ if(sw_block_line[310]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_310=line8;
+ sw_block_line[310]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 330:
+
+ if (count_block_polyline_330>1)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_330[count_block_polyline_330]=line8;
+ count_block_polyline_330=count_block_polyline_330+1;
+ }
+ break;
+
+ case 340:
+
+ if(sw_block_line[340]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_340=line8;
+ sw_block_line[340]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 360:
+
+ if(sw_block_line[360]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_360=line8;
+ sw_block_line[360]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
+ case 370:
+
+ if(sw_block_line[370]==0)
+ {
+ DXF_input_block_polyline[block_count1][block_polyline_count].DXF_block_polyline_code_370=line8.toInt();
+ sw_block_line[370]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_polyline());
+
+ }
+
+ break;
+
default:
Log_1.append(found_block_polyline());
@@ -13135,9 +14417,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code RAY n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_ray_count);
+ Log_1.append(QString::number(block_ray_count));
Log_1.append("\n");
block_ray_count=block_ray_count+1;
@@ -13176,9 +14458,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code REGION n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_region_count);
+ Log_1.append(QString::number(block_region_count));
Log_1.append("\n");
block_region_count=block_region_count+1;
@@ -13217,9 +14499,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code SECTION n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_section_count);
+ Log_1.append(QString::number(block_section_count));
Log_1.append("\n");
block_section_count=block_section_count+1;
@@ -13250,6 +14532,22 @@
line7=DXF_main_base[0].dxf_input[for_count1].toInt();
line8=DXF_main_base[0].dxf_input[for_count1+1];
+ for (sw_cleaner=0; sw_cleaner<1072;++sw_cleaner)
+ {
+ sw_block_line[sw_cleaner]=0;
+
+ }
+
+ count_block_seqend_100=0;
+ count_block_seqend_102=0;
+ count_block_seqend_14=0;
+ count_block_seqend_10=0;
+ count_block_seqend_20=0;
+ count_block_seqend_30=0;
+ count_block_seqend_40=0;
+ count_block_seqend_330=0;
+
+
switch (line7)
{
case 0:
@@ -13258,9 +14556,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code SEQEND n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_seqend_count);
+ Log_1.append(QString::number(block_seqend_count));
Log_1.append("\n");
block_seqend_count=block_seqend_count+1;
@@ -13268,9 +14566,681 @@
break;
+ case 5:
+
+ if(sw_block_line[5]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_5=line8;
+ sw_block_line[5]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+
+ case 6:
+
+ if(sw_block_line[6]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_6=line8;
+ sw_block_line[6]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+
+ case 8:
+
+ if(sw_block_line[8]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_8=line8;
+ sw_block_line[8]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 10:
+
+ if (count_block_seqend_10>199)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_seqend[block_count1][block_line_count].DXF_block_seqend_code_10[count_block_seqend_10]=line8.toDouble();
+ count_block_seqend_10=count_block_seqend_10+1;
+ }
+ break;
+
+ case 11:
+
+ if(sw_block_line[11]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_11=line8.toDouble();
+ sw_block_line[11]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 12:
+
+ if(sw_block_line[12]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_12=line8.toDouble();
+ sw_block_line[12]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 13:
+
+ if(sw_block_line[13]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_13=line8.toDouble();
+ sw_block_line[13]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 14:
+
+ if (count_block_seqend_14>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_seqend[block_count1][block_line_count].DXF_block_seqend_code_14[count_block_seqend_14]=line8.toDouble();
+ count_block_seqend_14=count_block_seqend_14+1;
+ }
+ break;
+
+ case 20:
+
+ if (count_block_seqend_20>199)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_seqend[block_count1][block_line_count].DXF_block_seqend_code_20[count_block_seqend_20]=line8.toDouble();
+ count_block_seqend_20=count_block_seqend_20+1;
+ }
+ break;
+
+ case 21:
+
+ if(sw_block_line[21]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_21=line8.toDouble();
+ sw_block_line[21]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 22:
+
+ if(sw_block_line[22]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_22=line8.toDouble();
+ sw_block_line[22]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 23:
+
+ if(sw_block_line[23]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_23=line8.toDouble();
+ sw_block_line[23]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 24:
+
+ if (count_block_seqend_24>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_seqend[block_count1][block_line_count].DXF_block_seqend_code_24[count_block_seqend_24]=line8.toDouble();
+ count_block_seqend_24=count_block_seqend_24+1;
+ }
+ break;
+
+ case 30:
+
+ if (count_block_seqend_30>199)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_seqend[block_count1][block_line_count].DXF_block_seqend_code_30[count_block_seqend_30]=line8.toDouble();
+ count_block_seqend_30=count_block_seqend_30+1;
+ }
+ break;
+
+ case 31:
+
+ if(sw_block_line[31]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_31=line8.toDouble();
+ sw_block_line[31]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 32:
+
+ if(sw_block_line[32]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_32=line8.toDouble();
+ sw_block_line[32]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 40:
+
+ if (count_block_seqend_40>199)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_seqend[block_count1][block_line_count].DXF_block_seqend_code_40[count_block_seqend_40]=line8.toDouble();
+ count_block_seqend_40=count_block_seqend_40+1;
+ }
+ break;
+
+ case 42:
+
+ if(sw_block_line[42]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_42=line8.toDouble();
+ sw_block_line[42]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 43:
+
+ if(sw_block_line[43]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_43=line8.toDouble();
+ sw_block_line[43]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 44:
+
+ if(sw_block_line[44]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_44=line8.toDouble();
+ sw_block_line[44]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+
+
+
+ case 48:
+
+ if(sw_block_line[48]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_48=line8.toDouble();
+ sw_block_line[48]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 50:
+
+ if(sw_block_line[50]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_50=line8.toDouble();
+ sw_block_line[50]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 51:
+
+ if(sw_block_line[51]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_51=line8.toDouble();
+ sw_block_line[51]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 62:
+
+ if(sw_block_line[62]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_62=line8.toInt();
+ sw_block_line[62]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 70:
+
+ if(sw_block_line[70]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_70=line8.toInt();
+ sw_block_line[70]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 71:
+
+ if(sw_block_line[71]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_71=line8.toInt();
+ sw_block_line[71]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 72:
+
+ if(sw_block_line[72]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_72=line8.toInt();
+ sw_block_line[72]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+
+ case 73:
+
+ if(sw_block_line[73]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_73=line8.toInt();
+ sw_block_line[73]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+
+ case 74:
+
+ if(sw_block_line[74]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_74=line8.toInt();
+ sw_block_line[74]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 90:
+
+ if(sw_block_line[90]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_90=line8.toInt();
+ sw_block_line[90]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 91:
+
+ if(sw_block_line[91]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_91=line8.toInt();
+ sw_block_line[91]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 92:
+
+ if(sw_block_line[92]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_92=line8.toInt();
+ sw_block_line[92]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 100:
+
+ if (count_block_seqend_100>2)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_100[count_block_seqend_100]=line8;
+ count_block_seqend_100=count_block_seqend_100+1;
+ }
+ break;
+
+
+ case 210:
+
+ if(sw_block_line[210]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_210=line8.toInt();
+ sw_block_line[210]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+
+ case 220:
+
+ if(sw_block_line[220]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_220=line8.toInt();
+ sw_block_line[220]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+
+ case 230:
+
+ if(sw_block_line[230]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_230=line8.toInt();
+ sw_block_line[230]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+
+
+ case 280:
+
+ if(sw_block_line[280]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_280=line8.toInt();
+ sw_block_line[280]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 281:
+
+ if(sw_block_line[281]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_281=line8.toInt();
+ sw_block_line[281]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 282:
+
+ if(sw_block_line[282]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_282=line8.toInt();
+ sw_block_line[282]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 283:
+
+ if(sw_block_line[283]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_283=line8.toInt();
+ sw_block_line[283]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 310:
+
+ if(sw_block_line[310]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_310=line8;
+ sw_block_line[310]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 330:
+
+ if (count_block_seqend_330>1)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_330[count_block_seqend_330]=line8;
+ count_block_seqend_330=count_block_seqend_330+1;
+ }
+ break;
+
+ case 340:
+
+ if(sw_block_line[340]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_340=line8;
+ sw_block_line[340]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 360:
+
+ if(sw_block_line[360]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_360=line8;
+ sw_block_line[360]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
+ case 370:
+
+ if(sw_block_line[370]==0)
+ {
+ DXF_input_block_seqend[block_count1][block_seqend_count].DXF_block_seqend_code_370=line8.toInt();
+ sw_block_line[370]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_seqend());
+
+ }
+
+ break;
+
default:
- Log_1.append("Find in BLOCK code SEQEND \n");
+ Log_1.append(found_block_seqend());
+
}
@@ -13299,9 +15269,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code SHAPE n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_shape_count);
+ Log_1.append(QString::number(block_shape_count));
Log_1.append("\n");
block_shape_count=block_shape_count+1;
@@ -13331,7 +15301,17 @@
}
+ count_block_solid_100=0;
+ count_block_solid_102=0;
+ count_block_solid_14=0;
+ count_block_solid_10=0;
+ count_block_solid_20=0;
+ count_block_solid_30=0;
+ count_block_solid_40=0;
+ count_block_solid_330=0;
+
+
while (block_st5==0 and block_count5<49)
{
@@ -13348,15 +15328,31 @@
Log_1.append("End reading BLOCK code SOLID n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_solid_count);
+ Log_1.append(QString::number(block_solid_count));
Log_1.append("\n");
block_solid_count=block_solid_count+1;
break;
+ case 5:
+
+ if(sw_block_line[5]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_5=line8;
+ sw_block_line[5]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+
case 6:
if(sw_block_line[6]==0)
@@ -13372,6 +15368,7 @@
break;
+
case 8:
if(sw_block_line[8]==0)
@@ -13382,22 +15379,22 @@
else
{
Log_1.append(found_block_solid());
+
}
break;
case 10:
- if(sw_block_line[10]==0)
+ if (count_block_solid_10>199)
{
- DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_10=line8.toDouble();
- sw_block_line[10]=1;
+ Log_1.append(found_block_line());
}
else
{
- Log_1.append(found_block_solid());
+ DXF_input_block_solid[block_count1][block_line_count].DXF_block_solid_code_10[count_block_solid_10]=line8.toDouble();
+ count_block_solid_10=count_block_solid_10+1;
}
-
break;
case 11:
@@ -13410,6 +15407,7 @@
else
{
Log_1.append(found_block_solid());
+
}
break;
@@ -13424,6 +15422,7 @@
else
{
Log_1.append(found_block_solid());
+
}
break;
@@ -13438,22 +15437,35 @@
else
{
Log_1.append(found_block_solid());
+
}
break;
+ case 14:
+
+ if (count_block_solid_14>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_solid[block_count1][block_line_count].DXF_block_solid_code_14[count_block_solid_14]=line8.toDouble();
+ count_block_solid_14=count_block_solid_14+1;
+ }
+ break;
+
case 20:
- if(sw_block_line[20]==0)
+ if (count_block_solid_20>199)
{
- DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_20=line8.toDouble();
- sw_block_line[20]=1;
+ Log_1.append(found_block_line());
}
else
{
- Log_1.append(found_block_solid());
+ DXF_input_block_solid[block_count1][block_line_count].DXF_block_solid_code_20[count_block_solid_20]=line8.toDouble();
+ count_block_solid_20=count_block_solid_20+1;
}
-
break;
case 21:
@@ -13466,6 +15478,7 @@
else
{
Log_1.append(found_block_solid());
+
}
break;
@@ -13480,6 +15493,7 @@
else
{
Log_1.append(found_block_solid());
+
}
break;
@@ -13494,12 +15508,509 @@
else
{
Log_1.append(found_block_solid());
+
}
break;
+ case 24:
+
+ if (count_block_solid_24>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_solid[block_count1][block_line_count].DXF_block_solid_code_24[count_block_solid_24]=line8.toDouble();
+ count_block_solid_24=count_block_solid_24+1;
+ }
+ break;
+
+ case 30:
+
+ if (count_block_solid_30>199)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_solid[block_count1][block_line_count].DXF_block_solid_code_30[count_block_solid_30]=line8.toDouble();
+ count_block_solid_30=count_block_solid_30+1;
+ }
+ break;
+
+ case 31:
+
+ if(sw_block_line[31]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_31=line8.toDouble();
+ sw_block_line[31]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 32:
+
+ if(sw_block_line[32]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_32=line8.toDouble();
+ sw_block_line[32]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 40:
+
+ if (count_block_solid_40>199)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_solid[block_count1][block_line_count].DXF_block_solid_code_40[count_block_solid_40]=line8.toDouble();
+ count_block_solid_40=count_block_solid_40+1;
+ }
+ break;
+
+ case 42:
+
+ if(sw_block_line[42]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_42=line8.toDouble();
+ sw_block_line[42]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 43:
+
+ if(sw_block_line[43]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_43=line8.toDouble();
+ sw_block_line[43]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 44:
+
+ if(sw_block_line[44]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_44=line8.toDouble();
+ sw_block_line[44]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+
+
+
+ case 48:
+
+ if(sw_block_line[48]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_48=line8.toDouble();
+ sw_block_line[48]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 50:
+
+ if(sw_block_line[50]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_50=line8.toDouble();
+ sw_block_line[50]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 51:
+
+ if(sw_block_line[51]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_51=line8.toDouble();
+ sw_block_line[51]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 62:
+
+ if(sw_block_line[62]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_62=line8.toInt();
+ sw_block_line[62]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 70:
+
+ if(sw_block_line[70]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_70=line8.toInt();
+ sw_block_line[70]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 71:
+
+ if(sw_block_line[71]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_71=line8.toInt();
+ sw_block_line[71]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 72:
+
+ if(sw_block_line[72]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_72=line8.toInt();
+ sw_block_line[72]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+
+ case 73:
+
+ if(sw_block_line[73]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_73=line8.toInt();
+ sw_block_line[73]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+
+ case 74:
+
+ if(sw_block_line[74]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_74=line8.toInt();
+ sw_block_line[74]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 90:
+
+ if(sw_block_line[90]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_90=line8.toInt();
+ sw_block_line[90]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 91:
+
+ if(sw_block_line[91]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_91=line8.toInt();
+ sw_block_line[91]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 92:
+
+ if(sw_block_line[92]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_92=line8.toInt();
+ sw_block_line[92]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 100:
+
+ if (count_block_solid_100>2)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_100[count_block_solid_100]=line8;
+ count_block_solid_100=count_block_solid_100+1;
+ }
+ break;
+
+
+ case 210:
+
+ if(sw_block_line[210]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_210=line8.toInt();
+ sw_block_line[210]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+
+ case 220:
+
+ if(sw_block_line[220]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_220=line8.toInt();
+ sw_block_line[220]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+
+ case 230:
+
+ if(sw_block_line[230]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_230=line8.toInt();
+ sw_block_line[230]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+
+
+ case 280:
+
+ if(sw_block_line[280]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_280=line8.toInt();
+ sw_block_line[280]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 281:
+
+ if(sw_block_line[281]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_281=line8.toInt();
+ sw_block_line[281]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 282:
+
+ if(sw_block_line[282]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_282=line8.toInt();
+ sw_block_line[282]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 283:
+
+ if(sw_block_line[283]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_283=line8.toInt();
+ sw_block_line[283]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 310:
+
+ if(sw_block_line[310]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_310=line8;
+ sw_block_line[310]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 330:
+
+ if (count_block_solid_330>1)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_330[count_block_solid_330]=line8;
+ count_block_solid_330=count_block_solid_330+1;
+ }
+ break;
+
+ case 340:
+
+ if(sw_block_line[340]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_340=line8;
+ sw_block_line[340]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 360:
+
+ if(sw_block_line[360]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_360=line8;
+ sw_block_line[360]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
+ case 370:
+
+ if(sw_block_line[370]==0)
+ {
+ DXF_input_block_solid[block_count1][block_solid_count].DXF_block_solid_code_370=line8.toInt();
+ sw_block_line[370]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_solid());
+
+ }
+
+ break;
+
default:
Log_1.append(found_block_solid());
+
}
@@ -13513,6 +16024,22 @@
block_st5=0;
block_count5=0;
+ for (sw_cleaner=0; sw_cleaner<1072;++sw_cleaner)
+ {
+ sw_block_line[sw_cleaner]=0;
+
+ }
+
+ count_block_spline_100=0;
+ count_block_spline_102=0;
+ count_block_spline_14=0;
+ count_block_spline_10=0;
+ count_block_spline_20=0;
+ count_block_spline_30=0;
+ count_block_spline_40=0;
+ count_block_spline_330=0;
+
+
while (block_st5==0 and block_count5<49)
{
@@ -13528,9 +16055,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code SPLINE n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_spline_count);
+ Log_1.append(QString::number(block_spline_count));
Log_1.append("\n");
block_spline_count=block_spline_count+1;
@@ -13538,9 +16065,682 @@
break;
+
+ case 5:
+
+ if(sw_block_line[5]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_5=line8;
+ sw_block_line[5]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+
+ case 6:
+
+ if(sw_block_line[6]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_6=line8;
+ sw_block_line[6]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+
+ case 8:
+
+ if(sw_block_line[8]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_8=line8;
+ sw_block_line[8]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 10:
+
+ if (count_block_spline_10>199)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_spline[block_count1][block_line_count].DXF_block_spline_code_10[count_block_spline_10]=line8.toDouble();
+ count_block_spline_10=count_block_spline_10+1;
+ }
+ break;
+
+ case 11:
+
+ if(sw_block_line[11]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_11=line8.toDouble();
+ sw_block_line[11]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 12:
+
+ if(sw_block_line[12]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_12=line8.toDouble();
+ sw_block_line[12]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 13:
+
+ if(sw_block_line[13]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_13=line8.toDouble();
+ sw_block_line[13]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 14:
+
+ if (count_block_spline_14>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_spline[block_count1][block_line_count].DXF_block_spline_code_14[count_block_spline_14]=line8.toDouble();
+ count_block_spline_14=count_block_spline_14+1;
+ }
+ break;
+
+ case 20:
+
+ if (count_block_spline_20>199)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_spline[block_count1][block_line_count].DXF_block_spline_code_20[count_block_spline_20]=line8.toDouble();
+ count_block_spline_20=count_block_spline_20+1;
+ }
+ break;
+
+ case 21:
+
+ if(sw_block_line[21]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_21=line8.toDouble();
+ sw_block_line[21]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 22:
+
+ if(sw_block_line[22]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_22=line8.toDouble();
+ sw_block_line[22]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 23:
+
+ if(sw_block_line[23]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_23=line8.toDouble();
+ sw_block_line[23]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 24:
+
+ if (count_block_spline_24>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_spline[block_count1][block_line_count].DXF_block_spline_code_24[count_block_spline_24]=line8.toDouble();
+ count_block_spline_24=count_block_spline_24+1;
+ }
+ break;
+
+ case 30:
+
+ if (count_block_spline_30>199)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_spline[block_count1][block_line_count].DXF_block_spline_code_30[count_block_spline_30]=line8.toDouble();
+ count_block_spline_30=count_block_spline_30+1;
+ }
+ break;
+
+ case 31:
+
+ if(sw_block_line[31]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_31=line8.toDouble();
+ sw_block_line[31]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 32:
+
+ if(sw_block_line[32]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_32=line8.toDouble();
+ sw_block_line[32]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 40:
+
+ if (count_block_spline_40>199)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_spline[block_count1][block_line_count].DXF_block_spline_code_40[count_block_spline_40]=line8.toDouble();
+ count_block_spline_40=count_block_spline_40+1;
+ }
+ break;
+
+ case 42:
+
+ if(sw_block_line[42]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_42=line8.toDouble();
+ sw_block_line[42]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 43:
+
+ if(sw_block_line[43]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_43=line8.toDouble();
+ sw_block_line[43]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 44:
+
+ if(sw_block_line[44]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_44=line8.toDouble();
+ sw_block_line[44]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+
+
+
+ case 48:
+
+ if(sw_block_line[48]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_48=line8.toDouble();
+ sw_block_line[48]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 50:
+
+ if(sw_block_line[50]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_50=line8.toDouble();
+ sw_block_line[50]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 51:
+
+ if(sw_block_line[51]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_51=line8.toDouble();
+ sw_block_line[51]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 62:
+
+ if(sw_block_line[62]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_62=line8.toInt();
+ sw_block_line[62]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 70:
+
+ if(sw_block_line[70]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_70=line8.toInt();
+ sw_block_line[70]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 71:
+
+ if(sw_block_line[71]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_71=line8.toInt();
+ sw_block_line[71]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 72:
+
+ if(sw_block_line[72]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_72=line8.toInt();
+ sw_block_line[72]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+
+ case 73:
+
+ if(sw_block_line[73]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_73=line8.toInt();
+ sw_block_line[73]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+
+ case 74:
+
+ if(sw_block_line[74]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_74=line8.toInt();
+ sw_block_line[74]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 90:
+
+ if(sw_block_line[90]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_90=line8.toInt();
+ sw_block_line[90]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 91:
+
+ if(sw_block_line[91]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_91=line8.toInt();
+ sw_block_line[91]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 92:
+
+ if(sw_block_line[92]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_92=line8.toInt();
+ sw_block_line[92]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 100:
+
+ if (count_block_spline_100>2)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_100[count_block_spline_100]=line8;
+ count_block_spline_100=count_block_spline_100+1;
+ }
+ break;
+
+
+ case 210:
+
+ if(sw_block_line[210]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_210=line8.toInt();
+ sw_block_line[210]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+
+ case 220:
+
+ if(sw_block_line[220]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_220=line8.toInt();
+ sw_block_line[220]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+
+ case 230:
+
+ if(sw_block_line[230]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_230=line8.toInt();
+ sw_block_line[230]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+
+
+ case 280:
+
+ if(sw_block_line[280]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_280=line8.toInt();
+ sw_block_line[280]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 281:
+
+ if(sw_block_line[281]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_281=line8.toInt();
+ sw_block_line[281]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 282:
+
+ if(sw_block_line[282]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_282=line8.toInt();
+ sw_block_line[282]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 283:
+
+ if(sw_block_line[283]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_283=line8.toInt();
+ sw_block_line[283]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 310:
+
+ if(sw_block_line[310]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_310=line8;
+ sw_block_line[310]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 330:
+
+ if (count_block_spline_330>1)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_330[count_block_spline_330]=line8;
+ count_block_spline_330=count_block_spline_330+1;
+ }
+ break;
+
+ case 340:
+
+ if(sw_block_line[340]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_340=line8;
+ sw_block_line[340]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 360:
+
+ if(sw_block_line[360]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_360=line8;
+ sw_block_line[360]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
+ case 370:
+
+ if(sw_block_line[370]==0)
+ {
+ DXF_input_block_spline[block_count1][block_spline_count].DXF_block_spline_code_370=line8.toInt();
+ sw_block_line[370]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_spline());
+
+ }
+
+ break;
+
default:
Log_1.append(found_block_spline());
+
}
@@ -13569,9 +16769,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code SUN n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_sun_count);
+ Log_1.append(QString::number(block_sun_count));
Log_1.append("\n");
block_sun_count=block_sun_count+1;
@@ -13610,9 +16810,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code SURFACE \n");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_surface_count);
+ Log_1.append(QString::number(block_surface_count));
Log_1.append("\n");
block_surface_count=block_surface_count+1;
@@ -13651,9 +16851,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code TABLE n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_table_count);
+ Log_1.append(QString::number(block_table_count));
Log_1.append("\n");
block_table_count=block_table_count+1;
@@ -13709,9 +16909,9 @@
Log_1.append("End reading BLOCK code TEXT n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_text_count);
+ Log_1.append(QString::number(block_text_count));
Log_1.append("\n");
block_text_count=block_text_count+1;
@@ -13766,6 +16966,22 @@
break;
+
+ case 6:
+
+ if(sw_block_line[6]==0)
+ {
+ DXF_input_block_text[block_count1][block_text_count].DXF_block_text_code_6=line8;
+ sw_block_line[6]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_text());
+
+ }
+
+ break;
+
case 7:
if(sw_block_line[7]==0)
@@ -14002,6 +17218,21 @@
break;
+ case 50:
+
+ if(sw_block_line[50]==0)
+ {
+ DXF_input_block_text[block_count1][block_text_count].DXF_block_text_code_50=line8.toDouble();
+ sw_block_line[50]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_text());
+
+ }
+
+ break;
+
case 62:
if(sw_block_line[62]==0)
@@ -14312,9 +17543,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code TOLERANCE n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_tolerance_count);
+ Log_1.append(QString::number(block_tolerance_count));
Log_1.append("\n");
block_tolerance_count=block_tolerance_count+1;
@@ -14353,9 +17584,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code TRACE n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_trace_count);
+ Log_1.append(QString::number(block_trace_count));
Log_1.append("\n");
block_trace_count=block_trace_count+1;
@@ -14394,9 +17625,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code UNDERLAY n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_underlay_count);
+ Log_1.append(QString::number(block_underlay_count));
Log_1.append("\n");
block_underlay_count=block_underlay_count+1;
@@ -14420,6 +17651,18 @@
block_st5=0;
block_count5=0;
+ for (sw_cleaner=0; sw_cleaner<1072;++sw_cleaner)
+ {
+ sw_block_line[sw_cleaner]=0;
+
+ }
+
+ count_block_vertex_100=0;
+ count_block_vertex_102=0;
+ count_block_vertex_14=0;
+ count_block_vertex_10=0;
+ count_block_vertex_330=0;
+
while (block_st5==0 and block_count5<49)
{
@@ -14435,27 +17678,584 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code VERTEX n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_vertex_count);
+ Log_1.append(QString::number(block_vertex_count));
Log_1.append("\n");
block_vertex_count=block_vertex_count+1;
+ DXF_input_block_vertex[block_count1][block_vertex_count].Master_block_handle_id=Master_block_handle_id;
+
break;
+ case 5:
+
+ if(sw_block_line[5]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_5=line8;
+ sw_block_line[5]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+
+ case 6:
+
+ if(sw_block_line[6]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_6=line8;
+ sw_block_line[6]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+
+ case 8:
+
+ if(sw_block_line[8]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_8=line8;
+ sw_block_line[8]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 10:
+
+ if(sw_block_line[10]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_10=line8.toDouble();
+ sw_block_line[10]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 11:
+
+ if(sw_block_line[11]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_11=line8.toDouble();
+ sw_block_line[11]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 12:
+
+ if(sw_block_line[12]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_12=line8.toDouble();
+ sw_block_line[12]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 13:
+
+ if(sw_block_line[13]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_13=line8.toDouble();
+ sw_block_line[13]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 14:
+
+ if (count_block_vertex_14>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_vertex[block_count1][block_line_count].DXF_block_vertex_code_14[count_block_vertex_14]=line8.toDouble();
+ count_block_vertex_14=count_block_vertex_14+1;
+ }
+ break;
+
+ case 20:
+
+ if(sw_block_line[20]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_20=line8.toDouble();
+ sw_block_line[20]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 21:
+
+ if(sw_block_line[21]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_21=line8.toDouble();
+ sw_block_line[21]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 22:
+
+ if(sw_block_line[22]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_22=line8.toDouble();
+ sw_block_line[22]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 23:
+
+ if(sw_block_line[23]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_23=line8.toDouble();
+ sw_block_line[23]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 24:
+
+ if (count_block_vertex_24>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_vertex[block_count1][block_line_count].DXF_block_vertex_code_24[count_block_vertex_24]=line8.toDouble();
+ count_block_vertex_24=count_block_vertex_24+1;
+ }
+ break;
+
+ case 30:
+
+ if(sw_block_line[30]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_30=line8.toDouble();
+ sw_block_line[30]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 31:
+
+ if(sw_block_line[31]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_31=line8.toDouble();
+ sw_block_line[31]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 32:
+
+ if(sw_block_line[32]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_32=line8.toDouble();
+ sw_block_line[32]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 40:
+
+ if(sw_block_line[40]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_40=line8.toDouble();
+ sw_block_line[40]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 48:
+
+ if(sw_block_line[48]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_48=line8.toDouble();
+ sw_block_line[48]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 50:
+
+ if(sw_block_line[50]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_50=line8.toDouble();
+ sw_block_line[50]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 51:
+
+ if(sw_block_line[51]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_51=line8.toDouble();
+ sw_block_line[51]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 62:
+
+ if(sw_block_line[62]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_62=line8.toInt();
+ sw_block_line[62]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 70:
+
+ if(sw_block_line[70]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_70=line8.toInt();
+ sw_block_line[70]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 71:
+
+ if(sw_block_line[71]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_71=line8.toInt();
+ sw_block_line[71]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ /*case 72:
+
+ if(sw_block_line[72]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_72=line8.toInt();
+ sw_block_line[72]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;*/
+
+ case 90:
+
+ if(sw_block_line[90]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_90=line8.toInt();
+ sw_block_line[90]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 91:
+
+ if(sw_block_line[91]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_91=line8.toInt();
+ sw_block_line[91]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 92:
+
+ if(sw_block_line[92]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_92=line8.toInt();
+ sw_block_line[92]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 100:
+
+ if (count_block_vertex_100>5)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_100[count_block_vertex_100]=line8;
+ count_block_vertex_100=count_block_vertex_100+1;
+ }
+ break;
+
+ case 102:
+
+ if (count_block_vertex_102>3)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_102[count_block_vertex_102]=line8;
+ count_block_vertex_102=count_block_vertex_102+1;
+ }
+ break;
+
+
+
+ case 280:
+
+ if(sw_block_line[280]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_280=line8.toInt();
+ sw_block_line[280]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 281:
+
+ if(sw_block_line[281]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_281=line8.toInt();
+ sw_block_line[281]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 282:
+
+ if(sw_block_line[282]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_282=line8.toInt();
+ sw_block_line[282]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 283:
+
+ if(sw_block_line[283]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_283=line8.toInt();
+ sw_block_line[283]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 310:
+
+ if(sw_block_line[310]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_310=line8;
+ sw_block_line[310]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 330:
+
+ if (count_block_vertex_330>1)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_330[count_block_vertex_330]=line8;
+ count_block_vertex_330=count_block_vertex_330+1;
+ }
+ break;
+
+ case 340:
+
+ if(sw_block_line[340]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_340=line8;
+ sw_block_line[340]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 360:
+
+ if(sw_block_line[360]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_360=line8;
+ sw_block_line[360]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
+ case 370:
+
+ if(sw_block_line[370]==0)
+ {
+ DXF_input_block_vertex[block_count1][block_vertex_count].DXF_block_vertex_code_370=line8.toInt();
+ sw_block_line[370]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_vertex());
+
+ }
+
+ break;
+
default:
- Log_1.append("Find in BLOCK code VERTEX \n");
- Log_1.append("Line :" );
- Log_1.append(QString::number( for_count1));
- Log_1.append(" ");
- Log_1.append("Code :" );
- Log_1.append(QString::number( line7));
- Log_1.append(" : ");
- Log_1.append(line8);
- Log_1.append(" ");
- Log_1.append("\n");
+ Log_1.append(found_block_vertex());
}
@@ -14469,6 +18269,18 @@
block_st5=0;
block_count5=0;
+ for (sw_cleaner=0; sw_cleaner<1072;++sw_cleaner)
+ {
+ sw_block_line[sw_cleaner]=0;
+
+ }
+
+ count_block_viewport_100=0;
+ count_block_viewport_102=0;
+ count_block_viewport_14=0;
+ count_block_viewport_10=0;
+ count_block_viewport_330=0;
+
while (block_st5==0 and block_count5<49)
{
@@ -14484,9 +18296,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code VIEWPORT n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_viewport_count);
+ Log_1.append(QString::number(block_viewport_count));
Log_1.append("\n");
block_viewport_count=block_viewport_count+1;
@@ -14494,9 +18306,997 @@
break;
+
+ case 1:
+
+ if(sw_block_line[1]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_1=line8;
+ sw_block_line[1]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 5:
+
+ if(sw_block_line[5]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_5=line8;
+ sw_block_line[5]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+
+ case 6:
+
+ if(sw_block_line[6]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_6=line8;
+ sw_block_line[6]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+
+ case 8:
+
+ if(sw_block_line[8]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_8=line8;
+ sw_block_line[8]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 10:
+
+ if(sw_block_line[10]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_10=line8.toDouble();
+ sw_block_line[10]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 11:
+
+ if(sw_block_line[11]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_11=line8.toDouble();
+ sw_block_line[11]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 12:
+
+ if(sw_block_line[12]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_12=line8.toDouble();
+ sw_block_line[12]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 13:
+
+ if(sw_block_line[13]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_13=line8.toDouble();
+ sw_block_line[13]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 14:
+
+ if (count_block_viewport_14>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_viewport[block_count1][block_line_count].DXF_block_viewport_code_14[count_block_viewport_14]=line8.toDouble();
+ count_block_viewport_14=count_block_viewport_14+1;
+ }
+ break;
+
+ case 15:
+
+ if(sw_block_line[15]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_15=line8.toDouble();
+ sw_block_line[15]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 16:
+
+ if(sw_block_line[16]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_16=line8.toDouble();
+ sw_block_line[16]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 17:
+
+ if(sw_block_line[17]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_17=line8.toDouble();
+ sw_block_line[17]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 20:
+
+ if(sw_block_line[20]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_20=line8.toDouble();
+ sw_block_line[20]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 21:
+
+ if(sw_block_line[21]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_21=line8.toDouble();
+ sw_block_line[21]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 22:
+
+ if(sw_block_line[22]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_22=line8.toDouble();
+ sw_block_line[22]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 23:
+
+ if(sw_block_line[23]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_23=line8.toDouble();
+ sw_block_line[23]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+
+ case 24:
+
+ if(sw_block_line[24]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_24=line8.toDouble();
+ sw_block_line[24]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 25:
+
+ if(sw_block_line[25]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_25=line8.toDouble();
+ sw_block_line[25]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 26:
+
+ if(sw_block_line[26]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_26=line8.toDouble();
+ sw_block_line[26]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 27:
+
+ if(sw_block_line[27]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_27=line8.toDouble();
+ sw_block_line[27]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 30:
+
+ if(sw_block_line[30]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_30=line8.toDouble();
+ sw_block_line[30]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 31:
+
+ if(sw_block_line[31]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_31=line8.toDouble();
+ sw_block_line[31]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 32:
+
+ if(sw_block_line[32]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_32=line8.toDouble();
+ sw_block_line[32]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 36:
+
+ if(sw_block_line[36]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_36=line8.toDouble();
+ sw_block_line[36]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 37:
+
+ if(sw_block_line[37]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_37=line8.toDouble();
+ sw_block_line[37]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+
+ case 40:
+
+ if(sw_block_line[40]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_40=line8.toDouble();
+ sw_block_line[40]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 41:
+
+ if(sw_block_line[41]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_41=line8.toDouble();
+ sw_block_line[41]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 42:
+
+ if(sw_block_line[42]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_42=line8.toDouble();
+ sw_block_line[42]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 43:
+
+ if(sw_block_line[43]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_43=line8.toDouble();
+ sw_block_line[43]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 44:
+
+ if(sw_block_line[44]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_44=line8.toDouble();
+ sw_block_line[44]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 45:
+
+ if(sw_block_line[45]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_45=line8.toDouble();
+ sw_block_line[45]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 48:
+
+ if(sw_block_line[48]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_48=line8.toDouble();
+ sw_block_line[48]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 50:
+
+ if(sw_block_line[50]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_50=line8.toDouble();
+ sw_block_line[50]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 51:
+
+ if(sw_block_line[51]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_51=line8.toDouble();
+ sw_block_line[51]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 62:
+
+ if(sw_block_line[62]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_62=line8.toInt();
+ sw_block_line[62]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 68:
+
+ if(sw_block_line[68]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_68=line8.toInt();
+ sw_block_line[68]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 69:
+
+ if(sw_block_line[69]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_69=line8.toInt();
+ sw_block_line[69]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 70:
+
+ if(sw_block_line[70]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_70=line8.toInt();
+ sw_block_line[70]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 71:
+
+ if(sw_block_line[71]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_71=line8.toInt();
+ sw_block_line[71]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 72:
+
+ if(sw_block_line[72]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_72=line8.toInt();
+ sw_block_line[72]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 74:
+
+ if(sw_block_line[74]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_74=line8.toInt();
+ sw_block_line[74]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 79:
+
+ if(sw_block_line[79]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_79=line8.toInt();
+ sw_block_line[79]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 90:
+
+ if(sw_block_line[90]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_90=line8.toInt();
+ sw_block_line[90]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 91:
+
+ if(sw_block_line[91]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_91=line8.toInt();
+ sw_block_line[91]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 92:
+
+ if(sw_block_line[92]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_92=line8.toInt();
+ sw_block_line[92]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 100:
+
+ if (count_block_viewport_100>3)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_100[count_block_viewport_100]=line8;
+ count_block_viewport_100=count_block_viewport_100+1;
+ }
+ break;
+
+ case 102:
+
+ if (count_block_viewport_102>3)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_102[count_block_viewport_102]=line8;
+ count_block_viewport_102=count_block_viewport_102+1;
+ }
+ break;
+
+ case 110:
+
+ if(sw_block_line[110]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_110=line8.toDouble();
+ sw_block_line[110]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 111:
+
+ if(sw_block_line[111]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_111=line8.toDouble();
+ sw_block_line[111]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 112:
+
+ if(sw_block_line[112]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_112=line8.toDouble();
+ sw_block_line[112]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 120:
+
+ if(sw_block_line[120]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_120=line8.toDouble();
+ sw_block_line[120]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 121:
+
+ if(sw_block_line[121]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_121=line8.toDouble();
+ sw_block_line[121]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 122:
+
+ if(sw_block_line[122]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_122=line8.toDouble();
+ sw_block_line[122]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 130:
+
+ if(sw_block_line[130]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_130=line8.toDouble();
+ sw_block_line[130]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 131:
+
+ if(sw_block_line[131]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_131=line8.toDouble();
+ sw_block_line[131]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 132:
+
+ if(sw_block_line[132]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_132=line8.toDouble();
+ sw_block_line[132]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 146:
+
+ if(sw_block_line[146]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_146=line8.toDouble();
+ sw_block_line[146]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 280:
+
+ if(sw_block_line[280]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_280=line8.toInt();
+ sw_block_line[280]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 281:
+
+ if(sw_block_line[281]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_281=line8.toInt();
+ sw_block_line[281]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 282:
+
+ if(sw_block_line[282]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_282=line8.toInt();
+ sw_block_line[282]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 283:
+
+ if(sw_block_line[283]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_283=line8.toInt();
+ sw_block_line[283]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 310:
+
+ if(sw_block_line[310]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_310=line8;
+ sw_block_line[310]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 330:
+
+ if (count_block_viewport_330>1)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_330[count_block_viewport_330]=line8;
+ count_block_viewport_330=count_block_viewport_330+1;
+ }
+ break;
+
+ case 340:
+
+ if(sw_block_line[340]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_340=line8;
+ sw_block_line[340]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 360:
+
+ if(sw_block_line[360]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_360=line8;
+ sw_block_line[360]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
+ case 370:
+
+ if(sw_block_line[370]==0)
+ {
+ DXF_input_block_viewport[block_count1][block_viewport_count].DXF_block_viewport_code_370=line8.toInt();
+ sw_block_line[370]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_viewport());
+
+ }
+
+ break;
+
default:
Log_1.append(found_block_viewport());
+
}
@@ -14525,9 +19325,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code WIPEOUT n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_wipeout_count);
+ Log_1.append(QString::number(block_wipeout_count));
Log_1.append("\n");
block_wipeout_count=block_wipeout_count+1;
@@ -14566,9 +19366,9 @@
block_count5=block_count5+1;
Log_1.append("End reading BLOCK code XLINE n° : ");
- Log_1.append(block_count1);
+ Log_1.append(QString::number(block_count1));
Log_1.append ("item n°: ");
- Log_1.append(block_xline_count);
+ Log_1.append(QString::number(block_xline_count));
Log_1.append("\n");
block_xline_count=block_xline_count+1;
@@ -17456,6 +22256,21 @@
break;
+ case 62:
+
+ if(sw_entities_ellipse[62]==0)
+ {
+ DXF_input_entities_ellipse[entities_ELLIPSE_count2].DXF_entities_ellipse_code_62=line6.toInt();
+ sw_entities_ellipse[62]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_ellipse());
+ }
+
+ break;
+
+
case 100:
if (entities_ELLIPSE_count2_100>2)
@@ -18997,7 +23812,7 @@
entities_count1=entities_count1+1;
entities_st2=1;
for_count1=for_count1-2;
- Log_1.append("End reading entities ");
+ Log_1.append("End reading entities ");
Log_1.append(" LINE n°: ");
Log_1.append(QString::number(entities_LINE_count2));
Log_1.append("\n");
@@ -23069,6 +27884,10 @@
}
+ entities_SPLINE_count2_10=0;
+ entities_SPLINE_count2_20=0;
+ entities_SPLINE_count2_30=0;
+ entities_SPLINE_count2_40=0;
entities_SPLINE_count2_100=0;
while (entities_st2==0 and entities_SPLINE_count2<999)
@@ -23102,18 +27921,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_SPLINE_count2));
- Log_1.append(" SPLINE \n");
- Log_1.append("Line :" );
- Log_1.append(QString::number( for_count1));
- Log_1.append(" ");
- Log_1.append("Code :" );
- Log_1.append(QString::number( line5));
- Log_1.append(" : ");
- Log_1.append(line6);
- Log_1.append(" ");
- Log_1.append("\n");
+ Log_1.append(found_entities_spline());
}
break;
@@ -23127,115 +27935,188 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_SPLINE_count2));
- Log_1.append(" SPLINE \n");
- Log_1.append("Line :" );
- Log_1.append(QString::number( for_count1));
- Log_1.append(" ");
- Log_1.append("Code :" );
- Log_1.append(QString::number( line5));
- Log_1.append(" : ");
- Log_1.append(line6);
- Log_1.append(" ");
- Log_1.append("\n");
+ Log_1.append(found_entities_spline());
}
break;
+
+
case 10:
- if(sw_entities_spline[10]==0)
+ if (entities_SPLINE_count2_10>49)
{
- DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_10=line6.toDouble();
- sw_entities_spline[10]=1;
+ Log_1.append(found_entities_spline());
+ }
+ else
+ {
+ DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_10[entities_SPLINE_count2_10]=line6.toDouble();
+ entities_SPLINE_count2_10=entities_SPLINE_count2_10+1;
+ }
+
+ break;
+
+ case 20:
+
+ if (entities_SPLINE_count2_20>49)
+ {
+ Log_1.append(found_entities_spline());
+ }
+ else
+ {
+ DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_20[entities_SPLINE_count2_20]=line6.toDouble();
+ entities_SPLINE_count2_20=entities_SPLINE_count2_20+1;
+ }
+
+ break;
+
+ case 30:
+
+ if (entities_SPLINE_count2_30>49)
+ {
+ Log_1.append(found_entities_spline());
+ }
+ else
+ {
+ DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_30[entities_SPLINE_count2_30]=line6.toDouble();
+ entities_SPLINE_count2_30=entities_SPLINE_count2_30+1;
+ }
+
+ break;
+
+
+ case 40:
+
+ if (entities_SPLINE_count2_40>49)
+ {
+ Log_1.append(found_entities_spline());
+
+ }
+ else
+ {
+ DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_30[entities_SPLINE_count2_40]=line6.toDouble();
+ entities_SPLINE_count2_40=entities_SPLINE_count2_40+1;
+ }
+
+ break;
+
+ case 42:
+
+ if(sw_entities_spline[42]==0)
+ {
+ DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_42=line6.toDouble();
+ sw_entities_spline[42]=1;
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_SPLINE_count2));
- Log_1.append(" SPLINE \n");
- Log_1.append("Line :" );
- Log_1.append(QString::number( for_count1));
- Log_1.append(" ");
- Log_1.append("Code :" );
- Log_1.append(QString::number( line5));
- Log_1.append(" : ");
- Log_1.append(line6);
- Log_1.append(" ");
- Log_1.append("\n");
+ Log_1.append(found_entities_spline());
}
break;
- case 20:
+ case 43:
- if(sw_entities_spline[20]==0)
+ if(sw_entities_spline[43]==0)
{
- DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_20=line6.toDouble();
- sw_entities_spline[20]=1;
+ DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_43=line6.toDouble();
+ sw_entities_spline[43]=1;
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_SPLINE_count2));
- Log_1.append(" SPLINE \n");
- Log_1.append("Line :" );
- Log_1.append(QString::number( for_count1));
- Log_1.append(" ");
- Log_1.append("Code :" );
- Log_1.append(QString::number( line5));
- Log_1.append(" : ");
- Log_1.append(line6);
- Log_1.append(" ");
- Log_1.append("\n");
+ Log_1.append(found_entities_spline());
}
break;
- case 30:
+ case 62:
- if(sw_entities_spline[30]==0)
+ if(sw_entities_spline[62]==0)
{
- DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_30=line6.toDouble();
- sw_entities_spline[30]=1;
+ DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_62=line6.toInt();
+ sw_entities_spline[62]=1;
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_SPLINE_count2));
- Log_1.append(" SPLINE \n");
- Log_1.append("Line :" );
- Log_1.append(QString::number( for_count1));
- Log_1.append(" ");
- Log_1.append("Code :" );
- Log_1.append(QString::number( line5));
- Log_1.append(" : ");
- Log_1.append(line6);
- Log_1.append(" ");
- Log_1.append("\n");
+ Log_1.append(found_entities_spline());
}
break;
+ case 70:
+ if(sw_entities_spline[70]==0)
+ {
+ DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_70=line6.toInt();
+ sw_entities_spline[70]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_spline());
+ }
+ break;
+
+ case 71:
+
+ if(sw_entities_spline[71]==0)
+ {
+ DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_71=line6.toInt();
+ sw_entities_spline[71]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_spline());
+ }
+
+ break;
+
+ case 72:
+
+ if(sw_entities_spline[72]==0)
+ {
+ DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_72=line6.toInt();
+ sw_entities_spline[72]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_spline());
+ }
+
+ break;
+
+ case 73:
+
+ if(sw_entities_spline[73]==0)
+ {
+ DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_73=line6.toInt();
+ sw_entities_spline[73]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_spline());
+ }
+
+ break;
+
+ case 74:
+
+ if(sw_entities_spline[74]==0)
+ {
+ DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_74=line6.toInt();
+ sw_entities_spline[74]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_spline());
+ }
+
+ break;
+
case 100:
if (entities_SPLINE_count2_100>2)
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_SPLINE_count2));
- Log_1.append(" SPLINE \n");
- Log_1.append("Line :" );
- Log_1.append(QString::number( for_count1));
- Log_1.append(" ");
- Log_1.append("Code :" );
- Log_1.append(QString::number( line5));
- Log_1.append(" : ");
- Log_1.append(line6);
- Log_1.append(" ");
- Log_1.append("\n");
+ Log_1.append(found_entities_spline());
}
else
{
@@ -23245,6 +28126,48 @@
break;
+ case 210:
+
+ if(sw_entities_spline[210]==0)
+ {
+ DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_210=line6.toDouble();
+ sw_entities_spline[210]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_spline());
+ }
+
+ break;
+
+ case 220:
+
+ if(sw_entities_spline[220]==0)
+ {
+ DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_220=line6.toDouble();
+ sw_entities_spline[220]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_spline());
+ }
+
+ break;
+
+ case 230:
+
+ if(sw_entities_spline[230]==0)
+ {
+ DXF_input_entities_spline[entities_SPLINE_count2].DXF_entities_spline_code_230=line6.toDouble();
+ sw_entities_spline[230]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_spline());
+ }
+
+ break;
+
case 330:
if(sw_entities_spline[330]==0)
@@ -23254,33 +28177,14 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_SPLINE_count2));
- Log_1.append(" SPLINE \n");
- Log_1.append("Line :" );
- Log_1.append(QString::number( for_count1));
- Log_1.append(" ");
- Log_1.append("Code :" );
- Log_1.append(QString::number( line5));
- Log_1.append(" : ");
- Log_1.append(line6);
- Log_1.append(" ");
- Log_1.append("\n");
+ Log_1.append(found_entities_spline());
}
break;
default:
- Log_1.append("Find in entities SPLINE \n");
- Log_1.append("Line :" );
- Log_1.append(QString::number( for_count1));
- Log_1.append(" ");
- Log_1.append("Code :" );
- Log_1.append(QString::number( line5));
- Log_1.append(" : ");
- Log_1.append(line6);
- Log_1.append(" ");
- Log_1.append("\n");
+ Log_1.append(found_entities_spline());
+
}
}
@@ -25024,7 +29928,7 @@
entities_VERTEX_count2_100=0;
- while (entities_st2==0 and entities_VERTEX_count2<999)
+ while (entities_st2==0 and entities_VERTEX_count2<4999)
{
for_count1=for_count1+2;
@@ -26210,6 +31114,25 @@
return Log_2;
}
+QString dxf_split::found_entities_spline()
+{
+ Log_2="";
+ Log_2.append("Found in ENTITIES code ");
+ Log_2.append(" SPLINE n°: ");
+ Log_2.append(QString::number(entities_CIRCLE_count2));
+ Log_2.append(" line :" );
+ Log_2.append(QString::number( for_count1));
+ Log_2.append(" ");
+ Log_2.append(" code :" );
+ Log_2.append(QString::number( line5));
+ Log_2.append(" - ");
+ Log_2.append(line6);
+ Log_2.append(" ");
+ Log_2.append("\n");
+
+ return Log_2;
+}
+
QString dxf_split::found_entities_text()
{
Log_2="";
Modified: branches/dxftoqet2/src/dxf_split.h
===================================================================
--- branches/dxftoqet2/src/dxf_split.h 2015-11-02 19:33:42 UTC (rev 4247)
+++ branches/dxftoqet2/src/dxf_split.h 2015-11-07 08:28:15 UTC (rev 4248)
@@ -209,7 +209,13 @@
int entities_SEQEND_count2_100;
int entities_SHAPE_count2_100;
int entities_SOLID_count2_100;
+
+ int entities_SPLINE_count2_10;
+ int entities_SPLINE_count2_20;
+ int entities_SPLINE_count2_30;
+ int entities_SPLINE_count2_40;
int entities_SPLINE_count2_100;
+
int entities_SUN_count2_100;
int entities_SURFACE_count2_100;
int entities_TABLE_count2_100;
@@ -312,6 +318,71 @@
int count_block_lwpolyline_102;
int count_block_lwpolyline_330;
+ int count_block_polyline_10;
+ int count_block_polyline_14;
+ int count_block_polyline_20;
+ int count_block_polyline_24;
+ int count_block_polyline_100;
+ int count_block_polyline_102;
+ int count_block_polyline_330;
+
+ int count_block_spline_10;
+ int count_block_spline_14;
+ int count_block_spline_20;
+ int count_block_spline_24;
+ int count_block_spline_30;
+ int count_block_spline_40;
+ int count_block_spline_100;
+ int count_block_spline_102;
+ int count_block_spline_330;
+
+ int count_block_viewport_10;
+ int count_block_viewport_14;
+ int count_block_viewport_20;
+ int count_block_viewport_24;
+ int count_block_viewport_100;
+ int count_block_viewport_102;
+ int count_block_viewport_330;
+
+ int count_block_hatch_10;
+ int count_block_hatch_14;
+ int count_block_hatch_20;
+ int count_block_hatch_24;
+ int count_block_hatch_30;
+ int count_block_hatch_40;
+ int count_block_hatch_100;
+ int count_block_hatch_102;
+ int count_block_hatch_330;
+
+ int count_block_solid_10;
+ int count_block_solid_14;
+ int count_block_solid_20;
+ int count_block_solid_24;
+ int count_block_solid_30;
+ int count_block_solid_40;
+ int count_block_solid_100;
+ int count_block_solid_102;
+ int count_block_solid_330;
+
+ int count_block_seqend_10;
+ int count_block_seqend_14;
+ int count_block_seqend_20;
+ int count_block_seqend_24;
+ int count_block_seqend_30;
+ int count_block_seqend_40;
+ int count_block_seqend_100;
+ int count_block_seqend_102;
+ int count_block_seqend_330;
+
+
+ int count_block_vertex_10;
+ int count_block_vertex_14;
+ int count_block_vertex_20;
+ int count_block_vertex_24;
+ int count_block_vertex_100;
+ int count_block_vertex_102;
+ int count_block_vertex_330;
+
int count_block_ellipse_10;
int count_block_ellipse_14;
int count_block_ellipse_20;
@@ -358,6 +429,7 @@
QString Log_1;
QString Master_handle_id;
+ QString Master_block_handle_id;
int sw_cleaner;
bool sw_header[1072];