[qet] [4342] dxftoqet functions update

[ Thread Index | Date Index | More lists.tuxfamily.org/qet Archives ]


Revision: 4342
Author:   rdsivd
Date:     2016-02-07 12:31:05 +0100 (Sun, 07 Feb 2016)
Log Message:
-----------
dxftoqet functions update

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.h
    branches/dxftoqet2/dxftoqet_mainwindow.ui
    branches/dxftoqet2/src/dxf_block/dxf_block_insert.cpp
    branches/dxftoqet2/src/dxf_block/dxf_block_insert.h
    branches/dxftoqet2/src/dxf_data.h
    branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.cpp
    branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.h

Added Paths:
-----------
    branches/dxftoqet2/src/dxf_block/dxf_block_entitie_insert.cpp
    branches/dxftoqet2/src/dxf_block/dxf_block_entitie_insert.h
    branches/dxftoqet2/src/dxf_entitie/dxf_entitie_input.cpp
    branches/dxftoqet2/src/dxf_entitie/dxf_entitie_input.h
    branches/dxftoqet2/src/dxf_entitie/dxf_entitie_terminal.cpp
    branches/dxftoqet2/src/dxf_entitie/dxf_entitie_terminal.h

Modified: branches/dxftoqet2/DXFtoQET.pro
===================================================================
--- branches/dxftoqet2/DXFtoQET.pro	2016-02-06 13:09:15 UTC (rev 4341)
+++ branches/dxftoqet2/DXFtoQET.pro	2016-02-07 11:31:05 UTC (rev 4342)
@@ -67,7 +67,10 @@
     src/dxf_entitie/dxf_entitie_insert.cpp \
     src/dxf_entitie/dxf_entitie_lwpolyline.cpp \
     src/dxf_block/dxf_block_insert.cpp \
-    src/dxf_entitie/dxf_entitie_point.cpp
+    src/dxf_entitie/dxf_entitie_point.cpp \
+    src/dxf_entitie/dxf_entitie_input.cpp \
+    src/dxf_entitie/dxf_entitie_terminal.cpp \
+    src/dxf_block/dxf_block_entitie_insert.cpp
 
 HEADERS  += dxftoqet_mainwindow.h \
     src/dxf_data.h \
@@ -122,7 +125,10 @@
     src/dxf_entitie/dxf_entitie_insert.h \
     src/dxf_entitie/dxf_entitie_lwpolyline.h \
     src/dxf_block/dxf_block_insert.h \
-    src/dxf_entitie/dxf_entitie_point.h
+    src/dxf_entitie/dxf_entitie_point.h \
+    src/dxf_entitie/dxf_entitie_input.h \
+    src/dxf_entitie/dxf_entitie_terminal.h \
+    src/dxf_block/dxf_block_entitie_insert.h
 
 FORMS    += dxftoqet_mainwindow.ui
 

Modified: branches/dxftoqet2/dxf_create_elmt.cpp
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.cpp	2016-02-06 13:09:15 UTC (rev 4341)
+++ branches/dxftoqet2/dxf_create_elmt.cpp	2016-02-07 11:31:05 UTC (rev 4342)
@@ -230,9 +230,20 @@
 	Result.append(Create_ELMT.Informations());
 	Result.append(Create_ELMT.DescriptionStart());
 
-	Result.append(Make_input());		// basic item needed by elmt editor
-	Result.append(Make_terminal());		// basic item needed by elmt editor
+	dxf_entitie_input Make_entitie_input;
+	dxf_entitie_terminal Make_entitie_terminal;
 
+	Make_entitie_input.Entitie_rotate="true";
+	Make_entitie_input.Entitie_tag="label";
+	Make_entitie_input.Entitie_text="_";
+	Make_entitie_input.Entitie_rotation=0;
+
+
+	Result.append(Make_entitie_input.dxf_entitie_make_input());			// basic item needed by elmt editor
+
+	Make_entitie_terminal.Entitie_orientation="n";
+	Result.append(Make_entitie_terminal.dxf_entitie_make_terminal());	// basic item needed by elmt editor
+
 	/* create function instances */
 
 	dxf_entitie_line Make_entitie_line;
@@ -247,11 +258,15 @@
 	dxf_entitie_insert Make_entitie_insert;
 	dxf_entitie_lwpolyline Make_entitie_lwpolyline;
 
+	Color_entitie=DXF_main_base[0].dxf_entitie_color;
+	Color_block=DXF_main_base[0].dxf_block_color;
+	Color_inserted_block=DXF_main_base[0].dxf_insert_block_color;
 
+
 	/* LINE */
 
 	Make_entitie_line.Count_entitie_line=DXF_main_base[0].DXF_entities_line_count;
-	Make_entitie_line.Entitie_color="red";
+	Make_entitie_line.Entitie_color=Color_entitie;
 	Make_entitie_line.Entitie_filling="none";
 	Make_entitie_line.Entitie_line_weight="thin";
 
@@ -260,7 +275,7 @@
 	/* ARC */
 
 	Make_entitie_arc.Count_entitie_arc=DXF_main_base[0].DXF_entities_arc_count;
-	Make_entitie_arc.Entitie_color="red";
+	Make_entitie_arc.Entitie_color=Color_entitie;
 	Make_entitie_arc.Entitie_antialias="false";
 	Make_entitie_arc.Entitie_filling="none";
 	Make_entitie_arc.Entitie_line_weight="thin";
@@ -270,7 +285,7 @@
 	/* ATTDEF */
 
 	Make_entitie_attdef.Count_entitie_attdef=DXF_main_base[0].DXF_entities_attdef_count;
-	Make_entitie_attdef.Entitie_color="red";
+	Make_entitie_attdef.Entitie_color=Color_entitie;
 	Make_entitie_attdef.Entitie_tag="label";
 	Make_entitie_attdef.Entitie_rotate="true";
 
@@ -279,7 +294,7 @@
 	/* ATTR */
 
 	Make_entitie_attribute.Count_entitie_attr=DXF_main_base[0].DXF_entities_attrib_count;
-	Make_entitie_attribute.Entitie_color="red";
+	Make_entitie_attribute.Entitie_color=Color_entitie;
 	Make_entitie_attribute.Entitie_tag="label";
 	Make_entitie_attribute.Entitie_rotate="true";
 
@@ -288,7 +303,7 @@
 	/* CIRCLE */
 
 	Make_entitie_circle.Count_entitie_circle=DXF_main_base[0].DXF_entities_circle_count;
-	Make_entitie_circle.Entitie_color="red";
+	Make_entitie_circle.Entitie_color=Color_entitie;
 	Make_entitie_circle.Entitie_antialias="true";
 	Make_entitie_circle.Entitie_filling="none";
 	Make_entitie_circle.Entitie_line_weight="thin";
@@ -307,14 +322,14 @@
 	/* TEXT */
 
 	Make_entitie_text.Count_entitie_text=DXF_main_base[0].DXF_entities_text_count;
-	Make_entitie_text.Entitie_color="black";
+	Make_entitie_text.Entitie_color=Color_entitie;
 
 	Result.append(Make_entitie_text.dxf_entitie_make_text());
 
 	/* ELLIPSE */
 
 	Make_entitie_ellipse.Count_entitie_ellipse=DXF_main_base[0].DXF_entities_ellipse_count;
-	Make_entitie_ellipse.Entitie_color="red";
+	Make_entitie_ellipse.Entitie_color=Color_entitie;
 	Make_entitie_ellipse.Entitie_antialias="true";
 	Make_entitie_ellipse.Entitie_filling="none";
 	Make_entitie_ellipse.Entitie_line_weight="thin";
@@ -324,7 +339,7 @@
 	/* POLYLINE */
 
 	Make_entitie_polyline.Count_entitie_polyline=DXF_main_base[0].DXF_entities_polyline_count;
-	Make_entitie_polyline.Entitie_color="red";
+	Make_entitie_polyline.Entitie_color=Color_entitie;
 	Make_entitie_polyline.Entitie_antialias="false";
 	Make_entitie_polyline.Entitie_filling="none";
 	Make_entitie_polyline.Entitie_line_weight="thin";
@@ -336,11 +351,12 @@
 	/* INSERT */
 
 	Make_entitie_insert.Count_entitie_insert=DXF_main_base[0].DXF_entities_insert_count;
+	//Make_entitie_insert.Insert_block_nr
 	Result.append(Make_entitie_insert.dxf_entitie_make_insert());
 
 	/* LWPOLYLINE */
 	Make_entitie_lwpolyline.Count_entitie_lwpolyline=DXF_main_base[0].DXF_entities_lwpolyline_count;
-	Make_entitie_lwpolyline.Entitie_color="red";
+	Make_entitie_lwpolyline.Entitie_color=Color_entitie;
 	Make_entitie_lwpolyline.Entitie_antialias="false";
 	Make_entitie_lwpolyline.Entitie_filling="none";
 	Make_entitie_lwpolyline.Entitie_line_weight="thin";
@@ -355,1178 +371,5 @@
 	return Result;
 }
 
-/* QString DXF_create_elmt::Make_LINE()
- {
 
-	 DXF_LINE dxb_line;
 
-	 Result_line ="";
-
-	 Count_lines=0;
-
-	 while (Count_lines<=Count_entitie_line)
-	 {
-
-		dxb_line.x1=DXF_input_entities_line[Count_lines].DXF_entities_line_code_10;
-		dxb_line.x2=DXF_input_entities_line[Count_lines].DXF_entities_line_code_11;
-		dxb_line.y1=-DXF_input_entities_line[Count_lines].DXF_entities_line_code_20;
-		dxb_line.y2=-DXF_input_entities_line[Count_lines].DXF_entities_line_code_21;
-		dxb_line.ltype=DXF_input_entities_line[Count_lines].DXF_entities_line_code_6;
-		dxb_line.layer=DXF_input_entities_line[Count_lines].DXF_entities_line_code_8;
-		dxb_line.color="black";
-		dxb_line.line_weight="thin";
-		dxb_line.filling="none";
-
-
-		Result_line.append(dxb_line.Create_LINE());
-
-		Count_lines=Count_lines+1;
-
-
-	 }
-
-	 return Result_line;
- }*/
-
- QString DXF_create_elmt::Make_input()
- {
-
-	 dxf_attdef db_input;
-
-	 Result_input="";
-
-	 db_input.x=0;
-	 db_input.y=10;
-	 db_input.size=9;
-	 db_input.rotate="true";
-	 db_input.text="_";
-	 db_input.tag="label";
-	 db_input.rotation=0;
-
-	 Result_input.append(db_input.Create_ATTDEF());
-
-	 return Result_input;
-
- }
-
- QString DXF_create_elmt::Make_terminal()
- {
-
-	 dxf_point db_terminal;
-
-	 Result_terminal="";
-
-	 db_terminal.x1=0;
-	 db_terminal.y1=0;
-	 db_terminal.orientation="n";
-
-
-	 Result_terminal.append(db_terminal.Create_POINT());
-
-
-	 return Result_terminal;
-
- }
-
-/* QString DXF_create_elmt::Make_ARC()
- {
-	 dxf_arc db_arc;
-
-	 Result_arc="";
-
-	 Count_lines=0;
-
-	 while (Count_lines<=Count_entitie_arc)
-	 {
-
-		db_arc.center_x=DXF_input_entities_arc[Count_lines].DXF_entities_arc_code_10;
-		db_arc.center_y=-DXF_input_entities_arc[Count_lines].DXF_entities_arc_code_20;
-		db_arc.radius=DXF_input_entities_arc[Count_lines].DXF_entities_arc_code_40;
-		db_arc.start_angle=DXF_input_entities_arc[Count_lines].DXF_entities_arc_code_50;
-		db_arc.end_angle=DXF_input_entities_arc[Count_lines].DXF_entities_arc_code_51;
-
-		db_arc.layer=DXF_input_entities_arc[Count_lines].DXF_entities_arc_code_8;
-		db_arc.ltype=DXF_input_entities_arc[Count_lines].DXF_entities_arc_code_6;
-		db_arc.color_dxf=-1;
-		db_arc.antialias="false";
-		db_arc.line_weight="thin";
-		db_arc.filling="none";
-		db_arc.color="black";
-
-		Result_arc.append(db_arc.Create_ARC());
-
-		Count_lines=Count_lines+1;
-
-	 }
-
-
-	 return Result_arc;
-
- }*/
-
-/* QString DXF_create_elmt::Make_ATTDEF()
- {
-
-	 dxf_attdef dxb_attdef2;
-	 DXF_Text_control db_txt_check;
-
-	 Result_attdef ="";
-
-	 Count_lines=0;
-
-	 while (Count_lines<=Count_entitie_attdef)
-	 {
-
-		dxb_attdef2.x=DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_10;
-		dxb_attdef2.y=-DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_20;
-		dxb_attdef2.rotation=DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_50;
-		dxb_attdef2.size=DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_40;
-		dxb_attdef2.tag="label"; // label //DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_2;
-		dxb_attdef2.rotate="true"; // true
-		dxb_attdef2.color_attdef="black"; // black
-
-		db_txt_check.TextToCheck=DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_1;
-
-		dxb_attdef2.text=db_txt_check.Text_control();
-
-		Result_attdef.append(dxb_attdef2.Create_ATTDEF());
-
-		Count_lines=Count_lines+1;
-
-
-	 }
-
-	 return Result_attdef;
- }*/
-
- /*QString DXF_create_elmt::Make_ATTR()
- {
-
-	 dxf_attdef dxb_attr;
-	 DXF_Text_control db_txt_check2;
-
-	 Result_attr ="";
-
-	 Count_lines=0;
-
-	 while (Count_lines<=Count_entitie_attr)
-	 {
-
-		dxb_attr.x=DXF_input_entities_attrib[Count_lines].DXF_entities_attrib_code_10;					// x start
-		dxb_attr.y=-DXF_input_entities_attrib[Count_lines].DXF_entities_attrib_code_20;					// y start
-		dxb_attr.rotation=DXF_input_entities_attrib[Count_lines].DXF_entities_attrib_code_50;			//text rotation
-		dxb_attr.size=DXF_input_entities_attrib[Count_lines].DXF_entities_attrib_code_40;				//text height
-		dxb_attr.tag="label"; //DXF_input_entities_attrib[Count_lines].DXF_entities_attrib_code_2;		// tag
-		dxb_attr.rotate="true";
-		dxb_attr.color_attdef="black";
-
-		db_txt_check2.TextToCheck=DXF_input_entities_attrib[Count_lines].DXF_entities_attrib_code_1;	// value
-
-		dxb_attr.text=db_txt_check2.Text_control();
-
-		Result_attr.append(dxb_attr.Create_ATTDEF());
-
-		Count_lines=Count_lines+1;
-
-
-	 }
-
-	 return Result_attr;
-
- }*/
-
- /*QString DXF_create_elmt::Make_CIRCLE()
-{
-	dxf_circle db_circle;
-
-	Result_circle="";
-
-	Count_lines=0;
-
-	while (Count_lines<=Count_entitie_circle)
-	{
-
-	   db_circle.x=DXF_input_entities_circle[Count_lines].DXF_entities_circle_code_10;
-	   db_circle.y=-DXF_input_entities_circle[Count_lines].DXF_entities_circle_code_20;
-	   db_circle.diameter=DXF_input_entities_circle[Count_lines].DXF_entities_circle_code_40*2;
-
-
-	   db_circle.layer=DXF_input_entities_circle[Count_lines].DXF_entities_circle_code_8;
-	   db_circle.ltype=DXF_input_entities_circle[Count_lines].DXF_entities_circle_code_6;
-	   db_circle.color="green";
-	   db_circle.antialias="true";
-	   db_circle.line_weight="thin";
-	   db_circle.filling="none";
-
-
-		Result_circle.append(db_circle.Create_CIRCLE());
-
-
-	   Count_lines=Count_lines+1;
-
-
-	}
-
-
-	return Result_circle;
-
-}*/
-
- /*QString DXF_create_elmt::Make_POINT()
-{
-	Result_point="";
-
-	dxf_point db_point;
-
-	Count_lines=0;
-
-	while (Count_lines<=Count_entitie_point)
-	{
-
-		db_point.x1=DXF_input_entities_point[Count_lines].DXF_entities_point_code_10;
-		db_point.y1=-DXF_input_entities_point[Count_lines].DXF_entities_point_code_20;
-		db_point.orientation="n";
-
-		Result_point.append(db_point.Create_POINT());
-
-		Count_lines=Count_lines+1;
-	}
-
-	return Result_point;
-}*/
-
-/* QString DXF_create_elmt::Make_TEXT()
- {
-
-	dxf_text db_text;
-	DXF_Text_control db_txt_check;
-
-	Result_text="";
-
-	Count_lines=0;
-
-	while (Count_lines<=Count_entitie_text)
-	{
-
-	   db_text.QET_x=DXF_input_entities_text[Count_lines].DXF_entities_text_code_10;
-	   db_text.QET_y=-DXF_input_entities_text[Count_lines].DXF_entities_text_code_20;
-	   db_text.QET_rotation=DXF_input_entities_text[Count_lines].DXF_entities_text_code_50;
-	   db_text.QET_size=DXF_input_entities_text[Count_lines].DXF_entities_text_code_40;
-	   db_text.QET_color="black";
-
-
-	   db_txt_check.TextToCheck=DXF_input_entities_text[Count_lines].DXF_entities_text_code_1;
-
-	   db_text.QET_text=db_txt_check.Text_control();
-
-	   Result_text.append(db_text.Create_Text());
-
-	   Count_lines=Count_lines+1;
-
-
-	}
-
-	return Result_text;
- }*/
-
- /*QString DXF_create_elmt::Make_ELLIPSE()
- {
-
-	dxf_ellipse db_ellipse;
-
-
-	Result_ellipse2="";
-
-	Count_lines=0;
-
-	while (Count_lines<=Count_entitie_ellipse)
-	{
-
-	   db_ellipse.center_x=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_10;
-	   db_ellipse.center_y=-DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_20;
-	   db_ellipse.major_radius_x=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_11;
-	   db_ellipse.major_radius_y=-DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_21;
-	   db_ellipse.ratio_of_minor=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_40;
-	   //db_ellipse.rotation=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_50;
-	   db_ellipse.start=DXF_input_entities_ellipse[Count_lines].DXF_entities_ellipse_code_41;
-	   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="black";
-	   db_ellipse.Line_weight="thin";
-	   db_ellipse.Filling="none";
-
-
-		Result_ellipse2.append(db_ellipse.Create_ELLIPSE());
-		Count_lines=Count_lines+1;
-
-
-	}
-
-	return Result_ellipse2;
- }*/
-
- /*QString DXF_create_elmt::Make_POLYLINE()
- {
-
-	 // read out table and pas values to xml creator
-
-	dxf_polyline db_polyline;
-
-	Polyline_vertex=DXF_main_base[0].DXF_entities_vertex_count;
-
-	Result_polyline="";
-
-	Count_lines=0;
-	count_vertex=1;
-
-	while (Count_lines<Count_entitie_polyline)
-	{
-
-	   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[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>499)
-		   {
-			   counter_x=Polyline_vertex+1;
-		   }
-		   if (count_vertex>Polyline_vertex)
-		   {
-			   counter_x=Polyline_vertex+1;
-		   }
-
-	   }
-
-	   db_polyline.vector_count=count_vertex-1;
-
-	   db_polyline.antialias="false";
-	   db_polyline.line_style="normal";
-	   db_polyline.line_weight="thin";
-	   db_polyline.filling="none";
-	   db_polyline.color="red";
-	   db_polyline.closed=DXF_input_entities_polyline[Count_lines].DXF_entities_polyline_code_70;
-
-
-	   db_polyline.ltype=DXF_input_entities_polyline[Count_lines].DXF_entities_polyline_code_6;
-	   db_polyline.layer=DXF_input_entities_polyline[Count_lines].DXF_entities_polyline_code_8;
-
-
-
-
-	   Result_polyline.append(db_polyline.Create_POLYLINE());
-
-	   Count_lines=Count_lines+1;
-	   count_vertex=1;
-	   counter_x=0;
-
-
-
-
-	}
-
-	return Result_polyline;
- }*/
- 
- /*QString DXF_create_elmt::Make_LWPOLYLINE()
- {
-
-	dxf_lwpolyline db_lwpolyline;
-
-
-	Result_lwpolyline="";
-
-	Count_lines=0;
-	count_vertex=1;
-
-	while (Count_lines<=Count_entitie_lwpolyline)
-	{
-		vector_max=DXF_input_entities_lwpolyline[Count_lines].DXF_entities_lwpolyline_code_90;
-
-		if(vector_max>0)
-		{
-			//vector_max=vector_max+1;
-
-
-	   for(counter_x=0;counter_x<vector_max;counter_x++)
-	   {
-
-
-			db_lwpolyline.x_vector[count_vertex]=DXF_input_entities_lwpolyline[Count_lines].DXF_entities_lwpolyline_code_10[counter_x];
-			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)
-		   {
-			   counter_x=vector_max+2;
-		   }
-		   if (count_vertex>vector_max+1)
-		   {
-			   counter_x=vector_max+2;
-		   }
-
-	   }
-
-	   db_lwpolyline.vector_count=vector_max;
-
-	   db_lwpolyline.antialias="false";
-	   db_lwpolyline.line_style="normal";
-	   db_lwpolyline.line_weight="thin";
-	   db_lwpolyline.filling="none";
-	   db_lwpolyline.color="orange";
-	   db_lwpolyline.closed=DXF_input_entities_lwpolyline[Count_lines].DXF_entities_lwpolyline_code_70;
-
-
-	   db_lwpolyline.ltype=DXF_input_entities_lwpolyline[Count_lines].DXF_entities_lwpolyline_code_6;
-	   db_lwpolyline.layer=DXF_input_entities_lwpolyline[Count_lines].DXF_entities_lwpolyline_code_8;
-
-
-
-
-	  Result_lwpolyline.append(db_lwpolyline.Create_LWPOLYLINE());
-
-	   Count_lines=Count_lines+1;
-	   count_vertex=1;
-	   counter_x=0;
-
-		}
-		else
-		{
-			Count_lines=Count_lines+1;
-		}
-
-
-
-	}
-
-	return Result_lwpolyline;
- }*/
-
-/*QString DXF_create_elmt::Make_INSERT()
-  {
-	  Result_insert="";
-
-	  Count_lines=0;
-
-	  dxf_block_lines insert_Make_Block_Lines;
-	  dxf_block_arc insert_Make_Block_Arc;
-	  dxf_block_circle insert_Make_Block_Circle;
-	  dxf_block_ellipse insert_Make_Block_Ellipse;
-	  dxf_block_polyline insert_Make_Block_Polyline;
-	  dxf_block_lwpolyline insert_Make_Block_Lwpolyline;
-	  dxf_block_attdef insert_Make_Block_Attdef;
-	  dxf_block_attribute insert_Make_Block_Attribute;
-	  dxf_block_text insert_Make_Block_Text;
-
-	  while (Count_lines<=Count_entitie_insert)
-	  {
-
-		if (DXF_input_entities_insert[Count_lines].DXF_entities_insert_code_2 == "")
-		{
-			Count_lines=Count_lines+1;
-
-		}
-		else
-		{
-
-			x_insert=0;
-			y_insert=0;
-			x_insert_scale=1;
-			y_insert_scale=1;
-
-
-			Insert_block_nr=Count_lines;
-
-			x_insert=DXF_input_entities_insert[Count_lines].DXF_entities_insert_code_10;
-			y_insert=DXF_input_entities_insert[Count_lines].DXF_entities_insert_code_20;
-			x_insert_scale=DXF_input_entities_insert[Count_lines].DXF_entities_insert_code_41;
-			y_insert_scale=DXF_input_entities_insert[Count_lines].DXF_entities_insert_code_42;
-
-			xy_rotation=DXF_input_entities_insert[Count_lines].DXF_entities_insert_code_50;
-			Name_insert=DXF_input_entities_insert[Count_lines].DXF_entities_insert_code_2;
-
-			for (Block_counter=0;Block_counter<=Count_entitie_insert;Block_counter++)
-			{
-				if(Name_insert==DXF_input_table_block_record[Block_counter].dxf_table_block_record_code_2)
-				{
-					Insert_block_nr=Block_counter;
-					Block_counter=Count_entitie_insert+1;
-				}
-
-
-			}
-
-
-
-			// Block LINES
-
-			insert_Make_Block_Lines.x_insert=x_insert;
-			insert_Make_Block_Lines.y_insert=y_insert;
-			insert_Make_Block_Lines.x_insert_scale=x_insert_scale;
-			insert_Make_Block_Lines.y_insert_scale=y_insert_scale;
-			insert_Make_Block_Lines.xy_rotation=xy_rotation;
-			insert_Make_Block_Lines.Name_insert=Name_insert;
-			insert_Make_Block_Lines.Insert_block_nr=Insert_block_nr;
-
-			insert_Make_Block_Lines.block_color="green";
-			insert_Make_Block_Lines.block_filling="none";
-			insert_Make_Block_Lines.block_line_weight="thin";
-
-
-			Result_insert.append(insert_Make_Block_Lines.Make_Block_Lines());
-
-			// Block ARC
-
-			insert_Make_Block_Arc.x_insert=x_insert;
-			insert_Make_Block_Arc.y_insert=y_insert;
-			insert_Make_Block_Arc.x_insert_scale=x_insert_scale;
-			insert_Make_Block_Arc.y_insert_scale=y_insert_scale;
-			insert_Make_Block_Arc.xy_rotation=xy_rotation;
-			insert_Make_Block_Arc.Name_insert=Name_insert;
-			insert_Make_Block_Arc.Insert_block_nr=Insert_block_nr;
-
-			insert_Make_Block_Arc.block_color="green";
-			insert_Make_Block_Arc.block_filling="none";
-			insert_Make_Block_Arc.block_line_weight="thin";
-			insert_Make_Block_Arc.block_antialias="false";
-
-			Result_insert.append(insert_Make_Block_Arc.Make_Block_Arc());
-
-			// Block CIRCLE
-
-			insert_Make_Block_Circle.x_insert=x_insert;
-			insert_Make_Block_Circle.y_insert=y_insert;
-			insert_Make_Block_Circle.x_insert_scale=x_insert_scale;
-			insert_Make_Block_Circle.y_insert_scale=y_insert_scale;
-			insert_Make_Block_Circle.xy_rotation=xy_rotation;
-			insert_Make_Block_Circle.Name_insert=Name_insert;
-			insert_Make_Block_Circle.Insert_block_nr=Insert_block_nr;
-
-			insert_Make_Block_Circle.block_color="green";
-			insert_Make_Block_Circle.block_filling="none";
-			insert_Make_Block_Circle.block_line_weight="thin";
-			insert_Make_Block_Circle.block_antialias="false";
-
-			Result_insert.append(insert_Make_Block_Circle.Make_Block_Circle());
-
-			// Block ELLIPSE
-
-			insert_Make_Block_Ellipse.x_insert=x_insert;
-			insert_Make_Block_Ellipse.y_insert=y_insert;
-			insert_Make_Block_Ellipse.x_insert_scale=x_insert_scale;
-			insert_Make_Block_Ellipse.y_insert_scale=y_insert_scale;
-			insert_Make_Block_Ellipse.xy_rotation=xy_rotation;
-			insert_Make_Block_Ellipse.Name_insert=Name_insert;
-			insert_Make_Block_Ellipse.Insert_block_nr=Insert_block_nr;
-
-			insert_Make_Block_Ellipse.block_color="green";
-			insert_Make_Block_Ellipse.block_filling="none";
-			insert_Make_Block_Ellipse.block_line_weight="thin";
-			insert_Make_Block_Ellipse.block_antialias="false";
-
-
-			Result_insert.append(insert_Make_Block_Ellipse.Make_Block_Ellipse());
-
-			// Block POLYLINE
-
-			insert_Make_Block_Polyline.x_insert=x_insert;
-			insert_Make_Block_Polyline.y_insert=y_insert;
-			insert_Make_Block_Polyline.x_insert_scale=x_insert_scale;
-			insert_Make_Block_Polyline.y_insert_scale=y_insert_scale;
-			insert_Make_Block_Polyline.xy_rotation=xy_rotation;
-			insert_Make_Block_Polyline.Name_insert=Name_insert;
-			insert_Make_Block_Polyline.Insert_block_nr=Insert_block_nr;
-
-			insert_Make_Block_Polyline.block_color="cyan";
-			insert_Make_Block_Polyline.block_filling="none";
-			insert_Make_Block_Polyline.block_line_weight="thin";
-			insert_Make_Block_Polyline.block_line_style="normal";
-
-			Result_insert.append(insert_Make_Block_Polyline.Make_Block_Polyline());
-
-			// Block LWPOLYLINE
-
-			insert_Make_Block_Lwpolyline.x_insert=x_insert;
-			insert_Make_Block_Lwpolyline.y_insert=y_insert;
-			insert_Make_Block_Lwpolyline.x_insert_scale=x_insert_scale;
-			insert_Make_Block_Lwpolyline.y_insert_scale=y_insert_scale;
-			insert_Make_Block_Lwpolyline.xy_rotation=xy_rotation;
-			insert_Make_Block_Lwpolyline.Name_insert=Name_insert;
-			insert_Make_Block_Lwpolyline.Insert_block_nr=Insert_block_nr;
-
-			insert_Make_Block_Lwpolyline.block_color="orange";
-			insert_Make_Block_Lwpolyline.block_filling="none";
-			insert_Make_Block_Lwpolyline.block_line_weight="thin";
-			insert_Make_Block_Lwpolyline.block_line_style="normal";
-
-			Result_insert.append(insert_Make_Block_Lwpolyline.Make_Block_Lwpolyline());
-
-			// Block ATTDEF
-
-			insert_Make_Block_Attdef.x_insert=x_insert;
-			insert_Make_Block_Attdef.y_insert=y_insert;
-			insert_Make_Block_Attdef.x_insert_scale=x_insert_scale;
-			insert_Make_Block_Attdef.y_insert_scale=y_insert_scale;
-			insert_Make_Block_Attdef.xy_rotation=xy_rotation;
-			insert_Make_Block_Attdef.Name_insert=Name_insert;
-			insert_Make_Block_Attdef.Insert_block_nr=Insert_block_nr;
-
-			insert_Make_Block_Attdef.block_color="green";
-			insert_Make_Block_Attdef.block_filling="none";
-			insert_Make_Block_Attdef.block_line_weight="thin";
-			insert_Make_Block_Attdef.block_color_attdef="green";
-
-			Result_insert.append(insert_Make_Block_Attdef.Make_Block_Attdef());
-
-			// Block ATTRIB
-
-			insert_Make_Block_Attribute.x_insert=x_insert;
-			insert_Make_Block_Attribute.y_insert=y_insert;
-			insert_Make_Block_Attribute.x_insert_scale=x_insert_scale;
-			insert_Make_Block_Attribute.y_insert_scale=y_insert_scale;
-			insert_Make_Block_Attribute.xy_rotation=xy_rotation;
-			insert_Make_Block_Attribute.Name_insert=Name_insert;
-			insert_Make_Block_Attribute.Insert_block_nr=Insert_block_nr;
-
-			insert_Make_Block_Attribute.block_color="green";
-			insert_Make_Block_Attribute.block_filling="none";
-			insert_Make_Block_Attribute.block_line_weight="thin";
-			insert_Make_Block_Attribute.block_rotate="true";
-			insert_Make_Block_Attribute.block_color_attrib="green";
-
-			Result_insert.append(insert_Make_Block_Attribute.Make_Block_Attri());
-
-			// Block TEXT
-
-			insert_Make_Block_Text.x_insert=x_insert;
-			insert_Make_Block_Text.y_insert=y_insert;
-			insert_Make_Block_Text.x_insert_scale=x_insert_scale;
-			insert_Make_Block_Text.y_insert_scale=y_insert_scale;
-			insert_Make_Block_Text.xy_rotation=xy_rotation;
-			insert_Make_Block_Text.Name_insert=Name_insert;
-			insert_Make_Block_Text.Insert_block_nr=Insert_block_nr;
-
-			insert_Make_Block_Text.block_color="green";
-			insert_Make_Block_Text.block_filling="none";
-			insert_Make_Block_Text.block_line_weight="thin";
-
-
-			Result_insert.append(insert_Make_Block_Text.Make_Block_Text());
-
-			// end of block
-
-			Count_lines=Count_lines+1;
-
-		}
-
-
-
-	  }
-
-	  return Result_insert;
-  }*/
-
-/* QString DXF_create_elmt::Make_Block_LINES()
-   {
-	   Result_Block_Lines="";
-	   Count_lines_block2=0;
-
-	   DXF_LINE dxb_line;
-
-	   while(Count_lines_block2<DXF_main_base[0].DXF_block_line_count[Insert_block_nr])
-	   {
-
-
-			  dxb_line.x1=x_insert+((DXF_input_block_line[Insert_block_nr][Count_lines_block2].DXF_block_line_code_10)*x_insert_scale);
-			  dxb_line.x2=x_insert+((DXF_input_block_line[Insert_block_nr][Count_lines_block2].DXF_block_line_code_11)*x_insert_scale);
-			  dxb_line.y1=(-y_insert)+(-(DXF_input_block_line[Insert_block_nr][Count_lines_block2].DXF_block_line_code_20*y_insert_scale));
-			  dxb_line.y2=(-y_insert)+(-(DXF_input_block_line[Insert_block_nr][Count_lines_block2].DXF_block_line_code_21*y_insert_scale));
-			  dxb_line.ltype=DXF_input_block_line[Insert_block_nr][Count_lines_block2].DXF_block_line_code_6;
-			  dxb_line.layer=DXF_input_block_line[Insert_block_nr][Count_lines_block2].DXF_block_line_code_8;
-			  dxb_line.color="blue";
-			  dxb_line.line_weight="thin";
-			  dxb_line.filling="none";
-
-
-			Result_Block_Lines.append(dxb_line.Create_LINE());
-
-
-			Count_lines_block2=Count_lines_block2+1;
-
-	   }
-
-
-	   return Result_Block_Lines;
-   }*/
-
-/* QString DXF_create_elmt::Make_Block_ARC()
-   {
-	   Result_Block_Arc="";
-	   Count_lines_block2=0;
-
-	   dxf_arc dxb_arc;
-
-	   while(Count_lines_block2<DXF_main_base[0].DXF_block_arc_count[Insert_block_nr])
-	   {
-
-		   dxb_arc.center_x=x_insert+(DXF_input_block_arc[Insert_block_nr][Count_lines_block2].DXF_block_arc_code_10*x_insert_scale);
-		   dxb_arc.center_y=(-y_insert)+(-(DXF_input_block_arc[Insert_block_nr][Count_lines_block2].DXF_block_arc_code_20*y_insert_scale));
-		   dxb_arc.radius=(DXF_input_block_arc[Insert_block_nr][Count_lines_block2].DXF_block_arc_code_40*x_insert_scale);
-
-		   dxb_arc.start_angle=DXF_input_block_arc[Insert_block_nr][Count_lines_block2].DXF_block_arc_code_50;
-		   dxb_arc.end_angle=DXF_input_block_arc[Insert_block_nr][Count_lines_block2].DXF_block_arc_code_51;
-
-		   dxb_arc.layer=DXF_input_block_arc[Insert_block_nr][Count_lines_block2].DXF_block_arc_code_8;
-		   dxb_arc.ltype=DXF_input_block_arc[Insert_block_nr][Count_lines_block2].DXF_block_arc_code_6;
-		   dxb_arc.color_dxf=-1;
-		   dxb_arc.color="blue";
-		   dxb_arc.antialias="false";
-		   dxb_arc.filling="none";
-		   dxb_arc.line_weight="thin";
-
-
-
-			Result_Block_Arc.append(dxb_arc.Create_ARC());
-
-
-
-			Count_lines_block2=Count_lines_block2+1;
-
-	   }
-
-
-	   return Result_Block_Arc;
-   }*/
-
- /*QString DXF_create_elmt::Make_Block_CIRCLE()
-   {
-	   Result_Block_Circle="";
-	   Count_lines_block2=0;
-
-	   dxf_circle dxb_circle2;
-
-	   while(Count_lines_block2<DXF_main_base[0].DXF_block_circle_count[Insert_block_nr])
-	   {
-
-		   dxb_circle2.x=x_insert+(DXF_input_block_circle[Insert_block_nr][Count_lines_block2].DXF_block_circle_code_10*x_insert_scale);
-		   dxb_circle2.y=(-y_insert)+(-(DXF_input_block_circle[Insert_block_nr][Count_lines_block2].DXF_block_circle_code_20*y_insert_scale));
-		   dxb_circle2.diameter=((DXF_input_block_circle[Insert_block_nr][Count_lines_block2].DXF_block_circle_code_40*2)*x_insert_scale);
-
-		   dxb_circle2.layer=DXF_input_block_circle[Insert_block_nr][Count_lines_block2].DXF_block_circle_code_8;
-		   dxb_circle2.ltype=DXF_input_block_circle[Insert_block_nr][Count_lines_block2].DXF_block_circle_code_6;
-		   dxb_circle2.color="blue";
-		   dxb_circle2.antialias="true";
-		   dxb_circle2.line_weight="thin";
-		   dxb_circle2.filling="none";
-
-
-
-			Result_Block_Circle.append(dxb_circle2.Create_CIRCLE());
-
-
-			Count_lines_block2=Count_lines_block2+1;
-
-	   }
-
-
-	   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=x_insert+DXF_input_block_ellipse[Insert_block_nr][Count_lines].DXF_block_ellipse_code_10;
-		   dxb_ellipse2.center_y=(-y_insert)+(-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.rotation=DXF_input_block_ellipse[Insert_block_nr][Count_lines].DXF_block_ellipse_code_50;
-		   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="blue";
-		   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;
-
-
-   }*/
-
-/* QString DXF_create_elmt::Make_Block_POLYLINE()
-   {
-	   Result_Block_polyline="";
-	   Count_lines_block2=0;
-	   Polyline_vertex=DXF_main_base[0].DXF_block_vertex_count[Insert_block_nr];
-
-	   dxf_polyline dxb_polyline2;
-
-	   while(Count_lines_block2<DXF_main_base[0].DXF_block_polyline_count[Insert_block_nr])
-	   {
-
-		   Count_lines2=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(counter_x=0;counter_x<Polyline_vertex;counter_x++)
-			  {
-
-				  if (DXF_input_block_vertex[Insert_block_nr][counter_x].Master_block_handle_id==DXF_input_block_polyline[Insert_block_nr][Count_lines2].DXF_block_polyline_code_5)
-				  {
-				   dxb_polyline2.x_vector[count_vertex2]=x_insert+DXF_input_block_vertex[Insert_block_nr][counter_x].DXF_block_vertex_code_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>49)
-				  {
-					  counter_x=Polyline_vertex+1;
-				  }
-				  if (count_vertex2>Polyline_vertex)
-				  {
-					  counter_x=Polyline_vertex+1;
-				  }
-
-			  }
-
-			  dxb_polyline2.vector_count=count_vertex;
-
-			  dxb_polyline2.antialias="false";
-			  dxb_polyline2.line_style="normal";
-			  dxb_polyline2.line_weight="thin";
-			  dxb_polyline2.filling="none";
-			  dxb_polyline2.color="green";
-			  dxb_polyline2.closed=DXF_input_block_polyline[Insert_block_nr][Count_lines2].DXF_block_polyline_code_70;
-
-
-			  dxb_polyline2.ltype=DXF_input_block_polyline[Insert_block_nr][Count_lines2].DXF_block_polyline_code_6;
-			  dxb_polyline2.layer=DXF_input_block_polyline[Insert_block_nr][Count_lines2].DXF_block_polyline_code_8;
-
-
-
-
-			  Result_Block_polyline.append(dxb_polyline2.Create_POLYLINE());
-
-			  Count_lines2=Count_lines2+1;
-			  count_vertex2=1;
-			  counter_x=0;
-
-
-
-
-
-		   }
-		   Count_lines_block2=Count_lines_block2+1;
-
-	   }
-
-
-
-	   return Result_Block_polyline;
-   }*/
-
-/* QString DXF_create_elmt::Make_Block_LWPOLYLINE()
-	{
-		// prepare polygon from block items
-
-		dxf_lwpolyline dxb_lwpolyline;
-
-		Count_lines_block2=0;
-		Count_lines2=0;
-
-		Result_Block_lwpolyline="";
-
-		while(Count_lines_block2<DXF_main_base[0].DXF_block_lwpolyline_count[Insert_block_nr])
-		{
-
-
-			Count_block_lwpolyline2=DXF_main_base[0].DXF_block_lwpolyline_count[Insert_block_nr];
-
-			while (Count_lines2<Count_block_lwpolyline2)
-			{
-				vector_max=DXF_input_block_lwpolyline[Insert_block_nr][Count_lines2].DXF_block_lwpolyline_code_90; // max number of vectors
-
-				if(vector_max>0)
-				{
-					//vector_max=vector_max+1;
-
-
-				   for(counter_x=0;counter_x<vector_max;counter_x++)
-				   {
-
-
-						dxb_lwpolyline.x_vector[count_vertex]=x_insert+DXF_input_block_lwpolyline[Insert_block_nr][Count_lines_block2].DXF_block_lwpolyline_code_10[counter_x];
-						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)
-					   {
-						   counter_x=vector_max+2;
-					   }
-					   if (count_vertex>vector_max+1)
-					   {
-						   counter_x=vector_max+2;
-					   }
-
-				   }
-
-				   dxb_lwpolyline.vector_count=vector_max;
-
-				   dxb_lwpolyline.antialias="false";
-				   dxb_lwpolyline.line_style="normal";
-				   dxb_lwpolyline.line_weight="thin";
-				   dxb_lwpolyline.filling="none";
-				   dxb_lwpolyline.color="black";
-				   dxb_lwpolyline.closed=DXF_input_block_lwpolyline[Insert_block_nr][Count_lines_block2].DXF_block_lwpolyline_code_70;
-
-
-				   dxb_lwpolyline.ltype=DXF_input_block_lwpolyline[Insert_block_nr][Count_lines_block2].DXF_block_lwpolyline_code_6;
-				   dxb_lwpolyline.layer=DXF_input_block_lwpolyline[Insert_block_nr][Count_lines_block2].DXF_block_lwpolyline_code_8;
-
-
-
-
-				  Result_Block_lwpolyline.append(dxb_lwpolyline.Create_LWPOLYLINE());
-
-				   Count_lines_block2=Count_lines_block2+1;
-				   count_vertex=1;
-				   counter_x=0;
-				   Count_lines2=Count_lines2+1;
-
-				}
-				else
-				{
-					Count_lines2=Count_lines2+1;
-				}
-
-
-
-			}
-
-
-
-
-		}
-
-
-
-		return Result_Block_lwpolyline;
-	}*/
-
-/* QString DXF_create_elmt::Make_Block_ATTDEF()
- {
-
-	 Count_lines_block2=0;
-	 Result_Block_attdef="";
-
-	 dxf_attdef dxb_attdef3;
-	 DXF_Text_control db_txt_check4;
-
-
-	 while(Count_lines_block2<DXF_main_base[0].DXF_block_attdef_count[Insert_block_nr])
-	 {
-
-		 dxb_attdef3.x=DXF_input_block_attdef[Insert_block_nr][Count_lines_block2].DXF_block_attdef_code_10;
-		 dxb_attdef3.y=-DXF_input_block_attdef[Insert_block_nr][Count_lines_block2].DXF_block_attdef_code_20;
-		 dxb_attdef3.rotation=DXF_input_block_attdef[Insert_block_nr][Count_lines_block2].DXF_block_attdef_code_50;
-		 dxb_attdef3.size=DXF_input_block_attdef[Insert_block_nr][Count_lines_block2].DXF_block_attdef_code_40*((x_insert_scale+y_insert_scale)/2);
-		 dxb_attdef3.tag="label"; //DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_2;
-		 dxb_attdef3.rotate="true";
-		 dxb_attdef3.color_attdef="blue";
-
-		 db_txt_check4.TextToCheck=DXF_input_block_attdef[Insert_block_nr][Count_lines_block2].DXF_block_attdef_code_1;
-
-		 dxb_attdef3.text=db_txt_check4.Text_control();
-
-		 Result_Block_attdef.append(dxb_attdef3.Create_ATTDEF());
-
-		 Count_lines_block2=Count_lines_block2+1;
-
-
-	 }
-
-	 return Result_Block_attdef;
- }*/
-
- /*QString DXF_create_elmt::Make_Block_ATTR()
- {
-
-	 Count_lines_block2=0;
-
-	 Result_Block_attr="";
-
-	 dxf_attr dxb_attr2;
-	 DXF_Text_control db_txt_check3;
-
-	 while(Count_lines_block2<DXF_main_base[0].DXF_block_attrib_count[Insert_block_nr])
-	 {
-
-		 dxb_attr2.x=DXF_input_block_attrib[Insert_block_nr][Count_lines_block2].DXF_block_attrib_code_10;					// x start
-		 dxb_attr2.y=-DXF_input_block_attrib[Insert_block_nr][Count_lines_block2].DXF_block_attrib_code_20;					// y start
-		 dxb_attr2.rotation=DXF_input_block_attrib[Insert_block_nr][Count_lines_block2].DXF_block_attrib_code_50;			//text rotation
-		 dxb_attr2.size=DXF_input_block_attrib[Insert_block_nr][Count_lines_block2].DXF_block_attrib_code_40*((x_insert_scale+y_insert_scale)/2);				//text height
-		 dxb_attr2.tag="label"; //DXF_input_entities_attrib[Count_lines].DXF_entities_attrib_code_2;		// tag
-		 dxb_attr2.rotate="true";
-		 dxb_attr2.color_attrib="orange";
-
-		 db_txt_check3.TextToCheck=DXF_input_block_attrib[Insert_block_nr][Count_lines].DXF_block_attrib_code_1;	// value
-
-		 dxb_attr2.text=db_txt_check3.Text_control();
-
-		 Result_Block_attr.append(dxb_attr2.Create_ATTR());
-
-		 Count_lines_block2=Count_lines_block2+1;
-	 }
-
-	 return Result_Block_attr;
- }*/
-
- /*QString DXF_create_elmt::Make_Block_TEXT()
- {
-	 Count_lines_block2=0;
-	 Result_Block_Text="";
-
-	 dxf_text db_text_block;
-	 DXF_Text_control db_txt_check_block;
-
-	while(Count_lines_block2<DXF_main_base[0].DXF_block_text_count[Insert_block_nr])
-	{
-		db_text_block.QET_x=DXF_input_block_text[Insert_block_nr][Count_lines_block2].DXF_block_text_code_10;
-		db_text_block.QET_y=-DXF_input_block_text[Insert_block_nr][Count_lines_block2].DXF_block_text_code_20;
-		db_text_block.QET_rotation=DXF_input_block_text[Insert_block_nr][Count_lines_block2].DXF_block_text_code_50;
-		db_text_block.QET_size=DXF_input_block_text[Insert_block_nr][Count_lines_block2].DXF_block_text_code_40*((x_insert_scale+y_insert_scale)/2);
-
-		db_text_block.QET_color="green";
-
-		db_txt_check_block.TextToCheck=DXF_input_block_text[Insert_block_nr][Count_lines_block2].DXF_block_text_code_1;
-
-		db_text_block.QET_text=db_txt_check_block.Text_control();
-
-		Result_Block_Text.append(db_text_block.Create_Text());
-
-		Count_lines_block2=Count_lines_block2+1;
-	}
-	return Result_Block_Text;
- }*/
-
- QString DXF_create_elmt::Make_Block_INSERT()
- {
-	 Result_insert2="";
-
-	 Count_lines3=0;
-
-	 /*while (Count_lines3<=Count_entitie_insert)
-	 {
-
-	   if (DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_2 == "")
-	   {
-		   Count_lines3=Count_lines3+1;
-
-	   }
-	   else
-	   {
-
-		   x_insert2=0;
-		   y_insert2=0;
-		   x_insert_scale2=1;
-		   y_insert_scale2=1;
-
-
-		   Insert_block_nr2=Count_lines3;
-
-		   x_insert2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_10;
-		   y_insert2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_20;
-		   x_insert_scale2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_41;
-		   y_insert_scale2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_42;
-
-		   xy_rotation2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_50;
-		   Name_insert2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_2;
-
-		   for (Block_counter2=0;Block_counter2<=Count_entitie_insert;Block_counter2++)
-		   {
-			   if(Name_insert2==DXF_input_table_block_record[Block_counter2].dxf_table_block_record_code_2)
-			   {
-				   Insert_block_nr2=Block_counter2;
-				   Block_counter2=Count_entitie_insert+1;
-			   }
-
-
-		   }*/
-
-
-
-		   /* Block LINES */
-
-		   //Result_insert.append(Make_Block_LINES());
-
-		   /* Block ARC */
-
-		   //Result_insert.append(Make_Block_ARC());
-
-		   /* Block CIRCLE */
-
-		   //Result_insert.append(Make_Block_CIRCLE());
-
-		   /* Block ELLIPSE */
-
-		   //Result_insert.append(Make_block_ELLIPSE());
-
-		   /* Block POLYLINE */
-
-		   //Result_insert.append(Make_Block_POLYLINE());
-
-		   /* Block LWPOLYLINE */
-
-		   //Result_insert.append(Make_Block_LWPOLYLINE());
-
-		   /* Block ATTDEF */
-
-		   //Result_insert.append(Make_Block_ATTDEF());
-
-		   /* Block ATTRIB*/
-
-		   //Result_insert.append(Make_Block_ATTR());
-
-		   /* Block TEXT*/
-
-		   //Result_insert.append(Make_Block_TEXT());
-
-		   /* end of block */
-
-		   //Count_lines2=Count_lines2+1;
-
-	   //}
-
-
-
-	 //}
-
-	 return Result_insert2;
-
-
- }

Modified: branches/dxftoqet2/dxf_create_elmt.h
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.h	2016-02-06 13:09:15 UTC (rev 4341)
+++ branches/dxftoqet2/dxf_create_elmt.h	2016-02-07 11:31:05 UTC (rev 4342)
@@ -41,7 +41,10 @@
 #include "src/dxf_entitie/dxf_entitie_polyline.h"
 #include "src/dxf_entitie/dxf_entitie_insert.h"
 #include "src/dxf_entitie/dxf_entitie_lwpolyline.h"
+#include "src/dxf_entitie/dxf_entitie_input.h"
+#include "src/dxf_entitie/dxf_entitie_terminal.h"
 
+
 class DXF_create_elmt : public QWidget // QMainWindow
 {
 	Q_OBJECT
@@ -49,19 +52,19 @@
 	explicit DXF_create_elmt(QWidget *parent = 0);
 
 	QString Make_ELMT();
-	QString Make_LINE();
-	QString Make_ARC();
-	QString Make_input();
-	QString Make_terminal();
-	QString Make_ATTDEF();
-	QString Make_ATTR();
-	QString Make_CIRCLE();
-	QString Make_POINT();
-	QString Make_TEXT();
-	QString Make_ELLIPSE();
-	QString Make_INSERT();
-	QString Make_POLYLINE();
-	QString Make_LWPOLYLINE();
+	//QString Make_LINE();
+	//QString Make_ARC();
+	//QString Make_input();
+	//QString Make_terminal();
+	//QString Make_ATTDEF();
+	//QString Make_ATTR();
+	//QString Make_CIRCLE();
+	//QString Make_POINT();
+	//QString Make_TEXT();
+	//QString Make_ELLIPSE();
+	//QString Make_INSERT();
+	//QString Make_POLYLINE();
+	//QString Make_LWPOLYLINE();
 
 	//QString Make_Block_LINES();
 	//QString Make_Block_ARC();
@@ -172,6 +175,10 @@
 
 	QString Name_insert2;
 
+	QString Color_entitie;
+	QString Color_block;
+	QString Color_inserted_block;
+
 	signals:
 
 	public slots:

Modified: branches/dxftoqet2/dxftoqet_mainwindow.cpp
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.cpp	2016-02-06 13:09:15 UTC (rev 4341)
+++ branches/dxftoqet2/dxftoqet_mainwindow.cpp	2016-02-07 11:31:05 UTC (rev 4342)
@@ -114,8 +114,8 @@
 
 
 struct DXF_end_block DXF_input_end_block[100];
-extern struct DXF_file_input DXF_input_entities[100];
-extern struct DXF_file_input DXF_input_thumbnailimage[100];
+//extern struct DXF_file_input DXF_input_entities[100];
+//extern struct DXF_file_input DXF_input_thumbnailimage[100];
 struct DXF_base DXF_main_base[1];
 
 
@@ -125,7 +125,7 @@
 {
 	ui->setupUi(this);
 
-	on_Open_config_file_clicked();
+	//on_Open_config_file_clicked();
 
 	ui->csv_header_bask_color->addItem("none");
 	ui->csv_header_bask_color->addItem("black");
@@ -172,6 +172,25 @@
 	ui->Entitie_color->addItem("yello");
 	ui->Entitie_color->addItem("lightgray");
 
+	//Insert_block_color
+
+	ui->Insert_block_color->addItem("none");
+	ui->Insert_block_color->addItem("black");
+	ui->Insert_block_color->addItem("white");
+	ui->Insert_block_color->addItem("red");
+	ui->Insert_block_color->addItem("green");
+	ui->Insert_block_color->addItem("blue");
+	ui->Insert_block_color->addItem("gray");
+	ui->Insert_block_color->addItem("cyan");
+	ui->Insert_block_color->addItem("orange");
+	ui->Insert_block_color->addItem("purple");
+	ui->Insert_block_color->addItem("magenta");
+	ui->Insert_block_color->addItem("brun");
+	ui->Insert_block_color->addItem("yello");
+	ui->Insert_block_color->addItem("lightgray");
+
+	on_Open_config_file_clicked();
+
 }
 
 DXFtoQET_MainWindow::~DXFtoQET_MainWindow()
@@ -1498,14 +1517,22 @@
 {
 	Config_save_to_file="";
 
+	Config_save_to_file.append("path=");
 	Config_save_to_file.append(Config_QET_User_Symbols);
 	Config_save_to_file.append("\n");
+	Config_save_to_file.append("block_color=");
 	Config_save_to_file.append(ui->Block_color->currentText());
 	Config_save_to_file.append("\n");
+	Config_save_to_file.append("entitie_color=");
 	Config_save_to_file.append(ui->Entitie_color->currentText());
 	Config_save_to_file.append("\n");
+	Config_save_to_file.append("block_insert_color=");
+	Config_save_to_file.append(ui->Insert_block_color->currentText());
+	Config_save_to_file.append("\n");
+	Config_save_to_file.append("x_factor_elmt=");
 	Config_save_to_file.append(QString::number(ui->X_factor_elmt->value()));
 	Config_save_to_file.append("\n");
+	Config_save_to_file.append("y_factor_elmt=");
 	Config_save_to_file.append(QString::number(ui->Y_factor_elmt->value()));
 	Config_save_to_file.append("\n");
 
@@ -1530,7 +1557,9 @@
 	DXF_main_base[0].dxf_entitie_color=ui->Entitie_color->currentText();
 	DXF_main_base[0].dxf_X_factor=ui->X_factor_elmt->value();
 	DXF_main_base[0].dxf_Y_factor=ui->Y_factor_elmt->value();
+	DXF_main_base[0].dxf_insert_block_color=ui->Insert_block_color->currentText();
 
+
 	ui->dxf_file_path_save->setText(DXF_main_base[0].dxf_savepath);
 	ui->dxf_file_path_save->show();
 
@@ -1540,6 +1569,9 @@
 	ui->Entitie_color->setCurrentText(DXF_main_base[0].dxf_entitie_color);
 	ui->Entitie_color->show();
 
+	ui->Insert_block_color->setCurrentText(DXF_main_base[0].dxf_insert_block_color);
+	ui->Entitie_color->show();
+
 	ui->X_factor_elmt->setValue(DXF_main_base[0].dxf_X_factor);
 	ui->X_factor_elmt->show();
 
@@ -1570,29 +1602,77 @@
 
 
 	Config_list=Config_in_read_all.split("\n");
-	Config_save_to_file=Config_list[0];
-	Config_QET_User_Symbols=Config_list[0];
 
+	split_lenght=Config_list.length();
+
+	for (counter_Split=0;counter_Split<split_lenght-1;counter_Split++)
+	{
+		Config_List_Split=Config_list[counter_Split].split("=");
+
+		if (Config_List_Split[0]=="path")
+		{
+
+			Config_save_to_file=Config_List_Split[1];
+			Config_QET_User_Symbols=Config_List_Split[1];
+			DXF_main_base[0].dxf_savepath=Config_List_Split[1];
+		}
+
+		if (Config_List_Split[0]=="block_color")
+		{
+			DXF_main_base[0].dxf_block_color=Config_List_Split[1];
+
+		}
+
+		if (Config_List_Split[0]=="entitie_color")
+		{
+
+			DXF_main_base[0].dxf_entitie_color=Config_List_Split[1];
+		}
+
+		if (Config_List_Split[0]=="block_insert_color")
+		{
+			DXF_main_base[0].dxf_insert_block_color=Config_List_Split[1];
+
+		}
+
+		if (Config_List_Split[0]=="x_factor_elmt")
+		{
+			DXF_main_base[0].dxf_X_factor=Config_List_Split[1].toInt();
+
+		}
+
+		if (Config_List_Split[0]=="y_factor_elmt")
+		{
+			DXF_main_base[0].dxf_Y_factor=Config_List_Split[1].toInt();
+
+
+		}
+
+	}
+
+
+
+
+
 	ui->QET_user_symbole_path_save->setText(Config_QET_User_Symbols);
-	ui->dxf_file_path_save->setText(Config_list[0]);
+	ui->dxf_file_path_save->setText(Config_save_to_file);
 	ui->dxf_file_path_save->show();
 	ui->QET_user_symbole_path_save->show();
 
 	if(Config_list.length()>4)
 	{
 
-		DXF_main_base[0].dxf_savepath=Config_list[0];
-		DXF_main_base[0].dxf_block_color=Config_list[1];
-		DXF_main_base[0].dxf_entitie_color=Config_list[2];
-		DXF_main_base[0].dxf_X_factor=Config_list[3].toInt();
-		DXF_main_base[0].dxf_Y_factor=Config_list[4].toInt();
 
+
 		ui->Block_color->setCurrentText(DXF_main_base[0].dxf_block_color);
 		ui->Block_color->show();
 
 		ui->Entitie_color->setCurrentText(DXF_main_base[0].dxf_entitie_color);
 		ui->Entitie_color->show();
 
+		ui->Insert_block_color->setCurrentText(DXF_main_base[0].dxf_insert_block_color);
+		ui->Insert_block_color->show();
+
 		ui->X_factor_elmt->setValue(DXF_main_base[0].dxf_X_factor);
 		ui->X_factor_elmt->show();
 

Modified: branches/dxftoqet2/dxftoqet_mainwindow.h
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.h	2016-02-06 13:09:15 UTC (rev 4341)
+++ branches/dxftoqet2/dxftoqet_mainwindow.h	2016-02-07 11:31:05 UTC (rev 4342)
@@ -51,6 +51,11 @@
 
 	int csv_elmt_count;
 
+	int split_count1;
+	int counter_Split;
+	int split_lenght;
+
+
 	QString log_file;
 	QString log_trans;
 	QString log_split;
@@ -64,7 +69,9 @@
 	QString Config_DXF_Entities_color;
 	QString Config_save_to_file;
 	QString Config_in_read_all;
+
 	QStringList Config_list;
+	QStringList Config_List_Split;
 
 	QString Result;
 	QString Result4;

Modified: branches/dxftoqet2/dxftoqet_mainwindow.ui
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.ui	2016-02-06 13:09:15 UTC (rev 4341)
+++ branches/dxftoqet2/dxftoqet_mainwindow.ui	2016-02-07 11:31:05 UTC (rev 4342)
@@ -478,7 +478,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">
@@ -2894,7 +2894,7 @@
              <property name="geometry">
               <rect>
                <x>40</x>
-               <y>170</y>
+               <y>210</y>
                <width>241</width>
                <height>27</height>
               </rect>
@@ -2945,7 +2945,7 @@
              <property name="geometry">
               <rect>
                <x>40</x>
-               <y>210</y>
+               <y>250</y>
                <width>241</width>
                <height>27</height>
               </rect>
@@ -2992,6 +2992,51 @@
               </item>
              </layout>
             </widget>
+            <widget class="QWidget" name="layoutWidget6_2">
+             <property name="geometry">
+              <rect>
+               <x>40</x>
+               <y>170</y>
+               <width>361</width>
+               <height>29</height>
+              </rect>
+             </property>
+             <layout class="QHBoxLayout" name="horizontalLayout_16">
+              <item>
+               <widget class="QLabel" name="label_86">
+                <property name="maximumSize">
+                 <size>
+                  <width>140</width>
+                  <height>16777215</height>
+                 </size>
+                </property>
+                <property name="text">
+                 <string>Block insert color : </string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_17">
+                <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="Insert_block_color">
+                <property name="currentText">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
            </widget>
           </widget>
          </item>

Added: branches/dxftoqet2/src/dxf_block/dxf_block_entitie_insert.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_entitie_insert.cpp	                        (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_entitie_insert.cpp	2016-02-07 11:31:05 UTC (rev 4342)
@@ -0,0 +1,211 @@
+#include "dxf_block_entitie_insert.h"
+
+extern struct DXF_base DXF_main_base[1];
+
+extern struct DXF_block_line DXF_input_block_line[100][50];
+extern struct DXF_block_arc DXF_input_block_arc[100][50];
+extern struct DXF_block_attdef DXF_input_block_attdef[100][50];
+extern struct DXF_block_attrib DXF_input_block_attrib[100][50];
+extern struct DXF_block_circle DXF_input_block_circle[100][50];
+extern struct DXF_block_ellipse DXF_input_block_ellipse[100][50];
+extern struct DXF_block_attdef DXF_input_block_attdef[100][50];
+extern struct DXF_block_attrib DXF_input_block_attrib[100][50];
+extern struct DXF_block_lwpolyline DXF_input_block_lwpolyline[100][50];
+extern struct DXF_block_point DXF_input_block_point[100][50];
+extern struct DXF_block_polyline DXF_input_block_polyline[100][50];
+extern struct DXF_block_seqend DXF_input_block_seqend[100][50];
+extern struct DXF_block_text DXF_input_block_text[100][50];
+extern struct DXF_block_vertex DXF_input_block_vertex[100][500];
+
+extern struct DXF_entities_insert DXF_input_entities_insert[1000];
+
+extern struct DXF_table_block_record DXF_input_table_block_record[500];
+
+dxf_block_entitie_insert::dxf_block_entitie_insert(QWidget *parent) : QWidget(parent)
+{
+
+}
+
+QString dxf_block_entitie_insert::Make_Block_Entitie_Insert()
+{
+	Result_insert="";
+
+	Count_lines=0;
+
+	dxf_block_lines insert_Make_Block_Lines;
+	dxf_block_arc insert_Make_Block_Arc;
+	dxf_block_circle insert_Make_Block_Circle;
+	dxf_block_ellipse insert_Make_Block_Ellipse;
+	dxf_block_polyline insert_Make_Block_Polyline;
+	dxf_block_lwpolyline insert_Make_Block_Lwpolyline;
+	dxf_block_attdef insert_Make_Block_Attdef;
+	dxf_block_attribute insert_Make_Block_Attribute;
+	dxf_block_text insert_Make_Block_Text;
+
+	/* Block LINES */
+
+	insert_Make_Block_Lines.x_insert=x_insert;
+	insert_Make_Block_Lines.y_insert=y_insert;
+	insert_Make_Block_Lines.x_insert_scale=x_insert_scale;
+	insert_Make_Block_Lines.y_insert_scale=y_insert_scale;
+	insert_Make_Block_Lines.xy_rotation=xy_rotation;
+	insert_Make_Block_Lines.Name_insert=Name_insert;
+	insert_Make_Block_Lines.Insert_block_nr=Insert_block_nr;
+
+	insert_Make_Block_Lines.block_color="green";
+	insert_Make_Block_Lines.block_filling="none";
+	insert_Make_Block_Lines.block_line_weight="thin";
+
+
+	Result_insert.append(insert_Make_Block_Lines.Make_Block_Lines());
+
+	/* Block ARC */
+
+	insert_Make_Block_Arc.x_insert=x_insert;
+	insert_Make_Block_Arc.y_insert=y_insert;
+	insert_Make_Block_Arc.x_insert_scale=x_insert_scale;
+	insert_Make_Block_Arc.y_insert_scale=y_insert_scale;
+	insert_Make_Block_Arc.xy_rotation=xy_rotation;
+	insert_Make_Block_Arc.Name_insert=Name_insert;
+	insert_Make_Block_Arc.Insert_block_nr=Insert_block_nr;
+
+	insert_Make_Block_Arc.block_color="green";
+	insert_Make_Block_Arc.block_filling="none";
+	insert_Make_Block_Arc.block_line_weight="thin";
+	insert_Make_Block_Arc.block_antialias="false";
+
+	Result_insert.append(insert_Make_Block_Arc.Make_Block_Arc());
+
+	/* Block CIRCLE */
+
+	insert_Make_Block_Circle.x_insert=x_insert;
+	insert_Make_Block_Circle.y_insert=y_insert;
+	insert_Make_Block_Circle.x_insert_scale=x_insert_scale;
+	insert_Make_Block_Circle.y_insert_scale=y_insert_scale;
+	insert_Make_Block_Circle.xy_rotation=xy_rotation;
+	insert_Make_Block_Circle.Name_insert=Name_insert;
+	insert_Make_Block_Circle.Insert_block_nr=Insert_block_nr;
+
+	insert_Make_Block_Circle.block_color="green";
+	insert_Make_Block_Circle.block_filling="none";
+	insert_Make_Block_Circle.block_line_weight="thin";
+	insert_Make_Block_Circle.block_antialias="false";
+
+	Result_insert.append(insert_Make_Block_Circle.Make_Block_Circle());
+
+	/* Block ELLIPSE */
+
+	insert_Make_Block_Ellipse.x_insert=x_insert;
+	insert_Make_Block_Ellipse.y_insert=y_insert;
+	insert_Make_Block_Ellipse.x_insert_scale=x_insert_scale;
+	insert_Make_Block_Ellipse.y_insert_scale=y_insert_scale;
+	insert_Make_Block_Ellipse.xy_rotation=xy_rotation;
+	insert_Make_Block_Ellipse.Name_insert=Name_insert;
+	insert_Make_Block_Ellipse.Insert_block_nr=Insert_block_nr;
+
+	insert_Make_Block_Ellipse.block_color="green";
+	insert_Make_Block_Ellipse.block_filling="none";
+	insert_Make_Block_Ellipse.block_line_weight="thin";
+	insert_Make_Block_Ellipse.block_antialias="false";
+
+
+	Result_insert.append(insert_Make_Block_Ellipse.Make_Block_Ellipse());
+
+	/* Block POLYLINE */
+
+	insert_Make_Block_Polyline.x_insert=x_insert;
+	insert_Make_Block_Polyline.y_insert=y_insert;
+	insert_Make_Block_Polyline.x_insert_scale=x_insert_scale;
+	insert_Make_Block_Polyline.y_insert_scale=y_insert_scale;
+	insert_Make_Block_Polyline.xy_rotation=xy_rotation;
+	insert_Make_Block_Polyline.Name_insert=Name_insert;
+	insert_Make_Block_Polyline.Insert_block_nr=Insert_block_nr;
+
+	insert_Make_Block_Polyline.block_color="cyan";
+	insert_Make_Block_Polyline.block_filling="none";
+	insert_Make_Block_Polyline.block_line_weight="thin";
+	insert_Make_Block_Polyline.block_line_style="normal";
+
+	Result_insert.append(insert_Make_Block_Polyline.Make_Block_Polyline());
+
+	/* Block LWPOLYLINE */
+
+	insert_Make_Block_Lwpolyline.x_insert=x_insert;
+	insert_Make_Block_Lwpolyline.y_insert=y_insert;
+	insert_Make_Block_Lwpolyline.x_insert_scale=x_insert_scale;
+	insert_Make_Block_Lwpolyline.y_insert_scale=y_insert_scale;
+	insert_Make_Block_Lwpolyline.xy_rotation=xy_rotation;
+	insert_Make_Block_Lwpolyline.Name_insert=Name_insert;
+	insert_Make_Block_Lwpolyline.Insert_block_nr=Insert_block_nr;
+
+	insert_Make_Block_Lwpolyline.block_color="orange";
+	insert_Make_Block_Lwpolyline.block_filling="none";
+	insert_Make_Block_Lwpolyline.block_line_weight="thin";
+	insert_Make_Block_Lwpolyline.block_line_style="normal";
+
+	Result_insert.append(insert_Make_Block_Lwpolyline.Make_Block_Lwpolyline());
+
+	/* Block ATTDEF */
+
+	insert_Make_Block_Attdef.x_insert=x_insert;
+	insert_Make_Block_Attdef.y_insert=y_insert;
+	insert_Make_Block_Attdef.x_insert_scale=x_insert_scale;
+	insert_Make_Block_Attdef.y_insert_scale=y_insert_scale;
+	insert_Make_Block_Attdef.xy_rotation=xy_rotation;
+	insert_Make_Block_Attdef.Name_insert=Name_insert;
+	insert_Make_Block_Attdef.Insert_block_nr=Insert_block_nr;
+
+	insert_Make_Block_Attdef.block_color="green";
+	insert_Make_Block_Attdef.block_filling="none";
+	insert_Make_Block_Attdef.block_line_weight="thin";
+	insert_Make_Block_Attdef.block_color_attdef="green";
+
+	Result_insert.append(insert_Make_Block_Attdef.Make_Block_Attdef());
+
+	/* Block ATTRIB*/
+
+	insert_Make_Block_Attribute.x_insert=x_insert;
+	insert_Make_Block_Attribute.y_insert=y_insert;
+	insert_Make_Block_Attribute.x_insert_scale=x_insert_scale;
+	insert_Make_Block_Attribute.y_insert_scale=y_insert_scale;
+	insert_Make_Block_Attribute.xy_rotation=xy_rotation;
+	insert_Make_Block_Attribute.Name_insert=Name_insert;
+	insert_Make_Block_Attribute.Insert_block_nr=Insert_block_nr;
+
+	insert_Make_Block_Attribute.block_color="green";
+	insert_Make_Block_Attribute.block_filling="none";
+	insert_Make_Block_Attribute.block_line_weight="thin";
+	insert_Make_Block_Attribute.block_rotate="true";
+	insert_Make_Block_Attribute.block_color_attrib="green";
+
+	Result_insert.append(insert_Make_Block_Attribute.Make_Block_Attri());
+
+	/* Block TEXT*/
+
+	insert_Make_Block_Text.x_insert=x_insert;
+	insert_Make_Block_Text.y_insert=y_insert;
+	insert_Make_Block_Text.x_insert_scale=x_insert_scale;
+	insert_Make_Block_Text.y_insert_scale=y_insert_scale;
+	insert_Make_Block_Text.xy_rotation=xy_rotation;
+	insert_Make_Block_Text.Name_insert=Name_insert;
+	insert_Make_Block_Text.Insert_block_nr=Insert_block_nr;
+
+	insert_Make_Block_Text.block_color="green";
+	insert_Make_Block_Text.block_filling="none";
+	insert_Make_Block_Text.block_line_weight="thin";
+
+
+	Result_insert.append(insert_Make_Block_Text.Make_Block_Text());
+
+	/* Block INSERT */
+
+
+
+	/* end of block */
+
+	Count_lines=Count_lines+1;
+
+
+
+return Result_insert;
+}

Added: branches/dxftoqet2/src/dxf_block/dxf_block_entitie_insert.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_entitie_insert.h	                        (rev 0)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_entitie_insert.h	2016-02-07 11:31:05 UTC (rev 4342)
@@ -0,0 +1,51 @@
+#ifndef DXF_BLOCK_ENTITIE_INSERT_H
+#define DXF_BLOCK_ENTITIE_INSERT_H
+
+#include <QWidget>
+
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+#include "dxftoqet_mainwindow.h"
+#include "ui_dxftoqet_mainwindow.h"
+
+class dxf_block_entitie_insert : public QWidget
+{
+	Q_OBJECT
+	public:
+	explicit dxf_block_entitie_insert(QWidget *parent = 0);
+
+	QString Result_insert;
+	QString Name_insert;
+
+	QString block_color;
+	QString block_filling;
+	QString block_line_weight;
+	QString block_antialias;
+	QString block_rotate;
+	QString block_color_attribute;
+
+
+
+
+	int Count_lines;
+	int Count_entitie_insert;
+	int Insert_block_nr;
+	int Block_counter;
+
+
+	double x_insert;
+	double y_insert;
+	double x_insert_scale;
+	double y_insert_scale;
+	double xy_rotation;
+
+
+
+
+	QString Make_Block_Entitie_Insert();
+	signals:
+
+	public slots:
+};
+
+#endif // DXF_BLOCK_ENTITIE_INSERT_H

Modified: branches/dxftoqet2/src/dxf_block/dxf_block_insert.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_insert.cpp	2016-02-06 13:09:15 UTC (rev 4341)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_insert.cpp	2016-02-07 11:31:05 UTC (rev 4342)
@@ -1,7 +1,124 @@
 #include "dxf_block_insert.h"
 
+extern struct DXF_base DXF_main_base[1];
+
+extern struct DXF_block_line DXF_input_block_line[100][50];
+extern struct DXF_block_arc DXF_input_block_arc[100][50];
+extern struct DXF_block_attdef DXF_input_block_attdef[100][50];
+extern struct DXF_block_attrib DXF_input_block_attrib[100][50];
+extern struct DXF_block_circle DXF_input_block_circle[100][50];
+extern struct DXF_block_ellipse DXF_input_block_ellipse[100][50];
+extern struct DXF_block_attdef DXF_input_block_attdef[100][50];
+extern struct DXF_block_attrib DXF_input_block_attrib[100][50];
+extern struct DXF_block_lwpolyline DXF_input_block_lwpolyline[100][50];
+extern struct DXF_block_point DXF_input_block_point[100][50];
+extern struct DXF_block_polyline DXF_input_block_polyline[100][50];
+extern struct DXF_block_seqend DXF_input_block_seqend[100][50];
+extern struct DXF_block_text DXF_input_block_text[100][50];
+extern struct DXF_block_vertex DXF_input_block_vertex[100][500];
+
+extern struct DXF_entities_insert DXF_input_entities_insert[1000];
+
+extern struct DXF_table_block_record DXF_input_table_block_record[500];
+
 dxf_block_insert::dxf_block_insert(QWidget *parent): QWidget(parent)
 {
 
 }
 
+QString dxf_block_insert::Make_Block_Insert()
+{
+
+	Result_insert2="";
+
+	Count_lines3=0;
+
+	while (Count_lines3<=Count_entitie_insert)
+	{
+
+	  if (DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_2 == "")
+	  {
+		  Count_lines3=Count_lines3+1;
+
+	  }
+	  else
+	  {
+
+		  x_insert2=0;
+		  y_insert2=0;
+		  x_insert_scale2=1;
+		  y_insert_scale2=1;
+
+
+		  Insert_block_nr2=Count_lines3;
+
+		  x_insert2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_10;
+		  y_insert2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_20;
+		  x_insert_scale2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_41;
+		  y_insert_scale2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_42;
+
+		  xy_rotation2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_50;
+		  Name_insert2=DXF_input_entities_insert[Count_lines3].DXF_entities_insert_code_2;
+
+		  for (Block_counter2=0;Block_counter2<=Count_entitie_insert;Block_counter2++)
+		  {
+			  if(Name_insert2==DXF_input_table_block_record[Block_counter2].dxf_table_block_record_code_2)
+			  {
+				  Insert_block_nr2=Block_counter2;
+				  Block_counter2=Count_entitie_insert+1;
+			  }
+
+
+		  }
+
+
+
+		  /* Block LINES */
+
+		  //Result_insert2.append(Make_Block_LINES());
+
+		  /* Block ARC */
+
+		  //Result_insert2.append(Make_Block_ARC());
+
+		  /* Block CIRCLE */
+
+		  //Result_insert2.append(Make_Block_CIRCLE());
+
+		  /* Block ELLIPSE */
+
+		  //Result_insert2.append(Make_block_ELLIPSE());
+
+		  /* Block POLYLINE */
+
+		  //Result_insert2.append(Make_Block_POLYLINE());
+
+		  /* Block LWPOLYLINE */
+
+		  //Result_insert2.append(Make_Block_LWPOLYLINE());
+
+		  /* Block ATTDEF */
+
+		  //Result_insert2.append(Make_Block_ATTDEF());
+
+		  /* Block ATTRIB*/
+
+		 // Result_insert2.append(Make_Block_ATTR());
+
+		  /* Block TEXT*/
+
+		  //Result_insert2.append(Make_Block_TEXT());
+
+		  /* end of block */
+
+		  //Count_lines2=Count_lines2+1;
+
+	  }
+
+
+
+   }
+
+	return Result_insert2;
+
+}

Modified: branches/dxftoqet2/src/dxf_block/dxf_block_insert.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_insert.h	2016-02-06 13:09:15 UTC (rev 4341)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_insert.h	2016-02-07 11:31:05 UTC (rev 4342)
@@ -4,12 +4,40 @@
 //#include <QMainWindow>
 #include <QWidget>
 
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+#include "dxftoqet_mainwindow.h"
+#include "ui_dxftoqet_mainwindow.h"
+#include "src/dxf_block/dxf_block_entitie_insert.h"
+
 class dxf_block_insert : public QWidget // QMainWindow
 {
 	Q_OBJECT
 	public:
 	explicit dxf_block_insert(QWidget *parent = 0);
 
+	QString Result_insert2;
+	QString Name_insert2;
+
+
+	int Count_lines3;
+	int Count_entitie_insert;
+	int Insert_block_nr2;
+	int Block_counter2;
+	int Count_lines2;
+
+
+	double x_insert2;
+	double y_insert2;
+	double x_insert_scale2;
+	double y_insert_scale2;
+	double xy_rotation2;
+
+
+
+
+	QString Make_Block_Insert();
+
 	signals:
 
 	public slots:

Modified: branches/dxftoqet2/src/dxf_data.h
===================================================================
--- branches/dxftoqet2/src/dxf_data.h	2016-02-06 13:09:15 UTC (rev 4341)
+++ branches/dxftoqet2/src/dxf_data.h	2016-02-07 11:31:05 UTC (rev 4342)
@@ -514,6 +514,11 @@
 
 	struct DXF_base
 	{
+		QString Color_entitie;
+		QString Color_block;
+		QString Color_insert_block;
+
+
 		QString dxf_openfile;
 		QString dxf_dir;
 		QString dxf_filepath;
@@ -522,6 +527,7 @@
 		QString dxf_savepath;
 		QString dxf_block_color;
 		QString dxf_element_color;
+		QString dxf_insert_block_color;
 
 		//QString dxf_block_color;
 		QString dxf_entitie_color;

Added: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_input.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_input.cpp	                        (rev 0)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_input.cpp	2016-02-07 11:31:05 UTC (rev 4342)
@@ -0,0 +1,25 @@
+#include "dxf_entitie_input.h"
+
+dxf_entitie_input::dxf_entitie_input(QWidget *parent) : QWidget(parent)
+{
+
+}
+
+QString dxf_entitie_input::dxf_entitie_make_input()
+{
+	dxf_attdef db_input;
+
+	Result_input="";
+
+	db_input.x=0;
+	db_input.y=10;
+	db_input.size=9;
+	db_input.rotate=Entitie_rotate;
+	db_input.text=Entitie_text;
+	db_input.tag=Entitie_tag;
+	db_input.rotation=Entitie_rotation;
+
+	Result_input.append(db_input.Create_ATTDEF());
+
+	return Result_input;
+}

Added: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_input.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_input.h	                        (rev 0)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_input.h	2016-02-07 11:31:05 UTC (rev 4342)
@@ -0,0 +1,34 @@
+#ifndef DXF_ENTITIE_INPUT_H
+#define DXF_ENTITIE_INPUT_H
+
+#include <QWidget>
+#include "src/dxf/dxf_attdef.h"
+
+class dxf_entitie_input : public QWidget
+{
+	Q_OBJECT
+	public:
+	explicit dxf_entitie_input(QWidget *parent = 0);
+
+	QString Entitie_color;			// black
+	QString Entitie_line_weight;
+	QString Entitie_line_style;
+	QString Entitie_filling;
+	QString Entitie_antialias;
+	QString Entitie_rotate;			// true
+	QString Entitie_tag;			// label
+	QString Entitie_text;
+	int Entitie_rotation;
+
+
+	QString Result_input;
+
+
+	QString dxf_entitie_make_input();
+
+	signals:
+
+	public slots:
+};
+
+#endif // DXF_ENTITIE_INPUT_H

Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.cpp	2016-02-06 13:09:15 UTC (rev 4341)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.cpp	2016-02-07 11:31:05 UTC (rev 4342)
@@ -42,6 +42,7 @@
 	dxf_block_attdef insert_Make_Block_Attdef;
 	dxf_block_attribute insert_Make_Block_Attribute;
 	dxf_block_text insert_Make_Block_Text;
+	dxf_block_entitie_insert insert_Make_Block_Entitie_insert;
 
 	while (Count_lines<=Count_entitie_insert)
 	{
@@ -82,9 +83,9 @@
 		  }
 
 
+/*
+		  // Block LINES
 
-		  /* Block LINES */
-
 		  insert_Make_Block_Lines.x_insert=x_insert;
 		  insert_Make_Block_Lines.y_insert=y_insert;
 		  insert_Make_Block_Lines.x_insert_scale=x_insert_scale;
@@ -100,7 +101,7 @@
 
 		  Result_insert.append(insert_Make_Block_Lines.Make_Block_Lines());
 
-		  /* Block ARC */
+		  // Block ARC
 
 		  insert_Make_Block_Arc.x_insert=x_insert;
 		  insert_Make_Block_Arc.y_insert=y_insert;
@@ -117,7 +118,7 @@
 
 		  Result_insert.append(insert_Make_Block_Arc.Make_Block_Arc());
 
-		  /* Block CIRCLE */
+		  // Block CIRCLE
 
 		  insert_Make_Block_Circle.x_insert=x_insert;
 		  insert_Make_Block_Circle.y_insert=y_insert;
@@ -134,7 +135,7 @@
 
 		  Result_insert.append(insert_Make_Block_Circle.Make_Block_Circle());
 
-		  /* Block ELLIPSE */
+		  // Block ELLIPSE
 
 		  insert_Make_Block_Ellipse.x_insert=x_insert;
 		  insert_Make_Block_Ellipse.y_insert=y_insert;
@@ -152,7 +153,7 @@
 
 		  Result_insert.append(insert_Make_Block_Ellipse.Make_Block_Ellipse());
 
-		  /* Block POLYLINE */
+		  // Block POLYLINE
 
 		  insert_Make_Block_Polyline.x_insert=x_insert;
 		  insert_Make_Block_Polyline.y_insert=y_insert;
@@ -169,7 +170,7 @@
 
 		  Result_insert.append(insert_Make_Block_Polyline.Make_Block_Polyline());
 
-		  /* Block LWPOLYLINE */
+		  // Block LWPOLYLINE
 
 		  insert_Make_Block_Lwpolyline.x_insert=x_insert;
 		  insert_Make_Block_Lwpolyline.y_insert=y_insert;
@@ -186,7 +187,7 @@
 
 		  Result_insert.append(insert_Make_Block_Lwpolyline.Make_Block_Lwpolyline());
 
-		  /* Block ATTDEF */
+		  // Block ATTDEF
 
 		  insert_Make_Block_Attdef.x_insert=x_insert;
 		  insert_Make_Block_Attdef.y_insert=y_insert;
@@ -203,7 +204,7 @@
 
 		  Result_insert.append(insert_Make_Block_Attdef.Make_Block_Attdef());
 
-		  /* Block ATTRIB*/
+		  // Block ATTRIB
 
 		  insert_Make_Block_Attribute.x_insert=x_insert;
 		  insert_Make_Block_Attribute.y_insert=y_insert;
@@ -221,7 +222,7 @@
 
 		  Result_insert.append(insert_Make_Block_Attribute.Make_Block_Attri());
 
-		  /* Block TEXT*/
+		  // Block TEXT
 
 		  insert_Make_Block_Text.x_insert=x_insert;
 		  insert_Make_Block_Text.y_insert=y_insert;
@@ -238,16 +239,31 @@
 
 		  Result_insert.append(insert_Make_Block_Text.Make_Block_Text());
 
-		  /* end of block */
+		  // Block INSERT
 
+
+
+		  // end of block
+
 		  Count_lines=Count_lines+1;
 
-	  }
+	  }*/
 
+	insert_Make_Block_Entitie_insert.x_insert=x_insert;
+	insert_Make_Block_Entitie_insert.y_insert=y_insert;
+	insert_Make_Block_Entitie_insert.x_insert_scale=x_insert_scale;
+	insert_Make_Block_Entitie_insert.y_insert_scale=y_insert_scale;
+	insert_Make_Block_Entitie_insert.xy_rotation=xy_rotation;
+	insert_Make_Block_Entitie_insert.Insert_block_nr=Insert_block_nr;
+	insert_Make_Block_Entitie_insert.Name_insert=Name_insert;
 
+	Result_insert.append(insert_Make_Block_Entitie_insert.Make_Block_Entitie_Insert());
 
+	Count_lines=Count_lines+1;
+
 	}
 
+	}
 	return Result_insert;
 
 }

Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.h	2016-02-06 13:09:15 UTC (rev 4341)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.h	2016-02-07 11:31:05 UTC (rev 4342)
@@ -13,6 +13,7 @@
 #include "src/dxf_block/dxf_block_attdef.h"
 #include "src/dxf_block/dxf_block_attribute.h"
 #include "src/dxf_block/dxf_block_text.h"
+#include "src/dxf_block/dxf_block_entitie_insert.h"
 
 class dxf_entitie_insert : public QWidget // QMainWindow
 {

Added: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_terminal.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_terminal.cpp	                        (rev 0)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_terminal.cpp	2016-02-07 11:31:05 UTC (rev 4342)
@@ -0,0 +1,25 @@
+#include "dxf_entitie_terminal.h"
+
+dxf_entitie_terminal::dxf_entitie_terminal(QWidget *parent) : QWidget(parent)
+{
+
+}
+
+QString dxf_entitie_terminal::dxf_entitie_make_terminal()
+{
+
+	dxf_point db_terminal;
+
+	Result_terminal="";
+
+	db_terminal.x1=0;
+	db_terminal.y1=0;
+	db_terminal.orientation=Entitie_orientation;
+
+
+	Result_terminal.append(db_terminal.Create_POINT());
+
+
+	return Result_terminal;
+
+}

Added: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_terminal.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_terminal.h	                        (rev 0)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_terminal.h	2016-02-07 11:31:05 UTC (rev 4342)
@@ -0,0 +1,33 @@
+#ifndef DXF_ENTITIE_TERMINAL_H
+#define DXF_ENTITIE_TERMINAL_H
+
+#include <QWidget>
+#include "src/dxf/dxf_point.h"
+
+class dxf_entitie_terminal : public QWidget
+{
+	Q_OBJECT
+	public:
+	explicit dxf_entitie_terminal(QWidget *parent = 0);
+
+	QString Entitie_color;			// black
+	QString Entitie_line_weight;
+	QString Entitie_line_style;
+	QString Entitie_filling;
+	QString Entitie_antialias;
+	QString Entitie_rotate;			// true
+	QString Entitie_tag;			// label
+	QString Entitie_text;
+	QString Entitie_orientation;	//n
+	int Entitie_rotation;
+
+	QString Result_terminal;
+
+	QString dxf_entitie_make_terminal();
+
+	signals:
+
+	public slots:
+};
+
+#endif // DXF_ENTITIE_TERMINAL_H


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/