| [qet] [4259] DXFtoQET updated |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4259
Author: rdsivd
Date: 2015-11-13 22:56:28 +0100 (Fri, 13 Nov 2015)
Log Message:
-----------
DXFtoQET updated
Modified Paths:
--------------
branches/dxftoqet2/dxf_create_elmt.cpp
branches/dxftoqet2/dxf_create_elmt.h
branches/dxftoqet2/dxftoqet_mainwindow.cpp
branches/dxftoqet2/dxftoqet_mainwindow.h
branches/dxftoqet2/dxftoqet_mainwindow.ui
branches/dxftoqet2/src/dxf/dxf_lwpolyline.cpp
branches/dxftoqet2/src/dxf/dxf_lwpolyline.h
branches/dxftoqet2/src/dxf/dxf_polyline.h
branches/dxftoqet2/src/dxf_split.h
Modified: branches/dxftoqet2/dxf_create_elmt.cpp
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.cpp 2015-11-12 17:29:48 UTC (rev 4258)
+++ branches/dxftoqet2/dxf_create_elmt.cpp 2015-11-13 21:56:28 UTC (rev 4259)
@@ -24,7 +24,9 @@
extern struct DXF_block_ellipse DXF_input_block_ellipse[100][50];
extern struct DXF_block_attdef DXF_input_block_attdef[100][50];
extern struct DXF_block_attrib DXF_input_block_attrib[100][50];
+extern struct DXF_block_lwpolyline DXF_input_block_lwpolyline[100][50];
extern struct DXF_block_point DXF_input_block_point[100][50];
+extern struct DXF_block_polyline DXF_input_block_polyline[100][50];
extern struct DXF_block_seqend DXF_input_block_seqend[100][50];
extern struct DXF_block_vertex DXF_input_block_vertex[100][500];
@@ -613,7 +615,7 @@
Count_lines=0;
count_vertex=1;
- while (Count_lines<=Count_entitie_polyline)
+ while (Count_lines<Count_entitie_polyline)
{
for(counter_x=0;counter_x<Polyline_vertex;counter_x++)
@@ -625,7 +627,7 @@
db_polyline.y_vector[count_vertex]=-DXF_input_entities_vertex[counter_x].DXF_entities_vertex_code_20;
count_vertex=count_vertex+1;
}
- if (count_vertex>999)
+ if (count_vertex>499)
{
counter_x=Polyline_vertex+1;
}
@@ -636,13 +638,13 @@
}
- db_polyline.vector_count=count_vertex;
+ db_polyline.vector_count=count_vertex-1;
db_polyline.antialias="false";
db_polyline.line_style="normal";
db_polyline.line_weight="thin";
db_polyline.filling="none";
- db_polyline.color="black";
+ db_polyline.color="magenta";
db_polyline.closed=DXF_input_entities_polyline[Count_lines].DXF_entities_polyline_code_70;
@@ -680,7 +682,13 @@
while (Count_lines<=Count_entitie_lwpolyline)
{
vector_max=DXF_input_entities_lwpolyline[Count_lines].DXF_entities_lwpolyline_code_90;
- for(counter_x=0;counter_x<=vector_max;counter_x++)
+
+ if(vector_max>0)
+ {
+ //vector_max=vector_max+1;
+
+
+ for(counter_x=0;counter_x<vector_max;counter_x++)
{
@@ -705,7 +713,7 @@
db_lwpolyline.line_style="normal";
db_lwpolyline.line_weight="thin";
db_lwpolyline.filling="none";
- db_lwpolyline.color="black";
+ db_lwpolyline.color="orange";
db_lwpolyline.closed=DXF_input_entities_lwpolyline[Count_lines].DXF_entities_lwpolyline_code_70;
@@ -721,6 +729,11 @@
count_vertex=1;
counter_x=0;
+ }
+ else
+ {
+ Count_lines=Count_lines+1;
+ }
@@ -791,6 +804,10 @@
Result_insert.append(Make_block_ELLIPSE());
+ /* Block POLYLINE */
+
+ Result_insert.append(Make_Block_POLYLINE());
+
/* end of block */
Count_lines=Count_lines+1;
@@ -944,10 +961,161 @@
QString DXF_create_elmt::Make_Block_POLYLINE()
{
Result_Block_polyline="";
+ Count_lines_block2=0;
+ Polyline_vertex=DXF_main_base[0].DXF_entities_vertex_count;
+ dxf_polyline dxb_polyline2;
+ while(Count_lines_block2<DXF_main_base[0].DXF_block_polyline_count[Insert_block_nr])
+ {
+ Count_lines2=0;
+ count_vertex2=1;
+ Count_block_polyline=DXF_main_base[0].DXF_block_polyline_count[Insert_block_nr];
+ while (Count_lines2<=Count_block_polyline)
+ {
+
+ for(counter_x=0;counter_x<Polyline_vertex;counter_x++)
+ {
+
+ if (DXF_input_block_vertex[Insert_block_nr][counter_x].Master_block_handle_id==DXF_input_block_polyline[Insert_block_nr][Count_lines2].DXF_block_polyline_code_5)
+ {
+ dxb_polyline2.x_vector[count_vertex2]=DXF_input_block_vertex[Insert_block_nr][counter_x].DXF_block_vertex_code_10;
+ dxb_polyline2.y_vector[count_vertex2]=-DXF_input_block_vertex[Insert_block_nr][counter_x].DXF_block_vertex_code_20;
+ count_vertex2=count_vertex2+1;
+ }
+ if (count_vertex2>49)
+ {
+ counter_x=Polyline_vertex+1;
+ }
+ if (count_vertex2>Polyline_vertex)
+ {
+ counter_x=Polyline_vertex+1;
+ }
+
+ }
+
+ dxb_polyline2.vector_count=count_vertex;
+
+ dxb_polyline2.antialias="false";
+ dxb_polyline2.line_style="normal";
+ dxb_polyline2.line_weight="thin";
+ dxb_polyline2.filling="none";
+ dxb_polyline2.color="green";
+ dxb_polyline2.closed=DXF_input_block_polyline[Insert_block_nr][Count_lines2].DXF_block_polyline_code_70;
+
+
+ dxb_polyline2.ltype=DXF_input_block_polyline[Insert_block_nr][Count_lines2].DXF_block_polyline_code_6;
+ dxb_polyline2.layer=DXF_input_block_polyline[Insert_block_nr][Count_lines2].DXF_block_polyline_code_8;
+
+
+
+
+ Result_Block_polyline.append(dxb_polyline2.Create_POLYLINE());
+
+ Count_lines2=Count_lines2+1;
+ count_vertex2=1;
+ counter_x=0;
+
+
+
+
+
+ }
+ Count_lines_block2=Count_lines_block2+1;
+
+ }
+
+
+
return Result_Block_polyline;
}
+
+ QString DXF_create_elmt::Make_Block_LWPOLYLINE()
+ {
+ dxf_lwpolyline dxb_lwpolyline;
+
+ Count_lines_block2=0;
+
+ Result_Block_lwpolyline;
+
+ while(Count_lines_block2<DXF_main_base[0].DXF_block_lwpolyline_count[Insert_block_nr])
+ {
+
+
+ while (Count_lines<=Count_entitie_lwpolyline)
+ {
+ vector_max=DXF_input_block_lwpolyline[Insert_block_nr][Count_lines].DXF_block_lwpolyline_code_90;
+
+ if(vector_max>0)
+ {
+ //vector_max=vector_max+1;
+
+
+ for(counter_x=0;counter_x<vector_max;counter_x++)
+ {
+
+
+ dxb_lwpolyline.x_vector[count_vertex]=DXF_input_block_lwpolyline[Insert_block_nr][Count_lines].DXF_block_lwpolyline_code_10[counter_x];
+ dxb_lwpolyline.y_vector[count_vertex]=-DXF_input_block_lwpolyline[Insert_block_nr][Count_lines].DXF_block_lwpolyline_code_20[counter_x];
+ count_vertex=count_vertex+1;
+
+ if (count_vertex>49)
+ {
+ counter_x=vector_max+2;
+ }
+ if (count_vertex>vector_max+1)
+ {
+ counter_x=vector_max+2;
+ }
+
+ }
+
+ dxb_lwpolyline.vector_count=vector_max;
+
+ dxb_lwpolyline.antialias="false";
+ dxb_lwpolyline.line_style="normal";
+ dxb_lwpolyline.line_weight="thin";
+ dxb_lwpolyline.filling="none";
+ dxb_lwpolyline.color="purple";
+ dxb_lwpolyline.closed=DXF_input_block_lwpolyline[Insert_block_nr][Count_lines].DXF_block_lwpolyline_code_70;
+
+
+ dxb_lwpolyline.ltype=DXF_input_block_lwpolyline[Insert_block_nr][Count_lines].DXF_block_lwpolyline_code_6;
+ dxb_lwpolyline.layer=DXF_input_block_lwpolyline[Insert_block_nr][Count_lines].DXF_block_lwpolyline_code_8;
+
+
+
+
+ Result_Block_lwpolyline.append(dxb_lwpolyline.Create_LWPOLYLINE());
+
+ Count_lines=Count_lines+1;
+ count_vertex=1;
+ counter_x=0;
+
+ }
+ else
+ {
+ Count_lines=Count_lines+1;
+ }
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+ }
+
+
+
+ return Result_Block_lwpolyline;
+ }
Modified: branches/dxftoqet2/dxf_create_elmt.h
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.h 2015-11-12 17:29:48 UTC (rev 4258)
+++ branches/dxftoqet2/dxf_create_elmt.h 2015-11-13 21:56:28 UTC (rev 4259)
@@ -49,6 +49,7 @@
QString Make_block_ELLIPSE();
QString Make_Block_INSERT();
QString Make_Block_POLYLINE();
+ QString Make_Block_LWPOLYLINE();
QString Result;
QString Result_line;
@@ -71,8 +72,8 @@
QString Result_Block_Circle;
QString Result_Block_ellipse;
QString Result_Block_polyline;
+ QString Result_Block_lwpolyline;
-
double DXF_LIMMAX_x;
double DXF_LIMMAX_y;
double DXF_LIMMIN_x;
@@ -86,6 +87,12 @@
int count_vertex;
int vector_max;
+ int count_vertex2;
+ int vector_max2;
+ int Count_lines2;
+
+ int Count_block_polyline;
+
int Count_entitie_line;
int Count_entitie_arc;
int Count_entitie_attdef;
Modified: branches/dxftoqet2/dxftoqet_mainwindow.cpp
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.cpp 2015-11-12 17:29:48 UTC (rev 4258)
+++ branches/dxftoqet2/dxftoqet_mainwindow.cpp 2015-11-13 21:56:28 UTC (rev 4259)
@@ -228,7 +228,7 @@
FileType=DXF_main_base[0].dxf_openfile.split(".").last();
FileName=DXF_main_base[0].dxf_openfile.split(".").first().toLower();
- Filename2=FileName.remove(QRegExp("[+-/\_=]"));
+ Filename2=FileName.remove(QRegExp("[+-/#_=]\<>"));
DXF_main_base[0].dxf_openfile=Filename2.toLower();
DXF_main_base[0].dxf_filetype=FileType;
@@ -258,6 +258,11 @@
log_file.append("file read into program \n");
ui->dxf_log->setPlainText(log_file);
+ status1="file read ";
+ status1.append(FileName);
+ status1.append(" into program");
+ ui->statusBar->showMessage(status1);
+
QTextStream in(&file);
DXF_main_base[0].dxf_text_all = in.readAll();
@@ -398,14 +403,14 @@
if (main_sw3==1)
{
- ui->progressBar->setMaximum(DXF_main_base[0].dxf_line_count);
- ui->progressBar->setMinimum(0);
+ //ui->progressBar->setMaximum(DXF_main_base[0].dxf_line_count);
+ //ui->progressBar->setMinimum(0);
//counter * counting = new counter(this);
dxf_split *dxf_spf=new dxf_split(this);
- QObject::connect(dxf_spf, SIGNAL(ValueChanged(int)), ui->progressBar, SLOT(setValue(int)));
+ //QObject::connect(dxf_spf, SIGNAL(ValueChanged(int)), ui->progressBar, SLOT(setValue(int)));
log_file.append("load dxf sections into specific table \n");
ui->dxf_log->setPlainText(log_file);
@@ -997,6 +1002,11 @@
}
ui->dxf_log->setPlainText(log_file);
+ status1="file ";
+ status1.append(FileName);
+ status1.append(" into table");
+ ui->statusBar->showMessage(status1);
+
DXF_Block_table();
}
@@ -1018,7 +1028,12 @@
CSV_Load_QTable();
+ status1="CSV file ";
+ status1.append(FileName);
+ status1.append(" into table");
+ ui->statusBar->showMessage(status1);
+
}
else
{
@@ -1138,27 +1153,6 @@
model2->setData(index,"Background color");
-
- /*
- * <rect height="10" x="-30" y="-40" style="line-style:normal;line-weight:normal;filling:black;color:black" width="20" antialias="false"/>
- <rect height="10" x="-30" y="-20" style="line-style:normal;line-weight:normal;filling:red;color:black" width="20" antialias="false"/>
- <rect height="10" x="0" y="-40" style="line-style:normal;line-weight:normal;filling:white;color:black" width="20" antialias="false"/>
- <rect height="10" x="30" y="-40" style="line-style:normal;line-weight:normal;filling:green;color:black" width="21" antialias="false"/>
- <rect height="10" x="0" y="-20" style="line-style:normal;line-weight:normal;filling:blue;color:black" width="20" antialias="false"/>
- <rect height="10" x="30" y="-20" style="line-style:normal;line-weight:normal;filling:gray;color:black" width="21" antialias="false"/>
- <rect height="10" x="-30" y="0" style="line-style:normal;line-weight:normal;filling:cyan;color:black" width="20" antialias="false"/>
- <rect height="10" x="-30" y="20" style="line-style:normal;line-weight:normal;filling:orange;color:black" width="20" antialias="false"/>
- <rect height="10" x="0" y="20" style="line-style:normal;line-weight:normal;filling:purple;color:black" width="20" antialias="false"/>
- <rect height="10" x="30" y="0" style="line-style:normal;line-weight:normal;filling:magenta;color:black" width="20" antialias="false"/>
- <rect height="10" x="30" y="20" style="line-style:normal;line-weight:normal;filling:fdiag;color:black" width="21" antialias="false"/>
- <rect height="10" x="60" y="-40" style="line-style:normal;line-weight:normal;filling:brun;color:black" width="20" antialias="false"/>
- <rect height="10" x="60" y="-20" style="line-style:normal;line-weight:normal;filling:yellow;color:black" width="20" antialias="false"/>
- <rect height="10" x="60" y="0" style="line-style:normal;line-weight:normal;filling:lightgray;color:black" width="20" antialias="false"/>
- <rect height="10" x="60" y="20" style="line-style:normal;line-weight:normal;filling:none;color:black" width="20" antialias="false"/>
- */
-
-
-
ui->CSV_Tablesettings->resizeColumnsToContents();
ui->CSV_Tablesettings->show();
@@ -1198,28 +1192,12 @@
ui->ELMT_result->setPlainText(Result4);
- /*if (DXF_main_base[0].DXF_file_loaded_into_table==1)
- {
+ status1="CSV file ";
+ status1.append(FileName);
+ status1.append(" created as ELMT");
+ ui->statusBar->showMessage(status1);
- log_file.append("CSV file NOT loaded into tables \n");
- log_file.append("click on load CSV into tables \n");
- ui->dxf_log->setPlainText(log_file);
-
- }
- else
- {
- log_file.append("CSV file coverting to ELMT \n");
- ui->dxf_log->setPlainText(log_file);
-
-
- csv_create_elmt make_new_ELMT;
-
- Result4 = make_new_ELMT.Make_ELMT();
-
- ui->ELMT_result->setPlainText(Result4);
-
- }*/
}
void DXFtoQET_MainWindow::on_CSV_create_qet_clicked()
@@ -1242,6 +1220,11 @@
Result = make_new_ELMT.Make_ELMT();
ui->ELMT_result->setPlainText(Result);
+
+ status1="file ";
+ status1.append(FileName);
+ status1.append(" created as ELMT");
+ ui->statusBar->showMessage(status1);
}
else
{
@@ -1286,11 +1269,59 @@
ui->Block_Items_2->setModel(model3);
List3.append("Block n°");
- for (int xcol=1;xcol<46;xcol++)
+
+ List3.append("3dface");
+ List3.append("3dsolid");
+ List3.append("acad_proxy_entity");
+ List3.append("arc");
+ List3.append("attdef");
+ List3.append("attr");
+ List3.append("body");
+ List3.append("circle");
+ List3.append("dimension");
+ List3.append("ellipse");
+ List3.append("hatch");
+ List3.append("helix");
+ List3.append("image");
+ List3.append("insert");
+ List3.append("leader");
+ List3.append("light");
+ List3.append("line");
+ List3.append("lwpolyline");
+ List3.append("mesh");
+ List3.append("mline");
+ List3.append("mleaderstyle");
+ List3.append("mleader");
+ List3.append("mtext");
+ List3.append("oleframe");
+ List3.append("oleframe2");
+ List3.append("point");
+ List3.append("polyline");
+ List3.append("ray");
+ List3.append("region");
+ List3.append("section");
+ List3.append("seqend");
+ List3.append("shape");
+ List3.append("solid");
+ List3.append("spline");
+ List3.append("sun");
+ List3.append("surface");
+ List3.append("table");
+ List3.append("text");
+ List3.append("tolerance");
+ List3.append("trace");
+ List3.append("underlay");
+ List3.append("vertex");
+ List3.append("viewport");
+ List3.append("wipeout");
+ List3.append("xline");
+
+
+ /*for (int xcol=1;xcol<46;xcol++)
{
List3.append(QString::number(xcol));
- }
+ }*/
model3->setHorizontalHeaderLabels(List3);
@@ -1445,29 +1476,8 @@
ui->Block_Items_2->resizeColumnsToContents();
- /*for (int row2=0; row2<100;row2++)
- {
- for (int col2=0;col2<46;col2++)
- {
- index = model3->index(row2,col2,QModelIndex());
- if (model3->data(index)>0 and model3->data(index)<50)
- {
-
- }
-
-
- // tableWidget->item(8, 0)->setBackground(Qt::red);
-
-
- }
-
-
-
-
- }*/
-
ui->Block_Items_2->show();
Modified: branches/dxftoqet2/dxftoqet_mainwindow.h
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.h 2015-11-12 17:29:48 UTC (rev 4258)
+++ branches/dxftoqet2/dxftoqet_mainwindow.h 2015-11-13 21:56:28 UTC (rev 4259)
@@ -54,6 +54,7 @@
QString log_file;
QString log_trans;
QString log_split;
+ QString status1;
QString FileType;
QString FileName;
Modified: branches/dxftoqet2/dxftoqet_mainwindow.ui
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.ui 2015-11-12 17:29:48 UTC (rev 4258)
+++ branches/dxftoqet2/dxftoqet_mainwindow.ui 2015-11-13 21:56:28 UTC (rev 4259)
@@ -757,7 +757,7 @@
<string notr="true">BACKGROUND:rgb(225, 225, 225)</string>
</property>
<property name="currentIndex">
- <number>3</number>
+ <number>2</number>
</property>
<widget class="QWidget" name="tab_dxf_sections">
<attribute name="title">
@@ -1339,7 +1339,7 @@
24 oleframe();
25 oleframe2();
26 point();
-27 polyline();
+27 polyline(converted);
28 ray();
29 region();
30 section();
@@ -1715,8 +1715,11 @@
</item>
<item row="13" column="4">
<widget class="QLabel" name="label_64">
+ <property name="styleSheet">
+ <string notr="true">BACKGROUND:rgb(165, 198, 130)</string>
+ </property>
<property name="text">
- <string>VERTEX</string>
+ <string><html><head/><body><p align="center">VERTEX</p></body></html></string>
</property>
</widget>
</item>
@@ -2886,13 +2889,6 @@
</layout>
</item>
<item>
- <widget class="QProgressBar" name="progressBar">
- <property name="value">
- <number>0</number>
- </property>
- </widget>
- </item>
- <item>
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -3019,22 +3015,6 @@
<resources/>
<connections>
<connection>
- <sender>progressBar</sender>
- <signal>valueChanged(int)</signal>
- <receiver>progressBar</receiver>
- <slot>setValue(int)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>466</x>
- <y>958</y>
- </hint>
- <hint type="destinationlabel">
- <x>468</x>
- <y>958</y>
- </hint>
- </hints>
- </connection>
- <connection>
<sender>elmt_lang_ar</sender>
<signal>textEdited(QString)</signal>
<receiver>pushButton</receiver>
Modified: branches/dxftoqet2/src/dxf/dxf_lwpolyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_lwpolyline.cpp 2015-11-12 17:29:48 UTC (rev 4258)
+++ branches/dxftoqet2/src/dxf/dxf_lwpolyline.cpp 2015-11-13 21:56:28 UTC (rev 4259)
@@ -30,7 +30,7 @@
db_lwpolyline.QET_closed="false";
}
- for (count=1; count<=vector_count+1;count++)
+ for (count=1; count<=vector_count;count++)
{
db_lwpolyline.QET_x[count]=x_vector[count];
db_lwpolyline.QET_y[count]=y_vector[count];
Modified: branches/dxftoqet2/src/dxf/dxf_lwpolyline.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_lwpolyline.h 2015-11-12 17:29:48 UTC (rev 4258)
+++ branches/dxftoqet2/src/dxf/dxf_lwpolyline.h 2015-11-13 21:56:28 UTC (rev 4259)
@@ -23,8 +23,8 @@
int16_t closed; //70
- double x_vector[50];
- double y_vector[50];
+ double x_vector[500];
+ double y_vector[500];
QString Result_lwpolyline;
Modified: branches/dxftoqet2/src/dxf/dxf_polyline.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_polyline.h 2015-11-12 17:29:48 UTC (rev 4258)
+++ branches/dxftoqet2/src/dxf/dxf_polyline.h 2015-11-13 21:56:28 UTC (rev 4259)
@@ -23,8 +23,8 @@
int16_t closed; //70
- double x_vector[50];
- double y_vector[50];
+ double x_vector[500];
+ double y_vector[500];
QString Result_polyline;
Modified: branches/dxftoqet2/src/dxf_split.h
===================================================================
--- branches/dxftoqet2/src/dxf_split.h 2015-11-12 17:29:48 UTC (rev 4258)
+++ branches/dxftoqet2/src/dxf_split.h 2015-11-13 21:56:28 UTC (rev 4259)
@@ -53,51 +53,51 @@
int block_count4;
int block_count5;
- int block_3dface_count;
- int block_3dsolid_count;
- int block_acad_proxy_entity_count;
- int block_arc_count;
- int block_attdef_count;
- int block_attrib_count;
- int block_body_count;
- int block_circle_count;
- int block_dimension_count;
- int block_ellipse_count;
- int block_hatch_count;
- int block_helix_count;
- int block_image_count;
- int block_insert_count;
- int block_leader_count;
- int block_light_count;
- int block_line_count;
- int block_lwpolyline_count;
- int block_mesh_count;
- int block_mline_count;
- int block_mleaderstyle_count;
- int block_mleader_count;
- int block_mtext_count;
- int block_oleframe_count;
- int block_ole2frame_count;
- int block_point_count;
- int block_polyline_count;
- int block_ray_count;
- int block_region_count;
- int block_section_count;
- int block_seqend_count;
- int block_shape_count;
- int block_solid_count;
- int block_spline_count;
- int block_sun_count;
- int block_surface_count;
- int block_table_count;
- int block_text_count;
- int block_tolerance_count;
- int block_trace_count;
- int block_underlay_count;
- int block_vertex_count;
- int block_viewport_count;
- int block_wipeout_count;
- int block_xline_count;
+ int32_t block_3dface_count;
+ int32_t block_3dsolid_count;
+ int32_t block_acad_proxy_entity_count;
+ int32_t block_arc_count;
+ int32_t block_attdef_count;
+ int32_t block_attrib_count;
+ int32_t block_body_count;
+ int32_t block_circle_count;
+ int32_t block_dimension_count;
+ int32_t block_ellipse_count;
+ int32_t block_hatch_count;
+ int32_t block_helix_count;
+ int32_t block_image_count;
+ int32_t block_insert_count;
+ int32_t block_leader_count;
+ int32_t block_light_count;
+ int32_t block_line_count;
+ int32_t block_lwpolyline_count;
+ int32_t block_mesh_count;
+ int32_t block_mline_count;
+ int32_t block_mleaderstyle_count;
+ int32_t block_mleader_count;
+ int32_t block_mtext_count;
+ int32_t block_oleframe_count;
+ int32_t block_ole2frame_count;
+ int32_t block_point_count;
+ int32_t block_polyline_count;
+ int32_t block_ray_count;
+ int32_t block_region_count;
+ int32_t block_section_count;
+ int32_t block_seqend_count;
+ int32_t block_shape_count;
+ int32_t block_solid_count;
+ int32_t block_spline_count;
+ int32_t block_sun_count;
+ int32_t block_surface_count;
+ int32_t block_table_count;
+ int32_t block_text_count;
+ int32_t block_tolerance_count;
+ int32_t block_trace_count;
+ int32_t block_underlay_count;
+ int32_t block_vertex_count;
+ int32_t block_viewport_count;
+ int32_t block_wipeout_count;
+ int32_t block_xline_count;
int block_st1;
@@ -109,51 +109,51 @@
int entities_count1;
int entities_count2;
- int entities_3DFACE_count2;
- int entities_3DSOLID_count2;
- int entities_ACAD_PROXY_ENTITY_count2;
- int entities_ARC_count2;
- int entities_ATTDEF_count2;
- int entities_ATTRIB_count2;
- int entities_BODY_count2;
- int entities_CIRCLE_count2;
- int entities_DIMENSION_count2;
- int entities_ELLIPSE_count2;
- int entities_HATCH_count2;
- int entities_HELIX_count2;
- int entities_IMAGE_count2;
- int entities_INSERT_count2;
- int entities_LEADER_count2;
- int entities_LIGHT_count2;
- int entities_LINE_count2;
- int entities_LWPOLYLINE_count2;
- int entities_MESH_count2;
- int entities_MLINE_count2;
- int entities_MLEADERSTYLE_count2;
- int entities_MLEADER_count2;
- int entities_MTEXT_count2;
- int entities_OLEFRAME_count2;
- int entities_OLE2FRAME_count2;
- int entities_POINT_count2;
- int entities_POLYLINE_count2;
- int entities_RAY_count2;
- int entities_REGION_count2;
- int entities_SECTION_count2;
- int entities_SEQEND_count2;
- int entities_SHAPE_count2;
- int entities_SOLID_count2;
- int entities_SPLINE_count2;
- int entities_SUN_count2;
- int entities_SURFACE_count2;
- int entities_TABLE_count2;
- int entities_TEXT_count2;
- int entities_TOLERANCE_count2;
- int entities_TRACE_count2;
- int entities_UNDERLAY_count2;
- int entities_VERTEX_count2;
- int entities_VIEWPORT_count2;
- int entities_WIPEOUT_count2;
- int entities_XLINE_count2;
+ int32_t entities_3DFACE_count2;
+ int32_t entities_3DSOLID_count2;
+ int32_t entities_ACAD_PROXY_ENTITY_count2;
+ int32_t entities_ARC_count2;
+ int32_t entities_ATTDEF_count2;
+ int32_t entities_ATTRIB_count2;
+ int32_t entities_BODY_count2;
+ int32_t entities_CIRCLE_count2;
+ int32_t entities_DIMENSION_count2;
+ int32_t entities_ELLIPSE_count2;
+ int32_t entities_HATCH_count2;
+ int32_t entities_HELIX_count2;
+ int32_t entities_IMAGE_count2;
+ int32_t entities_INSERT_count2;
+ int32_t entities_LEADER_count2;
+ int32_t entities_LIGHT_count2;
+ int32_t entities_LINE_count2;
+ int32_t entities_LWPOLYLINE_count2;
+ int32_t entities_MESH_count2;
+ int32_t entities_MLINE_count2;
+ int32_t entities_MLEADERSTYLE_count2;
+ int32_t entities_MLEADER_count2;
+ int32_t entities_MTEXT_count2;
+ int32_t entities_OLEFRAME_count2;
+ int32_t entities_OLE2FRAME_count2;
+ int32_t entities_POINT_count2;
+ int32_t entities_POLYLINE_count2;
+ int32_t entities_RAY_count2;
+ int32_t entities_REGION_count2;
+ int32_t entities_SECTION_count2;
+ int32_t entities_SEQEND_count2;
+ int32_t entities_SHAPE_count2;
+ int32_t entities_SOLID_count2;
+ int32_t entities_SPLINE_count2;
+ int32_t entities_SUN_count2;
+ int32_t entities_SURFACE_count2;
+ int32_t entities_TABLE_count2;
+ int32_t entities_TEXT_count2;
+ int32_t entities_TOLERANCE_count2;
+ int32_t entities_TRACE_count2;
+ int32_t entities_UNDERLAY_count2;
+ int32_t entities_VERTEX_count2;
+ int32_t entities_VIEWPORT_count2;
+ int32_t entities_WIPEOUT_count2;
+ int32_t entities_XLINE_count2;
int entities_3DFACE_count2_100;
int entities_3DSOLID_count2_100;