| [qet] qet/qet: [4989] dxf converter |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4989
Author: rdsivd
Date: 2017-07-14 13:30:39 +0200 (Fri, 14 Jul 2017)
Log Message:
-----------
dxf converter
added symbol id
dxfelmt == symbole name
dxfelmtid == identifikcation of items as parts of this inserted elmt
symbols are identified with dxfelmt + dxfelmtid
Modified Paths:
--------------
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
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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_arc.cpp 2017-07-14 11:30:39 UTC (rev 4989)
@@ -48,6 +48,11 @@
Result_arc.append(QET_block_name);
Result_arc.append(QChar(34));
+ Result_arc.append(" dxfelmtid=");
+ Result_arc.append(QChar(34));
+ Result_arc.append(QET_block_name_id);
+ 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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_arc.h 2017-07-14 11:30:39 UTC (rev 4989)
@@ -43,6 +43,7 @@
QString QET_block_name;
+ QString QET_block_name_id;
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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_circle.cpp 2017-07-14 11:30:39 UTC (rev 4989)
@@ -33,6 +33,11 @@
Result_circle.append(QET_block_name);
Result_circle.append(QChar(34));
+ Result_circle.append(" dxfelmtid=");
+ Result_circle.append(QChar(34));
+ Result_circle.append(QET_block_name_id);
+ 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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_circle.h 2017-07-14 11:30:39 UTC (rev 4989)
@@ -34,6 +34,7 @@
QString QET_filling;
QString QET_color;
QString QET_block_name;
+ QString QET_block_name_id;
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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_ellipse.cpp 2017-07-14 11:30:39 UTC (rev 4989)
@@ -49,6 +49,11 @@
Result_ellipse.append(QET_block_name);
Result_ellipse.append(QChar(34));
+ Result_ellipse.append(" dxfelmtid=");
+ Result_ellipse.append(QChar(34));
+ Result_ellipse.append(QET_block_name_id);
+ 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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_ellipse.h 2017-07-14 11:30:39 UTC (rev 4989)
@@ -58,6 +58,7 @@
double end_angle;
QString QET_block_name;
+ QString QET_block_name_id;
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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_input.cpp 2017-07-14 11:30:39 UTC (rev 4989)
@@ -32,6 +32,11 @@
Result.append(QET_block_name);
Result.append(QChar(34));
+ Result.append(" dxfelmtid=");
+ Result.append(QChar(34));
+ Result.append(QET_block_name_id);
+ 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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_input.h 2017-07-14 11:30:39 UTC (rev 4989)
@@ -43,6 +43,7 @@
QString QET_tag;
QString QET_block_name;
+ QString QET_block_name_id;
QString Create_input();
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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_line.cpp 2017-07-14 11:30:39 UTC (rev 4989)
@@ -35,6 +35,11 @@
Result.append(QET_block_name);
Result.append(QChar(34));
+ Result.append(" dxfelmtid=");
+ Result.append(QChar(34));
+ Result.append(QET_block_name_id);
+ 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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_line.h 2017-07-14 11:30:39 UTC (rev 4989)
@@ -42,6 +42,7 @@
QString QET_color;
QString QET_block_name;
+ QString QET_block_name_id;
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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_polyline.cpp 2017-07-14 11:30:39 UTC (rev 4989)
@@ -48,6 +48,11 @@
Result_polyline.append(QET_block_name);
Result_polyline.append(QChar(34));
+ Result_polyline.append(" dxfelmtid=");
+ Result_polyline.append(QChar(34));
+ Result_polyline.append(QET_block_name_id);
+ 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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_polyline.h 2017-07-14 11:30:39 UTC (rev 4989)
@@ -36,6 +36,7 @@
int segments;
QString QET_block_name;
+ QString QET_block_name_id;
QString Create_polyline();
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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_rectangel.cpp 2017-07-14 11:30:39 UTC (rev 4989)
@@ -35,6 +35,11 @@
Result_rect.append(QET_block_name);
Result_rect.append(QChar(34));
+ Result_rect.append(" dxfelmtid=");
+ Result_rect.append(QChar(34));
+ Result_rect.append(QET_block_name_id);
+ 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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_rectangel.h 2017-07-14 11:30:39 UTC (rev 4989)
@@ -38,6 +38,7 @@
QString Result_rect;
QString QET_block_name;
+ QString QET_block_name_id;
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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_terminal.cpp 2017-07-14 11:30:39 UTC (rev 4989)
@@ -25,6 +25,11 @@
Result.append(QET_block_name);
Result.append(QChar(34));
+ Result.append(" dxfelmtid=");
+ Result.append(QChar(34));
+ Result.append(QET_block_name_id);
+ 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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_terminal.h 2017-07-14 11:30:39 UTC (rev 4989)
@@ -27,6 +27,7 @@
QString QET_softID; //330
QString QET_block_name;
+ QString QET_block_name_id;
QString Create_terminal();
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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_text.cpp 2017-07-14 11:30:39 UTC (rev 4989)
@@ -27,6 +27,11 @@
Result_text.append(QET_block_name);
Result_text.append(QChar(34));
+ Result_text.append(" dxfelmtid=");
+ Result_text.append(QChar(34));
+ Result_text.append(QET_block_name_id);
+ 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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_text.h 2017-07-14 11:30:39 UTC (rev 4989)
@@ -34,6 +34,7 @@
QString Result_text;
QString QET_block_name;
+ QString QET_block_name_id;
QString Create_text();
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.cpp 2017-07-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.cpp 2017-07-14 11:30:39 UTC (rev 4989)
@@ -375,6 +375,7 @@
//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_block_name_id=QET_block_name_id;
New_DXF_Ellipse.QET_softID=Record3.value("dxf_330").toString();
//New_DXF_Terminal.QET_orientation="sud";//Record2.value("dxf_50").toDouble();
@@ -415,6 +416,7 @@
//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_block_name_id=QET_block_name_id;
New_DXF_Polyline.QET_softID=Record3.value("dxf_330").toString();
@@ -494,6 +496,7 @@
//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_block_name_id=Record3.value("dxf_5").toString();
New_DXF_blocks2.QET_softID=Record3.value("dxf_330").toString();
@@ -543,6 +546,7 @@
//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_block_name_id=QET_block_name_id;
New_DXF_LWPolyline.QET_softID=Record3.value("dxf_330").toString();
@@ -641,6 +645,7 @@
//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_block_name_id=QET_block_name_id;
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-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.h 2017-07-14 11:30:39 UTC (rev 4989)
@@ -61,6 +61,7 @@
QString QET_softID; //330
QString QET_block_name;
+ QString QET_block_name_id;
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp 2017-07-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp 2017-07-14 11:30:39 UTC (rev 4989)
@@ -17,7 +17,7 @@
QString elmt_blocks::Insert_Block()
{
- dbManager Manage_Blocks;
+ //dbManager Manage_Blocks;
DXF_main_base[0].QDXF_block_arc_color="blue";
DXF_main_base[0].QDXF_block_circle_color="blue";
@@ -153,6 +153,7 @@
//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_block_name_id=QET_block_name_id;
//New_DXF_Line.QET_handle=Record3.value("dxf_5").toString();
New_DXF_Line.QET_softID=Record3.value("dxf_330").toString();
@@ -188,6 +189,7 @@
//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_block_name_id=QET_block_name_id;
//New_DXF_Circle.QET_handle=Record3.value("dxf_5").toString();
New_DXF_Circle.QET_softID=Record3.value("dxf_330").toString();
@@ -223,6 +225,7 @@
//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_block_name_id=QET_block_name_id;
//New_DXF_Arc.QET_handle=Record3.value("dxf_5").toString();
New_DXF_Arc.QET_softID=Record3.value("dxf_330").toString();
@@ -259,6 +262,7 @@
//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_block_name_id=QET_block_name_id;
//New_DXF_Text.QET_handle=Record3.value("dxf_5").toString();
New_DXF_Text.QET_softID=Record3.value("dxf_330").toString();
@@ -295,6 +299,7 @@
//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_block_name_id=QET_block_name_id;
New_DXF_Input.QET_softID=Record3.value("dxf_330").toString();
//New_DXF_Text.QET_antialias="false";
@@ -331,6 +336,7 @@
//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_block_name_id=QET_block_name_id;
New_DXF_Input.QET_softID=Record3.value("dxf_330").toString();
@@ -368,6 +374,7 @@
//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_block_name_id=QET_block_name_id;
New_DXF_Terminal.QET_softID=Record3.value("dxf_330").toString();
@@ -406,6 +413,7 @@
//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_block_name_id=QET_block_name_id;
New_DXF_Ellipse.QET_softID=Record3.value("dxf_330").toString();
//New_DXF_Terminal.QET_orientation="sud";//Record2.value("dxf_50").toDouble();
@@ -436,6 +444,7 @@
//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_block_name_id=QET_block_name_id;
New_DXF_Polyline.QET_softID=Record3.value("dxf_330").toString();
New_DXF_Polyline.QET_antialias="false";
@@ -531,6 +540,8 @@
}
New_DXF_blocks2.Block_rotation=Record3.value("dxf_43").toDouble();
+ New_DXF_blocks2.QET_block_name_id=QET_block_name_id;
+
Signal_waarde1.clear();
Signal_waarde1.append("block : ");
Signal_waarde1.append(Record3.value("dxf_2").toString());
@@ -569,6 +580,7 @@
//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_block_name_id=QET_block_name_id;
New_DXF_LWPolyline.QET_softID=Record3.value("dxf_330").toString();
@@ -653,6 +665,7 @@
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_block_name_id=QET_block_name_id;
New_DXF_SOLID.QET_softID=Record3.value("dxf_330").toString();
New_DXF_SOLID.QET_antialias="false";
@@ -739,6 +752,7 @@
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_block_name_id=QET_block_name_id;
New_DXF_LWPolyline.QET_softID=Record3.value("dxf_330").toString();
New_DXF_LWPolyline.QET_antialias="false";
@@ -856,6 +870,7 @@
//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_block_name_id=QET_block_name_id;
New_DXF_Text.QET_softID=Record3.value("dxf_330").toString();
@@ -876,6 +891,7 @@
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_block_name_id=QET_block_name_id;
New_DXF_LWPolyline.QET_softID=Record3.value("dxf_330").toString();
New_DXF_LWPolyline.QET_antialias="false";
@@ -925,7 +941,7 @@
//NewQueryBlock.previous();
- while (end_lwpoly==0 and count_vertex<max_vertex-1)
+ while (end_lwpoly==0 and count_vertex<max_vertex)
{
readrecord=NewQueryBlock.next();
QSqlRecord Record4=NewQueryBlock.record();
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.h 2017-07-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.h 2017-07-14 11:30:39 UTC (rev 4989)
@@ -59,6 +59,7 @@
QString QET_softID; //330
QString QET_block_name;
+ QString QET_block_name_id;
QString filename1;
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp 2017-07-14 07:10:14 UTC (rev 4988)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp 2017-07-14 11:30:39 UTC (rev 4989)
@@ -97,7 +97,7 @@
//New_DXF_Text.QET_filling="none";
New_DXF_Input.QET_rotate="true";
New_DXF_Input.QET_tag="label";
-
+ New_DXF_Input.QET_block_name="_elmt_";
New_DXF_Input.QET_color=DXF_main_base[0].QDXF_entitie_text_color;
@@ -106,6 +106,7 @@
New_DXF_Terminal.QET_x=10;
New_DXF_Terminal.QET_y=-10;
New_DXF_Terminal.QET_orientation="sud";
+ New_DXF_Terminal.QET_block_name="_elmt_";
DXF_Entities_List.DXF_Result.append(New_DXF_Terminal.Create_terminal());
@@ -511,7 +512,9 @@
New_DXF_blocks.QET_block_name=Record2.value("dxf_2").toString();
New_DXF_blocks.QET_softID=Record2.value("dxf_330").toString();
+ New_DXF_blocks.QET_block_name_id=Record2.value("dxf_5").toString();
+
New_DXF_blocks.Block_scale_x=Record2.value("dxf_41").toDouble();
if (New_DXF_blocks.Block_scale_x==0)
{