[qet] [4333] dxftoqet : update acad block conversion

[subversion@xxxxxxxxxxxxx]

Revision: 4333
Author:   rdsivd
Date:     2016-01-20 22:25:52 +0100 (Wed, 20 Jan 2016)
Log Message:
-----------
dxftoqet : update acad block conversion

Modified Paths:
--------------
    branches/dxftoqet2/dxftoqet_mainwindow.cpp
    branches/dxftoqet2/src/dxf_split.cpp

Modified: branches/dxftoqet2/dxftoqet_mainwindow.cpp
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.cpp	2016-01-19 21:37:48 UTC (rev 4332)
+++ branches/dxftoqet2/dxftoqet_mainwindow.cpp	2016-01-20 21:25:52 UTC (rev 4333)
@@ -1332,9 +1332,9 @@
 	{
 
 			QModelIndex index = model3->index(row2,0,QModelIndex());
-			model3->setData(index,DXF_input_table_block_record[row2].dxf_table_block_record_code_2.remove(QRegExp("[$*+-_=#<>]")));
+			model3->setData(index,DXF_input_table_block_record[row2].dxf_table_block_record_code_2);//.remove(QRegExp("[$*+-_=#<>]")));
 
-			blockcount=blockcount+1;
+			//blockcount=blockcount+1;
 
 			index = model3->index(row2,1,QModelIndex());
 			model3->setData(index,QString::number(DXF_main_base[0].DXF_block_3dface_count[row2]));
@@ -1472,6 +1472,8 @@
 
 			index = model3->index(row2,45,QModelIndex());
 			model3->setData(index,QString::number(DXF_main_base[0].DXF_block_xline_count[row2]));
+
+			blockcount=blockcount+1;
 	}
 
 	ui->Block_Items_2->resizeColumnsToContents();

Modified: branches/dxftoqet2/src/dxf_split.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_split.cpp	2016-01-19 21:37:48 UTC (rev 4332)
+++ branches/dxftoqet2/src/dxf_split.cpp	2016-01-20 21:25:52 UTC (rev 4333)
@@ -8341,7 +8341,10 @@
 															block_xline_count=0;
 
 
+															break;
 
+
+
 														case 5:
 
 															if(sw_end_block[5]==0)
@@ -13023,7 +13026,7 @@
 													}
 												}
 
-												if (line4=="INSERT" and  line4.length()==5)
+												if (line4=="INSERT" and  line4.length()==6)
 												{
 													Log_1.append("Start reading BLOCK code INSERT \n");
 
@@ -20036,7 +20039,18 @@
 
 											if(sw_block[2]==0)
 											{
-												DXF_input_block[block_count1].DXF_block_code_2=line4.remove(QRegExp("[$*+-_=]"));
+												DXF_input_block[block_count1].DXF_block_code_2=line4;//.remove(QRegExp("[$*+-_=]"));
+
+												if (DXF_input_table_block_record[block_count1].dxf_table_block_record_code_2=="")
+												{
+													DXF_input_table_block_record[block_count1].dxf_table_block_record_code_2=line4;
+
+												}
+												else
+												{
+
+												}
+
 												sw_block[2]=1;
 											}
 											else
@@ -23723,7 +23737,7 @@
 
 											if(sw_entities_insert[2]==0)
 											{
-												DXF_input_entities_insert[entities_INSERT_count2].DXF_entities_insert_code_2=line6.remove(QRegExp("[$*+-_=]"));
+												DXF_input_entities_insert[entities_INSERT_count2].DXF_entities_insert_code_2=line6;//.remove(QRegExp("[$*+-_=]"));
 												sw_entities_insert[2]=1;
 											}
 											else