[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4402
Author: rdsivd
Date: 2016-03-28 11:18:19 +0200 (Mon, 28 Mar 2016)
Log Message:
-----------
DXFtoQET
Modifyed LWPOLYLINE table from 1000 to 2000
minor fixes
Modified Paths:
--------------
branches/dxftoqet2/DXFtoQET.pro
branches/dxftoqet2/dxf_create_elmt.cpp
branches/dxftoqet2/dxf_create_elmt.h
branches/dxftoqet2/dxftoqet_mainwindow.cpp
branches/dxftoqet2/dxftoqet_mainwindow.ui
branches/dxftoqet2/src/dxf/dxf_lwpolyline.h
branches/dxftoqet2/src/dxf/dxf_polyline.h
branches/dxftoqet2/src/dxf/dxf_solid.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_block/dxf_block_insert.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_polyline.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_solid.cpp
branches/dxftoqet2/src/dxf_data.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_solid.cpp
branches/dxftoqet2/src/dxf_split.cpp
Added Paths:
-----------
branches/dxftoqet2/src/elmt_create/
branches/dxftoqet2/src/elmt_create/elmt_langue.cpp
branches/dxftoqet2/src/elmt_create/elmt_langue.h
Modified: branches/dxftoqet2/DXFtoQET.pro
===================================================================
--- branches/dxftoqet2/DXFtoQET.pro 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/DXFtoQET.pro 2016-03-28 09:18:19 UTC (rev 4402)
@@ -74,7 +74,8 @@
src/dxf_table_size.cpp \
src/dxf_entitie/dxf_entitie_solid.cpp \
src/dxf/dxf_solid.cpp \
- src/dxf_block/dxf_block_solid.cpp
+ src/dxf_block/dxf_block_solid.cpp \
+ src/elmt_create/elmt_langue.cpp
HEADERS += dxftoqet_mainwindow.h \
src/dxf_data.h \
@@ -136,7 +137,8 @@
src/dxf_table_size.h \
src/dxf_entitie/dxf_entitie_solid.h \
src/dxf/dxf_solid.h \
- src/dxf_block/dxf_block_solid.h
+ src/dxf_block/dxf_block_solid.h \
+ src/elmt_create/elmt_langue.h
FORMS += dxftoqet_mainwindow.ui
Modified: branches/dxftoqet2/dxf_create_elmt.cpp
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.cpp 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/dxf_create_elmt.cpp 2016-03-28 09:18:19 UTC (rev 4402)
@@ -48,6 +48,7 @@
Result="";
BaseELMT Create_ELMT;
+ elmt_langue Create_langue;
Count_lines=0;
Count_header=DXF_main_base[0].dxf_header_item_count-1;
@@ -127,110 +128,10 @@
Result.append(Create_ELMT.Uuid());
- Create_ELMT.ELMT_Name_text_ar=DXF_main_base[0].DXF_ELMT_Name_text_ar;
- if (Create_ELMT.ELMT_Name_text_ar != "")
- {
- Create_ELMT.ELMT_Name_ar="ar";
- }
- else
- {
- Create_ELMT.ELMT_Name_ar="-";
- }
+ Result.append(Create_langue.Create_elmt_lanque());
-
- Create_ELMT.ELMT_Name_text_de=DXF_main_base[0].DXF_ELMT_Name_text_de;
- if (Create_ELMT.ELMT_Name_text_de != "")
- {
- Create_ELMT.ELMT_Name_de="de";
- }
- else
- {
- Create_ELMT.ELMT_Name_de="-";
- }
-
-
- Create_ELMT.ELMT_Name_text_en=DXF_main_base[0].DXF_ELMT_Name_text_en;
- if (Create_ELMT.ELMT_Name_text_en != "")
- {
- Create_ELMT.ELMT_Name_en="en";
- }
- else
- {
- Create_ELMT.ELMT_Name_en="-";
- }
-
- Create_ELMT.ELMT_Name_text_it=DXF_main_base[0].DXF_ELMT_Name_text_it;
- if (Create_ELMT.ELMT_Name_text_it != "")
- {
- Create_ELMT.ELMT_Name_it="it";
- }
- else
- {
- Create_ELMT.ELMT_Name_it="-";
- }
-
- Create_ELMT.ELMT_Name_text_fr=DXF_main_base[0].DXF_ELMT_Name_text_fr;
- if (Create_ELMT.ELMT_Name_text_fr != "")
- {
- Create_ELMT.ELMT_Name_fr="fr";
- }
- else
- {
- Create_ELMT.ELMT_Name_fr="-";
- }
-
- Create_ELMT.ELMT_Name_text_pl=DXF_main_base[0].DXF_ELMT_Name_text_pl;
- if (Create_ELMT.ELMT_Name_text_pl != "")
- {
- Create_ELMT.ELMT_Name_pl="pl";
- }
- else
- {
- Create_ELMT.ELMT_Name_pl="-";
- }
-
- Create_ELMT.ELMT_Name_text_es=DXF_main_base[0].DXF_ELMT_Name_text_es;
- if (Create_ELMT.ELMT_Name_text_es != "")
- {
- Create_ELMT.ELMT_Name_es="es";
- }
- else
- {
- Create_ELMT.ELMT_Name_es="-";
- }
-
- Create_ELMT.ELMT_Name_text_nl=DXF_main_base[0].DXF_ELMT_Name_text_nl;
- if (Create_ELMT.ELMT_Name_text_nl != "")
- {
- Create_ELMT.ELMT_Name_nl="nl";
- }
- else
- {
- Create_ELMT.ELMT_Name_nl="-";
- }
-
- Create_ELMT.ELMT_Name_text_cs=DXF_main_base[0].DXF_ELMT_Name_text_cs;
- if (Create_ELMT.ELMT_Name_text_cs != "")
- {
- Create_ELMT.ELMT_Name_cs="cs";
- }
- else
- {
- Create_ELMT.ELMT_Name_cs="-";
- }
-
- Create_ELMT.ELMT_Name_text_be_nl=DXF_main_base[0].DXF_ELMT_Name_text_be_nl;
- if (Create_ELMT.ELMT_Name_text_be_nl != "")
- {
- Create_ELMT.ELMT_Name_be_nl="be-nl";
- }
- else
- {
- Create_ELMT.ELMT_Name_be_nl="-";
- }
-
- Result.append(Create_ELMT.Names());
//Result.append(Create_ELMT.KindInformation());
+
Result.append(Create_ELMT.Informations());
Result.append(Create_ELMT.DescriptionStart());
Modified: branches/dxftoqet2/dxf_create_elmt.h
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.h 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/dxf_create_elmt.h 2016-03-28 09:18:19 UTC (rev 4402)
@@ -7,6 +7,7 @@
#include "src/dxf_data.h"
#include "src/dxf_table_size.h"
#include "src/qet_base_types/baseelmt.h"
+#include "src/elmt_create/elmt_langue.h"
#include "dxftoqet_mainwindow.h"
#include "ui_dxftoqet_mainwindow.h"
Modified: branches/dxftoqet2/dxftoqet_mainwindow.cpp
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.cpp 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/dxftoqet_mainwindow.cpp 2016-03-28 09:18:19 UTC (rev 4402)
@@ -325,6 +325,7 @@
{
Clear_view();
+ Clear_struct();//reset value of structure
main_sw1=0;
main_sw2=0;
@@ -1393,11 +1394,11 @@
void DXFtoQET_MainWindow::DXF_Block_table()
{
- model3=new QStandardItemModel(200,46,this);
+ model3=new QStandardItemModel(DXF_L_BLOCK,46,this);
ui->Block_Items_2->setModel(model3);
QModelIndex index3;
- for(int row= 0; row < 200; row++)
+ for(int row= 0; row < (DXF_L_BLOCK-1); row++)
{
for(int col= 0; col < 46; col++)
{
@@ -1469,7 +1470,7 @@
int blockcount =0;
- for (int row2=0; row2<199;row2++)
+ for (int row2=0; row2<(DXF_L_BLOCK-1);row2++)
{
QModelIndex index = model3->index(row2,0,QModelIndex());
@@ -1849,5 +1850,67 @@
void DXFtoQET_MainWindow::Clear_struct()
{
- //DXF_input_table_block_record[].
+ //clear block count element table
+ for (int xcount=0;xcount<DXF_L_BLOCK-1;xcount++)
+ {
+
+ DXF_input_table_block_record[xcount].dxf_table_block_record_code_2="xxx";
+ DXF_main_base[0].DXF_block_3dface_count[xcount]=0;
+ DXF_main_base[0].DXF_block_3dsolid_count[xcount]=0;
+ DXF_main_base[0].DXF_block_acad_proxy_entity_count[xcount]=0;
+ DXF_main_base[0].DXF_block_arc_count[xcount]=0;
+ DXF_main_base[0].DXF_block_attdef_count[xcount]=0;
+ DXF_main_base[0].DXF_block_attrib_count[xcount]=0;
+ DXF_main_base[0].DXF_block_body_count[xcount]=0;
+ DXF_main_base[0].DXF_block_circle_count[xcount]=0;
+ DXF_main_base[0].DXF_block_dimension_count[xcount]=0;
+ DXF_main_base[0].DXF_block_ellipse_count[xcount]=0;
+ DXF_main_base[0].DXF_block_hatch_count[xcount]=0;
+ DXF_main_base[0].DXF_block_helix_count[xcount]=0;
+ DXF_main_base[0].DXF_block_image_count[xcount]=0;
+ DXF_main_base[0].DXF_block_insert_count[xcount]=0;
+ DXF_main_base[0].DXF_block_leader_count[xcount]=0;
+ DXF_main_base[0].DXF_block_light_count[xcount]=0;
+ DXF_main_base[0].DXF_block_line_count[xcount]=0;
+ DXF_main_base[0].DXF_block_lwpolyline_count[xcount]=0;
+ DXF_main_base[0].DXF_block_mesh_count[xcount]=0;
+ DXF_main_base[0].DXF_block_mleaderstyle_count[xcount]=0;
+ DXF_main_base[0].DXF_block_mleader_count[xcount]=0;
+ DXF_main_base[0].DXF_block_mline_count[xcount]=0;
+ DXF_main_base[0].DXF_block_mtext_count[xcount]=0;
+ DXF_main_base[0].DXF_block_ole2frame_count[xcount]=0;
+ DXF_main_base[0].DXF_block_oleframe_count[xcount]=0;
+ DXF_main_base[0].DXF_block_point_count[xcount]=0;
+ DXF_main_base[0].DXF_block_polyline_count[xcount]=0;
+ DXF_main_base[0].DXF_block_ray_count[xcount]=0;
+ DXF_main_base[0].DXF_block_region_count[xcount]=0;
+ DXF_main_base[0].DXF_block_section_count[xcount]=0;
+ DXF_main_base[0].DXF_block_seqend_count[xcount]=0;
+ DXF_main_base[0].DXF_block_shape_count[xcount]=0;
+ DXF_main_base[0].DXF_block_solid_count[xcount]=0;
+ DXF_main_base[0].DXF_block_spline_count[xcount]=0;
+ DXF_main_base[0].DXF_block_sun_count[xcount]=0;
+ DXF_main_base[0].DXF_block_surface_count[xcount]=0;
+ DXF_main_base[0].DXF_block_table_count[xcount]=0;
+ DXF_main_base[0].DXF_block_text_count[xcount]=0;
+ DXF_main_base[0].DXF_block_tolerance_count[xcount]=0;
+ DXF_main_base[0].DXF_block_trace_count[xcount]=0;
+ DXF_main_base[0].DXF_block_text_count[xcount]=0;
+ DXF_main_base[0].DXF_block_tolerance_count[xcount]=0;
+ DXF_main_base[0].DXF_block_underlay_count[xcount]=0;
+ DXF_main_base[0].DXF_block_vertex_count[xcount]=0;
+ DXF_main_base[0].DXF_block_viewport_count[xcount]=0;
+ DXF_main_base[0].DXF_block_wipeout_count[xcount]=0;
+ DXF_main_base[0].DXF_block_xline_count[xcount]=0;
+
+
+
+
+
+
+
+
+ }
+
+
}
Modified: branches/dxftoqet2/dxftoqet_mainwindow.ui
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.ui 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/dxftoqet_mainwindow.ui 2016-03-28 09:18:19 UTC (rev 4402)
@@ -759,7 +759,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">
Modified: branches/dxftoqet2/src/dxf/dxf_lwpolyline.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_lwpolyline.h 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/src/dxf/dxf_lwpolyline.h 2016-03-28 09:18:19 UTC (rev 4402)
@@ -24,8 +24,8 @@
int16_t closed; //70
- double x_vector[500];
- double y_vector[500];
+ double x_vector[QET_L_POLYLINE];
+ double y_vector[QET_L_POLYLINE];
QString Result_lwpolyline;
Modified: branches/dxftoqet2/src/dxf/dxf_polyline.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_polyline.h 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/src/dxf/dxf_polyline.h 2016-03-28 09:18:19 UTC (rev 4402)
@@ -24,8 +24,8 @@
int16_t closed; //70
- double x_vector[50000];
- double y_vector[50000];
+ double x_vector[QET_L_POLYLINE];
+ double y_vector[QET_L_POLYLINE];
QString Result_polyline;
Modified: branches/dxftoqet2/src/dxf/dxf_solid.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_solid.h 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/src/dxf/dxf_solid.h 2016-03-28 09:18:19 UTC (rev 4402)
@@ -23,8 +23,8 @@
int16_t closed; //70
- double x_vector[500];
- double y_vector[500];
+ double x_vector[QET_L_POLYLINE];
+ double y_vector[QET_L_POLYLINE];
QString Result_solid;
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.cpp 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.cpp 2016-03-28 09:18:19 UTC (rev 4402)
@@ -62,7 +62,7 @@
Result_polyline.append(QET_antialias);
Result_polyline.append(QChar(34));
- for (count_segments=0; count_segments<=segments;count_segments++)
+ for (count_segments=1; (count_segments<=segments) and (count_segments<QET_L_POLYLINE-1);count_segments++)
{
Result_polyline.append(" x");
Result_polyline.append(QString::number(count_segments));
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.h
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.h 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.h 2016-03-28 09:18:19 UTC (rev 4402)
@@ -3,6 +3,7 @@
//#include <QMainWindow>
#include <QWidget>
+#include "src/dxf_data.h"
class dxf_base_polyline : public QWidget // QMainWindow
{
@@ -19,8 +20,8 @@
QString QET_closed;
QString QET_antialias;
- double QET_x[1000];
- double QET_y[1000];
+ double QET_x[QET_L_POLYLINE];
+ double QET_y[QET_L_POLYLINE];
int count_segments;
int segments;
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_insert.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_insert.cpp 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_insert.cpp 2016-03-28 09:18:19 UTC (rev 4402)
@@ -27,12 +27,12 @@
dxf_block_insert::dxf_block_insert(QWidget *parent): QWidget(parent)
{
- x_insert2=0;
+ /*x_insert2=0;
y_insert2=0;
x_insert_scale2=1;
y_insert_scale2=1;
x_base=0;
- y_base=0;
+ y_base=0;*/
}
QString dxf_block_insert::Make_Block_Insert()
@@ -46,6 +46,13 @@
Insert_block_nr2=0;
+ x_insert2=0;
+ y_insert2=0;
+ x_insert_scale2=1;
+ y_insert_scale2=1;
+ x_base=0;
+ y_base=0;
+
//DXF_main_base[0].DXF_block_insert_count[Block_nr]!=0
while (Count_lines3<=Count_entitie_insert)
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.cpp 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.cpp 2016-03-28 09:18:19 UTC (rev 4402)
@@ -40,7 +40,7 @@
//vector_max=vector_max+1;
- for(counter_x=0;counter_x<vector_max;counter_x++)
+ for(counter_x=1;counter_x<=vector_max;counter_x++)
{
@@ -48,7 +48,7 @@
dxb_lwpolyline.y_vector[count_vertex]=(-y_insert)+(-DXF_input_block_lwpolyline[Insert_block_nr][Count_lines_block2].DXF_block_lwpolyline_code_20[counter_x]);
count_vertex=count_vertex+1;
- if (count_vertex>49)
+ if (count_vertex>(QET_L_POLYLINE-1))
{
counter_x=vector_max+2;
}
@@ -65,7 +65,7 @@
dxb_lwpolyline.line_style=block_line_style;
dxb_lwpolyline.line_weight=block_line_weight;
dxb_lwpolyline.filling=block_filling;
- dxb_lwpolyline.color=block_color;
+ dxb_lwpolyline.color="cyan";//block_color;
dxb_lwpolyline.closed=DXF_input_block_lwpolyline[Insert_block_nr][Count_lines_block2].DXF_block_lwpolyline_code_70;
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_polyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_polyline.cpp 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_polyline.cpp 2016-03-28 09:18:19 UTC (rev 4402)
@@ -24,14 +24,14 @@
{
Count_lines2=0;
- count_vertex2=0;
+ count_vertex2=1;
Count_block_polyline=DXF_main_base[0].DXF_block_polyline_count[Insert_block_nr];
while (Count_lines2<=Count_block_polyline)
{
- for (int clean=0;clean>=499;clean++)
+ for (int clean=0;clean>=(DXF_LB_VERTEX-1);clean++)
{
dxb_polyline2.x_vector[clean]=0;
dxb_polyline2.y_vector[clean]=0;
@@ -54,10 +54,10 @@
dxb_polyline2.y_vector[count_vertex2]=(-y_insert)+(-DXF_input_block_vertex[Insert_block_nr][counter_x].DXF_block_vertex_code_20);
count_vertex2=count_vertex2+1;
}
- if (count_vertex2>499)
+ if (count_vertex2>(DXF_LB_VERTEX-1))
{
counter_x=Polyline_vertex+1;
- count_vertex2=499;
+ //count_vertex2=DXF_LB_VERTEX+1;
}
if (count_vertex2>Polyline_vertex)
{
@@ -66,13 +66,13 @@
}
- dxb_polyline2.vector_count=count_vertex2;
+ dxb_polyline2.vector_count=count_vertex2-1;
dxb_polyline2.antialias=block_antialias;
dxb_polyline2.line_style=block_line_style;
dxb_polyline2.line_weight=block_line_weight;
dxb_polyline2.filling=block_filling;
- dxb_polyline2.color=block_color;
+ dxb_polyline2.color="blue";//block_color;
dxb_polyline2.closed=DXF_input_block_polyline[Insert_block_nr][Count_lines2].DXF_block_polyline_code_70;
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_solid.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_solid.cpp 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_solid.cpp 2016-03-28 09:18:19 UTC (rev 4402)
@@ -55,7 +55,7 @@
dxb_solid.y_vector[4]=(-y_insert)+(-DXF_input_block_solid[Insert_block_nr][Count_lines2].DXF_block_solid_code_23);
- count_vertex=count_vertex+1;
+ /*count_vertex=count_vertex+1;
if (count_vertex>49)
{
@@ -64,17 +64,17 @@
if (count_vertex>vector_max+1)
{
counter_x=vector_max+2;
- }
+ }*/
+ //count_vertex=4;
+ dxb_solid.vector_count=4;
- dxb_solid.vector_count=vector_max;
-
dxb_solid.antialias=block_antialias;
dxb_solid.line_style=block_line_style;
dxb_solid.line_weight=block_line_weight;
dxb_solid.filling=block_filling;
- dxb_solid.color=block_color;
+ dxb_solid.color="brun";//block_color;
dxb_solid.closed=DXF_input_block_solid[Insert_block_nr][Count_lines_block2].DXF_block_solid_code_70;
Modified: branches/dxftoqet2/src/dxf_data.h
===================================================================
--- branches/dxftoqet2/src/dxf_data.h 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/src/dxf_data.h 2016-03-28 09:18:19 UTC (rev 4402)
@@ -8,10 +8,12 @@
// this is the only place where the are defined
// to use them in the program
+#define QET_L_POLYLINE 1000
+
#define DXF_L_HEADER 500
#define DXF_L_CLASSES 1000
#define DXF_L_TABLES 20
-#define DXF_L_BLOCK 200
+#define DXF_L_BLOCK 500
#define DXF_L_ENTITIES 100000
#define DXF_L_OBJECTS 10000
#define DXF_L_THUMBNAILIMAGE 10000
@@ -89,7 +91,11 @@
#define DXF_LE_LEADER 1000
#define DXF_LE_LIGHT 1000
#define DXF_LE_LINE 100000
-#define DXF_LE_LWPOLYLINE 1000
+#define DXF_LE_LWPOLYLINE 2000
+
+#define DXF_LE_LWPOLYLINE_10 50
+#define DXF_LE_LWPOLYLINE_20 50
+
#define DXF_LE_MESH 1000
#define DXF_LE_MLINE 1000
#define DXF_LE_MLEADERSTYLE 1000
@@ -686,51 +692,51 @@
int DXF_table_view_count;
int DXF_table_vport_count;
- int32_t DXF_block_3dface_count[100];
- int32_t DXF_block_3dsolid_count[100];
- int32_t DXF_block_acad_proxy_entity_count[100];
- int32_t DXF_block_arc_count[100];
- int32_t DXF_block_attdef_count[100];
- int32_t DXF_block_attrib_count[100];
- int32_t DXF_block_body_count[100];
- int32_t DXF_block_circle_count[100];
- int32_t DXF_block_dimension_count[100];
- int32_t DXF_block_ellipse_count[100];
- int32_t DXF_block_hatch_count[100];
- int32_t DXF_block_helix_count[100];
- int32_t DXF_block_image_count[100];
- int32_t DXF_block_insert_count[100];
- int32_t DXF_block_leader_count[100];
- int32_t DXF_block_light_count[100];
- int32_t DXF_block_line_count[100];
- int32_t DXF_block_lwpolyline_count[100];
- int32_t DXF_block_mesh_count[100];
- int32_t DXF_block_mline_count[100];
- int32_t DXF_block_mleaderstyle_count[100];
- int32_t DXF_block_mleader_count[100];
- int32_t DXF_block_mtext_count[100];
- int32_t DXF_block_oleframe_count[100];
- int32_t DXF_block_ole2frame_count[100];
- int32_t DXF_block_point_count[100];
- int32_t DXF_block_polyline_count[100];
- int32_t DXF_block_ray_count[100];
- int32_t DXF_block_region_count[100];
- int32_t DXF_block_section_count[100];
- int32_t DXF_block_seqend_count[100];
- int32_t DXF_block_shape_count[100];
- int32_t DXF_block_solid_count[100];
- int32_t DXF_block_spline_count[100];
- int32_t DXF_block_sun_count[100];
- int32_t DXF_block_surface_count[100];
- int32_t DXF_block_table_count[100];
- int32_t DXF_block_text_count[100];
- int32_t DXF_block_tolerance_count[100];
- int32_t DXF_block_trace_count[100];
- int32_t DXF_block_underlay_count[100];
- int32_t DXF_block_vertex_count[100];
- int32_t DXF_block_viewport_count[100];
- int32_t DXF_block_wipeout_count[100];
- int32_t DXF_block_xline_count[100];
+ int32_t DXF_block_3dface_count[DXF_L_BLOCK];
+ int32_t DXF_block_3dsolid_count[DXF_L_BLOCK];
+ int32_t DXF_block_acad_proxy_entity_count[DXF_L_BLOCK];
+ int32_t DXF_block_arc_count[DXF_L_BLOCK];
+ int32_t DXF_block_attdef_count[DXF_L_BLOCK];
+ int32_t DXF_block_attrib_count[DXF_L_BLOCK];
+ int32_t DXF_block_body_count[DXF_L_BLOCK];
+ int32_t DXF_block_circle_count[DXF_L_BLOCK];
+ int32_t DXF_block_dimension_count[DXF_L_BLOCK];
+ int32_t DXF_block_ellipse_count[DXF_L_BLOCK];
+ int32_t DXF_block_hatch_count[DXF_L_BLOCK];
+ int32_t DXF_block_helix_count[DXF_L_BLOCK];
+ int32_t DXF_block_image_count[DXF_L_BLOCK];
+ int32_t DXF_block_insert_count[DXF_L_BLOCK];
+ int32_t DXF_block_leader_count[DXF_L_BLOCK];
+ int32_t DXF_block_light_count[DXF_L_BLOCK];
+ int32_t DXF_block_line_count[DXF_L_BLOCK];
+ int32_t DXF_block_lwpolyline_count[DXF_L_BLOCK];
+ int32_t DXF_block_mesh_count[DXF_L_BLOCK];
+ int32_t DXF_block_mline_count[DXF_L_BLOCK];
+ int32_t DXF_block_mleaderstyle_count[DXF_L_BLOCK];
+ int32_t DXF_block_mleader_count[DXF_L_BLOCK];
+ int32_t DXF_block_mtext_count[DXF_L_BLOCK];
+ int32_t DXF_block_oleframe_count[DXF_L_BLOCK];
+ int32_t DXF_block_ole2frame_count[DXF_L_BLOCK];
+ int32_t DXF_block_point_count[DXF_L_BLOCK];
+ int32_t DXF_block_polyline_count[DXF_L_BLOCK];
+ int32_t DXF_block_ray_count[DXF_L_BLOCK];
+ int32_t DXF_block_region_count[DXF_L_BLOCK];
+ int32_t DXF_block_section_count[DXF_L_BLOCK];
+ int32_t DXF_block_seqend_count[DXF_L_BLOCK];
+ int32_t DXF_block_shape_count[DXF_L_BLOCK];
+ int32_t DXF_block_solid_count[DXF_L_BLOCK];
+ int32_t DXF_block_spline_count[DXF_L_BLOCK];
+ int32_t DXF_block_sun_count[DXF_L_BLOCK];
+ int32_t DXF_block_surface_count[DXF_L_BLOCK];
+ int32_t DXF_block_table_count[DXF_L_BLOCK];
+ int32_t DXF_block_text_count[DXF_L_BLOCK];
+ int32_t DXF_block_tolerance_count[DXF_L_BLOCK];
+ int32_t DXF_block_trace_count[DXF_L_BLOCK];
+ int32_t DXF_block_underlay_count[DXF_L_BLOCK];
+ int32_t DXF_block_vertex_count[DXF_L_BLOCK];
+ int32_t DXF_block_viewport_count[DXF_L_BLOCK];
+ int32_t DXF_block_wipeout_count[DXF_L_BLOCK];
+ int32_t DXF_block_xline_count[DXF_L_BLOCK];
int32_t DXF_entities_3dface_count ;
int32_t DXF_entities_3dsolid_count ;
@@ -1676,10 +1682,10 @@
QString DXF_block_lwpolyline_code_6;
QString DXF_block_lwpolyline_code_8;
- double DXF_block_lwpolyline_code_10[4];
+ double DXF_block_lwpolyline_code_10[DXF_LE_LWPOLYLINE_10];
double DXF_block_lwpolyline_code_11;
- double DXF_block_lwpolyline_code_20[4];
+ double DXF_block_lwpolyline_code_20[DXF_LE_LWPOLYLINE_20];
double DXF_block_lwpolyline_code_21;
double DXF_block_lwpolyline_code_30;
@@ -3532,9 +3538,9 @@
QString DXF_entities_lwpolyline_code_8;
- double DXF_entities_lwpolyline_code_10[50]; //x
+ double DXF_entities_lwpolyline_code_10[DXF_LE_LWPOLYLINE_10]; //x
double DXF_entities_lwpolyline_code_11;
- double DXF_entities_lwpolyline_code_20[50]; //y
+ double DXF_entities_lwpolyline_code_20[DXF_LE_LWPOLYLINE_20]; //y
double DXF_entities_lwpolyline_code_21;
double DXF_entities_lwpolyline_code_30; //z
double DXF_entities_lwpolyline_code_31;
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.cpp 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.cpp 2016-03-28 09:18:19 UTC (rev 4402)
@@ -39,6 +39,11 @@
Insert_block_nr=0;
+ x_insert=0;
+ y_insert=0;
+ x_insert_scale=1;
+ y_insert_scale=1;
+
dxf_block_entitie_insert insert_Make_Block_Entitie_insert;
while (Count_lines<=Count_entitie_insert)
@@ -52,10 +57,10 @@
else
{
- x_insert=0;
+ /*x_insert=0;
y_insert=0;
x_insert_scale=1;
- y_insert_scale=1;
+ y_insert_scale=1;*/
Insert_block_nr=Count_lines+1;
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.cpp 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.cpp 2016-03-28 09:18:19 UTC (rev 4402)
@@ -31,7 +31,7 @@
//vector_max=vector_max+1;
- for(counter_x=0;counter_x<vector_max;counter_x++)
+ for(counter_x=1;counter_x<=vector_max;counter_x++)
{
@@ -39,7 +39,7 @@
db_lwpolyline.y_vector[count_vertex]=-DXF_input_entities_lwpolyline[Count_lines].DXF_entities_lwpolyline_code_20[counter_x];
count_vertex=count_vertex+1;
- if (count_vertex>49)
+ if (count_vertex>(QET_L_POLYLINE-1))
{
counter_x=vector_max+2;
}
@@ -56,7 +56,7 @@
db_lwpolyline.line_style=Entitie_line_style; // normal
db_lwpolyline.line_weight=Entitie_line_weight; // thin
db_lwpolyline.filling=Entitie_filling; // none
- db_lwpolyline.color=Entitie_color; // orange
+ db_lwpolyline.color="purple";//Entitie_color; // orange
db_lwpolyline.closed=DXF_input_entities_lwpolyline[Count_lines].DXF_entities_lwpolyline_code_70;
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.cpp 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.cpp 2016-03-28 09:18:19 UTC (rev 4402)
@@ -29,7 +29,7 @@
while (Count_lines<Count_entitie_polyline)
{
- for(counter_x=0;counter_x<Polyline_vertex;counter_x++)
+ 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)
@@ -38,7 +38,7 @@
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>499)
+ if (count_vertex>(QET_L_POLYLINE -1))
{
counter_x=Polyline_vertex+1;
}
@@ -55,7 +55,7 @@
db_polyline.line_style=Entitie_line_style; // normal
db_polyline.line_weight=Entitie_line_weight; // thin
db_polyline.filling=Entitie_filling; // none
- db_polyline.color=Entitie_color; // red
+ db_polyline.color="cyan";//Entitie_color; // red
db_polyline.closed=DXF_input_entities_polyline[Count_lines].DXF_entities_polyline_code_70;
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_solid.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_solid.cpp 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_solid.cpp 2016-03-28 09:18:19 UTC (rev 4402)
@@ -22,7 +22,7 @@
Count_lines=0;
Count_vertex=1;
- vector_max=5;
+ vector_max=4;
while (Count_lines<=Count_entitie_solid)
{
@@ -42,13 +42,13 @@
db_solid.x_vector[4]=DXF_input_entities_solid[Count_lines].DXF_entities_solid_code_13;
db_solid.y_vector[4]=-DXF_input_entities_solid[Count_lines].DXF_entities_solid_code_23;
- db_solid.vector_count=vector_max-1;
+ db_solid.vector_count=4;
db_solid.antialias=Entitie_antialias; // false
db_solid.line_style=Entitie_line_style; // normal
db_solid.line_weight=Entitie_line_weight; // thin
db_solid.filling=Entitie_filling; // none
- db_solid.color=Entitie_color;
+ db_solid.color="orange";//Entitie_color;
db_solid.closed=1; //DXF_input_entities_solid[Count_lines].DXF_entities_solid_code_70;
Modified: branches/dxftoqet2/src/dxf_split.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_split.cpp 2016-03-26 12:53:20 UTC (rev 4401)
+++ branches/dxftoqet2/src/dxf_split.cpp 2016-03-28 09:18:19 UTC (rev 4402)
@@ -14236,9 +14236,9 @@
}
- count_block_lwpolyline_10=0;
+ count_block_lwpolyline_10=1;
count_block_lwpolyline_14=0;
- count_block_lwpolyline_20=0;
+ count_block_lwpolyline_20=1;
count_block_lwpolyline_24=0;
count_block_lwpolyline_100=0;
count_block_lwpolyline_102=0;
@@ -14349,7 +14349,7 @@
case 10:
- if (count_block_lwpolyline_10>3)
+ if (count_block_lwpolyline_10>(DXF_LE_LWPOLYLINE_10-1))
{
Log_1.append(found_block_line());
}
@@ -14422,7 +14422,7 @@
case 20:
- if (count_block_lwpolyline_20>3)
+ if (count_block_lwpolyline_20>(DXF_LE_LWPOLYLINE_20-1))
{
Log_1.append(found_block_line());
}
@@ -15200,7 +15200,7 @@
count_block_polyline_100=0;
count_block_polyline_102=0;
count_block_polyline_14=0;
- count_block_polyline_10=0;
+ count_block_polyline_10=1;
count_block_polyline_330=0;
@@ -16728,10 +16728,10 @@
count_block_solid_100=0;
count_block_solid_102=0;
count_block_solid_14=0;
- count_block_solid_10=0;
- count_block_solid_20=0;
- count_block_solid_30=0;
- count_block_solid_40=0;
+ count_block_solid_10=1;
+ count_block_solid_20=1;
+ count_block_solid_30=1;
+ count_block_solid_40=1;
count_block_solid_330=0;
@@ -19144,7 +19144,7 @@
count_block_vertex_100=0;
count_block_vertex_102=0;
count_block_vertex_14=0;
- count_block_vertex_10=0;
+ count_block_vertex_10=1;
count_block_vertex_330=0;
while (block_st5==0 and block_count5<(DXF_LB_VERTEX-1))
@@ -19168,7 +19168,7 @@
Log_1.append("\n");
block_vertex_count=block_vertex_count+1;
- if (block_vertex_count>499)
+ if (block_vertex_count>(DXF_LB_VERTEX-1))
{
Log_1.append("more than 499 vertexes in block defenition");
Log_1.append("\n");
@@ -20904,15 +20904,15 @@
{
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=="")
- {
+ //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
- {
+ //}
+ //else
+ //{
- }
+ //}
sw_block[2]=1;
}
@@ -25590,8 +25590,8 @@
}
- entities_LWPOLYLINE_count2_10=0;
- entities_LWPOLYLINE_count2_20=0;
+ entities_LWPOLYLINE_count2_10=1;
+ entities_LWPOLYLINE_count2_20=1;
entities_LWPOLYLINE_count2_100=0;
while (entities_st2==0 and entities_LWPOLYLINE_count2<(DXF_LE_LWPOLYLINE-1))
@@ -25646,7 +25646,7 @@
case 10:
- if (entities_LWPOLYLINE_count2_10>49)
+ if (entities_LWPOLYLINE_count2_10>DXF_LE_LWPOLYLINE_10)
{
Log_1.append(found_entities_lwpolyline());
}
@@ -25663,7 +25663,7 @@
case 20:
- if (entities_LWPOLYLINE_count2_20>49)
+ if (entities_LWPOLYLINE_count2_20>DXF_LE_LWPOLYLINE_20)
{
Log_1.append(found_entities_lwpolyline());
}
Added: branches/dxftoqet2/src/elmt_create/elmt_langue.cpp
===================================================================
--- branches/dxftoqet2/src/elmt_create/elmt_langue.cpp (rev 0)
+++ branches/dxftoqet2/src/elmt_create/elmt_langue.cpp 2016-03-28 09:18:19 UTC (rev 4402)
@@ -0,0 +1,121 @@
+#include "elmt_langue.h"
+
+extern struct DXF_base DXF_main_base[1];
+
+elmt_langue::elmt_langue(QWidget *parent) : QWidget(parent)
+{
+
+}
+
+QString elmt_langue::Create_elmt_lanque()
+{
+ Result="";
+
+ BaseELMT Create_ELMT;
+
+ Create_ELMT.ELMT_Name_text_ar=DXF_main_base[0].DXF_ELMT_Name_text_ar;
+ if (Create_ELMT.ELMT_Name_text_ar != "")
+ {
+ Create_ELMT.ELMT_Name_ar="ar";
+ }
+ else
+ {
+ Create_ELMT.ELMT_Name_ar="-";
+ }
+
+
+ Create_ELMT.ELMT_Name_text_de=DXF_main_base[0].DXF_ELMT_Name_text_de;
+ if (Create_ELMT.ELMT_Name_text_de != "")
+ {
+ Create_ELMT.ELMT_Name_de="de";
+ }
+ else
+ {
+ Create_ELMT.ELMT_Name_de="-";
+ }
+
+
+ Create_ELMT.ELMT_Name_text_en=DXF_main_base[0].DXF_ELMT_Name_text_en;
+ if (Create_ELMT.ELMT_Name_text_en != "")
+ {
+ Create_ELMT.ELMT_Name_en="en";
+ }
+ else
+ {
+ Create_ELMT.ELMT_Name_en="-";
+ }
+
+ Create_ELMT.ELMT_Name_text_it=DXF_main_base[0].DXF_ELMT_Name_text_it;
+ if (Create_ELMT.ELMT_Name_text_it != "")
+ {
+ Create_ELMT.ELMT_Name_it="it";
+ }
+ else
+ {
+ Create_ELMT.ELMT_Name_it="-";
+ }
+
+ Create_ELMT.ELMT_Name_text_fr=DXF_main_base[0].DXF_ELMT_Name_text_fr;
+ if (Create_ELMT.ELMT_Name_text_fr != "")
+ {
+ Create_ELMT.ELMT_Name_fr="fr";
+ }
+ else
+ {
+ Create_ELMT.ELMT_Name_fr="-";
+ }
+
+ Create_ELMT.ELMT_Name_text_pl=DXF_main_base[0].DXF_ELMT_Name_text_pl;
+ if (Create_ELMT.ELMT_Name_text_pl != "")
+ {
+ Create_ELMT.ELMT_Name_pl="pl";
+ }
+ else
+ {
+ Create_ELMT.ELMT_Name_pl="-";
+ }
+
+ Create_ELMT.ELMT_Name_text_es=DXF_main_base[0].DXF_ELMT_Name_text_es;
+ if (Create_ELMT.ELMT_Name_text_es != "")
+ {
+ Create_ELMT.ELMT_Name_es="es";
+ }
+ else
+ {
+ Create_ELMT.ELMT_Name_es="-";
+ }
+
+ Create_ELMT.ELMT_Name_text_nl=DXF_main_base[0].DXF_ELMT_Name_text_nl;
+ if (Create_ELMT.ELMT_Name_text_nl != "")
+ {
+ Create_ELMT.ELMT_Name_nl="nl";
+ }
+ else
+ {
+ Create_ELMT.ELMT_Name_nl="-";
+ }
+
+ Create_ELMT.ELMT_Name_text_cs=DXF_main_base[0].DXF_ELMT_Name_text_cs;
+ if (Create_ELMT.ELMT_Name_text_cs != "")
+ {
+ Create_ELMT.ELMT_Name_cs="cs";
+ }
+ else
+ {
+ Create_ELMT.ELMT_Name_cs="-";
+ }
+
+ Create_ELMT.ELMT_Name_text_be_nl=DXF_main_base[0].DXF_ELMT_Name_text_be_nl;
+ if (Create_ELMT.ELMT_Name_text_be_nl != "")
+ {
+ Create_ELMT.ELMT_Name_be_nl="be-nl";
+ }
+ else
+ {
+ Create_ELMT.ELMT_Name_be_nl="-";
+ }
+
+ Result.append(Create_ELMT.Names());
+
+ return Result;
+}
Added: branches/dxftoqet2/src/elmt_create/elmt_langue.h
===================================================================
--- branches/dxftoqet2/src/elmt_create/elmt_langue.h (rev 0)
+++ branches/dxftoqet2/src/elmt_create/elmt_langue.h 2016-03-28 09:18:19 UTC (rev 4402)
@@ -0,0 +1,24 @@
+#ifndef ELMT_LANGUE_H
+#define ELMT_LANGUE_H
+
+#include <QWidget>
+
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+
+class elmt_langue : public QWidget
+{
+ Q_OBJECT
+ public:
+ explicit elmt_langue(QWidget *parent = 0);
+
+ QString Result;
+
+ QString Create_elmt_lanque();
+
+ signals:
+
+ public slots:
+};
+
+#endif // ELMT_LANGUE_H