| [qet] [4215] DXFtoQET minor correction in split file function |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4215
Author: rdsivd
Date: 2015-09-20 20:32:14 +0200 (Sun, 20 Sep 2015)
Log Message:
-----------
DXFtoQET minor correction in split file function
Modified Paths:
--------------
branches/dxftoqet2/DXFtoQET.pro
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
Added Paths:
-----------
branches/dxftoqet2/src/dxf/dxf_ellipse.cpp
branches/dxftoqet2/src/dxf/dxf_ellipse.h
branches/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.cpp
branches/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.h
Modified: branches/dxftoqet2/DXFtoQET.pro
===================================================================
--- branches/dxftoqet2/DXFtoQET.pro 2015-09-19 13:27:06 UTC (rev 4214)
+++ branches/dxftoqet2/DXFtoQET.pro 2015-09-20 18:32:14 UTC (rev 4215)
@@ -41,7 +41,9 @@
src/dxf_base_types/dxf_base_text.cpp \
src/dxf/dxf_text.cpp \
src/dxf/dxf_rect.cpp \
- src/dxf/dxf_attr.cpp
+ src/dxf/dxf_attr.cpp \
+ src/dxf/dxf_ellipse.cpp \
+ src/dxf_base_types/dxf_base_ellipse.cpp
HEADERS += dxftoqet_mainwindow.h \
src/dxf_data.h \
@@ -70,7 +72,9 @@
src/dxf_base_types/dxf_base_text.h \
src/dxf/dxf_text.h \
src/dxf/dxf_rect.h \
- src/dxf/dxf_attr.h
+ src/dxf/dxf_attr.h \
+ src/dxf/dxf_ellipse.h \
+ src/dxf_base_types/dxf_base_ellipse.h
FORMS += dxftoqet_mainwindow.ui
Modified: branches/dxftoqet2/dxf_create_elmt.cpp
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.cpp 2015-09-19 13:27:06 UTC (rev 4214)
+++ branches/dxftoqet2/dxf_create_elmt.cpp 2015-09-20 18:32:14 UTC (rev 4215)
@@ -9,6 +9,8 @@
extern struct DXF_entities_attrib DXF_input_entities_attrib[1000];
extern struct DXF_entities_circle DXF_input_entities_circle[1000];
extern struct DXF_entities_point DXF_input_entities_point[1000];
+extern struct DXF_entities_text DXF_input_entities_text[1000];
+extern struct DXF_entities_ellipse DXF_input_entities_ellipse[1000];
DXF_create_elmt::DXF_create_elmt(QWidget *parent) :
QMainWindow(parent)
@@ -248,7 +250,16 @@
Result.append(Make_POINT());
+ /* TEXT */
+ Count_entitie_text=DXF_main_base[0].DXF_entities_text_count;
+ Result.append(Make_TEXT());
+
+ /* ELLIPSE */
+
+ Count_entitie_ellipse=DXF_main_base[0].DXF_entities_ellipse_count;
+ Result.append(Make_ELLIPSE());
+
/* Close elmt description */
Result.append(Create_ELMT.DescriptionEnd());
@@ -257,7 +268,6 @@
return Result;
}
-
QString DXF_create_elmt::Make_LINE()
{
@@ -309,7 +319,6 @@
}
-
QString DXF_create_elmt::Make_terminal()
{
@@ -395,7 +404,6 @@
return Result_attdef;
}
-
QString DXF_create_elmt::Make_ATTR()
{
@@ -431,9 +439,7 @@
}
-
-
-QString DXF_create_elmt::Make_CIRCLE()
+ QString DXF_create_elmt::Make_CIRCLE()
{
dxf_circle db_circle;
@@ -465,7 +471,7 @@
}
-QString DXF_create_elmt::Make_POINT()
+ QString DXF_create_elmt::Make_POINT()
{
Result_point="";
@@ -487,3 +493,73 @@
return Result_point;
}
+
+ QString DXF_create_elmt::Make_TEXT()
+ {
+
+ dxf_text db_text;
+ DXF_Text_control db_txt_check;
+
+ Result_text="";
+
+ Count_lines=0;
+
+ while (Count_lines<=Count_entitie_text)
+ {
+
+ db_text.QET_x=DXF_input_entities_text[Count_lines].DXF_entities_text_code_10;
+ db_text.QET_y=-DXF_input_entities_text[Count_lines].DXF_entities_text_code_20;
+ db_text.QET_rotation=DXF_input_entities_text[Count_lines].DXF_entities_text_code_50;
+ db_text.QET_size=DXF_input_entities_text[Count_lines].DXF_entities_text_code_40;
+
+
+
+ db_txt_check.TextToCheck=DXF_input_entities_text[Count_lines].DXF_entities_text_code_1;
+
+ db_text.QET_text=db_txt_check.Text_control();
+
+ Result_text.append(db_text.Create_Text());
+
+ Count_lines=Count_lines+1;
+
+
+ }
+
+ return Result_text;
+ }
+
+ QString DXF_create_elmt::Make_ELLIPSE()
+ {
+
+ dxf_ellipse db_ellipse;
+
+
+ Result_ellipse2="";
+
+ Count_lines=0;
+
+ while (Count_lines<=Count_entitie_ellipse)
+ {
+
+ db_ellipse.center_x=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_10;
+ db_ellipse.center_y=-DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_20;
+ db_ellipse.major_radius_x=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_11;
+ db_ellipse.major_radius_y=-DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_21;
+ db_ellipse.ratio_of_minor=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_40;
+ db_ellipse.start=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_41;
+ db_ellipse.end2=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_42;
+ db_ellipse.LineTypeOFLine=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_6;
+ db_ellipse.LayerNameOFLine=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_8;
+
+
+
+
+ Result_ellipse2.append(db_ellipse.Create_ELLIPSE());
+
+ Count_lines=Count_lines+1;
+
+
+ }
+
+ return Result_ellipse2;
+ }
Modified: branches/dxftoqet2/dxf_create_elmt.h
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.h 2015-09-19 13:27:06 UTC (rev 4214)
+++ branches/dxftoqet2/dxf_create_elmt.h 2015-09-20 18:32:14 UTC (rev 4215)
@@ -13,6 +13,8 @@
#include "dxf/dxf_arc.h"
#include "dxf/dxf_circle.h"
#include "dxf/dxf_attr.h"
+#include "dxf/dxf_text.h"
+#include "dxf/dxf_ellipse.h"
class DXF_create_elmt : public QMainWindow
{
@@ -29,6 +31,8 @@
QString Make_ATTR();
QString Make_CIRCLE();
QString Make_POINT();
+ QString Make_TEXT();
+ QString Make_ELLIPSE();
QString Result;
QString Result_line;
@@ -39,6 +43,9 @@
QString Result_attr;
QString Result_circle;
QString Result_point;
+ QString Result_text;
+ QString Result_ellipse;
+ QString Result_ellipse2;
double DXF_LIMMAX_x;
@@ -57,6 +64,8 @@
int Count_entitie_attr;
int Count_entitie_circle;
int Count_entitie_point;
+ int Count_entitie_text;
+ int Count_entitie_ellipse;
int Count_lines;
int Count_for;
Modified: branches/dxftoqet2/dxftoqet_mainwindow.cpp
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.cpp 2015-09-19 13:27:06 UTC (rev 4214)
+++ branches/dxftoqet2/dxftoqet_mainwindow.cpp 2015-09-20 18:32:14 UTC (rev 4215)
@@ -874,9 +874,9 @@
ui->DXF_TRACE->setStyleSheet("QLineEdit { background-color:rgb(7,200,4)}");
}
- ui->DXF_UNDERLAY->setText(QString::number(DXF_main_base[0].DXF_entities_underlay));
+ ui->DXF_UNDERLAY->setText(QString::number(DXF_main_base[0].DXF_entities_underlay_count));
- if (DXF_main_base[0].DXF_entities_underlay>999)
+ if (DXF_main_base[0].DXF_entities_underlay_count>999)
{
ui->DXF_UNDERLAY->setStyleSheet("QLineEdit { background-color:rgb(255,0,0)}");
@@ -1178,7 +1178,7 @@
{
Result ="";
- if (DXF_main_base[0].DXF_entities_insert_count>0)
+ /*if (DXF_main_base[0].DXF_entities_insert_count>0)
{
log_file.append("DXF file NOT for convertion to ELMT \n");
log_file.append("DXF file contains symbols \n");
@@ -1190,7 +1190,7 @@
}
else
- {
+ {*/
if (DXF_main_base[0].DXF_file_loaded_into_table==1)
{
log_file.append("DXF file coverting to ELMT \n");
@@ -1209,7 +1209,7 @@
ui->dxf_log->setPlainText(log_file);
}
- }
+ //}
}
void DXFtoQET_MainWindow::on_pushButton_clicked()
Modified: branches/dxftoqet2/dxftoqet_mainwindow.ui
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.ui 2015-09-19 13:27:06 UTC (rev 4214)
+++ branches/dxftoqet2/dxftoqet_mainwindow.ui 2015-09-20 18:32:14 UTC (rev 4215)
@@ -1337,6 +1337,9 @@
</item>
<item row="11" column="2">
<widget class="QLabel" name="label_45">
+ <property name="styleSheet">
+ <string notr="true">BACKGROUND:rgb(165, 198, 130)</string>
+ </property>
<property name="text">
<string>POINT</string>
</property>
@@ -1589,6 +1592,9 @@
</item>
<item row="9" column="4">
<widget class="QLabel" name="label_60">
+ <property name="styleSheet">
+ <string notr="true">BACKGROUND:rgb(165, 198, 130)</string>
+ </property>
<property name="text">
<string>TEXT</string>
</property>
@@ -1966,6 +1972,9 @@
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_31">
+ <property name="styleSheet">
+ <string notr="true">BACKGROUND:rgb(165, 198, 130)</string>
+ </property>
<property name="text">
<string>ELLIPSE</string>
</property>
Added: branches/dxftoqet2/src/dxf/dxf_ellipse.cpp
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_ellipse.cpp (rev 0)
+++ branches/dxftoqet2/src/dxf/dxf_ellipse.cpp 2015-09-20 18:32:14 UTC (rev 4215)
@@ -0,0 +1,91 @@
+#include "dxf_ellipse.h"
+
+dxf_ellipse::dxf_ellipse(QWidget *parent) :
+ QMainWindow(parent)
+{
+}
+
+QString dxf_ellipse::Create_ELLIPSE()
+{
+
+ dxf_base_ellipse db_ellipse;
+
+ Result_ellipse="";
+
+
+
+ //a=0;
+ //b=0;
+ //i2=0;
+ //j2=0;
+ //Pstart=0;
+ //Pend2=0;
+ //hoek2=0;
+
+ //center_x=0;
+ //center_y=0;
+ //major_radius_x=0;
+ //major_radius_y=0;
+ //ratio_of_minor=0;
+ //end2=0;
+ //start=0;
+
+
+ width=2*major_radius_x;
+ height=2*major_radius_x*ratio_of_minor;
+
+ a=width/2;
+ b=height/2;
+
+ i2=1;
+ j2=0.1;
+ Pstart=0;
+ Pend2=0;
+
+ Pstart=(180*(start/3.141592654));
+
+ Pend2=(180*(end2/3.141592654));
+
+ hoek2=Pstart-Pend2;
+ begin=Pstart-hoek2;
+
+ x_center=((center_x-(width/2) ));
+ y_center=((center_y-(height/2) ));
+
+ breedte=width;
+ hoogte=height;
+
+ BeginHoek=begin;
+ Hoek2=hoek2;
+
+
+ db_ellipse.QET_x=x_center;
+ db_ellipse.QET_y=y_center;
+ db_ellipse.QET_start=BeginHoek;
+ db_ellipse.QET_angle=Hoek2;
+ db_ellipse.QET_width=breedte;
+ db_ellipse.QET_height=hoogte;
+ db_ellipse.QET_antialias="false";
+
+ DXF_Ltype_control db_line_ltype_control;
+
+ db_line_ltype_control.FindLT=ltype;
+ db_line_ltype_control.Layer=layer;
+
+
+ db_ellipse.QET_line_style=db_line_ltype_control.Ltype_control();
+
+ db_ellipse.QET_line_weight="thin";
+ db_ellipse.QET_filling="none";
+ db_ellipse.QET_color="black";
+
+
+
+ Result_ellipse.append(db_ellipse.Create_ellipse());
+
+
+
+ return Result_ellipse;
+}
+
+
Added: branches/dxftoqet2/src/dxf/dxf_ellipse.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_ellipse.h (rev 0)
+++ branches/dxftoqet2/src/dxf/dxf_ellipse.h 2015-09-20 18:32:14 UTC (rev 4215)
@@ -0,0 +1,99 @@
+#ifndef DXF_ELLIPSE_H
+#define DXF_ELLIPSE_H
+
+#include <QMainWindow>
+#include "dxf_base_types/dxf_base_ellipse.h"
+#include "dxf_control/dxf_ltype_control.h"
+
+class dxf_ellipse : public QMainWindow
+{
+ Q_OBJECT
+ public:
+ explicit dxf_ellipse(QWidget *parent = 0);
+
+ QString Result_ellipse;
+
+ int x;
+
+ QString Lineout;
+ float x_center;
+ float y_center;
+ float breedte;
+ float hoogte;
+ QString ActiveFunction;
+ QString StatusbarMessage;
+ QString LineTypeOFLine;
+ QString LayerNameOFLine;
+ QString LineStyle;
+ float BeginHoek;
+ float Hoek2;
+
+
+ float center_x;
+ float center_y;
+ float major_radius_x;
+ float major_radius_y;
+ float ratio_of_minor;
+ float start;
+
+ float end2;
+
+ float begin1;
+ float einde1;
+
+ float begin;
+ float einde;
+
+
+
+ float width;
+ float height;
+
+
+ float hoek2;
+
+
+ float a;
+ float b;
+ float i2;
+ float j2;
+ float Pstart;
+ float Pend2;
+
+ float startcos;
+ float startsin;
+ float endcos;
+ float endsin;
+ float powwidth;
+ float powheight;
+ float sqrtwidth;
+ float sqrtheight;
+
+ /*float N;
+ float O;
+ float J;
+ float K;
+ float L;
+ float M;
+ float R;
+ float S;
+ float T;
+ float U;
+ float V;
+ float W;*/
+
+ QString ltype;
+ QString layer;
+
+ QString Create_ELLIPSE();
+
+ double RadiansToDegrees (double Radians);
+ double DegreesToRadians (double Degrees);
+
+ signals:
+
+ public slots:
+
+};
+
+#endif // DXF_ELLIPSE_H
Added: branches/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.cpp (rev 0)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.cpp 2015-09-20 18:32:14 UTC (rev 4215)
@@ -0,0 +1,75 @@
+#include "dxf_base_ellipse.h"
+
+dxf_base_ellipse::dxf_base_ellipse(QWidget *parent) :
+ QMainWindow(parent)
+{
+}
+
+QString dxf_base_ellipse::Create_ellipse()
+{
+ /* <ellipse width="38"
+ * x="-15" y="34"
+ * antialias="true"
+ * height="13"
+ * style="line-style:normal;line-weight:normal;filling:none;color:black"/>*/
+ Result_ellipse="";
+
+ Result_ellipse.append(" ");
+ Result_ellipse.append("<arc");
+
+
+ Result_ellipse.append(" width=");
+ Result_ellipse.append(QChar(34));
+ Result_ellipse.append(QString::number(QET_width,'f',2));
+ Result_ellipse.append(QChar(34));
+
+ Result_ellipse.append(" x=");
+ Result_ellipse.append(QChar(34));
+ Result_ellipse.append(QString::number(QET_x,'f',2));
+ Result_ellipse.append(QChar(34));
+
+ Result_ellipse.append(" y=");
+ Result_ellipse.append(QChar(34));
+ Result_ellipse.append(QString::number(QET_y,'f',2));
+ Result_ellipse.append(QChar(34));
+
+ Result_ellipse.append(" antialias=");
+ Result_ellipse.append(QChar(34));
+ Result_ellipse.append(QET_antialias);
+ Result_ellipse.append(QChar(34));
+
+ Result_ellipse.append(" height=");
+ Result_ellipse.append(QChar(34));
+ Result_ellipse.append(QString::number(QET_height,'f',2));
+ Result_ellipse.append(QChar(34));
+
+ Result_ellipse.append(" style=");
+ Result_ellipse.append(QChar(34));
+ Result_ellipse.append("line-style:");
+ Result_ellipse.append(QET_line_style);
+ Result_ellipse.append(";");
+ Result_ellipse.append("line-weight:");
+ Result_ellipse.append(QET_line_weight);
+ Result_ellipse.append(";");
+ Result_ellipse.append("filling:");
+ Result_ellipse.append(QET_filling);
+ Result_ellipse.append(";");
+ Result_ellipse.append("color:");
+ Result_ellipse.append(QET_color);
+ Result_ellipse.append(QChar(34));
+
+ Result_ellipse.append(" start=");
+ Result_ellipse.append(QChar(34));
+ Result_ellipse.append(QString::number(QET_start,'f',0));
+ Result_ellipse.append(QChar(34));
+
+ Result_ellipse.append(" angle=");
+ Result_ellipse.append(QChar(34));
+ Result_ellipse.append(QString::number(QET_angle,'f',0));
+ Result_ellipse.append(QChar(34));
+
+ Result_ellipse.append(" />");
+ Result_ellipse.append('\n');
+
+ return Result_ellipse;
+}
Added: branches/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.h
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.h (rev 0)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.h 2015-09-20 18:32:14 UTC (rev 4215)
@@ -0,0 +1,45 @@
+#ifndef DXF_BASE_ELLIPSE_H
+#define DXF_BASE_ELLIPSE_H
+
+#include <QMainWindow>
+
+class dxf_base_ellipse : public QMainWindow
+{
+ Q_OBJECT
+ public:
+ explicit dxf_base_ellipse(QWidget *parent = 0);
+
+ QString Result_ellipse;
+ /* <ellipse width="38"
+ * x="-15" y="34"
+ * antialias="true"
+ * height="13"
+ * style="line-style:normal;line-weight:normal;filling:none;color:black"/>*/
+
+ //QET xml var
+ double QET_x; //10
+ double QET_y; //20
+ double QET_width;
+ double QET_height;
+ double QET_start;
+ double QET_angle;
+
+ //double QET_diameter;
+
+
+ QString QET_antialias;
+
+ QString QET_line_style;
+ QString QET_line_weight;
+ QString QET_filling;
+ QString QET_color;
+
+ QString Create_ellipse();
+
+ signals:
+
+ public slots:
+
+};
+
+#endif // DXF_BASE_ELLIPSE_H
Modified: branches/dxftoqet2/src/dxf_data.h
===================================================================
--- branches/dxftoqet2/src/dxf_data.h 2015-09-19 13:27:06 UTC (rev 4214)
+++ branches/dxftoqet2/src/dxf_data.h 2015-09-20 18:32:14 UTC (rev 4215)
@@ -641,7 +641,7 @@
int DXF_entities_text_count ;
int DXF_entities_tolerance_count ;
int DXF_entities_trace_count ;
- int DXF_entities_underlay ;
+ int DXF_entities_underlay_count ;
int DXF_entities_vertex_count ;
int DXF_entities_viewport_count ;
int DXF_entities_wipeout_count ;
@@ -1051,7 +1051,12 @@
QString DXF_entities_arc_code_100[3]; //[1] Subclass marker (AcDbCircle)
//[2] Subclass marker (AcDbArc)
- QString DXF_entities_arc_code_330; // Soft-pointer ID/handle to owner dictionary (optional)
+ QString DXF_entities_arc_code_102[3];
+
+ QString DXF_entities_arc_code_330[3]; // Soft-pointer ID/handle to owner dictionary (optional)
+
+ int16_t DXF_entities_arc_code_370;
+
};
struct DXF_entities_attdef
@@ -1139,6 +1144,7 @@
struct DXF_entities_circle
{
+ QString DXF_entities_circle_code_2;
QString DXF_entities_circle_code_5;
QString DXF_entities_circle_code_6;
@@ -1152,12 +1158,20 @@
double DXF_entities_circle_code_31;
double DXF_entities_circle_code_40;
+ double DXF_entities_circle_code_48;
int16_t DXF_entities_circle_code_62;
+ int16_t DXF_entities_circle_code_72;
+ int16_t DXF_entities_circle_code_73;
+
QString DXF_entities_circle_code_100[3];
+ QString DXF_entities_circle_code_102[3];
- QString DXF_entities_circle_code_330;
+ QString DXF_entities_circle_code_330[3];
+
+ double DXF_entities_circle_code_370;
+
};
struct DXF_entities_dimension
@@ -1184,7 +1198,7 @@
struct DXF_entities_ellipse
{
QString DXF_entities_ellipse_code_5;
-
+ QString DXF_entities_ellipse_code_6;
QString DXF_entities_ellipse_code_8;
double DXF_entities_ellipse_code_10;
@@ -1274,6 +1288,8 @@
struct DXF_entities_insert
{
+
+ QString DXF_entities_insert_code_2;
QString DXF_entities_insert_code_5;
QString DXF_entities_insert_code_6;
@@ -1287,10 +1303,12 @@
double DXF_entities_insert_code_31;
int16_t DXF_entities_insert_code_62;
+ int16_t DXF_entities_insert_code_66;
QString DXF_entities_insert_code_100[3];
+ QString DXF_entities_insert_code_102[3];
- QString DXF_entities_insert_code_330;
+ QString DXF_entities_insert_code_330[3];
};
struct DXF_entities_leader
@@ -1793,9 +1811,10 @@
struct DXF_entities_text
{
- QString DXF_entities_text_code_5;
+ QString DXF_entities_text_code_1; // Default value text string
+ QString DXF_entities_text_code_5; //
QString DXF_entities_text_code_6;
-
+ QString DXF_entities_text_code_7;
QString DXF_entities_text_code_8;
double DXF_entities_text_code_10;
@@ -1805,11 +1824,19 @@
double DXF_entities_text_code_30;
double DXF_entities_text_code_31;
+ double DXF_entities_text_code_40; // Text height
+ double DXF_entities_text_code_50; // Text rotation
+
int16_t DXF_entities_text_code_62;
+ int16_t DXF_entities_text_code_72;
+ int16_t DXF_entities_text_code_73;
+
QString DXF_entities_text_code_100[3];
+ QString DXF_entities_text_code_102[5];
- QString DXF_entities_text_code_330;
+ QString DXF_entities_text_code_330[5];
+
};
struct DXF_entities_tolerance
Modified: branches/dxftoqet2/src/dxf_split.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_split.cpp 2015-09-19 13:27:06 UTC (rev 4214)
+++ branches/dxftoqet2/src/dxf_split.cpp 2015-09-20 18:32:14 UTC (rev 4215)
@@ -11644,8 +11644,10 @@
entities_st2=0;
entities_count2=0;
+ // Log_1.append(found_entities_());
+
if (line3==0 and line4=="3DFACE" and line4.length()==6)
{
entities_3DFACE_count2=entities_3DFACE_count2+1;
@@ -12345,8 +12347,9 @@
entities_ARC_count2=entities_ARC_count2+1;
Log_1.append("Start reading entities ");
+ Log_1.append(" ARC n°: ");
Log_1.append(QString::number(entities_ARC_count2));
- Log_1.append(" ARC \n");
+ Log_1.append("\n");
@@ -12357,6 +12360,8 @@
}
entities_ARC_count2_100=0;
+ entities_ARC_count2_102=0;
+ entities_ARC_count2_330=0;
while (entities_st2==0 and entities_ARC_count2<999)
{
@@ -12372,9 +12377,10 @@
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(" ARC n°: ");
Log_1.append(QString::number(entities_ARC_count2));
- Log_1.append(" ARC \n");
+ Log_1.append("\n");
break;
@@ -12387,22 +12393,27 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ARC_count2));
- Log_1.append(" ARC \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_arc());
+
}
break;
+ case 6:
+
+ if(sw_entities_arc[6]==0)
+ {
+ DXF_input_entities_arc[entities_ARC_count2].DXF_entities_arc_code_6=line6;
+ sw_entities_arc[6]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_arc());
+
+ }
+
+ break;
+
case 8:
if(sw_entities_arc[8]==0)
@@ -12412,18 +12423,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ARC_count2));
- Log_1.append(" ARC \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_arc());
}
break;
@@ -12437,18 +12437,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ARC_count2));
- Log_1.append(" ARC \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_arc());
}
break;
@@ -12462,18 +12451,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ARC_count2));
- Log_1.append(" ARC \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_arc());
}
break;
@@ -12487,18 +12465,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ARC_count2));
- Log_1.append(" ARC \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_arc());
}
break;
@@ -12512,20 +12479,25 @@
}
else
{
- Log_1.append("Find in ENTITIES code ARC \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_arc());
}
break;
+ case 48:
+
+ if(sw_entities_arc[48]==0)
+ {
+ DXF_input_entities_arc[entities_ARC_count2].DXF_entities_arc_code_48=line6.toDouble();
+ sw_entities_arc[48]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_arc());
+ }
+
+ break;
+
case 50:
if(sw_entities_arc[50]==0)
@@ -12535,16 +12507,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ARC \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_arc());
}
break;
@@ -12558,36 +12521,30 @@
}
else
{
- Log_1.append("Find in ENTITIES code ARC \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_arc());
}
break;
+ case 62:
+
+ if(sw_entities_arc[62]==0)
+ {
+ DXF_input_entities_arc[entities_ARC_count2].DXF_entities_arc_code_62=line6.toInt();
+ sw_entities_arc[62]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_arc());
+ }
+
+ break;
+
case 100:
if (entities_ARC_count2_100>2)
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ARC_count2));
- Log_1.append(" ARC \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_arc());
}
else
{
@@ -12597,42 +12554,52 @@
break;
+ case 102:
+
+ if (entities_ARC_count2_102>2)
+ {
+ Log_1.append(found_entities_arc());
+ }
+ else
+ {
+ DXF_input_entities_arc[entities_ARC_count2].DXF_entities_arc_code_102[entities_ARC_count2_102]=line6.toInt();
+ entities_ARC_count2_102=entities_ARC_count2_102+1;
+ }
+
+ break;
+
case 330:
- if(sw_entities_arc[330]==0)
+ if (entities_ARC_count2_330>2)
{
- DXF_input_entities_arc[entities_ARC_count2].DXF_entities_arc_code_330=line6;
- sw_entities_arc[330]=1;
+ Log_1.append(found_entities_arc());
+ }
+ else
+ {
+ DXF_input_entities_arc[entities_ARC_count2].DXF_entities_arc_code_330[entities_ARC_count2_330]=line6.toInt();
+ entities_ARC_count2_330=entities_ARC_count2_330+1;
+ }
+
+ break;
+
+ case 370:
+
+ if(sw_entities_arc[370]==0)
+ {
+ DXF_input_entities_arc[entities_ARC_count2].DXF_entities_arc_code_370=line6.toInt();
+ sw_entities_arc[370]=1;
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ARC_count2));
- Log_1.append(" ARC \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_arc());
}
break;
+
+
default:
- Log_1.append("Find in entities ARC \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_arc());
}
}
}
@@ -12643,8 +12610,9 @@
entities_ATTDEF_count2=entities_ATTDEF_count2+1;
Log_1.append("Start reading entities ");
+ Log_1.append(" ATTDEFn°: ");
Log_1.append(QString::number(entities_ATTDEF_count2));
- Log_1.append(" ATTDEF \n");
+ Log_1.append("\n");
for (sw_cleaner=0; sw_cleaner<1072;++sw_cleaner)
@@ -12672,9 +12640,10 @@
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(" ATTDEF n°: ");
Log_1.append(QString::number(entities_ATTDEF_count2));
- Log_1.append(" ATTDEF \n");
+ Log_1.append("\n");
break;
@@ -12687,18 +12656,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTDEF_count2));
- Log_1.append(" ATTDEF \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_attdef());
}
break;
@@ -12712,18 +12670,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTDEF_count2));
- Log_1.append(" ATTDEF \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_attdef());
}
break;
@@ -12737,18 +12684,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTDEF_count2));
- Log_1.append(" ATTDEF \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_attdef());
}
break;
@@ -12787,18 +12723,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTDEF_count2));
- Log_1.append(" ATTDEF \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_attdef());
}
break;
@@ -12812,18 +12737,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTDEF_count2));
- Log_1.append(" ATTDEF \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_attdef());
}
break;
@@ -12837,18 +12751,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTDEF_count2));
- Log_1.append(" ATTDEF \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_attdef());
}
break;
@@ -12862,18 +12765,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTDEF_count2));
- Log_1.append(" ATTDEF \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_attdef());
}
break;
@@ -12887,18 +12779,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTDEF_count2));
- Log_1.append(" ATTDEF \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_attdef());
}
break;
@@ -12912,16 +12793,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ATTDEF \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_attdef());
}
break;
@@ -12935,16 +12807,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ATTDEF \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_attdef());
}
break;
@@ -12958,18 +12821,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTDEF_count2));
- Log_1.append(" ATTDEF \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_attdef());
}
break;
@@ -12978,18 +12830,7 @@
if (entities_ATTDEF_count2_100>2)
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTDEF_count2));
- Log_1.append(" ATTDEF \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_attdef());
}
else
{
@@ -13008,35 +12849,13 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTDEF_count2));
- Log_1.append(" ATTDEF \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_attdef());
}
break;
default:
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTDEF_count2));
- Log_1.append(" ATTDEF \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_attdef());
}
}
}
@@ -13046,8 +12865,9 @@
entities_ATTRIB_count2=entities_ATTRIB_count2+1;
Log_1.append("Start reading entities ");
+ Log_1.append(" ATTRIB n°: ");
Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \n");
+ Log_1.append("\n");
@@ -13075,9 +12895,10 @@
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(" ATTRIB n°: ");
Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \n");
+ Log_1.append("\n");
break;
@@ -13090,18 +12911,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
@@ -13115,18 +12925,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
@@ -13140,22 +12939,25 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
+ case 7: // Layername
+
+ if(sw_entities_attrib[7]==0)
+ {
+ DXF_input_entities_attrib[entities_ATTRIB_count2].DXF_entities_attrib_code_7=line6;
+ sw_entities_attrib[7]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_attr());
+ }
+
+ break;
+
case 8: // Layername
if(sw_entities_attrib[8]==0)
@@ -13165,18 +12967,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
@@ -13190,18 +12981,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
@@ -13215,18 +12995,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
@@ -13240,18 +13009,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
@@ -13265,18 +13023,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
@@ -13290,18 +13037,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
@@ -13316,18 +13052,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
@@ -13343,18 +13068,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
@@ -13370,18 +13084,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
@@ -13397,18 +13100,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
@@ -13424,18 +13116,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
@@ -13451,18 +13132,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
@@ -13478,18 +13148,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
@@ -13498,18 +13157,7 @@
if (entities_ATTRIB_count2_100>2)
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
else
{
@@ -13530,18 +13178,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
@@ -13555,33 +13192,13 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ATTRIB_count2));
- Log_1.append(" ATTRIB \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_attr());
}
break;
default:
- Log_1.append("Find in entities ATTRIB \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_attr());
}
}
@@ -13822,8 +13439,9 @@
entities_CIRCLE_count2=entities_CIRCLE_count2+1;
Log_1.append("Start reading entities ");
+ Log_1.append(" CIRCLE n°: ");
Log_1.append(QString::number(entities_CIRCLE_count2));
- Log_1.append(" CIRCLE \n");
+ Log_1.append("\n");
@@ -13834,6 +13452,8 @@
}
entities_CIRCLE_count2_100=0;
+ entities_CIRCLE_count2_102=0;
+ entities_CIRCLE_count2_330=0;
while (entities_st2==0 and entities_CIRCLE_count2<999)
{
@@ -13850,11 +13470,26 @@
entities_st2=1;
for_count1=for_count1-2;
Log_1.append("End reading entities ");
+ Log_1.append(" CIRCLE n°: ");
Log_1.append(QString::number(entities_CIRCLE_count2));
- Log_1.append(" CIRCLE \n");
+ Log_1.append("\n");
break;
+ case 2:
+
+ if(sw_entities_circle[2]==0)
+ {
+ DXF_input_entities_circle[entities_CIRCLE_count2].DXF_entities_circle_code_2=line6;
+ sw_entities_circle[2]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_circle());
+ }
+
+ break;
+
case 5:
if(sw_entities_circle[5]==0)
@@ -13864,22 +13499,25 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_CIRCLE_count2));
- Log_1.append(" CIRCLE \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_circle());
}
break;
+ case 6:
+
+ if(sw_entities_circle[6]==0)
+ {
+ DXF_input_entities_circle[entities_CIRCLE_count2].DXF_entities_circle_code_6=line6;
+ sw_entities_circle[6]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_circle());
+ }
+
+ break;
+
case 8:
if(sw_entities_circle[8]==0)
@@ -13889,18 +13527,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_CIRCLE_count2));
- Log_1.append(" CIRCLE \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_circle());
}
break;
@@ -13914,22 +13541,25 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_CIRCLE_count2));
- Log_1.append(" CIRCLE \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_circle());
}
break;
+ case 11:
+
+ if(sw_entities_circle[11]==0)
+ {
+ DXF_input_entities_circle[entities_CIRCLE_count2].DXF_entities_circle_code_11=line6.toDouble();
+ sw_entities_circle[11]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_circle());
+ }
+
+ break;
+
case 20:
if(sw_entities_circle[20]==0)
@@ -13939,22 +13569,25 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_CIRCLE_count2));
- Log_1.append(" CIRCLE \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_circle());
}
break;
+ case 21:
+
+ if(sw_entities_circle[21]==0)
+ {
+ DXF_input_entities_circle[entities_CIRCLE_count2].DXF_entities_circle_code_21=line6.toDouble();
+ sw_entities_circle[21]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_circle());
+ }
+
+ break;
+
case 30:
if(sw_entities_circle[30]==0)
@@ -13964,22 +13597,25 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_CIRCLE_count2));
- Log_1.append(" CIRCLE \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_circle());
}
break;
+ case 31:
+
+ if(sw_entities_circle[31]==0)
+ {
+ DXF_input_entities_circle[entities_CIRCLE_count2].DXF_entities_circle_code_31=line6.toDouble();
+ sw_entities_circle[31]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_circle());
+ }
+
+ break;
+
case 40:
if(sw_entities_circle[40]==0)
@@ -13989,39 +13625,59 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_CIRCLE_count2));
- Log_1.append(" CIRCLE \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_circle());
}
break;
+ case 48:
+ if(sw_entities_circle[48]==0)
+ {
+ DXF_input_entities_circle[entities_CIRCLE_count2].DXF_entities_circle_code_48=line6.toDouble();
+ sw_entities_circle[48]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_circle());
+ }
+
+ break;
+
+ case 62:
+
+ if(sw_entities_circle[62]==0)
+ {
+ DXF_input_entities_circle[entities_CIRCLE_count2].DXF_entities_circle_code_62=line6.toInt();
+ sw_entities_circle[62]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_circle());
+ }
+
+ break;
+
+ case 72:
+
+ if(sw_entities_circle[72]==0)
+ {
+ DXF_input_entities_circle[entities_CIRCLE_count2].DXF_entities_circle_code_72=line6.toInt();
+ sw_entities_circle[72]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_circle());
+ }
+
+ break;
+
+
case 100:
if (entities_CIRCLE_count2_100>2)
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_CIRCLE_count2));
- Log_1.append(" CIRCLE \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_circle());
}
else
{
@@ -14031,42 +13687,55 @@
break;
+ case 102:
+
+ if (entities_CIRCLE_count2_102>2)
+ {
+ Log_1.append(found_entities_circle());
+ }
+ else
+ {
+ DXF_input_entities_circle[entities_CIRCLE_count2].DXF_entities_circle_code_102[entities_CIRCLE_count2_102]=line6.toInt();
+ entities_CIRCLE_count2_102=entities_CIRCLE_count2_102+1;
+ }
+
+ break;
+
case 330:
- if(sw_entities_circle[330]==0)
+ if (entities_CIRCLE_count2_330>2)
{
- DXF_input_entities_circle[entities_CIRCLE_count2].DXF_entities_circle_code_330=line6;
- sw_entities_circle[330]=1;
+ Log_1.append(found_entities_circle());
+ }
+ else
+ {
+ DXF_input_entities_circle[entities_CIRCLE_count2].DXF_entities_circle_code_330[entities_CIRCLE_count2_330]=line6.toInt();
+ entities_CIRCLE_count2_330=entities_CIRCLE_count2_330+1;
+ }
+
+ break;
+
+ case 370:
+
+ if(sw_entities_circle[370]==0)
+ {
+ DXF_input_entities_circle[entities_CIRCLE_count2].DXF_entities_circle_code_370=line6.toInt();
+ sw_entities_circle[370]=1;
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_CIRCLE_count2));
- Log_1.append(" CIRCLE \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_circle());
}
break;
+
+
+
+
default:
- Log_1.append("Find in entities CIRCLE \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_circle());
+
}
}
@@ -14307,8 +13976,9 @@
entities_ELLIPSE_count2=entities_ELLIPSE_count2+1;
Log_1.append("Start reading entities ");
+ Log_1.append(" ELLIPSE n°: ");
Log_1.append(QString::number(entities_ELLIPSE_count2));
- Log_1.append(" ELLIPSE \n");
+ Log_1.append("\n");
@@ -14334,9 +14004,10 @@
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(" ELLIPSE n°: ");
Log_1.append(QString::number(entities_ELLIPSE_count2));
- Log_1.append(" ELLIPSE \n");
+ Log_1.append("\n");
break;
@@ -14349,18 +14020,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ELLIPSE_count2));
- Log_1.append(" ELLIPSE \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_ellipse());
}
break;
@@ -14374,18 +14034,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ELLIPSE_count2));
- Log_1.append(" ELLIPSE \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_ellipse());
}
break;
@@ -14399,18 +14048,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ELLIPSE_count2));
- Log_1.append(" ELLIPSE \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_ellipse());
}
break;
@@ -14424,18 +14062,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ELLIPSE_count2));
- Log_1.append(" ELLIPSE \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_ellipse());
}
break;
@@ -14449,18 +14076,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ELLIPSE_count2));
- Log_1.append(" ELLIPSE \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_ellipse());
}
break;
@@ -14474,18 +14090,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ELLIPSE_count2));
- Log_1.append(" ELLIPSE \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_ellipse());
}
break;
@@ -14499,18 +14104,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ELLIPSE_count2));
- Log_1.append(" ELLIPSE \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_ellipse());
}
break;
@@ -14524,18 +14118,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ELLIPSE_count2));
- Log_1.append(" ELLIPSE \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_ellipse());
}
break;
@@ -14549,16 +14132,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ELLIPSE \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_ellipse());
}
break;
@@ -14572,16 +14146,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ELLIPSE \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_ellipse());
}
break;
@@ -14595,16 +14160,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ELLIPSE \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_ellipse());
}
break;
@@ -14613,18 +14169,7 @@
if (entities_ELLIPSE_count2_100>2)
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ELLIPSE_count2));
- Log_1.append(" ELLIPSE \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_ellipse());
}
else
{
@@ -14643,18 +14188,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ELLIPSE_count2));
- Log_1.append(" ELLIPSE \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_ellipse());
}
break;
@@ -14668,18 +14202,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ELLIPSE_count2));
- Log_1.append(" ELLIPSE \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_ellipse());
}
break;
@@ -14693,18 +14216,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ELLIPSE_count2));
- Log_1.append(" ELLIPSE \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_ellipse());
}
break;
@@ -14718,33 +14230,13 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_ELLIPSE_count2));
- Log_1.append(" ELLIPSE \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_ellipse());
}
break;
default:
- Log_1.append("Find in entities ELLIPSE \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_ellipse());
}
}
@@ -15443,13 +14935,14 @@
}
- if (line3==0 and line4=="INSERT" and line4.length()==5)
+ if (line3==0 and line4=="INSERT" and line4.length()==6)
{
entities_INSERT_count2=entities_INSERT_count2+1;
Log_1.append("Start reading entities ");
+ Log_1.append(" INSERT n°: ");
Log_1.append(QString::number(entities_INSERT_count2));
- Log_1.append(" INSERT \n");
+ Log_1.append("\n");
@@ -15459,7 +14952,10 @@
}
+
entities_INSERT_count2_100=0;
+ entities_INSERT_count2_102=0;
+ entities_INSERT_count2_330=0;
while (entities_st2==0 and entities_INSERT_count2<999)
{
@@ -15475,12 +14971,27 @@
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(" INSERT n°: ");
Log_1.append(QString::number(entities_INSERT_count2));
- Log_1.append(" INSERT \n");
+ Log_1.append("\n");
break;
+ case 2:
+
+ if(sw_entities_insert[2]==0)
+ {
+ DXF_input_entities_insert[entities_INSERT_count2].DXF_entities_insert_code_2=line6;
+ sw_entities_insert[2]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_insert());
+ }
+
+ break;
+
case 5:
if(sw_entities_insert[5]==0)
@@ -15490,18 +15001,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_INSERT_count2));
- Log_1.append(" INSERT \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_insert());
}
break;
@@ -15515,18 +15015,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_INSERT_count2));
- Log_1.append(" INSERT \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_insert());
}
break;
@@ -15540,18 +15029,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_INSERT_count2));
- Log_1.append(" INSERT \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_insert());
}
break;
@@ -15565,18 +15043,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_INSERT_count2));
- Log_1.append(" INSERT \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_insert());
}
break;
@@ -15590,40 +15057,37 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_INSERT_count2));
- Log_1.append(" INSERT \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_insert());
}
break;
+ case 66:
+ if(sw_entities_insert[66]==0)
+ {
+ DXF_input_entities_insert[entities_INSERT_count2].DXF_entities_insert_code_66=line6.toInt();
+ /* Variable attributes-follow flag (optional;
+ default = 0);
+ if the value of attributes-follow flag is 1,
+ a series of attribute entities is expected to follow the insert,
+ terminated by a seqend entity */
+ sw_entities_insert[66]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_insert());
+ }
+ break;
+
+
+
case 100:
if (entities_INSERT_count2_100>2)
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_INSERT_count2));
- Log_1.append(" INSERT \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_insert());
}
else
{
@@ -15633,42 +15097,38 @@
break;
- case 330:
+ case 102:
- if(sw_entities_insert[330]==0)
+ if (entities_INSERT_count2_102>2)
{
- DXF_input_entities_insert[entities_INSERT_count2].DXF_entities_insert_code_330=line6;
- sw_entities_insert[330]=1;
- }
+ Log_1.append(found_entities_insert());
+ }
else
+ {
+ DXF_input_entities_insert[entities_INSERT_count2].DXF_entities_insert_code_102[entities_INSERT_count2_102]=line6.toInt();
+ entities_INSERT_count2_102=entities_INSERT_count2_102+1;
+ }
+
+ break;
+
+ case 330:
+
+ if (entities_INSERT_count2_330>2)
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_INSERT_count2));
- Log_1.append(" INSERT \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_insert());
+ }
+ else
+ {
+ DXF_input_entities_insert[entities_INSERT_count2].DXF_entities_insert_code_330[entities_INSERT_count2_330]=line6.toInt();
+ entities_INSERT_count2_330=entities_INSERT_count2_330+1;
+ }
break;
+
default:
- Log_1.append("Find in entities INSERT \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_insert());
+
}
}
@@ -16142,8 +15602,9 @@
entities_LINE_count2=entities_LINE_count2+1;
Log_1.append("Start reading entities ");
+ Log_1.append(" LINE n°: ");
Log_1.append(QString::number(entities_LINE_count2));
- Log_1.append(" LINE \n");
+ Log_1.append("\n");
@@ -16171,9 +15632,10 @@
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(" LINE \n");
+ Log_1.append("\n");
break;
@@ -16186,18 +15648,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_LINE_count2));
- Log_1.append(" LINE \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_line());
}
break;
@@ -16211,18 +15662,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_LINE_count2));
- Log_1.append(" LINE \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_line());
}
break;
@@ -16236,18 +15676,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_LINE_count2));
- Log_1.append(" LINE \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_line());
}
break;
@@ -16261,18 +15690,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_LINE_count2));
- Log_1.append(" LINE \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_line());
}
break;
@@ -16286,18 +15704,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_LINE_count2));
- Log_1.append(" LINE \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_line());
}
break;
@@ -16311,18 +15718,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_LINE_count2));
- Log_1.append(" LINE \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_line());
}
break;
@@ -16336,18 +15732,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_LINE_count2));
- Log_1.append(" LINE \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_line());
}
break;
@@ -16361,18 +15746,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_LINE_count2));
- Log_1.append(" LINE \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_line());
}
break;
@@ -16386,18 +15760,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_LINE_count2));
- Log_1.append(" LINE \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_line());
}
break;
@@ -16412,18 +15775,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_LINE_count2));
- Log_1.append(" LINE \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_line());
}
break;
@@ -16437,18 +15789,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_LINE_count2));
- Log_1.append(" LINE \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_line());
}
break;
@@ -16459,18 +15800,7 @@
if (entities_LINE_count2_100>2)
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_LINE_count2));
- Log_1.append(" LINE \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_line());
}
else
{
@@ -16484,18 +15814,7 @@
if (entities_LINE_count2_102>2)
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_LINE_count2));
- Log_1.append(" LINE \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_line());
}
else
{
@@ -16509,18 +15828,7 @@
if (entities_LINE_count2_330>2)
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_LINE_count2));
- Log_1.append(" LINE \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_line());
}
else
{
@@ -16539,18 +15847,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_LINE_count2));
- Log_1.append(" LINE \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_line());
}
break;
@@ -16558,16 +15855,8 @@
default:
- Log_1.append("Find in entities LINE \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_line());
+
}
}
@@ -21353,8 +20642,9 @@
entities_TEXT_count2=entities_TEXT_count2+1;
Log_1.append("Start reading entities ");
+ Log_1.append(" TEXT n°: ");
Log_1.append(QString::number(entities_TEXT_count2));
- Log_1.append(" TEXT \n");
+ Log_1.append("\n");
@@ -21365,7 +20655,10 @@
}
entities_TEXT_count2_100=0;
+ entities_TEXT_count2_102=0;
+ entities_TEXT_count2_330=0;
+
while (entities_st2==0 and entities_TEXT_count2<999)
{
for_count1=for_count1+2;
@@ -21373,19 +20666,36 @@
line5=DXF_main_base[0].dxf_input[for_count1].toInt();
line6=DXF_main_base[0].dxf_input[for_count1+1];
+ DXF_input_entities_text[entities_TEXT_count2].DXF_entities_text_code_50=0;
+
switch (line5)
{
case 0:
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(" TEXT n°: ");
Log_1.append(QString::number(entities_TEXT_count2));
- Log_1.append(" TEXT \n");
+ Log_1.append("\n");
break;
+ case 1:
+
+ if(sw_entities_text[1]==0)
+ {
+ DXF_input_entities_text[entities_TEXT_count2].DXF_entities_text_code_1=line6;
+ sw_entities_text[1]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_text());
+ }
+
+ break;
+
case 5:
if(sw_entities_text[5]==0)
@@ -21395,22 +20705,39 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_TEXT_count2));
- Log_1.append(" TEXT \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_text());
}
break;
+ case 6:
+
+ if(sw_entities_text[6]==0)
+ {
+ DXF_input_entities_text[entities_TEXT_count2].DXF_entities_text_code_6=line6;
+ sw_entities_text[6]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_text());
+ }
+
+ break;
+
+ case 7:
+
+ if(sw_entities_text[7]==0)
+ {
+ DXF_input_entities_text[entities_TEXT_count2].DXF_entities_text_code_7=line6;
+ sw_entities_text[7]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_text());
+ }
+
+ break;
+
case 8:
if(sw_entities_text[8]==0)
@@ -21420,18 +20747,7 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_TEXT_count2));
- Log_1.append(" TEXT \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_text());
}
break;
@@ -21445,22 +20761,25 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_TEXT_count2));
- Log_1.append(" TEXT \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_text());
}
break;
+ case 11:
+
+ if(sw_entities_text[11]==0)
+ {
+ DXF_input_entities_text[entities_TEXT_count2].DXF_entities_text_code_11=line6.toDouble();
+ sw_entities_text[11]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_text());
+ }
+
+ break;
+
case 20:
if(sw_entities_text[20]==0)
@@ -21470,22 +20789,24 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_TEXT_count2));
- Log_1.append(" TEXT \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_text());
}
break;
+ case 21:
+ if(sw_entities_text[21]==0)
+ {
+ DXF_input_entities_text[entities_TEXT_count2].DXF_entities_text_code_21=line6.toDouble();
+ sw_entities_text[21]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_text());
+ }
+
+ break;
+
case 30:
if(sw_entities_text[30]==0)
@@ -21495,40 +20816,101 @@
}
else
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_TEXT_count2));
- Log_1.append(" TEXT \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_text());
}
break;
+ case 31:
+ if(sw_entities_text[31]==0)
+ {
+ DXF_input_entities_text[entities_TEXT_count2].DXF_entities_text_code_31=line6.toDouble();
+ sw_entities_text[31]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_text());
+ }
+ break;
+
+ case 40:
+
+ if(sw_entities_text[40]==0)
+ {
+ DXF_input_entities_text[entities_TEXT_count2].DXF_entities_text_code_40=line6.toDouble();
+ sw_entities_text[40]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_text());
+ }
+
+ break;
+
+ case 50:
+
+ if(sw_entities_text[50]==0)
+ {
+ DXF_input_entities_text[entities_TEXT_count2].DXF_entities_text_code_50=line6.toDouble();
+ sw_entities_text[50]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_text());
+ }
+
+ break;
+
+ case 62:
+
+ if(sw_entities_text[62]==0)
+ {
+ DXF_input_entities_text[entities_TEXT_count2].DXF_entities_text_code_62=line6.toInt();
+ sw_entities_text[62]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_text());
+ }
+
+ break;
+
+ case 72:
+
+ if(sw_entities_text[72]==0)
+ {
+ DXF_input_entities_text[entities_TEXT_count2].DXF_entities_text_code_72=line6.toInt();
+ sw_entities_text[72]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_text());
+ }
+
+ break;
+
+ case 73:
+
+ if(sw_entities_text[73]==0)
+ {
+ DXF_input_entities_text[entities_TEXT_count2].DXF_entities_text_code_73=line6.toInt();
+ sw_entities_text[73]=1;
+ }
+ else
+ {
+ Log_1.append(found_entities_text());
+ }
+
+ break;
+
+
case 100:
if (entities_TEXT_count2_100>2)
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_TEXT_count2));
- Log_1.append(" TEXT \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_text());
}
else
{
@@ -21538,42 +20920,38 @@
break;
- case 330:
+ case 102:
- if(sw_entities_text[330]==0)
+ if (entities_TEXT_count2_102>4)
{
- DXF_input_entities_text[entities_TEXT_count2].DXF_entities_text_code_330=line6;
- sw_entities_text[330]=1;
- }
+ Log_1.append(found_entities_text());
+ }
else
+ {
+ DXF_input_entities_text[entities_TEXT_count2].DXF_entities_text_code_102[entities_TEXT_count2_102]=line6.toInt();
+ entities_TEXT_count2_102=entities_TEXT_count2_102+1;
+ }
+
+ break;
+
+ case 330:
+
+ if (entities_TEXT_count2_330>4)
{
- Log_1.append("Find in ENTITIES code ");
- Log_1.append(QString::number(entities_TEXT_count2));
- Log_1.append(" TEXT \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_text());
+ }
+ else
+ {
+ DXF_input_entities_text[entities_TEXT_count2].DXF_entities_text_code_330[entities_TEXT_count2_330]=line6.toInt();
+ entities_TEXT_count2_330=entities_TEXT_count2_330+1;
+ }
break;
+
+
default:
- Log_1.append("Find in entities TEXT \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_text());
}
}
@@ -23250,19 +22628,19 @@
DXF_main_base[0].DXF_entities_section_count=entities_SECTION_count2;
DXF_main_base[0].DXF_entities_seqend_count=entities_SEQEND_count2;
DXF_main_base[0].DXF_entities_shape_count=entities_SHAPE_count2;
- DXF_main_base[0].DXF_entities_ellipse_count=entities_SOLID_count2;
- DXF_main_base[0].DXF_entities_ellipse_count=entities_SPLINE_count2;
- DXF_main_base[0].DXF_entities_ellipse_count=entities_SUN_count2;
- DXF_main_base[0].DXF_entities_ellipse_count=entities_SURFACE_count2;
- DXF_main_base[0].DXF_entities_ellipse_count=entities_TABLE_count2;
- DXF_main_base[0].DXF_entities_ellipse_count=entities_TEXT_count2;
- DXF_main_base[0].DXF_entities_ellipse_count=entities_TOLERANCE_count2;
- DXF_main_base[0].DXF_entities_ellipse_count=entities_TRACE_count2;
- DXF_main_base[0].DXF_entities_ellipse_count=entities_UNDERLAY_count2;
- DXF_main_base[0].DXF_entities_ellipse_count=entities_VERTEX_count2;
- DXF_main_base[0].DXF_entities_ellipse_count=entities_VIEWPORT_count2;
- DXF_main_base[0].DXF_entities_ellipse_count=entities_WIPEOUT_count2;
- DXF_main_base[0].DXF_entities_ellipse_count=entities_XLINE_count2;
+ DXF_main_base[0].DXF_entities_solid_count=entities_SOLID_count2;
+ DXF_main_base[0].DXF_entities_spline_count=entities_SPLINE_count2;
+ DXF_main_base[0].DXF_entities_sun_count=entities_SUN_count2;
+ DXF_main_base[0].DXF_entities_surface_count=entities_SURFACE_count2;
+ DXF_main_base[0].DXF_entities_table_count=entities_TABLE_count2;
+ DXF_main_base[0].DXF_entities_text_count=entities_TEXT_count2;
+ DXF_main_base[0].DXF_entities_tolerance_count=entities_TOLERANCE_count2;
+ DXF_main_base[0].DXF_entities_trace_count=entities_TRACE_count2;
+ DXF_main_base[0].DXF_entities_underlay_count=entities_UNDERLAY_count2;
+ DXF_main_base[0].DXF_entities_vertex_count=entities_VERTEX_count2;
+ DXF_main_base[0].DXF_entities_viewport_count=entities_VIEWPORT_count2;
+ DXF_main_base[0].DXF_entities_wipeout_count=entities_WIPEOUT_count2;
+ DXF_main_base[0].DXF_entities_xline_count=entities_XLINE_count2;
@@ -23449,3 +22827,154 @@
}
+QString dxf_split::found_entities_circle()
+{
+ Log_2="";
+ Log_2.append("Found in ENTITIES code ");
+ Log_2.append(" CIRCLE 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="";
+ Log_2.append("Found in ENTITIES code ");
+ Log_2.append(" TEXT n°: ");
+ Log_2.append(QString::number(entities_TEXT_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_line()
+{
+ Log_2="";
+ Log_2.append("Found in ENTITIES code ");
+ Log_2.append(" LINE n°: ");
+ Log_2.append(QString::number(entities_LINE_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_attdef()
+{
+ Log_2="";
+ Log_2.append("Found in ENTITIES code ");
+ Log_2.append(" ATTDEF n°: ");
+ Log_2.append(QString::number(entities_LINE_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_attr()
+{
+ Log_2="";
+ Log_2.append("Found in ENTITIES code ");
+ Log_2.append(" ATTRIB n°: ");
+ Log_2.append(QString::number(entities_LINE_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_arc()
+{
+ Log_2="";
+ Log_2.append("Found in ENTITIES code ");
+ Log_2.append(" ARC n°: ");
+ Log_2.append(QString::number(entities_LINE_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_insert()
+{
+ Log_2="";
+ Log_2.append("Found in ENTITIES code ");
+ Log_2.append(" INSERT n°: ");
+ Log_2.append(QString::number(entities_LINE_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_ellipse()
+{
+ Log_2="";
+ Log_2.append("Found in ENTITIES code ");
+ Log_2.append(" ELLIPSE n°: ");
+ Log_2.append(QString::number(entities_LINE_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;
+}
Modified: branches/dxftoqet2/src/dxf_split.h
===================================================================
--- branches/dxftoqet2/src/dxf_split.h 2015-09-19 13:27:06 UTC (rev 4214)
+++ branches/dxftoqet2/src/dxf_split.h 2015-09-20 18:32:14 UTC (rev 4215)
@@ -116,17 +116,29 @@
int entities_3DFACE_count2_100;
int entities_3DSOLID_count2_100;
int entities_ACAD_PROXY_ENTITY_count2_100;
+
int entities_ARC_count2_100;
+ int entities_ARC_count2_102;
+ int entities_ARC_count2_330;
+
int entities_ATTDEF_count2_100;
int entities_ATTRIB_count2_100;
int entities_BODY_count2_100;
+
int entities_CIRCLE_count2_100;
+ int entities_CIRCLE_count2_102;
+ int entities_CIRCLE_count2_330;
+
int entities_DIMENSION_count2_100;
int entities_ELLIPSE_count2_100;
int entities_HATCH_count2_100;
int entities_HELIX_count2_100;
int entities_IMAGE_count2_100;
+
int entities_INSERT_count2_100;
+ int entities_INSERT_count2_102;
+ int entities_INSERT_count2_330;
+
int entities_LEADER_count2_100;
int entities_LIGHT_count2_100;
@@ -159,7 +171,11 @@
int entities_SUN_count2_100;
int entities_SURFACE_count2_100;
int entities_TABLE_count2_100;
+
int entities_TEXT_count2_100;
+ int entities_TEXT_count2_102;
+ int entities_TEXT_count2_330;
+
int entities_TOLERANCE_count2_100;
int entities_TRACE_count2_100;
int entities_UNDERLAY_count2_100;
@@ -322,10 +338,11 @@
bool sw_entities_xline[1072];
+ QString Log_2;
+ QString dxf_split_section();
- QString dxf_split_section();
void dxf_split_header();
void dxf_split_classes();
void dxf_split_tables();
@@ -334,7 +351,54 @@
void dxf_split_objects();
void dxf_split_thumbnailimage();
+ QString found_entities_3dface();
+ QString found_entities_3dsolid();
+ QString found_entities_acad_proxy_entity();
+ QString found_entities_arc();
+ QString found_entities_attdef();
+ QString found_entities_attr();
+ QString found_entities_body();
+ QString found_entities_circle();
+ QString found_entities_dimension();
+ QString found_entities_ellipse();
+ QString found_entities_hatch();
+ QString found_entities_helix();
+ QString found_entities_image();
+ QString found_entities_insert();
+ QString found_entities_leader();
+ QString found_entities_light();
+ QString found_entities_line();
+ QString found_entities_lwpolyline();
+ QString found_entities_mesh();
+ QString found_entities_mline();
+ QString found_entities_mleaderstyle();
+ QString found_entities_mleader();
+ QString found_entities_mtext();
+ QString found_entities_oleframe();
+ QString found_entities_oleframe2();
+ QString found_entities_point();
+ QString found_entities_polyline();
+ QString found_entities_ray();
+ QString found_entities_region();
+ QString found_entities_section();
+ QString found_entities_seqend();
+ QString found_entities_shape();
+ QString found_entities_solid();
+ QString found_entities_spline();
+ QString found_entities_sun();
+ QString found_entities_surface();
+ QString found_entities_table();
+ QString found_entities_text();
+ QString found_entities_tolerance();
+ QString found_entities_trace();
+ QString found_entities_underlay();
+ QString found_entities_vertex();
+ QString found_entities_viewport();
+ QString found_entities_wipeout();
+ QString found_entities_xline();
+
+
signals:
void ValueChanged (int for_count1);