| [qet] qet/qet: [4824] updated fucntions |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4824
Author: rdsivd
Date: 2016-12-27 15:59:31 +0100 (Tue, 27 Dec 2016)
Log Message:
-----------
updated fucntions
Modified Paths:
--------------
branches/DXFtoQET3_DB/data.h
branches/DXFtoQET3_DB/db/dbmanager.cpp
branches/DXFtoQET3_DB/dxftoqet3db.cpp
branches/DXFtoQET3_DB/dxftoqet3db.h
branches/DXFtoQET3_DB/dxftoqet3db.ui
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_ellipse.cpp
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_polyline.cpp
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_rectangel.cpp
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_entities.h
branches/DXFtoQET3_DB/src/ELMT_steps/elmt_header_steps.cpp
Modified: branches/DXFtoQET3_DB/data.h
===================================================================
--- branches/DXFtoQET3_DB/data.h 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/data.h 2016-12-27 14:59:31 UTC (rev 4824)
@@ -7,9 +7,9 @@
//#include "db/dbmanager.h"
#define DXF_base_set 1
-#define DXF_item_split 50000 //dxf split tables
-#define DXF_codes_set 8000
-#define DXF_codeset_copies 5000
+#define DXF_item_split 100000 //dxf split tables
+#define DXF_codes_set 20000
+#define DXF_codeset_copies 20000
#define QET_L_POLYLINE 100
#define DXF_layers_set 500
Modified: branches/DXFtoQET3_DB/db/dbmanager.cpp
===================================================================
--- branches/DXFtoQET3_DB/db/dbmanager.cpp 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/db/dbmanager.cpp 2016-12-27 14:59:31 UTC (rev 4824)
@@ -1366,4 +1366,6 @@
m_db.commit();*/
+
+ return "false";
}
Modified: branches/DXFtoQET3_DB/dxftoqet3db.cpp
===================================================================
--- branches/DXFtoQET3_DB/dxftoqet3db.cpp 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/dxftoqet3db.cpp 2016-12-27 14:59:31 UTC (rev 4824)
@@ -1247,6 +1247,15 @@
void DXFtoQET3DB::split_header()
{
header_max_items=dxf_header.count(" 9");
+ if (header_max_items==0)
+ {
+ header_max_items=dxf_header.count(" 9");
+ }
+ if (header_max_items==0)
+ {
+ header_max_items=dxf_header.count("9");
+ }
+
header_max_count=dxf_header.count();
ui->dxf_log->insertPlainText("============================================================================\n");
@@ -1273,14 +1282,18 @@
for (x2=0;x2<header_max_count and header_max_items<DXF_item_split;x2++)
{
- if (dxf_header[x2]==" 9")
+ if (QString(dxf_header[x2]).toInt()==9)
{
x1=x1+1;
split_tables_list[x1].append(dxf_header[x2]); //??
+ x2++;
+ split_tables_list[x1].append(dxf_header[x2]);
}
else
{
split_tables_list[x1].append(dxf_header[x2]); //??
+ x2++;
+ split_tables_list[x1].append(dxf_header[x2]);
}
}
@@ -1297,6 +1310,7 @@
clear_dxf_code_tables();
+
ui->dxf_section->clear();
ui->dxf_section->insert("Section Header");
ui->dxf_log->repaint();
@@ -1356,6 +1370,15 @@
void DXFtoQET3DB::split_classes()
{
classes_max_items=dxf_classes.count(" 0");
+ if (classes_max_items==0)
+ {
+ classes_max_items=dxf_classes.count(" 0");
+ }
+ if (classes_max_items==0)
+ {
+ classes_max_items=dxf_classes.count("0");
+ }
+
classes_max_count=dxf_classes.count();
ui->dxf_log->insertPlainText("============================================================================\n");
@@ -1382,14 +1405,18 @@
for (x2=0;x2<classes_max_count and classes_max_items<DXF_item_split;x2++)
{
- if (dxf_classes[x2]==" 0")
+ if (QString( dxf_classes[x2]).toInt()==0)
{
x1=x1+1;
split_tables_list[x1].append(dxf_classes[x2]);
+ x2++;
+ split_tables_list[x1].append(dxf_header[x2]);
}
else
{
split_tables_list[x1].append(dxf_classes[x2]);
+ x2++;
+ split_tables_list[x1].append(dxf_header[x2]);
}
}
@@ -1471,6 +1498,15 @@
void DXFtoQET3DB::split_tables()
{
tables_max_items=dxf_tables.count(" 0");
+ if (tables_max_items==0)
+ {
+ tables_max_items=dxf_tables.count(" 0");
+ }
+ if (tables_max_items==0)
+ {
+ tables_max_items=dxf_tables.count("0");
+ }
+
tables_max_count=dxf_tables.count();
ui->dxf_log->insertPlainText("============================================================================\n");
@@ -1496,14 +1532,18 @@
for (x2=0;x2<tables_max_count and tables_max_items<DXF_item_split;x2++)
{
- if (dxf_tables[x2]==" 0")
+ if (QString(dxf_tables[x2]).toInt()==0)
{
x1=x1+1;
split_tables_list[x1].append(dxf_tables[x2]);
+ x2++;
+ split_tables_list[x1].append(dxf_tables[x2]);
}
else
{
split_tables_list[x1].append(dxf_tables[x2]);
+ x2++;
+ split_tables_list[x1].append(dxf_tables[x2]);
}
}
@@ -1581,6 +1621,14 @@
void DXFtoQET3DB::split_blocks()
{
blocks_max_items=dxf_blocks.count(" 0");
+ if (blocks_max_items==0)
+ {
+ blocks_max_items=dxf_blocks.count(" 0");
+ }
+ {
+ blocks_max_items=dxf_blocks.count("0");
+ }
+
blocks_max_count=dxf_blocks.count();
ui->dxf_log->insertPlainText("============================================================================\n");
@@ -1609,14 +1657,18 @@
for (x2=0;x2<blocks_max_count and blocks_max_items<DXF_item_split;x2++)
{
- if (dxf_blocks[x2]==" 0")
+ if (QString(dxf_blocks[x2]).toInt()==0)
{
x1=x1+1;
split_tables_list[x1].append(dxf_blocks[x2]);
+ x2++;
+ split_tables_list[x1].append(dxf_blocks[x2]);
}
else
{
split_tables_list[x1].append(dxf_blocks[x2]);
+ x2++;
+ split_tables_list[x1].append(dxf_blocks[x2]);
}
}
@@ -1696,6 +1748,15 @@
void DXFtoQET3DB::split_entities()
{
entities_max_items=dxf_entities.count(" 0");
+ if (entities_max_items==0)
+ {
+ entities_max_items=dxf_entities.count(" 0");
+ }
+ if (entities_max_items==0)
+ {
+ entities_max_items=dxf_entities.count("0");
+ }
+
entities_max_count=dxf_entities.count();
count_entities=0;
count_entities_record_id=1;
@@ -1726,14 +1787,18 @@
for (x2=0;x2<entities_max_count and entities_max_items<DXF_item_split;x2++)
{
- if (dxf_entities[x2]==" 0")
+ if (QString( dxf_entities[x2]).toInt()==0)
{
x1=x1+1;
split_tables_list[x1].append(dxf_entities[x2]);
+ x2++;
+ split_tables_list[x1].append(dxf_entities[x2]);
}
else
{
split_tables_list[x1].append(dxf_entities[x2]);
+ x2++;
+ split_tables_list[x1].append(dxf_entities[x2]);
}
}
@@ -1813,6 +1878,15 @@
void DXFtoQET3DB::split_objects()
{
objects_max_items=dxf_objects.count(" 0");
+ if (objects_max_items==0)
+ {
+ objects_max_items=dxf_objects.count(" 0");
+ }
+ if (objects_max_items==0)
+ {
+ objects_max_items=dxf_objects.count("0");
+ }
+
objects_max_count=dxf_objects.count();
count_objects=0;
count_objects_record_id=1;
@@ -1841,14 +1915,18 @@
for (x2=0;x2<objects_max_count and objects_max_items<DXF_item_split;x2++)
{
- if (dxf_objects[x2]==" 0")
+ if ( QString( dxf_objects[x2]).toInt()==0)
{
x1=x1+1;
split_tables_list[x1].append(dxf_objects[x2]);
+ x2++;
+ split_tables_list[x1].append(dxf_objects[x2]);
}
else
{
split_tables_list[x1].append(dxf_objects[x2]);
+ x2++;
+ split_tables_list[x1].append(dxf_objects[x2]);
}
}
@@ -3858,6 +3936,21 @@
break;
+ case 213:
+ if (sw_header[213]>=0)
+ {
+
+ DXF_code_tables[sw_header[213]].dxf_213=line2;
+ sw_header[213]++;
+
+ if (sw_header[213]>max3)
+ {
+ max3=sw_header[213];
+ }
+ }
+
+ break;
+
case 220:
if (sw_header[220]>=0)
{
@@ -3873,6 +3966,21 @@
break;
+ case 223:
+ if (sw_header[223]>=0)
+ {
+
+ DXF_code_tables[sw_header[223]].dxf_223=line2;
+ sw_header[223]++;
+
+ if (sw_header[223]>max3)
+ {
+ max3=sw_header[223];
+ }
+ }
+
+ break;
+
case 230:
if (sw_header[230]>=0)
{
@@ -3888,6 +3996,21 @@
break;
+ case 233:
+ if (sw_header[233]>=0)
+ {
+
+ DXF_code_tables[sw_header[233]].dxf_233=line2;
+ sw_header[233]++;
+
+ if (sw_header[233]>max3)
+ {
+ max3=sw_header[233];
+ }
+ }
+
+ break;
+
case 270:
if (sw_header[270]>=0)
{
@@ -4626,6 +4749,51 @@
break;
+ case 344:
+ if (sw_header[344]>=0)
+ {
+
+ DXF_code_tables[sw_header[344]].dxf_344=line2;
+ sw_header[344]++;
+
+ if (sw_header[344]>max3)
+ {
+ max3=sw_header[344];
+ }
+ }
+
+ break;
+
+ case 345:
+ if (sw_header[345]>=0)
+ {
+
+ DXF_code_tables[sw_header[345]].dxf_345=line2;
+ sw_header[345]++;
+
+ if (sw_header[345]>max3)
+ {
+ max3=sw_header[345];
+ }
+ }
+
+ break;
+
+ case 346:
+ if (sw_header[346]>=0)
+ {
+
+ DXF_code_tables[sw_header[346]].dxf_346=line2;
+ sw_header[346]++;
+
+ if (sw_header[346]>max3)
+ {
+ max3=sw_header[346];
+ }
+ }
+
+ break;
+
case 347:
if (sw_header[347]>=0)
{
@@ -5471,9 +5639,12 @@
}
+void DXFtoQET3DB::on_Convert_dxf_entities_clicked()
+{
+}
-void DXFtoQET3DB::on_Convert_dxf_entities_clicked()
+void DXFtoQET3DB::on_progressBar_valueChanged(int value)
{
}
Modified: branches/DXFtoQET3_DB/dxftoqet3db.h
===================================================================
--- branches/DXFtoQET3_DB/dxftoqet3db.h 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/dxftoqet3db.h 2016-12-27 14:59:31 UTC (rev 4824)
@@ -199,6 +199,8 @@
QStringList dxf_thumbnailimage_items[DXF_item_split];
QStringList split_tables_list[DXF_item_split];
+ int count_tables_list;
+
QString Copy_list_item;
QString ResultELMT;
@@ -344,6 +346,8 @@
void on_Convert_dxf_entities_clicked();
+ void on_progressBar_valueChanged(int value);
+
private:
Ui::DXFtoQET3DB *ui;
};
Modified: branches/DXFtoQET3_DB/dxftoqet3db.ui
===================================================================
--- branches/DXFtoQET3_DB/dxftoqet3db.ui 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/dxftoqet3db.ui 2016-12-27 14:59:31 UTC (rev 4824)
@@ -421,6 +421,13 @@
</property>
</spacer>
</item>
+ <item>
+ <widget class="QProgressBar" name="progressBar">
+ <property name="value">
+ <number>24</number>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget">
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_arc.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_arc.cpp 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_arc.cpp 2016-12-27 14:59:31 UTC (rev 4824)
@@ -42,6 +42,11 @@
Result_arc.append(" ");
Result_arc.append("<arc");
+ Result_arc.append(" dxfid=");
+ Result_arc.append(QChar(34));
+ Result_arc.append(QET_handle);
+ Result_arc.append(QChar(34));
+
Result_arc.append(" width=");
Result_arc.append(QChar(34));
Result_arc.append(QString::number(QET_width,'f',2));
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_arc.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_arc.h 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_arc.h 2016-12-27 14:59:31 UTC (rev 4824)
@@ -45,6 +45,7 @@
+
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 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_circle.cpp 2016-12-27 14:59:31 UTC (rev 4824)
@@ -27,6 +27,11 @@
Result_circle.append("<ellipse");
+ Result_circle.append(" dxfid=");
+ Result_circle.append(QChar(34));
+ Result_circle.append(QET_handle);
+ Result_circle.append(QChar(34));
+
Result_circle.append(" x=");
Result_circle.append(QChar(34));
Result_circle.append(QString::number (QET_x-QET_diameter ,'f',2));
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_ellipse.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_ellipse.cpp 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_ellipse.cpp 2016-12-27 14:59:31 UTC (rev 4824)
@@ -43,6 +43,10 @@
Result_ellipse.append(" ");
Result_ellipse.append("<arc");
+ Result_ellipse.append(" dxfid=");
+ Result_ellipse.append(QChar(34));
+ Result_ellipse.append(QET_handle);
+ Result_ellipse.append(QChar(34));
Result_ellipse.append(" width=");
Result_ellipse.append(QChar(34));
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_input.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_input.cpp 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_input.cpp 2016-12-27 14:59:31 UTC (rev 4824)
@@ -24,6 +24,17 @@
Result.append(" ");
Result.append("<input");
+
+ Result.append(" dxfid=");
+ Result.append(QChar(34));
+ Result.append(QET_handle);
+ Result.append(QChar(34));
+
+ Result.append(" dxftagg=");
+ Result.append(QChar(34));
+ Result.append(QET_dxf_tag);
+ Result.append(QChar(34));
+
Result.append(" x=");
Result.append(QChar(34));
Result.append(QString::number(QET_x,'f',2));
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_input.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_input.h 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_input.h 2016-12-27 14:59:31 UTC (rev 4824)
@@ -29,7 +29,7 @@
//QString QET_rotate;
QString QET_text; //1
- QString QET_tag; //2
+ QString QET_dxf_tag; //2
QString QET_color;
QString QET_text_style; //7
QString QET_rotate;
@@ -40,8 +40,8 @@
QString QET_softID; //330
+ QString QET_tag;
-
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 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_line.cpp 2016-12-27 14:59:31 UTC (rev 4824)
@@ -29,6 +29,12 @@
Result.append(" ");
Result.append("<line");
+
+ Result.append(" dxfid=");
+ Result.append(QChar(34));
+ Result.append(QET_handle);
+ Result.append(QChar(34));
+
Result.append(" lenght1=");
Result.append(QChar(34));
Result.append(QString::number(QET_lenght1,'f',2));
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_polyline.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_polyline.cpp 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_polyline.cpp 2016-12-27 14:59:31 UTC (rev 4824)
@@ -41,6 +41,12 @@
Result_polyline.append(" ");
Result_polyline.append("<polygon");
+
+ Result_polyline.append(" dxfid=");
+ Result_polyline.append(QChar(34));
+ Result_polyline.append(QET_handle);
+ Result_polyline.append(QChar(34));
+
Result_polyline.append(" style=");
Result_polyline.append(QChar(34));
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_rectangel.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_rectangel.cpp 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_rectangel.cpp 2016-12-27 14:59:31 UTC (rev 4824)
@@ -29,6 +29,11 @@
Result_rect.append(" ");
Result_rect.append("<rect");
+ Result_rect.append(" dxfid=");
+ Result_rect.append(QChar(34));
+ Result_rect.append(QET_handle);
+ Result_rect.append(QChar(34));
+
Result_rect.append(" width=");
Result_rect.append(QChar(34));
Result_rect.append(QString::number(QET_width,'f',2));
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_terminal.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_terminal.cpp 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_terminal.cpp 2016-12-27 14:59:31 UTC (rev 4824)
@@ -16,6 +16,12 @@
Result.append(" ");
Result.append("<terminal");
+
+ Result.append(" dxfid=");
+ Result.append(QChar(34));
+ Result.append(QET_handle);
+ Result.append(QChar(34));
+
Result.append(" x=");
Result.append(QChar(34));
Result.append(QString::number(QET_x,'f',2));
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_terminal.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_terminal.h 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_terminal.h 2016-12-27 14:59:31 UTC (rev 4824)
@@ -21,6 +21,10 @@
QString QET_orientation;
+ QString QET_layer; //8
+ QString QET_ltype; //6
+ QString QET_handle; //5
+ QString QET_softID; //330
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 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_text.cpp 2016-12-27 14:59:31 UTC (rev 4824)
@@ -21,6 +21,11 @@
Result_text.append(" ");
Result_text.append("<text");
+ Result_text.append(" dxfid=");
+ Result_text.append(QChar(34));
+ Result_text.append(QET_handle);
+ Result_text.append(QChar(34));
+
Result_text.append(" x=");
Result_text.append(QChar(34));
Result_text.append(QString::number(QET_x,'f',2));
Modified: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_text.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_text.h 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_text.h 2016-12-27 14:59:31 UTC (rev 4824)
@@ -26,6 +26,10 @@
QString QET_color;
QString QET_text_style; //7
+ QString QET_layer; //8
+ QString QET_ltype; //6
+ QString QET_handle; //5
+ QString QET_softID; //330
QString Result_text;
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.cpp 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.cpp 2016-12-27 14:59:31 UTC (rev 4824)
@@ -106,7 +106,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=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_softID=Record3.value("dxf_330").toString();
New_DXF_Line.QET_lenght1=1.5;
@@ -137,7 +140,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=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_softID=Record3.value("dxf_330").toString();
New_DXF_Circle.QET_antialias="false";
@@ -166,7 +172,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=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_softID=Record3.value("dxf_330").toString();
@@ -194,6 +203,13 @@
New_DXF_Text.QET_size=Record3.value("dxf_40").toDouble();
New_DXF_Text.QET_text_style=Record3.value("dxf_7").toString();
+ 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_softID=Record3.value("dxf_330").toString();
//New_DXF_Text.QET_antialias="false";
//New_DXF_Text.QET_line_style="normal";
@@ -219,6 +235,13 @@
New_DXF_Input.QET_size=Record3.value("dxf_40").toDouble()*Block_scale_y;
New_DXF_Input.QET_text_style=Record3.value("dxf_7").toString();
+ 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_softID=Record3.value("dxf_330").toString();
//New_DXF_Text.QET_antialias="false";
//New_DXF_Text.QET_line_style="normal";
@@ -247,6 +270,13 @@
New_DXF_Input.QET_size=Record3.value("dxf_40").toDouble()*Block_scale_y;
New_DXF_Input.QET_text_style=Record3.value("dxf_7").toString();
+ 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_softID=Record3.value("dxf_330").toString();
//New_DXF_Text.QET_antialias="false";
//New_DXF_Text.QET_line_style="normal";
@@ -275,6 +305,13 @@
//New_DXF_Input.QET_size=Record2.value("dxf_40").toDouble();
//New_DXF_Input.QET_text_style=Record2.value("dxf_7").toString();
+ 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_softID=Record3.value("dxf_330").toString();
//New_DXF_Text.QET_antialias="false";
//New_DXF_Text.QET_line_style="normal";
@@ -298,7 +335,7 @@
New_DXF_Ellipse.QET_center_x=(Record3.value("dxf_10").toDouble()*Block_scale_x)+Block_X;
New_DXF_Ellipse.QET_center_y=(Record3.value("dxf_20").toDouble()*Block_scale_y)+Block_Y;
New_DXF_Ellipse.QET_major_radius_x=Record3.value("dxf_11").toDouble()*Block_scale_x;
- New_DXF_Ellipse.QET_major_radius_y==Record3.value("dxf_21").toDouble()*Block_scale_y;
+ New_DXF_Ellipse.QET_major_radius_y=Record3.value("dxf_21").toDouble()*Block_scale_y;
New_DXF_Ellipse.QET_end_parameter=Record3.value("dxf_42").toDouble();
New_DXF_Ellipse.QET_Start_parameter=Record3.value("dxf_41").toDouble();
@@ -306,7 +343,10 @@
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=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_Arc.QET_handle=Record3.value("dxf_5").toString();
New_DXF_Ellipse.QET_softID=Record3.value("dxf_330").toString();
//New_DXF_Terminal.QET_orientation="sud";//Record2.value("dxf_50").toDouble();
@@ -340,6 +380,15 @@
New_DXF_Polyline.QET_line_weight="thin";
New_DXF_Polyline.QET_filling="none";
+ 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_softID=Record3.value("dxf_330").toString();
+
+
New_DXF_Polyline.QET_color=DXF_main_base[0].QDXF_block_polyline_color;
if (Record3.value("dxf_70").toInt()==1)
@@ -367,6 +416,10 @@
count_vertex++;
}
+ else
+ {
+ count_vertex++;
+ }
if (Record4.value("Command").toString()=="SEQEND" and Record4.value("Command_count").toInt()==0)
{
end_seqend=1;
@@ -388,7 +441,16 @@
New_DXF_blocks2.Block_X=(Record3.value("dxf_10").toDouble()*Block_scale_x)+Block_X;
New_DXF_blocks2.Block_Y=(Record3.value("dxf_20").toDouble()*Block_scale_y)+Block_Y;
+ 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_softID=Record3.value("dxf_330").toString();
+
New_DXF_blocks2.Block_scale_x=Record3.value("dxf_41").toDouble();
if (New_DXF_blocks2.Block_scale_x==0)
{
@@ -428,6 +490,15 @@
New_DXF_LWPolyline.QET_line_weight="thin";
New_DXF_LWPolyline.QET_filling="none";
+ 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_softID=Record3.value("dxf_330").toString();
+
+
New_DXF_LWPolyline.QET_color=DXF_main_base[0].QDXF_block_polyline_color;
if (Record3.value("dxf_70").toInt()==1)
@@ -467,6 +538,10 @@
count_vertex++;
}
+ else
+ {
+ count_vertex++;
+ }
if (count_vertex>max_vertex)
{
end_lwpoly=1;
@@ -496,6 +571,14 @@
New_DXF_SOLID.QET_line_weight="thin";
New_DXF_SOLID.QET_filling="red";
+ 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_softID=Record3.value("dxf_330").toString();
+
New_DXF_SOLID.QET_color=DXF_main_base[0].QDXF_block_solid_color;
if (Record2.value("dxf_70").toInt()==1)
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.h 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_block_level2.h 2016-12-27 14:59:31 UTC (rev 4824)
@@ -52,8 +52,13 @@
QString FromBlock;
+ QString QET_layer; //8
+ QString QET_ltype; //6
+ QString QET_handle; //5
+ QString QET_softID; //330
+
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 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.cpp 2016-12-27 14:59:31 UTC (rev 4824)
@@ -23,13 +23,13 @@
DXF_main_base[0].QDXF_block_circle_color="blue";
DXF_main_base[0].QDXF_block_ellipse_color="blue";
DXF_main_base[0].QDXF_block_input_color="blue";
- DXF_main_base[0].QDXF_block_line_color="blue";
- DXF_main_base[0].QDXF_block_lwpolyline_color="blue";
- DXF_main_base[0].QDXF_block_polyline_color="blue";
+ DXF_main_base[0].QDXF_block_line_color="yellow";
+ DXF_main_base[0].QDXF_block_lwpolyline_color="brun";
+ DXF_main_base[0].QDXF_block_polyline_color="cyan";
DXF_main_base[0].QDXF_block_rectangel_color="blue";
DXF_main_base[0].QDXF_block_terminal_color="blue";
DXF_main_base[0].QDXF_block_text_color="blue";
- DXF_main_base[0].QDXF_block_solid_color="blue";
+ DXF_main_base[0].QDXF_block_solid_color="magenta";
xcount=0;
Logtext="";
@@ -106,7 +106,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=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_softID=Record3.value("dxf_330").toString();
New_DXF_Line.QET_lenght1=1.5;
@@ -137,7 +140,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=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_softID=Record3.value("dxf_330").toString();
New_DXF_Circle.QET_antialias="false";
@@ -158,7 +164,9 @@
start="-30" angle="-299"/> */
New_DXF_Arc.QET_x=((Record3.value("dxf_10").toDouble()*Block_scale_x)+Block_X)-(Record3.value("dxf_40").toDouble()*Block_scale_x);
+ //New_DXF_Arc.QET_x=((Record3.value("dxf_10").toDouble())+Block_X)-(Record3.value("dxf_40").toDouble()*Block_scale_x);
New_DXF_Arc.QET_y=((Record3.value("dxf_20").toDouble()*Block_scale_y)+Block_Y)+(Record3.value("dxf_40").toDouble()*Block_scale_y);
+ //New_DXF_Arc.QET_y=((Record3.value("dxf_20").toDouble())+Block_Y)+(Record3.value("dxf_40").toDouble()*Block_scale_y);
New_DXF_Arc.QET_width=Record3.value("dxf_40").toDouble()*2*Block_scale_x;
New_DXF_Arc.QET_height=Record3.value("dxf_40").toDouble()*2*Block_scale_y;
New_DXF_Arc.QET_start=Record3.value("dxf_50").toDouble();
@@ -166,7 +174,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=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_softID=Record3.value("dxf_330").toString();
@@ -187,7 +198,9 @@
<text x="-50" y="-45" text="Test" color="white" size="9"/>*/
New_DXF_Text.QET_x=(Record3.value("dxf_10").toDouble()*Block_scale_x)+Block_X;
+ //New_DXF_Text.QET_x=(Record3.value("dxf_10").toDouble())+Block_X;
New_DXF_Text.QET_y=(Record3.value("dxf_20").toDouble()*Block_scale_y)+Block_Y;
+ //New_DXF_Text.QET_y=(Record3.value("dxf_20").toDouble())+Block_Y;
New_DXF_Text.QET_rotation=Record3.value("dxf_50").toDouble();
New_DXF_Text.QET_text=Record3.value("dxf_1").toString();
@@ -194,7 +207,15 @@
New_DXF_Text.QET_size=Record3.value("dxf_40").toDouble();
New_DXF_Text.QET_text_style=Record3.value("dxf_7").toString();
+ 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_softID=Record3.value("dxf_330").toString();
+
//New_DXF_Text.QET_antialias="false";
//New_DXF_Text.QET_line_style="normal";
//New_DXF_Text.QET_line_weight="thin";
@@ -218,7 +239,15 @@
New_DXF_Input.QET_text=Record3.value("dxf_1").toString();
New_DXF_Input.QET_size=Record3.value("dxf_40").toDouble()*Block_scale_y;
New_DXF_Input.QET_text_style=Record3.value("dxf_7").toString();
+ New_DXF_Input.QET_dxf_tag=Record3.value("dxf_2").toString();
+ 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_softID=Record3.value("dxf_330").toString();
//New_DXF_Text.QET_antialias="false";
//New_DXF_Text.QET_line_style="normal";
@@ -247,7 +276,15 @@
New_DXF_Input.QET_size=Record3.value("dxf_40").toDouble()*Block_scale_y;
New_DXF_Input.QET_text_style=Record3.value("dxf_7").toString();
+ 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_softID=Record3.value("dxf_330").toString();
+
//New_DXF_Text.QET_antialias="false";
//New_DXF_Text.QET_line_style="normal";
//New_DXF_Text.QET_line_weight="thin";
@@ -275,7 +312,15 @@
//New_DXF_Input.QET_size=Record2.value("dxf_40").toDouble();
//New_DXF_Input.QET_text_style=Record2.value("dxf_7").toString();
+ 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_softID=Record3.value("dxf_330").toString();
+
//New_DXF_Text.QET_antialias="false";
//New_DXF_Text.QET_line_style="normal";
//New_DXF_Text.QET_line_weight="thin";
@@ -298,7 +343,7 @@
New_DXF_Ellipse.QET_center_x=(Record3.value("dxf_10").toDouble()*Block_scale_x)+Block_X;
New_DXF_Ellipse.QET_center_y=(Record3.value("dxf_20").toDouble()*Block_scale_y)+Block_Y;
New_DXF_Ellipse.QET_major_radius_x=Record3.value("dxf_11").toDouble()*Block_scale_x;
- New_DXF_Ellipse.QET_major_radius_y==Record3.value("dxf_21").toDouble()*Block_scale_y;
+ New_DXF_Ellipse.QET_major_radius_y=Record3.value("dxf_21").toDouble()*Block_scale_y;
New_DXF_Ellipse.QET_end_parameter=Record3.value("dxf_42").toDouble();
New_DXF_Ellipse.QET_Start_parameter=Record3.value("dxf_41").toDouble();
@@ -306,7 +351,10 @@
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=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_softID=Record3.value("dxf_330").toString();
//New_DXF_Terminal.QET_orientation="sud";//Record2.value("dxf_50").toDouble();
@@ -332,7 +380,10 @@
{
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=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_softID=Record3.value("dxf_330").toString();
New_DXF_Polyline.QET_antialias="false";
@@ -367,6 +418,10 @@
count_vertex++;
}
+ else
+ {
+ count_vertex++;
+ }
if (Record4.value("Command").toString()=="SEQEND" and Record4.value("Command_count").toInt()==0)
{
end_seqend=1;
@@ -388,6 +443,14 @@
New_DXF_blocks2.Block_X=(Record3.value("dxf_10").toDouble()*Block_scale_x)+Block_X;
New_DXF_blocks2.Block_Y=(Record3.value("dxf_20").toDouble()*Block_scale_y)+Block_Y;
+ 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_softID=Record3.value("dxf_330").toString();
New_DXF_blocks2.Block_scale_x=Record3.value("dxf_41").toDouble();
if (New_DXF_blocks2.Block_scale_x==0)
@@ -428,6 +491,15 @@
New_DXF_LWPolyline.QET_line_weight="thin";
New_DXF_LWPolyline.QET_filling="none";
+ 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_softID=Record3.value("dxf_330").toString();
+
+
New_DXF_LWPolyline.QET_color=DXF_main_base[0].QDXF_block_polyline_color;
if (Record3.value("dxf_70").toInt()==1)
@@ -467,6 +539,11 @@
count_vertex++;
}
+ else
+ {
+ count_vertex++;
+ }
+
if (count_vertex>max_vertex)
{
end_lwpoly=1;
@@ -496,6 +573,13 @@
New_DXF_SOLID.QET_line_weight="thin";
New_DXF_SOLID.QET_filling="red";
+ 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_softID=Record3.value("dxf_330").toString();
+
New_DXF_SOLID.QET_color=DXF_main_base[0].QDXF_block_solid_color;
if (Record2.value("dxf_70").toInt()==1)
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.h 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_blocks.h 2016-12-27 14:59:31 UTC (rev 4824)
@@ -48,6 +48,11 @@
QString Rec_Command;
QString Rec_Blocknaam;
+ QString QET_layer; //8
+ QString QET_ltype; //6
+ QString QET_handle; //5
+ QString QET_softID; //330
+
QString filename1;
QString FromBlock;
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.cpp 2016-12-27 14:59:31 UTC (rev 4824)
@@ -226,7 +226,12 @@
New_DXF_Text.QET_size=Record2.value("dxf_40").toDouble();
New_DXF_Text.QET_text_style=Record2.value("dxf_7").toString();
+ 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_softID=Record2.value("dxf_330").toString();
+
//New_DXF_Text.QET_antialias="false";
//New_DXF_Text.QET_line_style="normal";
//New_DXF_Text.QET_line_weight="thin";
@@ -251,6 +256,10 @@
New_DXF_Input.QET_size=Record2.value("dxf_40").toDouble();
New_DXF_Input.QET_text_style=Record2.value("dxf_7").toString();
+ 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_softID=Record2.value("dxf_330").toString();
//New_DXF_Text.QET_antialias="false";
//New_DXF_Text.QET_line_style="normal";
@@ -261,7 +270,6 @@
New_DXF_Input.QET_color=DXF_main_base[0].QDXF_entitie_input_color;
-
DXF_Entities_List.DXF_Result.append(New_DXF_Input.Create_input());
}
@@ -278,7 +286,13 @@
New_DXF_Input.QET_size=Record2.value("dxf_40").toDouble();
New_DXF_Input.QET_text_style=Record2.value("dxf_7").toString();
+ 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_softID=Record2.value("dxf_330").toString();
+ New_DXF_Input.QET_dxf_tag=Record2.value("dxf_2").toString();
+
//New_DXF_Text.QET_antialias="false";
//New_DXF_Text.QET_line_style="normal";
//New_DXF_Text.QET_line_weight="thin";
@@ -306,7 +320,12 @@
//New_DXF_Input.QET_size=Record2.value("dxf_40").toDouble();
//New_DXF_Input.QET_text_style=Record2.value("dxf_7").toString();
+ 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_softID=Record2.value("dxf_330").toString();
+
//New_DXF_Text.QET_antialias="false";
//New_DXF_Text.QET_line_style="normal";
//New_DXF_Text.QET_line_weight="thin";
@@ -329,7 +348,7 @@
New_DXF_Ellipse.QET_center_x=Record2.value("dxf_10").toDouble();
New_DXF_Ellipse.QET_center_y=Record2.value("dxf_20").toDouble();
New_DXF_Ellipse.QET_major_radius_x=Record2.value("dxf_11").toDouble();
- New_DXF_Ellipse.QET_major_radius_y==Record2.value("dxf_21").toDouble();
+ New_DXF_Ellipse.QET_major_radius_y=Record2.value("dxf_21").toDouble();
New_DXF_Ellipse.QET_end_parameter=Record2.value("dxf_42").toDouble();
New_DXF_Ellipse.QET_Start_parameter=Record2.value("dxf_41").toDouble();
@@ -398,6 +417,10 @@
count_vertex++;
}
+ else
+ {
+ count_vertex++;
+ }
if (Record3.value("Command").toString()=="SEQEND" and Record3.value("Command_count").toInt()==0)
{
end_seqend=1;
@@ -420,7 +443,12 @@
New_DXF_blocks.Block_X=Record2.value("dxf_10").toDouble();
New_DXF_blocks.Block_Y=Record2.value("dxf_20").toDouble();
+ 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_softID=Record2.value("dxf_330").toString();
+
New_DXF_blocks.Block_scale_x=Record2.value("dxf_41").toDouble();
if (New_DXF_blocks.Block_scale_x==0)
{
@@ -435,7 +463,7 @@
New_DXF_blocks.FromBlock="Inserted from entitie ";
- Logtext.append("block : ");
+ Logtext.append("Inserted from entitie block : ");
Logtext.append(Record2.value("dxf_2").toString());
Logtext.append(" will be converted as a drawing part");
Logtext.append(" \n");
@@ -487,6 +515,7 @@
NewQuery.next();
QSqlRecord Record3=NewQuery.record();
Recordvalue2=Record3.value("Command").toString();
+ comand_count2=Record3.value("Command_count").toInt();
if (Record3.value("Command").toString()=="LWPOLYLINE" and max_vertex<QET_L_POLYLINE)
{
@@ -495,6 +524,11 @@
count_vertex++;
}
+ else
+ {
+ count_vertex++;
+ }
+
if (count_vertex>max_vertex)
{
end_lwpoly=1;
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.h 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_entities.h 2016-12-27 14:59:31 UTC (rev 4824)
@@ -36,6 +36,7 @@
int32_t count_vertex;
+ int32_t comand_count2;
int32_t max_vertex;
QString Logtext;
Modified: branches/DXFtoQET3_DB/src/ELMT_steps/elmt_header_steps.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_steps/elmt_header_steps.cpp 2016-12-24 12:48:44 UTC (rev 4823)
+++ branches/DXFtoQET3_DB/src/ELMT_steps/elmt_header_steps.cpp 2016-12-27 14:59:31 UTC (rev 4824)
@@ -56,6 +56,16 @@
{
DXF_variable.DXF_INSBASE_X=record.value("dxf_10").toString();
DXF_variable.DXF_INSBASE_Y=record.value("dxf_20").toString();
+
+ if (DXF_variable.DXF_INSBASE_X=="")
+ {
+ DXF_variable.DXF_INSBASE_X=5;
+ }
+
+ if (DXF_variable.DXF_INSBASE_Y=="")
+ {
+ DXF_variable.DXF_INSBASE_Y=5;
+ }
}
if(record.value("Command").toString()=="$EXTMIN")
@@ -94,6 +104,8 @@
}
+
+
return Logtext;
}