| [qet] qet/qet: [4988] Added some information to process the result elmt file itno a page with |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4988
Author: rdsivd
Date: 2017-07-14 09:10:14 +0200 (Fri, 14 Jul 2017)
Log Message:
-----------
Added some information to process the result elmt file itno a page with
symbols
dxfelmt == elmt name
dxftagg == acad value field name
for example :
dxfelmt="_elmt_" == basic elmt part
dxfelmt="ZVI-c41LIT-DEF-att" == is a elmt symbol inserted into a base
elmt file
so with these additions now it is possible to split out a converted dxf
file into seperated symbols and create a page to insert into a project
if some can rocess this information then it is posible to convert eplan
dxf files into qet pages
Modified Paths:
--------------
branches/DXFtoQET3_DB/dxftoqet3db.cpp
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_arc.cpp
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_arc.h
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_circle.cpp
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_circle.h
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_ellipse.cpp
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_ellipse.h
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_input.cpp
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_input.h
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_line.cpp
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_line.h
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_polyline.cpp
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_polyline.h
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_rectangel.cpp
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_rectangel.h
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_terminal.cpp
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_terminal.h
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_text.cpp
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_text.h
branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.cpp
branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.h
branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp
branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.h
branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp
branches/DXFtoQET3_DB/src/ELMT_steps/elmt_header_steps.cpp
Modified: branches/DXFtoQET3_DB/dxftoqet3db.cpp
===================================================================
--- branches/DXFtoQET3_DB/dxftoqet3db.cpp 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/dxftoqet3db.cpp 2017-07-14 07:10:14 UTC (rev 4988)
@@ -184,6 +184,7 @@
emit send_log(Signal_log1);
+ ui->Processing_dxf_file_2->clear();
ui->Processing_dxf_file_2->insert(FileName);
@@ -299,6 +300,7 @@
Filename_db.append(".db3");
ui->dxf_line_count1_2->clear();
+ ui->Processing_dxf_file_2->clear();
ui->Processing_dxf_file_2->insert(FileName);
on_Delete_DB_clicked();
@@ -1145,6 +1147,10 @@
x1=-1;
x2=0;
+ emit send_text("dxf_header");
+ emit send_min(0);
+ emit send_max(header_max_items-1);
+
while (Header_Query.next())
{
QSqlRecord Header_record=Header_Query.record();
@@ -1186,6 +1192,7 @@
emit send_log(Signal_log1);
}
+ emit send_actual(x1);
}
@@ -6335,6 +6342,10 @@
Signal_log1.append("\n");
Signal_log1.append("Get dxf Header information");
+
+ ui->Processing_dxf_file_2->clear();
+ ui->Processing_dxf_file_2->insert(Filename_db);
+
emit send_log(Signal_log1);
ELMT_header_steps NewHeader;
@@ -6637,8 +6648,8 @@
Signal_log1.append(QTime::currentTime().toString());
Signal_log1.append("=> Start loading dxf");
Signal_log1.append(FileName);
- Signal_log1.append(" file into DB tables \n");
- Signal_log1.append("Creating DB : ");
+ Signal_log1.append(" file into SQLite DB tables \n");
+ Signal_log1.append("Creating SQLite DB : ");
Signal_log1.append(FileName);
Signal_log1.append("\n");
Signal_log1.append("============================================================================");
@@ -6682,7 +6693,11 @@
//DXF_main_base[0].dxf_input = DXF_main_base[0].dxf_text_all.split("\n");
//DXF_main_base[0].dxf_line_count=DXF_main_base[0].dxf_input.count();
+ emit send_text("dxf into SQLite DB");
+ emit send_min(0);
+ emit send_max(dxf_line_count2-1);
+
mydb.dbManager_load_dxf_list(FileName);
mydb.dbManager_transfer_dxf(FileName);
@@ -6751,6 +6766,8 @@
emit send_log(Signal_log1);
+
+
db_split_header();
}
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_arc.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_arc.cpp 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_arc.cpp 2017-07-14 07:10:14 UTC (rev 4988)
@@ -42,6 +42,12 @@
Result_arc.append(" ");
Result_arc.append("<arc");
+
+ Result_arc.append(" dxfelmt=");
+ Result_arc.append(QChar(34));
+ Result_arc.append(QET_block_name);
+ Result_arc.append(QChar(34));
+
Result_arc.append(" dxfid=");
Result_arc.append(QChar(34));
Result_arc.append(QET_handle);
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_arc.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_arc.h 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_arc.h 2017-07-14 07:10:14 UTC (rev 4988)
@@ -42,10 +42,10 @@
QString QET_softID; //330
+ QString QET_block_name;
-
QString Create_arc();
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_circle.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_circle.cpp 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_circle.cpp 2017-07-14 07:10:14 UTC (rev 4988)
@@ -27,6 +27,12 @@
Result_circle.append("<ellipse");
+
+ Result_circle.append(" dxfelmt=");
+ Result_circle.append(QChar(34));
+ Result_circle.append(QET_block_name);
+ Result_circle.append(QChar(34));
+
Result_circle.append(" dxfid=");
Result_circle.append(QChar(34));
Result_circle.append(QET_handle);
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_circle.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_circle.h 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_circle.h 2017-07-14 07:10:14 UTC (rev 4988)
@@ -33,6 +33,7 @@
QString QET_line_weight;
QString QET_filling;
QString QET_color;
+ QString QET_block_name;
QString Create_circle();
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_ellipse.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_ellipse.cpp 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_ellipse.cpp 2017-07-14 07:10:14 UTC (rev 4988)
@@ -43,6 +43,12 @@
Result_ellipse.append(" ");
Result_ellipse.append("<arc");
+
+ Result_ellipse.append(" dxfelmt=");
+ Result_ellipse.append(QChar(34));
+ Result_ellipse.append(QET_block_name);
+ Result_ellipse.append(QChar(34));
+
Result_ellipse.append(" dxfid=");
Result_ellipse.append(QChar(34));
Result_ellipse.append(QET_handle);
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_ellipse.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_ellipse.h 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_ellipse.h 2017-07-14 07:10:14 UTC (rev 4988)
@@ -57,9 +57,11 @@
double start_angle;
double end_angle;
+ QString QET_block_name;
+
QString Create_ellipse();
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_input.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_input.cpp 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_input.cpp 2017-07-14 07:10:14 UTC (rev 4988)
@@ -26,6 +26,12 @@
Result.append(" ");
Result.append("<input");
+
+ Result.append(" dxfelmt=");
+ Result.append(QChar(34));
+ Result.append(QET_block_name);
+ Result.append(QChar(34));
+
Result.append(" dxfid=");
Result.append(QChar(34));
Result.append(QET_handle);
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_input.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_input.h 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_input.h 2017-07-14 07:10:14 UTC (rev 4988)
@@ -42,6 +42,8 @@
QString QET_tag;
+ QString QET_block_name;
+
QString Create_input();
signals:
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_line.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_line.cpp 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_line.cpp 2017-07-14 07:10:14 UTC (rev 4988)
@@ -30,6 +30,11 @@
Result.append(" ");
Result.append("<line");
+ Result.append(" dxfelmt=");
+ Result.append(QChar(34));
+ Result.append(QET_block_name);
+ Result.append(QChar(34));
+
Result.append(" dxfid=");
Result.append(QChar(34));
Result.append(QET_handle);
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_line.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_line.h 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_line.h 2017-07-14 07:10:14 UTC (rev 4988)
@@ -41,8 +41,8 @@
QString QET_filling;
QString QET_color;
+ QString QET_block_name;
-
QString Result;
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_polyline.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_polyline.cpp 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_polyline.cpp 2017-07-14 07:10:14 UTC (rev 4988)
@@ -42,6 +42,12 @@
Result_polyline.append(" ");
Result_polyline.append("<polygon");
+
+ Result_polyline.append(" dxfelmt=");
+ Result_polyline.append(QChar(34));
+ Result_polyline.append(QET_block_name);
+ Result_polyline.append(QChar(34));
+
Result_polyline.append(" dxfid=");
Result_polyline.append(QChar(34));
Result_polyline.append(QET_handle);
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_polyline.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_polyline.h 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_polyline.h 2017-07-14 07:10:14 UTC (rev 4988)
@@ -35,7 +35,9 @@
int count_segments;
int segments;
+ QString QET_block_name;
+
QString Create_polyline();
signals:
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_rectangel.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_rectangel.cpp 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_rectangel.cpp 2017-07-14 07:10:14 UTC (rev 4988)
@@ -29,6 +29,12 @@
Result_rect.append(" ");
Result_rect.append("<rect");
+
+ Result_rect.append(" dxfelmt=");
+ Result_rect.append(QChar(34));
+ Result_rect.append(QET_block_name);
+ Result_rect.append(QChar(34));
+
Result_rect.append(" dxfid=");
Result_rect.append(QChar(34));
Result_rect.append(QET_handle);
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_rectangel.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_rectangel.h 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_rectangel.h 2017-07-14 07:10:14 UTC (rev 4988)
@@ -37,6 +37,8 @@
QString Result_rect;
+ QString QET_block_name;
+
QString Create_rectangel();
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_terminal.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_terminal.cpp 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_terminal.cpp 2017-07-14 07:10:14 UTC (rev 4988)
@@ -19,6 +19,12 @@
Result.append(" ");
Result.append("<terminal");
+
+ Result.append(" dxfelmt=");
+ Result.append(QChar(34));
+ Result.append(QET_block_name);
+ Result.append(QChar(34));
+
Result.append(" dxfid=");
Result.append(QChar(34));
Result.append(QET_handle);
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_terminal.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_terminal.h 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_terminal.h 2017-07-14 07:10:14 UTC (rev 4988)
@@ -26,6 +26,8 @@
QString QET_handle; //5
QString QET_softID; //330
+ QString QET_block_name;
+
QString Create_terminal();
signals:
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_text.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_text.cpp 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_text.cpp 2017-07-14 07:10:14 UTC (rev 4988)
@@ -21,6 +21,12 @@
Result_text.append(" ");
Result_text.append("<text");
+
+ Result_text.append(" dxfelmt=");
+ Result_text.append(QChar(34));
+ Result_text.append(QET_block_name);
+ Result_text.append(QChar(34));
+
Result_text.append(" dxfid=");
Result_text.append(QChar(34));
Result_text.append(QET_handle);
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_text.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_text.h 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_text.h 2017-07-14 07:10:14 UTC (rev 4988)
@@ -33,6 +33,8 @@
QString Result_text;
+ QString QET_block_name;
+
QString Create_text();
signals:
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.cpp 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.cpp 2017-07-14 07:10:14 UTC (rev 4988)
@@ -126,10 +126,11 @@
New_DXF_Line.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Line.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Line.QET_handle=QET_handle;
- New_DXF_Line.QET_handle.append(":");
- New_DXF_Line.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_Line.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_Line.QET_handle=QET_handle;
+ //New_DXF_Line.QET_handle.append(":");
+ //New_DXF_Line.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_Line.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Line.QET_block_name=QET_block_name;
New_DXF_Line.QET_softID=Record3.value("dxf_330").toString();
New_DXF_Line.QET_lenght1=1.5;
@@ -160,10 +161,11 @@
New_DXF_Circle.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Circle.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Circle.QET_handle=QET_handle;
- New_DXF_Circle.QET_handle.append(":");
- New_DXF_Circle.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_Circle.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_Circle.QET_handle=QET_handle;
+ //New_DXF_Circle.QET_handle.append(":");
+ //New_DXF_Circle.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_Circle.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Circle.QET_block_name=QET_block_name;
New_DXF_Circle.QET_softID=Record3.value("dxf_330").toString();
New_DXF_Circle.QET_antialias="false";
@@ -192,10 +194,11 @@
New_DXF_Arc.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Arc.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Arc.QET_handle=QET_handle;
- New_DXF_Arc.QET_handle.append(":");
- New_DXF_Arc.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_Arc.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_Arc.QET_handle=QET_handle;
+ //New_DXF_Arc.QET_handle.append(":");
+ //New_DXF_Arc.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_Arc.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Arc.QET_block_name=QET_block_name;
New_DXF_Arc.QET_softID=Record3.value("dxf_330").toString();
@@ -225,10 +228,11 @@
New_DXF_Text.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Text.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Text.QET_handle=QET_handle;
- New_DXF_Text.QET_handle.append(":");
- New_DXF_Text.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_Arc.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_Text.QET_handle=QET_handle;
+ //New_DXF_Text.QET_handle.append(":");
+ //New_DXF_Text.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_Text.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Text.QET_block_name=QET_block_name;
New_DXF_Text.QET_softID=Record3.value("dxf_330").toString();
//New_DXF_Text.QET_antialias="false";
@@ -257,10 +261,11 @@
New_DXF_Input.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Input.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Input.QET_handle=QET_handle;
- New_DXF_Input.QET_handle.append(":");
- New_DXF_Input.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_Arc.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_Input.QET_handle=QET_handle;
+ //New_DXF_Input.QET_handle.append(":");
+ //New_DXF_Input.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_Input.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Input.QET_block_name=QET_block_name;
New_DXF_Input.QET_softID=Record3.value("dxf_330").toString();
//New_DXF_Text.QET_antialias="false";
@@ -292,10 +297,11 @@
New_DXF_Input.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Input.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Input.QET_handle=QET_handle;
- New_DXF_Input.QET_handle.append(":");
- New_DXF_Input.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_Arc.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_Input.QET_handle=QET_handle;
+ //New_DXF_Input.QET_handle.append(":");
+ //New_DXF_Input.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_Input.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Input.QET_block_name=QET_block_name;
New_DXF_Input.QET_softID=Record3.value("dxf_330").toString();
//New_DXF_Text.QET_antialias="false";
@@ -327,10 +333,11 @@
New_DXF_Terminal.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Terminal.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Terminal.QET_handle=QET_handle;
- New_DXF_Terminal.QET_handle.append(":");
- New_DXF_Terminal.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_Arc.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_Terminal.QET_handle=QET_handle;
+ //New_DXF_Terminal.QET_handle.append(":");
+ //New_DXF_Terminal.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_Terminal.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Terminal.QET_block_name=QET_block_name;
New_DXF_Terminal.QET_softID=Record3.value("dxf_330").toString();
//New_DXF_Text.QET_antialias="false";
@@ -363,10 +370,11 @@
New_DXF_Ellipse.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Ellipse.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Ellipse.QET_handle=QET_handle;
- New_DXF_Ellipse.QET_handle.append(":");
- New_DXF_Ellipse.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_Arc.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_Ellipse.QET_handle=QET_handle;
+ //New_DXF_Ellipse.QET_handle.append(":");
+ //New_DXF_Ellipse.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_Ellipse.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Ellipse.QET_block_name=QET_block_name;
New_DXF_Ellipse.QET_softID=Record3.value("dxf_330").toString();
//New_DXF_Terminal.QET_orientation="sud";//Record2.value("dxf_50").toDouble();
@@ -402,10 +410,11 @@
New_DXF_Polyline.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Polyline.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Polyline.QET_handle=QET_handle;
- New_DXF_Polyline.QET_handle.append(":");
- New_DXF_Polyline.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_Arc.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_Polyline.QET_handle=QET_handle;
+ //New_DXF_Polyline.QET_handle.append(":");
+ //New_DXF_Polyline.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_Polyline.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Polyline.QET_block_name=QET_block_name;
New_DXF_Polyline.QET_softID=Record3.value("dxf_330").toString();
@@ -479,11 +488,12 @@
New_DXF_blocks2.QET_layer=Record3.value("dxf_8").toString();
New_DXF_blocks2.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_blocks2.QET_handle=QET_handle;
- New_DXF_blocks2.QET_handle.append(":");
- New_DXF_blocks2.QET_handle.append(Record3.value("dxf_2").toString());
- New_DXF_blocks2.QET_handle.append(":");
- //New_DXF_Arc.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_blocks2.QET_handle=QET_handle;
+ //New_DXF_blocks2.QET_handle.append(":");
+ //New_DXF_blocks2.QET_handle.append(Record3.value("dxf_2").toString());
+ //New_DXF_blocks2.QET_handle.append(":");
+ New_DXF_blocks2.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_blocks2.QET_block_name=Record3.value("dxf_2").toString();
New_DXF_blocks2.QET_softID=Record3.value("dxf_330").toString();
@@ -528,10 +538,11 @@
New_DXF_LWPolyline.QET_layer=Record3.value("dxf_8").toString();
New_DXF_LWPolyline.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_LWPolyline.QET_handle=QET_handle;
- New_DXF_LWPolyline.QET_handle.append(":");
- New_DXF_LWPolyline.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_Arc.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_LWPolyline.QET_handle=QET_handle;
+ //New_DXF_LWPolyline.QET_handle.append(":");
+ //New_DXF_LWPolyline.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_LWPolyline.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_LWPolyline.QET_block_name=QET_block_name;
New_DXF_LWPolyline.QET_softID=Record3.value("dxf_330").toString();
@@ -625,10 +636,11 @@
New_DXF_SOLID.QET_layer=Record3.value("dxf_8").toString();
New_DXF_SOLID.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_SOLID.QET_handle=QET_handle;
- New_DXF_SOLID.QET_handle.append(":");
- New_DXF_SOLID.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_Arc.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_SOLID.QET_handle=QET_handle;
+ //New_DXF_SOLID.QET_handle.append(":");
+ //New_DXF_SOLID.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_SOLID.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_SOLID.QET_block_name=QET_block_name;
New_DXF_SOLID.QET_softID=Record3.value("dxf_330").toString();
New_DXF_SOLID.QET_color=DXF_main_base[0].QDXF_block_solid_color;
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.h 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.h 2017-07-14 07:10:14 UTC (rev 4988)
@@ -60,8 +60,10 @@
QString QET_handle; //5
QString QET_softID; //330
+ QString QET_block_name;
+
double Block_X; //10
double Block_Y; //20
double Block_scale_x; //41
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp 2017-07-14 07:10:14 UTC (rev 4988)
@@ -149,9 +149,10 @@
New_DXF_Line.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Line.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Line.QET_handle=QET_handle;
- New_DXF_Line.QET_handle.append(":");
- New_DXF_Line.QET_handle.append(Record3.value("dxf_5").toString());
+ //New_DXF_Line.QET_handle=QET_handle;
+ //New_DXF_Line.QET_handle.append(":");
+ New_DXF_Line.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Line.QET_block_name=QET_block_name;
//New_DXF_Line.QET_handle=Record3.value("dxf_5").toString();
New_DXF_Line.QET_softID=Record3.value("dxf_330").toString();
@@ -183,9 +184,10 @@
New_DXF_Circle.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Circle.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Circle.QET_handle=QET_handle;
- New_DXF_Circle.QET_handle.append(":");
- New_DXF_Circle.QET_handle.append(Record3.value("dxf_5").toString());
+ //New_DXF_Circle.QET_handle=QET_handle;
+ //New_DXF_Circle.QET_handle.append(":");
+ New_DXF_Circle.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Circle.QET_block_name=QET_block_name;
//New_DXF_Circle.QET_handle=Record3.value("dxf_5").toString();
New_DXF_Circle.QET_softID=Record3.value("dxf_330").toString();
@@ -217,9 +219,10 @@
New_DXF_Arc.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Arc.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Arc.QET_handle=QET_handle;
- New_DXF_Arc.QET_handle.append(":");
- New_DXF_Arc.QET_handle.append(Record3.value("dxf_5").toString());
+ //New_DXF_Arc.QET_handle=QET_handle;
+ //New_DXF_Arc.QET_handle.append(":");
+ New_DXF_Arc.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Arc.QET_block_name=QET_block_name;
//New_DXF_Arc.QET_handle=Record3.value("dxf_5").toString();
New_DXF_Arc.QET_softID=Record3.value("dxf_330").toString();
@@ -252,9 +255,10 @@
New_DXF_Text.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Text.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Text.QET_handle=QET_handle;
- New_DXF_Text.QET_handle.append(":");
- New_DXF_Text.QET_handle.append(Record3.value("dxf_5").toString());
+ //New_DXF_Text.QET_handle=QET_handle;
+ //New_DXF_Text.QET_handle.append(":");
+ New_DXF_Text.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Text.QET_block_name=QET_block_name;
//New_DXF_Text.QET_handle=Record3.value("dxf_5").toString();
New_DXF_Text.QET_softID=Record3.value("dxf_330").toString();
@@ -286,10 +290,11 @@
New_DXF_Input.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Input.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Input.QET_handle=QET_handle;
- New_DXF_Input.QET_handle.append(":");
- New_DXF_Input.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_Input.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_Input.QET_handle=QET_handle;
+ //New_DXF_Input.QET_handle.append(":");
+ //New_DXF_Input.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_Input.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Input.QET_block_name=QET_block_name;
New_DXF_Input.QET_softID=Record3.value("dxf_330").toString();
//New_DXF_Text.QET_antialias="false";
@@ -321,10 +326,11 @@
New_DXF_Input.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Input.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Input.QET_handle=QET_handle;
- New_DXF_Input.QET_handle.append(":");
- New_DXF_Input.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_Input.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_Input.QET_handle=QET_handle;
+ //New_DXF_Input.QET_handle.append(":");
+ //New_DXF_Input.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_Input.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Input.QET_block_name=QET_block_name;
New_DXF_Input.QET_softID=Record3.value("dxf_330").toString();
@@ -357,10 +363,11 @@
New_DXF_Terminal.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Terminal.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Terminal.QET_handle=QET_handle;
- New_DXF_Terminal.QET_handle.append(":");
- New_DXF_Terminal.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_Terminal.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_Terminal.QET_handle=QET_handle;
+ //New_DXF_Terminal.QET_handle.append(":");
+ //New_DXF_Terminal.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_Terminal.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Terminal.QET_block_name=QET_block_name;
New_DXF_Terminal.QET_softID=Record3.value("dxf_330").toString();
@@ -394,10 +401,11 @@
New_DXF_Ellipse.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Ellipse.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Ellipse.QET_handle=QET_handle;
- New_DXF_Ellipse.QET_handle.append(":");
- New_DXF_Ellipse.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_Ellipse.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_Ellipse.QET_handle=QET_handle;
+ //New_DXF_Ellipse.QET_handle.append(":");
+ //New_DXF_Ellipse.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_Ellipse.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Ellipse.QET_block_name=QET_block_name;
New_DXF_Ellipse.QET_softID=Record3.value("dxf_330").toString();
//New_DXF_Terminal.QET_orientation="sud";//Record2.value("dxf_50").toDouble();
@@ -423,10 +431,11 @@
{
New_DXF_Polyline.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Polyline.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Polyline.QET_handle=QET_handle;
- New_DXF_Polyline.QET_handle.append(":");
- New_DXF_Polyline.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_Polyline.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_Polyline.QET_handle=QET_handle;
+ //New_DXF_Polyline.QET_handle.append(":");
+ //New_DXF_Polyline.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_Polyline.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Polyline.QET_block_name=QET_block_name;
New_DXF_Polyline.QET_softID=Record3.value("dxf_330").toString();
New_DXF_Polyline.QET_antialias="false";
@@ -503,11 +512,11 @@
New_DXF_blocks2.QET_layer=Record3.value("dxf_8").toString();
New_DXF_blocks2.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_blocks2.QET_handle=QET_handle;
- New_DXF_blocks2.QET_handle.append(":");
- New_DXF_blocks2.QET_handle.append(Record3.value("dxf_2").toString());
- New_DXF_blocks2.QET_handle.append(":");
- //New_DXF_blocks2.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_blocks2.QET_handle=QET_handle;
+ //New_DXF_blocks2.QET_handle.append(":");
+ New_DXF_blocks2.QET_block_name=Record3.value("dxf_2").toString();
+ //New_DXF_blocks2.QET_handle.append(":");
+ New_DXF_blocks2.QET_handle=Record3.value("dxf_5").toString();
New_DXF_blocks2.QET_softID=Record3.value("dxf_330").toString();
New_DXF_blocks2.Block_scale_x=Record3.value("dxf_41").toDouble();
@@ -555,10 +564,11 @@
New_DXF_LWPolyline.QET_layer=Record3.value("dxf_8").toString();
New_DXF_LWPolyline.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_LWPolyline.QET_handle=QET_handle;
- New_DXF_LWPolyline.QET_handle.append(":");
- New_DXF_LWPolyline.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_LWPolyline.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_LWPolyline.QET_handle=QET_handle;
+ //New_DXF_LWPolyline.QET_handle.append(":");
+ //New_DXF_LWPolyline.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_LWPolyline.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_LWPolyline.QET_block_name=QET_block_name;
New_DXF_LWPolyline.QET_softID=Record3.value("dxf_330").toString();
@@ -642,6 +652,7 @@
New_DXF_SOLID.QET_layer=Record3.value("dxf_8").toString();
New_DXF_SOLID.QET_ltype=Record3.value("dxf_6").toString();
New_DXF_SOLID.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_SOLID.QET_block_name=QET_block_name;
New_DXF_SOLID.QET_softID=Record3.value("dxf_330").toString();
New_DXF_SOLID.QET_antialias="false";
@@ -651,9 +662,9 @@
New_DXF_SOLID.QET_layer=Record3.value("dxf_8").toString();
New_DXF_SOLID.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_SOLID.QET_handle=QET_handle;
- New_DXF_SOLID.QET_handle.append(":");
- New_DXF_SOLID.QET_handle.append(Record3.value("dxf_5").toString());
+ //New_DXF_SOLID.QET_handle=QET_handle;
+ //New_DXF_SOLID.QET_handle.append(":");
+ //New_DXF_SOLID.QET_handle.append(Record3.value("dxf_5").toString());
New_DXF_SOLID.QET_softID=Record3.value("dxf_330").toString();
New_DXF_SOLID.QET_color=DXF_main_base[0].QDXF_block_solid_color;
@@ -727,6 +738,7 @@
New_DXF_LWPolyline.QET_layer=Record3.value("dxf_8").toString();
New_DXF_LWPolyline.QET_ltype=Record3.value("dxf_6").toString();
New_DXF_LWPolyline.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_LWPolyline.QET_block_name=QET_block_name;
New_DXF_LWPolyline.QET_softID=Record3.value("dxf_330").toString();
New_DXF_LWPolyline.QET_antialias="false";
@@ -736,9 +748,9 @@
New_DXF_LWPolyline.QET_layer=Record3.value("dxf_8").toString();
New_DXF_LWPolyline.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_LWPolyline.QET_handle=QET_handle;
- New_DXF_LWPolyline.QET_handle.append(":");
- New_DXF_LWPolyline.QET_handle.append(Record3.value("dxf_5").toString());
+ //New_DXF_LWPolyline.QET_handle=QET_handle;
+ //New_DXF_LWPolyline.QET_handle.append(":");
+ //New_DXF_LWPolyline.QET_handle.append(Record3.value("dxf_5").toString());
//New_DXF_LWPolyline.QET_handle=Record3.value("dxf_5").toString();
New_DXF_LWPolyline.QET_softID=Record3.value("dxf_330").toString();
@@ -839,10 +851,11 @@
New_DXF_Text.QET_layer=Record3.value("dxf_8").toString();
New_DXF_Text.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_Text.QET_handle=QET_handle;
- New_DXF_Text.QET_handle.append(":");
- New_DXF_Text.QET_handle.append(Record3.value("dxf_5").toString());
- //New_DXF_Text.QET_handle=Record3.value("dxf_5").toString();
+ //New_DXF_Text.QET_handle=QET_handle;
+ //New_DXF_Text.QET_handle.append(":");
+ //New_DXF_Text.QET_handle.append(Record3.value("dxf_5").toString());
+ New_DXF_Text.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_Text.QET_block_name=QET_block_name;
New_DXF_Text.QET_softID=Record3.value("dxf_330").toString();
@@ -862,6 +875,7 @@
New_DXF_LWPolyline.QET_layer=Record3.value("dxf_8").toString();
New_DXF_LWPolyline.QET_ltype=Record3.value("dxf_6").toString();
New_DXF_LWPolyline.QET_handle=Record3.value("dxf_5").toString();
+ New_DXF_LWPolyline.QET_block_name=QET_block_name;
New_DXF_LWPolyline.QET_softID=Record3.value("dxf_330").toString();
New_DXF_LWPolyline.QET_antialias="false";
@@ -871,9 +885,9 @@
New_DXF_LWPolyline.QET_layer=Record3.value("dxf_8").toString();
New_DXF_LWPolyline.QET_ltype=Record3.value("dxf_6").toString();
- New_DXF_LWPolyline.QET_handle=QET_handle;
- New_DXF_LWPolyline.QET_handle.append(":");
- New_DXF_LWPolyline.QET_handle.append(Record3.value("dxf_5").toString());
+ //New_DXF_LWPolyline.QET_handle=QET_handle;
+ //New_DXF_LWPolyline.QET_handle.append(":");
+ //New_DXF_LWPolyline.QET_handle.append(Record3.value("dxf_5").toString());
//New_DXF_LWPolyline.QET_handle=Record3.value("dxf_5").toString();
New_DXF_LWPolyline.QET_softID=Record3.value("dxf_330").toString();
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.h 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.h 2017-07-14 07:10:14 UTC (rev 4988)
@@ -58,6 +58,8 @@
QString QET_handle; //5
QString QET_softID; //330
+ QString QET_block_name;
+
QString filename1;
QString FromBlock;
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp 2017-07-14 07:10:14 UTC (rev 4988)
@@ -165,6 +165,7 @@
New_DXF_Line.QET_layer=Record2.value("dxf_8").toString();
New_DXF_Line.QET_ltype=Record2.value("dxf_6").toString();
New_DXF_Line.QET_handle=Record2.value("dxf_5").toString();
+ New_DXF_Line.QET_block_name="_elmt_";
New_DXF_Line.QET_softID=Record2.value("dxf_330").toString();
New_DXF_Line.QET_lenght1=1.5;
@@ -196,6 +197,7 @@
New_DXF_Circle.QET_layer=Record2.value("dxf_8").toString();
New_DXF_Circle.QET_ltype=Record2.value("dxf_6").toString();
New_DXF_Circle.QET_handle=Record2.value("dxf_5").toString(); //dxf id
+ New_DXF_Circle.QET_block_name="_elmt_";
New_DXF_Circle.QET_softID=Record2.value("dxf_330").toString();
New_DXF_Circle.QET_antialias="false";
@@ -225,6 +227,7 @@
New_DXF_Arc.QET_layer=Record2.value("dxf_8").toString();
New_DXF_Arc.QET_ltype=Record2.value("dxf_6").toString();
New_DXF_Arc.QET_handle=Record2.value("dxf_5").toString(); //dxf id
+ New_DXF_Arc.QET_block_name="_elmt_";
New_DXF_Arc.QET_softID=Record2.value("dxf_330").toString();
@@ -254,6 +257,7 @@
New_DXF_Text.QET_layer=Record2.value("dxf_8").toString();
New_DXF_Text.QET_ltype=Record2.value("dxf_6").toString();
New_DXF_Text.QET_handle=Record2.value("dxf_5").toString();
+ New_DXF_Text.QET_block_name="_elmt_";
New_DXF_Text.QET_softID=Record2.value("dxf_330").toString();
@@ -261,7 +265,7 @@
//New_DXF_Text.QET_line_style="normal";
//New_DXF_Text.QET_line_weight="thin";
//New_DXF_Text.QET_filling="none";
- New_DXF_Text.QET_color=DXF_main_base[0].QDXF_entitie_circle_color;
+ New_DXF_Text.QET_color=DXF_main_base[0].QDXF_entitie_text_color;
DXF_Entities_List.DXF_Result.append(New_DXF_Text.Create_text());
@@ -284,6 +288,7 @@
New_DXF_Input.QET_layer=Record2.value("dxf_8").toString();
New_DXF_Input.QET_ltype=Record2.value("dxf_6").toString();
New_DXF_Input.QET_handle=Record2.value("dxf_5").toString();
+ New_DXF_Input.QET_block_name="_elmt_";
New_DXF_Input.QET_softID=Record2.value("dxf_330").toString();
//New_DXF_Text.QET_antialias="false";
@@ -314,6 +319,7 @@
New_DXF_Input.QET_layer=Record2.value("dxf_8").toString();
New_DXF_Input.QET_ltype=Record2.value("dxf_6").toString();
New_DXF_Input.QET_handle=Record2.value("dxf_5").toString();
+ New_DXF_Input.QET_block_name="_elmt_";
New_DXF_Input.QET_softID=Record2.value("dxf_330").toString();
New_DXF_Input.QET_dxf_tag=Record2.value("dxf_2").toString();
@@ -348,6 +354,7 @@
New_DXF_Terminal.QET_layer=Record2.value("dxf_8").toString();
New_DXF_Terminal.QET_ltype=Record2.value("dxf_6").toString();
New_DXF_Terminal.QET_handle=Record2.value("dxf_5").toString();
+ New_DXF_Terminal.QET_block_name="_elmt_";
New_DXF_Terminal.QET_softID=Record2.value("dxf_330").toString();
@@ -382,6 +389,7 @@
New_DXF_Ellipse.QET_layer=Record2.value("dxf_8").toString();
New_DXF_Ellipse.QET_ltype=Record2.value("dxf_6").toString();
New_DXF_Ellipse.QET_handle=Record2.value("dxf_5").toString();
+ New_DXF_Ellipse.QET_block_name="_elmt_";
New_DXF_Ellipse.QET_softID=Record2.value("dxf_330").toString();
//New_DXF_Terminal.QET_orientation="sud";//Record2.value("dxf_50").toDouble();
@@ -408,6 +416,7 @@
New_DXF_Polyline.QET_layer=Record2.value("dxf_8").toString();
New_DXF_Polyline.QET_ltype=Record2.value("dxf_6").toString();
New_DXF_Polyline.QET_handle=Record2.value("dxf_5").toString();
+ New_DXF_Polyline.QET_block_name="_elmt_";
New_DXF_Polyline.QET_softID=Record2.value("dxf_330").toString();
New_DXF_Polyline.QET_antialias="false";
@@ -498,7 +507,8 @@
New_DXF_blocks.QET_layer=Record2.value("dxf_8").toString();
New_DXF_blocks.QET_ltype=Record2.value("dxf_6").toString();
- New_DXF_blocks.QET_handle=Record2.value("dxf_2").toString();//Record2.value("dxf_5").toString();
+ New_DXF_blocks.QET_handle=Record2.value("dxf_5").toString();
+ New_DXF_blocks.QET_block_name=Record2.value("dxf_2").toString();
New_DXF_blocks.QET_softID=Record2.value("dxf_330").toString();
@@ -535,6 +545,7 @@
New_DXF_LWPolyline.QET_layer=Record2.value("dxf_8").toString();
New_DXF_LWPolyline.QET_ltype=Record2.value("dxf_6").toString();
New_DXF_LWPolyline.QET_handle=Record2.value("dxf_5").toString();
+ New_DXF_LWPolyline.QET_block_name="_elmt_";
New_DXF_LWPolyline.QET_softID=Record2.value("dxf_330").toString();
New_DXF_LWPolyline.QET_antialias="false";
@@ -638,6 +649,7 @@
New_DXF_SOLID.QET_layer=Record2.value("dxf_8").toString();
New_DXF_SOLID.QET_ltype=Record2.value("dxf_6").toString();
New_DXF_SOLID.QET_handle=Record2.value("dxf_5").toString();
+ New_DXF_SOLID.QET_block_name="_elmt_";
New_DXF_SOLID.QET_softID=Record2.value("dxf_330").toString();
New_DXF_SOLID.QET_antialias="false";
@@ -721,6 +733,7 @@
New_DXF_LWPolyline.QET_layer=Record2.value("dxf_8").toString();
New_DXF_LWPolyline.QET_ltype=Record2.value("dxf_6").toString();
New_DXF_LWPolyline.QET_handle=Record2.value("dxf_5").toString();
+ New_DXF_LWPolyline.QET_block_name="_elmt_";
New_DXF_LWPolyline.QET_softID=Record2.value("dxf_330").toString();
New_DXF_LWPolyline.QET_antialias="false";
@@ -840,6 +853,7 @@
New_DXF_Text.QET_layer=Record2.value("dxf_8").toString();
New_DXF_Text.QET_ltype=Record2.value("dxf_6").toString();
New_DXF_Text.QET_handle=Record2.value("dxf_5").toString();
+ New_DXF_Text.QET_block_name="_elmt_";
New_DXF_Text.QET_softID=Record2.value("dxf_330").toString();
@@ -859,6 +873,7 @@
New_DXF_LWPolyline.QET_layer=Record2.value("dxf_8").toString();
New_DXF_LWPolyline.QET_ltype=Record2.value("dxf_6").toString();
New_DXF_LWPolyline.QET_handle=Record2.value("dxf_5").toString();
+ New_DXF_LWPolyline.QET_block_name="_elmt_";
New_DXF_LWPolyline.QET_softID=Record2.value("dxf_330").toString();
New_DXF_LWPolyline.QET_antialias="false";
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_header_steps.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_header_steps.cpp 2017-07-12 18:10:04 UTC (rev 4987)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_header_steps.cpp 2017-07-14 07:10:14 UTC (rev 4988)
@@ -115,6 +115,9 @@
DXF_LIMMAX_X=DXF_variable.DXF_LIMMAX_X.toDouble();
DXF_LIMMIN_X=DXF_variable.DXF_LIMMIN_X.toDouble();
+ //DXF_variable.DXF_INSBASE_X;
+ //DXF_variable.DXF_INSBASE_y;
+
if (DXF_LIMMIN_X <0)
{
DXF_LIMMIN_X=-DXF_LIMMIN_X;
@@ -124,7 +127,8 @@
DXF_LIMMAX_X=-DXF_LIMMAX_X;
}
- return (QString::number(DXF_LIMMIN_X+DXF_LIMMAX_X));
+ //return (QString::number(DXF_LIMMIN_X+DXF_LIMMAX_X));
+ return (QString::number((DXF_variable.DXF_INSBASE_X.toDouble()*2)+5));
}
QString ELMT_header_steps::Calc_Height()
@@ -141,6 +145,7 @@
DXF_LIMMAX_Y=-DXF_LIMMAX_Y;
}
- return (QString::number(DXF_LIMMIN_Y+DXF_LIMMAX_Y));
+ //return (QString::number(DXF_LIMMIN_Y+DXF_LIMMAX_Y));
+ return (QString::number((DXF_variable.DXF_INSBASE_Y.toDouble()*2)+5));
}