| [qet] [4262] DXFtoQET update text conversions for acad blocks |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4262
Author: rdsivd
Date: 2015-11-15 13:14:00 +0100 (Sun, 15 Nov 2015)
Log Message:
-----------
DXFtoQET update text conversions for acad blocks
Modified Paths:
--------------
branches/dxftoqet2/dxf_create_elmt.cpp
branches/dxftoqet2/dxf_create_elmt.h
branches/dxftoqet2/dxftoqet_mainwindow.ui
branches/dxftoqet2/src/dxf/dxf_attdef.h
branches/dxftoqet2/src/dxf/dxf_attr.cpp
branches/dxftoqet2/src/dxf/dxf_attr.h
branches/dxftoqet2/src/dxf/dxf_text.cpp
branches/dxftoqet2/src/dxf/dxf_text.h
branches/dxftoqet2/src/dxf_base_types/dxf_base_input.cpp
branches/dxftoqet2/src/dxf_base_types/dxf_base_input.h
branches/dxftoqet2/src/dxf_base_types/dxf_base_text.cpp
branches/dxftoqet2/src/dxf_base_types/dxf_base_text.h
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-14 15:06:55 UTC (rev 4261)
+++ branches/dxftoqet2/dxf_create_elmt.cpp 2015-11-15 12:14:00 UTC (rev 4262)
@@ -20,6 +20,8 @@
extern struct DXF_block_line DXF_input_block_line[100][50];
extern struct DXF_block_arc DXF_input_block_arc[100][50];
+extern struct DXF_block_attdef DXF_input_block_attdef[100][50];
+extern struct DXF_block_attrib DXF_input_block_attrib[100][50];
extern struct DXF_block_circle DXF_input_block_circle[100][50];
extern struct DXF_block_ellipse DXF_input_block_ellipse[100][50];
extern struct DXF_block_attdef DXF_input_block_attdef[100][50];
@@ -28,6 +30,7 @@
extern struct DXF_block_point DXF_input_block_point[100][50];
extern struct DXF_block_polyline DXF_input_block_polyline[100][50];
extern struct DXF_block_seqend DXF_input_block_seqend[100][50];
+extern struct DXF_block_text DXF_input_block_text[100][50];
extern struct DXF_block_vertex DXF_input_block_vertex[100][500];
DXF_create_elmt::DXF_create_elmt(QWidget *parent) :
@@ -742,7 +745,7 @@
return Result_lwpolyline;
}
- QString DXF_create_elmt::Make_INSERT()
+ QString DXF_create_elmt::Make_INSERT()
{
Result_insert="";
@@ -796,7 +799,7 @@
Result_insert.append(Make_Block_ARC());
- /* Block ARC */
+ /* Block CIRCLE */
Result_insert.append(Make_Block_CIRCLE());
@@ -812,6 +815,18 @@
Result_insert.append(Make_Block_LWPOLYLINE());
+ /* Block ATTDEF */
+
+ Result_insert.append(Make_Block_ATTDEF());
+
+ /* Block ATTRIB*/
+
+ Result_insert.append(Make_Block_ATTR());
+
+ /* Block TEXT*/
+
+ Result_insert.append(Make_Block_TEXT());
+
/* end of block */
Count_lines=Count_lines+1;
@@ -825,7 +840,7 @@
return Result_insert;
}
- QString DXF_create_elmt::Make_Block_LINES()
+ QString DXF_create_elmt::Make_Block_LINES()
{
Result_Block_Lines="";
Count_lines_block2=0;
@@ -856,7 +871,7 @@
return Result_Block_Lines;
}
- QString DXF_create_elmt::Make_Block_ARC()
+ QString DXF_create_elmt::Make_Block_ARC()
{
Result_Block_Arc="";
Count_lines_block2=0;
@@ -891,7 +906,7 @@
return Result_Block_Arc;
}
- QString DXF_create_elmt::Make_Block_CIRCLE()
+ QString DXF_create_elmt::Make_Block_CIRCLE()
{
Result_Block_Circle="";
Count_lines_block2=0;
@@ -925,7 +940,7 @@
return Result_Block_Circle;
}
- QString DXF_create_elmt::Make_block_ELLIPSE()
+ QString DXF_create_elmt::Make_block_ELLIPSE()
{
Result_Block_ellipse="";
Count_lines_block2=0;
@@ -962,7 +977,7 @@
}
- QString DXF_create_elmt::Make_Block_POLYLINE()
+ QString DXF_create_elmt::Make_Block_POLYLINE()
{
Result_Block_polyline="";
Count_lines_block2=0;
@@ -1037,7 +1052,7 @@
return Result_Block_polyline;
}
- QString DXF_create_elmt::Make_Block_LWPOLYLINE()
+ QString DXF_create_elmt::Make_Block_LWPOLYLINE()
{
dxf_lwpolyline dxb_lwpolyline;
@@ -1122,3 +1137,99 @@
return Result_Block_lwpolyline;
}
+
+ QString DXF_create_elmt::Make_Block_ATTDEF()
+ {
+
+ Count_lines_block2=0;
+ Result_Block_attdef="";
+
+ dxf_attdef dxb_attdef3;
+ DXF_Text_control db_txt_check4;
+
+
+ while(Count_lines_block2<DXF_main_base[0].DXF_block_attdef_count[Insert_block_nr])
+ {
+
+ dxb_attdef3.x=DXF_input_block_attdef[Insert_block_nr][Count_lines_block2].DXF_block_attdef_code_10;
+ dxb_attdef3.y=-DXF_input_block_attdef[Insert_block_nr][Count_lines_block2].DXF_block_attdef_code_20;
+ dxb_attdef3.rotation=DXF_input_block_attdef[Insert_block_nr][Count_lines_block2].DXF_block_attdef_code_50;
+ dxb_attdef3.size=DXF_input_block_attdef[Insert_block_nr][Count_lines_block2].DXF_block_attdef_code_40*((x_insert_scale+y_insert_scale)/2);
+ dxb_attdef3.tag="label"; //DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_2;
+ dxb_attdef3.rotate="true";
+ dxb_attdef3.color_attdef="blue";
+
+ db_txt_check4.TextToCheck=DXF_input_block_attdef[Insert_block_nr][Count_lines_block2].DXF_block_attdef_code_1;
+
+ dxb_attdef3.text=db_txt_check4.Text_control();
+
+ Result_Block_attdef.append(dxb_attdef3.Create_ATTDEF());
+
+ Count_lines_block2=Count_lines_block2+1;
+
+
+ }
+
+ return Result_Block_attdef;
+ }
+
+ QString DXF_create_elmt::Make_Block_ATTR()
+ {
+
+ Count_lines_block2=0;
+
+ Result_Block_attr="";
+
+ dxf_attr dxb_attr2;
+ DXF_Text_control db_txt_check3;
+
+ while(Count_lines_block2<DXF_main_base[0].DXF_block_attrib_count[Insert_block_nr])
+ {
+
+ dxb_attr2.x=DXF_input_block_attrib[Insert_block_nr][Count_lines_block2].DXF_block_attrib_code_10; // x start
+ dxb_attr2.y=-DXF_input_block_attrib[Insert_block_nr][Count_lines_block2].DXF_block_attrib_code_20; // y start
+ dxb_attr2.rotation=DXF_input_block_attrib[Insert_block_nr][Count_lines_block2].DXF_block_attrib_code_50; //text rotation
+ dxb_attr2.size=DXF_input_block_attrib[Insert_block_nr][Count_lines_block2].DXF_block_attrib_code_40*((x_insert_scale+y_insert_scale)/2); //text height
+ dxb_attr2.tag="label"; //DXF_input_entities_attrib[Count_lines].DXF_entities_attrib_code_2; // tag
+ dxb_attr2.rotate="true";
+ dxb_attr2.color_attrib="red";
+
+ db_txt_check3.TextToCheck=DXF_input_block_attrib[Insert_block_nr][Count_lines].DXF_block_attrib_code_1; // value
+
+ dxb_attr2.text=db_txt_check3.Text_control();
+
+ Result_Block_attr.append(dxb_attr2.Create_ATTR());
+
+ Count_lines_block2=Count_lines_block2+1;
+ }
+
+ return Result_Block_attr;
+ }
+
+ QString DXF_create_elmt::Make_Block_TEXT()
+ {
+ Count_lines_block2=0;
+ Result_Block_Text="";
+
+ dxf_text db_text_block;
+ DXF_Text_control db_txt_check_block;
+
+ while(Count_lines_block2<DXF_main_base[0].DXF_block_text_count[Insert_block_nr])
+ {
+ db_text_block.QET_x=DXF_input_block_text[Insert_block_nr][Count_lines_block2].DXF_block_text_code_10;
+ db_text_block.QET_y=-DXF_input_block_text[Insert_block_nr][Count_lines_block2].DXF_block_text_code_20;
+ db_text_block.QET_rotation=DXF_input_block_text[Insert_block_nr][Count_lines_block2].DXF_block_text_code_50;
+ db_text_block.QET_size=DXF_input_block_text[Insert_block_nr][Count_lines_block2].DXF_block_text_code_40*((x_insert_scale+y_insert_scale)/2);
+
+
+
+ db_txt_check_block.TextToCheck=DXF_input_block_text[Insert_block_nr][Count_lines_block2].DXF_block_text_code_1;
+
+ db_text_block.QET_text=db_txt_check_block.Text_control();
+
+ Result_Block_Text.append(db_text_block.Create_Text());
+
+ Count_lines_block2=Count_lines_block2+1;
+ }
+ return Result_Block_Text;
+ }
Modified: branches/dxftoqet2/dxf_create_elmt.h
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.h 2015-11-14 15:06:55 UTC (rev 4261)
+++ branches/dxftoqet2/dxf_create_elmt.h 2015-11-15 12:14:00 UTC (rev 4262)
@@ -50,6 +50,7 @@
QString Make_Block_INSERT();
QString Make_Block_POLYLINE();
QString Make_Block_LWPOLYLINE();
+ QString Make_Block_TEXT();
QString Result;
QString Result_line;
@@ -69,10 +70,13 @@
QString Result_Block_Lines;
QString Result_Block_Arc;
+ QString Result_Block_attdef;
+ QString Result_Block_attr;
QString Result_Block_Circle;
QString Result_Block_ellipse;
QString Result_Block_polyline;
QString Result_Block_lwpolyline;
+ QString Result_Block_Text;
double DXF_LIMMAX_x;
double DXF_LIMMAX_y;
Modified: branches/dxftoqet2/dxftoqet_mainwindow.ui
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.ui 2015-11-14 15:06:55 UTC (rev 4261)
+++ branches/dxftoqet2/dxftoqet_mainwindow.ui 2015-11-15 12:14:00 UTC (rev 4262)
@@ -1317,8 +1317,8 @@
02 3dsolid();
03 acad_proxy_entity();
04 arc(converted);
-05 attdef();
-06 attr();
+05 attdef(converted);
+06 attr(converted);
07 body();
08 circle(converted);
09 dimension();
@@ -1350,7 +1350,7 @@
35 sun();
36 surface();
37 table();
-38 text();
+38 text(converted);
39 tolerance();
40 trace();
41 underlay();
Modified: branches/dxftoqet2/src/dxf/dxf_attdef.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_attdef.h 2015-11-14 15:06:55 UTC (rev 4261)
+++ branches/dxftoqet2/src/dxf/dxf_attdef.h 2015-11-15 12:14:00 UTC (rev 4262)
@@ -22,6 +22,7 @@
QString rotate;
QString text;
QString tag;
+ QString color_attdef;
QString Create_ATTDEF();
Modified: branches/dxftoqet2/src/dxf/dxf_attr.cpp
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_attr.cpp 2015-11-14 15:06:55 UTC (rev 4261)
+++ branches/dxftoqet2/src/dxf/dxf_attr.cpp 2015-11-15 12:14:00 UTC (rev 4262)
@@ -20,6 +20,7 @@
db_attr.QET_text=text;
db_attr.QET_rotate=rotate;
db_attr.QET_rotation=rotation;
+ db_attr.QET_color=color_attrib;
Result_attr.append(db_attr.Create_input());
Modified: branches/dxftoqet2/src/dxf/dxf_attr.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_attr.h 2015-11-14 15:06:55 UTC (rev 4261)
+++ branches/dxftoqet2/src/dxf/dxf_attr.h 2015-11-15 12:14:00 UTC (rev 4262)
@@ -22,6 +22,7 @@
QString text;
QString tag;
double rotation;//50
+ QString color_attrib;
QString Create_ATTR();
Modified: branches/dxftoqet2/src/dxf/dxf_text.cpp
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_text.cpp 2015-11-14 15:06:55 UTC (rev 4261)
+++ branches/dxftoqet2/src/dxf/dxf_text.cpp 2015-11-15 12:14:00 UTC (rev 4262)
@@ -19,6 +19,7 @@
db_text_base.QET_size=QET_size;
db_text_base.QET_rotation=QET_rotation;
db_text_base.QET_text=QET_text;
+ db_text_base.QET_color=QET_color;
Result_text= db_text_base.Create_text();
Modified: branches/dxftoqet2/src/dxf/dxf_text.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_text.h 2015-11-14 15:06:55 UTC (rev 4261)
+++ branches/dxftoqet2/src/dxf/dxf_text.h 2015-11-15 12:14:00 UTC (rev 4262)
@@ -17,7 +17,7 @@
QString QET_text;
double QET_rec_height;
double QET_rec_width;
-
+ QString QET_color;
QString Result_text;
QString Create_Text();
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_input.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_input.cpp 2015-11-14 15:06:55 UTC (rev 4261)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_input.cpp 2015-11-15 12:14:00 UTC (rev 4262)
@@ -36,12 +36,12 @@
Result.append(" size=");
Result.append(QChar(34));
- Result.append(QString::number(QET_size,10));
+ Result.append(QString::number(QET_size,'f',0));
Result.append(QChar(34));
Result.append(" rotation=");
Result.append(QChar(34));
- Result.append(QString::number(QET_rotation,'f',2));
+ Result.append(QString::number(QET_rotation,'f',0));
Result.append(QChar(34));
Result.append(" rotate=");
@@ -49,6 +49,11 @@
Result.append(QET_rotate);
Result.append(QChar(34));
+ Result.append(" color=");
+ Result.append(QChar(34));
+ Result.append(QET_color);
+ Result.append(QChar(34));
+
Result.append(" text=");
Result.append(QChar(34));
Result.append(QET_text);
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_input.h
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_input.h 2015-11-14 15:06:55 UTC (rev 4261)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_input.h 2015-11-15 12:14:00 UTC (rev 4262)
@@ -22,6 +22,7 @@
QString QET_rotate;
QString QET_text;
QString QET_tag;
+ QString QET_color;
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_text.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_text.cpp 2015-11-14 15:06:55 UTC (rev 4261)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_text.cpp 2015-11-15 12:14:00 UTC (rev 4262)
@@ -36,6 +36,11 @@
Result_text.append(QString::number(QET_rotation,'f',0));
Result_text.append(QChar(34));
+ Result_text.append(" color=");
+ Result_text.append(QChar(34));
+ Result_text.append(QET_color);
+ Result_text.append(QChar(34));
+
Result_text.append(" text=");
Result_text.append(QChar(34));
Result_text.append(QET_text);
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_text.h
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_text.h 2015-11-14 15:06:55 UTC (rev 4261)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_text.h 2015-11-15 12:14:00 UTC (rev 4262)
@@ -17,6 +17,7 @@
QString QET_text;
+ QString QET_color;
QString Result_text;
Modified: branches/dxftoqet2/src/dxf_data.h
===================================================================
--- branches/dxftoqet2/src/dxf_data.h 2015-11-14 15:06:55 UTC (rev 4261)
+++ branches/dxftoqet2/src/dxf_data.h 2015-11-15 12:14:00 UTC (rev 4262)
@@ -888,6 +888,7 @@
double DXF_block_attdef_code_32;
double DXF_block_attdef_code_40;
+ double DXF_block_attdef_code_50;
double DXF_block_attdef_code_53;
int16_t DXF_block_attdef_code_62;
@@ -918,6 +919,9 @@
struct DXF_block_attrib
{
+ QString DXF_block_attrib_code_1;
+ QString DXF_block_attrib_code_2;
+ QString DXF_block_attrib_code_3;
QString DXF_block_attrib_code_5;
QString DXF_block_attrib_code_6;
QString DXF_block_attrib_code_8;
@@ -939,11 +943,16 @@
double DXF_block_attrib_code_31;
double DXF_block_attrib_code_32;
+ double DXF_block_attrib_code_40;
+ double DXF_block_attrib_code_50;
+ double DXF_block_attrib_code_53;
int16_t DXF_block_attrib_code_62;
int16_t DXF_block_attrib_code_70;
int16_t DXF_block_attrib_code_71;
+ int16_t DXF_block_attrib_code_72;
+ int16_t DXF_block_attrib_code_74;
int32_t DXF_block_attrib_code_90;
int32_t DXF_block_attrib_code_91;
Modified: branches/dxftoqet2/src/dxf_split.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_split.cpp 2015-11-14 15:06:55 UTC (rev 4261)
+++ branches/dxftoqet2/src/dxf_split.cpp 2015-11-15 12:14:00 UTC (rev 4262)
@@ -8589,6 +8589,38 @@
break;
+
+ /*case 1:
+
+ if(sw_block_line[1]==0)
+ {
+ DXF_input_block_arc[block_count1][block_arc_count].DXF_block_arc_code_1=line8;
+ sw_block_line[1]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_arc());
+
+ }
+
+ break;
+
+
+ case 2:
+
+ if(sw_block_line[2]==0)
+ {
+ DXF_input_block_arc[block_count1][block_arc_count].DXF_block_arc_code_2=line8;
+ sw_block_line[2]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_arc());
+
+ }
+
+ break;*/
+
case 5:
if(sw_block_line[5]==0)
@@ -9474,6 +9506,21 @@
break;
+ case 50:
+
+ if(sw_block_line[50]==0)
+ {
+ DXF_input_block_attdef[block_count1][block_attdef_count].DXF_block_attdef_code_50=line8.toDouble();
+ sw_block_line[50]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attdef());
+
+ }
+
+ break;
+
case 53:
if(sw_block_line[53]==0)
@@ -9758,6 +9805,16 @@
block_st5=0;
block_count5=0;
+ for (sw_cleaner=0; sw_cleaner<1072;++sw_cleaner)
+ {
+ sw_block_line[sw_cleaner]=0;
+
+ }
+
+ count_block_attrib_14=0;
+ count_block_attrib_24=0;
+ count_block_attrib_100=0;
+
while (block_st5==0 and block_count5<49)
{
@@ -9783,8 +9840,575 @@
break;
+ case 1:
+
+ if(sw_block_line[1]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_1=line8;
+ sw_block_line[1]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 2:
+
+ if(sw_block_line[2]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_2=line8;
+ sw_block_line[2]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 3:
+
+ if(sw_block_line[3]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_3=line8;
+ sw_block_line[3]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+
+
+ case 5:
+
+ if(sw_block_line[5]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_5=line8;
+ sw_block_line[5]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 8:
+
+ if(sw_block_line[8]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_8=line8;
+ sw_block_line[8]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 10:
+
+ if(sw_block_line[10]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_10=line8.toDouble();
+ sw_block_line[10]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 11:
+
+ if(sw_block_line[11]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_11=line8.toDouble();
+ sw_block_line[11]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 12:
+
+ if(sw_block_line[12]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_12=line8.toDouble();
+ sw_block_line[12]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 13:
+
+ if(sw_block_line[13]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_13=line8.toDouble();
+ sw_block_line[13]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ /*case 14:
+
+ if (count_block_attrib_14>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_attrib[block_count1][block_line_count].DXF_block_attrib_code_14[count_block_attrib_14]=line8.toDouble();
+ count_block_attrib_14=count_block_attrib_14+1;
+ }
+ break;*/
+
+ case 20:
+
+ if(sw_block_line[20]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_20=line8.toDouble();
+ sw_block_line[20]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 21:
+
+ if(sw_block_line[21]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_21=line8.toDouble();
+ sw_block_line[21]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 22:
+
+ if(sw_block_line[22]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_22=line8.toDouble();
+ sw_block_line[22]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 23:
+
+ if(sw_block_line[23]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_23=line8.toDouble();
+ sw_block_line[23]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 24:
+
+ /*if (count_block_attrib_24>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_attrib[block_count1][block_line_count].DXF_block_attrib_code_24[count_block_attrib_24]=line8.toDouble();
+ count_block_attrib_24=count_block_attrib_24+1;
+ }
+ break;*/
+
+ case 30:
+
+ if(sw_block_line[30]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_30=line8.toDouble();
+ sw_block_line[30]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 31:
+
+ if(sw_block_line[31]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_31=line8.toDouble();
+ sw_block_line[31]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 32:
+
+ if(sw_block_line[32]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_32=line8.toDouble();
+ sw_block_line[32]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 40:
+
+ if(sw_block_line[40]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_40=line8.toDouble();
+ sw_block_line[40]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 50:
+
+ if(sw_block_line[50]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_50=line8.toDouble();
+ sw_block_line[50]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 53:
+
+ if(sw_block_line[53]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_53=line8.toDouble();
+ sw_block_line[53]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 62:
+
+ if(sw_block_line[62]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_62=line8.toInt();
+ sw_block_line[62]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 70:
+
+ if(sw_block_line[70]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_70=line8.toInt();
+ sw_block_line[70]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 71:
+
+ if(sw_block_line[71]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_71=line8.toInt();
+ sw_block_line[71]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 72:
+
+ if(sw_block_line[72]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_72=line8.toInt();
+ sw_block_line[72]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 74:
+
+ if(sw_block_line[74]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_74=line8.toInt();
+ sw_block_line[74]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 90:
+
+ if(sw_block_line[90]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_90=line8.toInt();
+ sw_block_line[90]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 91:
+
+ if(sw_block_line[91]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_91=line8.toInt();
+ sw_block_line[91]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 92:
+
+ if(sw_block_line[92]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_92=line8.toInt();
+ sw_block_line[92]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 100:
+
+ if (count_block_attrib_100>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_100[count_block_attrib_100]=line8;
+ count_block_attrib_100=count_block_attrib_100+1;
+ }
+ break;
+
+ case 280:
+
+ if(sw_block_line[280]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_280=line8.toInt();
+ sw_block_line[280]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 281:
+
+ if(sw_block_line[281]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_281=line8.toInt();
+ sw_block_line[281]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 282:
+
+ if(sw_block_line[282]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_282=line8.toInt();
+ sw_block_line[282]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 283:
+
+ if(sw_block_line[283]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_283=line8.toInt();
+ sw_block_line[283]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 310:
+
+ if(sw_block_line[310]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_310=line8;
+ sw_block_line[310]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 330:
+
+ if(sw_block_line[330]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_330=line8;
+ sw_block_line[330]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 340:
+
+ if(sw_block_line[340]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_340=line8;
+ sw_block_line[340]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+ case 360:
+
+ if(sw_block_line[360]==0)
+ {
+ DXF_input_block_attrib[block_count1][block_attrib_count].DXF_block_attrib_code_360=line8;
+ sw_block_line[360]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_attrib());
+
+ }
+
+ break;
+
+
default:
- Log_1.append(found_block_attr());
+ Log_1.append(found_block_attrib());
}
@@ -31303,7 +31927,7 @@
return Log_2;
}
-QString dxf_split::found_block_attr()
+QString dxf_split::found_block_attrib()
{
Log_2="";
Log_2.append("Found in BLOCK n° ");
Modified: branches/dxftoqet2/src/dxf_split.h
===================================================================
--- branches/dxftoqet2/src/dxf_split.h 2015-11-14 15:06:55 UTC (rev 4261)
+++ branches/dxftoqet2/src/dxf_split.h 2015-11-15 12:14:00 UTC (rev 4262)
@@ -304,6 +304,10 @@
int count_block_attdef_24;
int count_block_attdef_100;
+ int count_block_attrib_14;
+ int count_block_attrib_24;
+ int count_block_attrib_100;
+
int count_block_circle_14;
int count_block_circle_24;
int count_block_circle_100;
@@ -517,7 +521,7 @@
QString found_block_acad_proxy_entity();
QString found_block_arc();
QString found_block_attdef();
- QString found_block_attr();
+ QString found_block_attrib();
QString found_block_body();
QString found_block_circle();
QString found_block_dimension();