| [qet] [4240] dxftoqet update entitie polyline |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4240
Author: rdsivd
Date: 2015-10-18 21:20:45 +0200 (Sun, 18 Oct 2015)
Log Message:
-----------
dxftoqet update entitie polyline
Modified Paths:
--------------
branches/dxftoqet2/dxf_create_elmt.cpp
branches/dxftoqet2/dxf_create_elmt.h
branches/dxftoqet2/dxftoqet_mainwindow.cpp
branches/dxftoqet2/dxftoqet_mainwindow.h
branches/dxftoqet2/dxftoqet_mainwindow.ui
branches/dxftoqet2/src/dxf/dxf_ellipse.cpp
branches/dxftoqet2/src/dxf/dxf_ellipse.h
branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.cpp
branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.h
branches/dxftoqet2/src/dxf_data.h
branches/dxftoqet2/src/dxf_split.cpp
branches/dxftoqet2/src/dxf_split.h
Modified: branches/dxftoqet2/dxf_create_elmt.cpp
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.cpp 2015-10-12 12:54:06 UTC (rev 4239)
+++ branches/dxftoqet2/dxf_create_elmt.cpp 2015-10-18 19:20:45 UTC (rev 4240)
@@ -579,10 +579,12 @@
db_ellipse.end2=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_42;
db_ellipse.LineTypeOFLine=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_6;
db_ellipse.LayerNameOFLine=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_8;
+ db_ellipse.Color="red";
+ db_ellipse.Line_weight="thin";
+ db_ellipse.Filling="none";
-
Result_ellipse2.append(db_ellipse.Create_ELLIPSE());
Count_lines=Count_lines+1;
@@ -593,7 +595,6 @@
return Result_ellipse2;
}
-
QString DXF_create_elmt::Make_POLYLINE()
{
@@ -611,12 +612,22 @@
for(counter_x=0;counter_x<Polyline_vertex;counter_x++)
{
+
if (DXF_input_entities_vertex[counter_x].Master_handle_id==DXF_input_entities_polyline[Count_lines].DXF_entities_polyline_code_5)
{
- db_polyline.x_vector[count_vertex]=DXF_input_entities_vertex[Count_lines].DXF_entities_vertex_code_10;
- db_polyline.y_vector[count_vertex]=-DXF_input_entities_vertex[Count_lines].DXF_entities_vertex_code_20;
+ db_polyline.x_vector[count_vertex]=DXF_input_entities_vertex[counter_x].DXF_entities_vertex_code_10;
+ db_polyline.y_vector[count_vertex]=-DXF_input_entities_vertex[counter_x].DXF_entities_vertex_code_20;
count_vertex=count_vertex+1;
}
+ if (count_vertex>999)
+ {
+ counter_x=Polyline_vertex+1;
+ }
+ if (count_vertex>Polyline_vertex)
+ {
+ counter_x=Polyline_vertex+1;
+ }
+
}
db_polyline.vector_count=count_vertex;
@@ -639,8 +650,11 @@
Count_lines=Count_lines+1;
count_vertex=1;
+ counter_x=0;
+
+
}
return Result_polyline;
@@ -696,6 +710,10 @@
Result_insert.append(Make_Block_CIRCLE());
+ /* Block ELLIPSE */
+
+ Result_insert.append(Make_block_ELLIPSE());
+
/* end of block */
Count_lines=Count_lines+1;
@@ -808,3 +826,40 @@
return Result_Block_Circle;
}
+
+ QString DXF_create_elmt::Make_block_ELLIPSE()
+ {
+ Result_Block_ellipse="";
+ Count_lines_block2=0;
+
+ dxf_ellipse dxb_ellipse2;
+
+ while(Count_lines_block2<DXF_main_base[0].DXF_block_ellipse_count[Insert_block_nr])
+ {
+
+ dxb_ellipse2.center_x=DXF_input_block_ellipse[Insert_block_nr][Count_lines].DXF_block_ellipse_code_10;
+ dxb_ellipse2.center_y=-DXF_input_block_ellipse[Insert_block_nr][Count_lines].DXF_block_ellipse_code_20;
+ dxb_ellipse2.major_radius_x=DXF_input_block_ellipse[Insert_block_nr][Count_lines].DXF_block_ellipse_code_11;
+ dxb_ellipse2.major_radius_y=-DXF_input_block_ellipse[Insert_block_nr][Count_lines].DXF_block_ellipse_code_21;
+ dxb_ellipse2.ratio_of_minor=DXF_input_block_ellipse[Insert_block_nr][Count_lines].DXF_block_ellipse_code_40;
+ dxb_ellipse2.start=DXF_input_block_ellipse[Insert_block_nr][Count_lines].DXF_block_ellipse_code_41;
+ dxb_ellipse2.end2=DXF_input_block_ellipse[Insert_block_nr][Count_lines].DXF_block_ellipse_code_42;
+ dxb_ellipse2.LineTypeOFLine=DXF_input_block_ellipse[Insert_block_nr][Count_lines].DXF_block_ellipse_code_6;
+ dxb_ellipse2.LayerNameOFLine=DXF_input_block_ellipse[Insert_block_nr][Count_lines].DXF_block_ellipse_code_8;
+ dxb_ellipse2.Color="red";
+ dxb_ellipse2.Line_weight="thin";
+ dxb_ellipse2.Filling="none";
+
+
+ Result_Block_ellipse.append(dxb_ellipse2.Create_ELLIPSE());
+
+
+ Count_lines_block2=Count_lines_block2+1;
+
+ }
+
+
+ return Result_Block_ellipse;
+
+
+ }
Modified: branches/dxftoqet2/dxf_create_elmt.h
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.h 2015-10-12 12:54:06 UTC (rev 4239)
+++ branches/dxftoqet2/dxf_create_elmt.h 2015-10-18 19:20:45 UTC (rev 4240)
@@ -65,6 +65,7 @@
QString Result_Block_Lines;
QString Result_Block_Arc;
QString Result_Block_Circle;
+ QString Result_Block_ellipse;
double DXF_LIMMAX_x;
Modified: branches/dxftoqet2/dxftoqet_mainwindow.cpp
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.cpp 2015-10-12 12:54:06 UTC (rev 4239)
+++ branches/dxftoqet2/dxftoqet_mainwindow.cpp 2015-10-18 19:20:45 UTC (rev 4240)
@@ -131,6 +131,51 @@
on_Open_config_file_clicked();
+ ui->csv_header_bask_color->addItem("none");
+ ui->csv_header_bask_color->addItem("black");
+ ui->csv_header_bask_color->addItem("white");
+ ui->csv_header_bask_color->addItem("red");
+ ui->csv_header_bask_color->addItem("green");
+ ui->csv_header_bask_color->addItem("blue");
+ ui->csv_header_bask_color->addItem("gray");
+ ui->csv_header_bask_color->addItem("cyan");
+ ui->csv_header_bask_color->addItem("orange");
+ ui->csv_header_bask_color->addItem("purple");
+ ui->csv_header_bask_color->addItem("magenta");
+ ui->csv_header_bask_color->addItem("brun");
+ ui->csv_header_bask_color->addItem("yello");
+ ui->csv_header_bask_color->addItem("lightgray");
+
+ ui->Block_color->addItem("none");
+ ui->Block_color->addItem("black");
+ ui->Block_color->addItem("white");
+ ui->Block_color->addItem("red");
+ ui->Block_color->addItem("green");
+ ui->Block_color->addItem("blue");
+ ui->Block_color->addItem("gray");
+ ui->Block_color->addItem("cyan");
+ ui->Block_color->addItem("orange");
+ ui->Block_color->addItem("purple");
+ ui->Block_color->addItem("magenta");
+ ui->Block_color->addItem("brun");
+ ui->Block_color->addItem("yello");
+ ui->Block_color->addItem("lightgray");
+
+ ui->Entitie_color->addItem("none");
+ ui->Entitie_color->addItem("black");
+ ui->Entitie_color->addItem("white");
+ ui->Entitie_color->addItem("red");
+ ui->Entitie_color->addItem("green");
+ ui->Entitie_color->addItem("blue");
+ ui->Entitie_color->addItem("gray");
+ ui->Entitie_color->addItem("cyan");
+ ui->Entitie_color->addItem("orange");
+ ui->Entitie_color->addItem("purple");
+ ui->Entitie_color->addItem("magenta");
+ ui->Entitie_color->addItem("brun");
+ ui->Entitie_color->addItem("yello");
+ ui->Entitie_color->addItem("lightgray");
+
}
DXFtoQET_MainWindow::~DXFtoQET_MainWindow()
@@ -183,7 +228,9 @@
FileType=DXF_main_base[0].dxf_openfile.split(".").last();
FileName=DXF_main_base[0].dxf_openfile.split(".").first().toLower();
- DXF_main_base[0].dxf_openfile=FileName.remove(QRegExp("[+-/\_]"));
+ Filename2=FileName.remove(QRegExp("[+-/\_=]"));
+
+ DXF_main_base[0].dxf_openfile=Filename2.toLower();
DXF_main_base[0].dxf_filetype=FileType;
@@ -192,6 +239,7 @@
DXF_main_base[0].DXF_ELMT_Name_text_fr=FileName;
ui->elmt_lang_en->setText(FileName);
+ ui->elmt_lang_fr->setText(FileName);
log_file.append("\n");
ui->dxf_log->setPlainText(log_file);
@@ -976,9 +1024,7 @@
{
log_file.append("not a CSV file, load other file or try a other option \n");
}
- //ui->dxf_log->setPlainText(log_file);
- //CSV_Load_QTable();
}
void DXFtoQET_MainWindow::CSV_Load_QTable()
@@ -1185,19 +1231,7 @@
{
Result ="";
- /*if (DXF_main_base[0].DXF_entities_insert_count>0)
- {
- log_file.append("DXF file NOT for convertion to ELMT \n");
- log_file.append("DXF file contains symbols \n");
- log_file.append("use convertion to QET \n");
- ui->dxf_log->setPlainText(log_file);
-
-
-
- }
- else
- {*/
if (DXF_main_base[0].DXF_file_loaded_into_table==1)
{
log_file.append("DXF file coverting to ELMT \n");
@@ -1216,7 +1250,7 @@
ui->dxf_log->setPlainText(log_file);
}
- //}
+
}
void DXFtoQET_MainWindow::on_pushButton_clicked()
@@ -1267,7 +1301,7 @@
{
QModelIndex index = model3->index(row2,0,QModelIndex());
- model3->setData(index,DXF_input_table_block_record[row2].dxf_table_block_record_code_2);
+ model3->setData(index,DXF_input_table_block_record[row2].dxf_table_block_record_code_2.remove(QRegExp("[$*+-/\_=]")));
blockcount=blockcount+1;
Modified: branches/dxftoqet2/dxftoqet_mainwindow.h
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.h 2015-10-12 12:54:06 UTC (rev 4239)
+++ branches/dxftoqet2/dxftoqet_mainwindow.h 2015-10-18 19:20:45 UTC (rev 4240)
@@ -57,7 +57,10 @@
QString FileType;
QString FileName;
+ QString Filename2;
QString Config_QET_User_Symbols;
+ QString Config_DXF_Block_color;
+ QString Config_DXF_Entities_color;
QString Config_save_to_file;
QString Config_in_read_all;
QStringList Config_list;
Modified: branches/dxftoqet2/dxftoqet_mainwindow.ui
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.ui 2015-10-12 12:54:06 UTC (rev 4239)
+++ branches/dxftoqet2/dxftoqet_mainwindow.ui 2015-10-18 19:20:45 UTC (rev 4240)
@@ -30,7 +30,7 @@
<x>10</x>
<y>11</y>
<width>1191</width>
- <height>901</height>
+ <height>956</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
@@ -470,7 +470,7 @@
<enum>QTabWidget::Rounded</enum>
</property>
<property name="currentIndex">
- <number>2</number>
+ <number>6</number>
</property>
<widget class="QWidget" name="tab_ELMT">
<property name="sizePolicy">
@@ -757,7 +757,7 @@
<string notr="true">BACKGROUND:rgb(225, 225, 225)</string>
</property>
<property name="currentIndex">
- <number>3</number>
+ <number>2</number>
</property>
<widget class="QWidget" name="tab_dxf_sections">
<attribute name="title">
@@ -1322,7 +1322,7 @@
07 body();
08 circle(converted);
09 dimension();
-10 ellipse();
+10 ellipse(converted);
11 hatch();
12 helix();
13 image();
@@ -2787,6 +2787,88 @@
</item>
</layout>
</widget>
+ <widget class="QWidget" name="layoutWidget">
+ <property name="geometry">
+ <rect>
+ <x>40</x>
+ <y>90</y>
+ <width>361</width>
+ <height>29</height>
+ </rect>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_12">
+ <item>
+ <widget class="QLabel" name="label_82">
+ <property name="maximumSize">
+ <size>
+ <width>140</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Block color : </string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_13">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QComboBox" name="Block_color"/>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="layoutWidget">
+ <property name="geometry">
+ <rect>
+ <x>40</x>
+ <y>130</y>
+ <width>361</width>
+ <height>29</height>
+ </rect>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_13">
+ <item>
+ <widget class="QLabel" name="label_83">
+ <property name="maximumSize">
+ <size>
+ <width>140</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Entitie color : </string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_14">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QComboBox" name="Entitie_color"/>
+ </item>
+ </layout>
+ </widget>
</widget>
</widget>
</item>
Modified: branches/dxftoqet2/src/dxf/dxf_ellipse.cpp
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_ellipse.cpp 2015-10-12 12:54:06 UTC (rev 4239)
+++ branches/dxftoqet2/src/dxf/dxf_ellipse.cpp 2015-10-18 19:20:45 UTC (rev 4240)
@@ -45,9 +45,9 @@
db_ellipse.QET_line_style=db_line_ltype_control.Ltype_control();
- db_ellipse.QET_line_weight="thin";
- db_ellipse.QET_filling="none";
- db_ellipse.QET_color="black";
+ db_ellipse.QET_line_weight=Line_weight;
+ db_ellipse.QET_filling=Filling;
+ db_ellipse.QET_color=Color;
Modified: branches/dxftoqet2/src/dxf/dxf_ellipse.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_ellipse.h 2015-10-12 12:54:06 UTC (rev 4239)
+++ branches/dxftoqet2/src/dxf/dxf_ellipse.h 2015-10-18 19:20:45 UTC (rev 4240)
@@ -57,6 +57,10 @@
QString ltype;
QString layer;
+ QString Color;
+ QString Line_weight;
+ QString Filling;
+
QString Create_ELLIPSE();
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.cpp 2015-10-12 12:54:06 UTC (rev 4239)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.cpp 2015-10-18 19:20:45 UTC (rev 4240)
@@ -18,10 +18,11 @@
* x9="-5" y10="-75" x10="-20" y11="-75" x11="-20"/>*/
/* <polygon style="line-style:normal;
- * line-weight:thin;filling:none;color:red"
- * closed="true" antialias="false"
- * x1="184.65" y1="-143.83" x2="184.65" y2="-143.83"
- * x3="184.65" y3="-143.83" x4="184.65" y4="-143.83" /> */
+ * line-weight:thin;filling:none;color:black"
+ * closed="false"
+ * antialias="false"
+ * x1="107" y1="-179" x2="107" y2="-179"
+ * x3="107" y3="-179" x4="107" y4="-179" /> */
Result_polyline="";
@@ -76,7 +77,7 @@
Result_polyline.append(QChar(34));
}
- Result_polyline.append(" />");
+ Result_polyline.append("/>");
Result_polyline.append('\n');
return Result_polyline;
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.h
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.h 2015-10-12 12:54:06 UTC (rev 4239)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.h 2015-10-18 19:20:45 UTC (rev 4240)
@@ -18,8 +18,8 @@
QString QET_closed;
QString QET_antialias;
- double QET_x[50];
- double QET_y[50];
+ double QET_x[1000];
+ double QET_y[1000];
int count_segments;
int segments;
Modified: branches/dxftoqet2/src/dxf_data.h
===================================================================
--- branches/dxftoqet2/src/dxf_data.h 2015-10-12 12:54:06 UTC (rev 4239)
+++ branches/dxftoqet2/src/dxf_data.h 2015-10-18 19:20:45 UTC (rev 4240)
@@ -519,6 +519,8 @@
QString dxf_text_all;
QString dxf_filetype;
QString dxf_savepath;
+ QString dxf_block_color;
+ QString dxf_element_color;
QStringList dxf_input;
@@ -1115,6 +1117,9 @@
struct DXF_block_ellipse
{
+ QString DXF_block_ellipse_code_1;
+ QString DXF_block_ellipse_code_2;
+ QString DXF_block_ellipse_code_3;
QString DXF_block_ellipse_code_5;
QString DXF_block_ellipse_code_6;
QString DXF_block_ellipse_code_8;
@@ -1136,17 +1141,25 @@
double DXF_block_ellipse_code_31;
double DXF_block_ellipse_code_32;
+ double DXF_block_ellipse_code_40;
+ double DXF_block_ellipse_code_41;
+ double DXF_block_ellipse_code_42;
+ double DXF_block_ellipse_code_48;
+
int16_t DXF_block_ellipse_code_62;
int16_t DXF_block_ellipse_code_70;
int16_t DXF_block_ellipse_code_71;
+ int16_t DXF_block_ellipse_code_72;
+ int16_t DXF_block_ellipse_code_74;
int32_t DXF_block_ellipse_code_90;
int32_t DXF_block_ellipse_code_91;
int32_t DXF_block_ellipse_code_92;
QString DXF_block_ellipse_code_100[2];
+ QString DXF_block_ellipse_code_102[2];
int16_t DXF_block_ellipse_code_280;
@@ -1155,9 +1168,11 @@
int16_t DXF_block_ellipse_code_283;
QString DXF_block_ellipse_code_310;
- QString DXF_block_ellipse_code_330;
+ QString DXF_block_ellipse_code_330[2];
QString DXF_block_ellipse_code_340;
QString DXF_block_ellipse_code_360;
+
+ int16_t DXF_block_ellipse_code_370;
};
struct DXF_block_hatch
@@ -1462,7 +1477,7 @@
int16_t DXF_block_line_code_62;
- QString DXF_block_line_code_100[2];
+ QString DXF_block_line_code_100[5];
QString DXF_block_line_code_102[2];
QString DXF_block_line_code_330[5];
@@ -2182,8 +2197,6 @@
double DXF_block_solid_code_23;
};
-
-
struct DXF_block_spline
{
QString DXF_block_spline_code_5;
@@ -2397,8 +2410,9 @@
int16_t DXF_block_text_code_62;
int16_t DXF_block_text_code_72;
+ int16_t DXF_block_text_code_73;
- QString DXF_block_text_code_100[2];
+ QString DXF_block_text_code_100[5];
QString DXF_block_text_code_102[2];
QString DXF_block_text_code_330[2];
@@ -3151,7 +3165,7 @@
int16_t DXF_entities_line_code_62;
- QString DXF_entities_line_code_100[3];
+ QString DXF_entities_line_code_100[5];
QString DXF_entities_line_code_102[3];
QString DXF_entities_line_code_330[3];
Modified: branches/dxftoqet2/src/dxf_split.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_split.cpp 2015-10-12 12:54:06 UTC (rev 4239)
+++ branches/dxftoqet2/src/dxf_split.cpp 2015-10-18 19:20:45 UTC (rev 4240)
@@ -10539,9 +10539,589 @@
break;
- default:
- Log_1.append(found_block_ellipse());
+ case 1:
+ if(sw_block_line[1]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_1=line8;
+ sw_block_line[1]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 3:
+
+ if(sw_block_line[3]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_3=line8;
+ sw_block_line[3]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+
+
+ case 5:
+
+ if(sw_block_line[5]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_5=line8;
+ sw_block_line[5]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 6:
+
+ if(sw_block_line[6]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_6=line8;
+ sw_block_line[6]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 8:
+
+ if(sw_block_line[8]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_8=line8;
+ sw_block_line[8]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 10:
+
+ if(sw_block_line[10]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_10=line8.toDouble();
+ sw_block_line[10]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 11:
+
+ if(sw_block_line[11]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_11=line8.toDouble();
+ sw_block_line[11]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 12:
+
+ if(sw_block_line[12]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_12=line8.toDouble();
+ sw_block_line[12]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 13:
+
+ if(sw_block_line[13]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_13=line8.toDouble();
+ sw_block_line[13]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 14:
+
+ if (count_block_ellipse_14>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_ellipse[block_count1][block_line_count].DXF_block_ellipse_code_14[count_block_ellipse_14]=line8.toDouble();
+ count_block_ellipse_14=count_block_ellipse_14+1;
+ }
+ break;
+
+ case 20:
+
+ if(sw_block_line[20]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_20=line8.toDouble();
+ sw_block_line[20]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 21:
+
+ if(sw_block_line[21]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_21=line8.toDouble();
+ sw_block_line[21]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 22:
+
+ if(sw_block_line[22]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_22=line8.toDouble();
+ sw_block_line[22]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 23:
+
+ if(sw_block_line[23]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_23=line8.toDouble();
+ sw_block_line[23]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 24:
+
+ if (count_block_ellipse_24>4)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_ellipse[block_count1][block_line_count].DXF_block_ellipse_code_24[count_block_ellipse_24]=line8.toDouble();
+ count_block_ellipse_24=count_block_ellipse_24+1;
+ }
+ break;
+
+ case 30:
+
+ if(sw_block_line[30]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_30=line8.toDouble();
+ sw_block_line[30]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 31:
+
+ if(sw_block_line[31]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_31=line8.toDouble();
+ sw_block_line[31]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 32:
+
+ if(sw_block_line[32]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_32=line8.toDouble();
+ sw_block_line[32]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 40:
+
+ if(sw_block_line[40]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_40=line8.toDouble();
+ sw_block_line[40]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 48:
+
+ if(sw_block_line[48]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_48=line8.toDouble();
+ sw_block_line[48]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+
+ case 62:
+
+ if(sw_block_line[62]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_62=line8.toInt();
+ sw_block_line[62]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 70:
+
+ if(sw_block_line[70]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_70=line8.toInt();
+ sw_block_line[70]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 71:
+
+ if(sw_block_line[71]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_71=line8.toInt();
+ sw_block_line[71]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 72:
+
+ if(sw_block_line[72]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_72=line8.toInt();
+ sw_block_line[72]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 74:
+
+ if(sw_block_line[74]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_74=line8.toInt();
+ sw_block_line[74]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 90:
+
+ if(sw_block_line[90]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_90=line8.toInt();
+ sw_block_line[90]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 91:
+
+ if(sw_block_line[91]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_91=line8.toInt();
+ sw_block_line[91]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 92:
+
+ if(sw_block_line[92]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_92=line8.toInt();
+ sw_block_line[92]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 100:
+
+ if (count_block_ellipse_100>1)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_100[count_block_ellipse_100]=line8;
+ count_block_ellipse_100=count_block_ellipse_100+1;
+ }
+ break;
+
+ case 102:
+
+ if (count_block_ellipse_102>1)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_102[count_block_ellipse_102]=line8;
+ count_block_ellipse_102=count_block_ellipse_102+1;
+ }
+ break;
+
+
+ case 280:
+
+ if(sw_block_line[280]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_280=line8.toInt();
+ sw_block_line[280]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 281:
+
+ if(sw_block_line[281]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_281=line8.toInt();
+ sw_block_line[281]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 282:
+
+ if(sw_block_line[282]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_282=line8.toInt();
+ sw_block_line[282]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 283:
+
+ if(sw_block_line[283]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_283=line8.toInt();
+ sw_block_line[283]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 310:
+
+ if(sw_block_line[310]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_310=line8;
+ sw_block_line[310]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+ case 330:
+
+ if (count_block_ellipse_100>1)
+ {
+ Log_1.append(found_block_line());
+ }
+ else
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_330[count_block_ellipse_330]=line8;
+ count_block_ellipse_330=count_block_ellipse_330+1;
+ }
+ break;
+
+
+
+ case 340:
+
+ if(sw_block_line[340]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_340=line8;
+ sw_block_line[340]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 360:
+
+ if(sw_block_line[360]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_360=line8;
+ sw_block_line[360]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ case 370:
+
+ if(sw_block_line[370]==0)
+ {
+ DXF_input_block_ellipse[block_count1][block_ellipse_count].DXF_block_ellipse_code_370=line8.toInt();
+ sw_block_line[370]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_ellipse());
+
+ }
+
+ break;
+
+ default:
+ Log_1.append(found_block_ellipse());
+
}
@@ -11460,7 +12040,7 @@
case 100:
- if (count_block_line_100>1)
+ if (count_block_line_100>4)
{
Log_1.append(found_block_line());
}
@@ -13465,7 +14045,7 @@
}
- break;
+ break;*/
case 72:
@@ -13482,8 +14062,23 @@
break;
- case 74:
+ case 73:
+ if(sw_block_line[73]==0)
+ {
+ DXF_input_block_text[block_count1][block_text_count].DXF_block_text_code_73=line8.toInt();
+ sw_block_line[73]=1;
+ }
+ else
+ {
+ Log_1.append(found_block_text());
+
+ }
+
+ break;
+
+ /*case 74:
+
if(sw_block_line[74]==0)
{
DXF_input_block_text[block_count1][block_text_count].DXF_block_text_code_74=line8.toInt();
@@ -13544,7 +14139,7 @@
case 100:
- if (count_block_text_100>1)
+ if (count_block_text_100>4)
{
Log_1.append(found_block_line());
}
@@ -14017,7 +14612,7 @@
if(sw_block[2]==0)
{
- DXF_input_block[block_count1].DXF_block_code_2=line4;
+ DXF_input_block[block_count1].DXF_block_code_2=line4.remove(QRegExp("[$*+-/\_=]"));
sw_block[2]=1;
}
else
@@ -17659,8 +18254,8 @@
entities_INSERT_count2_102=0;
entities_INSERT_count2_330=0;
DXF_input_entities_insert[entities_INSERT_count2].DXF_entities_insert_code_41=1;
- DXF_input_entities_insert[entities_INSERT_count2].DXF_entities_insert_code_42=1;
- DXF_input_entities_insert[entities_INSERT_count2].DXF_entities_insert_code_43=1;
+ DXF_input_entities_insert[entities_INSERT_count2].DXF_entities_insert_code_42=1;
+ DXF_input_entities_insert[entities_INSERT_count2].DXF_entities_insert_code_43=1;
while (entities_st2==0 and entities_INSERT_count2<999)
{
@@ -17689,7 +18284,7 @@
if(sw_entities_insert[2]==0)
{
- DXF_input_entities_insert[entities_INSERT_count2].DXF_entities_insert_code_2=line6;
+ DXF_input_entities_insert[entities_INSERT_count2].DXF_entities_insert_code_2=line6.remove(QRegExp("[$*+-/\_=]"));
sw_entities_insert[2]=1;
}
else
@@ -18570,7 +19165,7 @@
case 100: //subclass marker
- if (entities_LINE_count2_100>2)
+ if (entities_LINE_count2_100>4)
{
Log_1.append(found_entities_line());
}
Modified: branches/dxftoqet2/src/dxf_split.h
===================================================================
--- branches/dxftoqet2/src/dxf_split.h 2015-10-12 12:54:06 UTC (rev 4239)
+++ branches/dxftoqet2/src/dxf_split.h 2015-10-18 19:20:45 UTC (rev 4240)
@@ -312,7 +312,15 @@
int count_block_lwpolyline_102;
int count_block_lwpolyline_330;
+ int count_block_ellipse_10;
+ int count_block_ellipse_14;
+ int count_block_ellipse_20;
+ int count_block_ellipse_24;
+ int count_block_ellipse_100;
+ int count_block_ellipse_102;
+ int count_block_ellipse_330;
+
int count_block_text_14;
int count_block_text_24;
int count_block_text_100;