[qet] [4330] qetdxf integration : minor update

[subversion@xxxxxxxxxxxxx]

Revision: 4330
Author:   rdsivd
Date:     2016-01-18 22:02:01 +0100 (Mon, 18 Jan 2016)
Log Message:
-----------
qetdxf integration : minor update

Modified Paths:
--------------
    branches/Qetdxf/sources/dxftoqet2/dxf_create_elmt.cpp
    branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_arc.cpp

Modified: branches/Qetdxf/sources/dxftoqet2/dxf_create_elmt.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/dxf_create_elmt.cpp	2016-01-18 09:21:53 UTC (rev 4329)
+++ branches/Qetdxf/sources/dxftoqet2/dxf_create_elmt.cpp	2016-01-18 21:02:01 UTC (rev 4330)
@@ -395,6 +395,13 @@
 		db_arc.ltype=DXF_input_entities_arc[Count_lines].DXF_entities_arc_code_6;
 		db_arc.color_dxf=-1;
 
+		// added rds 2016 01 18
+		db_arc.antialias="false";
+		db_arc.line_weight="thin";
+		db_arc.filling="none";
+		db_arc.color="black";
+		// rds 2016 01 18
+
 		Result_arc.append(db_arc.Create_ARC());
 
 		Count_lines=Count_lines+1;
@@ -427,6 +434,10 @@
 		dxb_attdef2.tag="label"; //DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_2;
 		dxb_attdef2.rotate="true";
 
+		//added rds 2016 01 18
+		dxb_attdef2.color_attdef="black";
+		//rds 2016 01 18
+
 		db_txt_check.TextToCheck=DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_1;
 
 		dxb_attdef2.text=db_txt_check.Text_control();
@@ -461,6 +472,11 @@
 		dxb_attr.tag="label"; //DXF_input_entities_attrib[Count_lines].DXF_entities_attrib_code_2;		// tag
 		dxb_attr.rotate="true";
 
+		//added rds 2019 01 18
+		dxb_attr.rotate="true";
+		dxb_attr.color_attdef="black";
+		//rds 2016 01 18
+
 		db_txt_check2.TextToCheck=DXF_input_entities_attrib[Count_lines].DXF_entities_attrib_code_1;	// value
 
 		dxb_attr.text=db_txt_check2.Text_control();

Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_arc.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_arc.cpp	2016-01-18 09:21:53 UTC (rev 4329)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_arc.cpp	2016-01-18 21:02:01 UTC (rev 4330)
@@ -9,27 +9,27 @@
 QString dxf_arc::Create_ARC()
 {
 
-	dxf_base_arc db_line;
+	dxf_base_arc db_arc2;
 
 	Result_line ="";
 
-	db_line.QET_x=center_x - radius;		// 10
-	db_line.QET_y=(center_y) - radius;		// 20
-	db_line.QET_width=radius*2;
-	db_line.QET_height=radius*2;
-	db_line.QET_antialias="false";
+	db_arc2.QET_x=center_x - radius;		// 10
+	db_arc2.QET_y=(center_y) - radius;		// 20
+	db_arc2.QET_width=radius*2;
+	db_arc2.QET_height=radius*2;
+	db_arc2.QET_antialias="false";
 
 	DXF_Ltype_control db_line_ltype_control;
 
-	db_line_ltype_control.dxf_FindLT=ltype;
-	db_line_ltype_control.dxf_Layer=layer;
+	db_arc2_ltype_control.dxf_FindLT=ltype;
+	db_arc2_ltype_control.dxf_Layer=layer;
 
 
-	db_line.QET_line_style=db_line_ltype_control.dxf2_Ltype_control();
+	db_arc2.QET_line_style=db_line_ltype_control.dxf2_Ltype_control();
 
-	db_line.QET_line_weight="thin";
-	db_line.QET_filling="none";
-	db_line.QET_color=color;
+	db_arc2.QET_line_weight="thin";
+	db_arc2.QET_filling="none";
+	db_arc2.QET_color=color;
 
 	/*
 		h = (450° - acad°)/30
@@ -149,11 +149,11 @@
 
 	/* einde omrekening */
 
-	db_line.QET_angle=-hoek2;
-	db_line.QET_start=-(begin-90);
+	db_arc2.QET_angle=-hoek2;
+	db_arc2.QET_start=-(begin-90);
 
 
-	Result_line.append(db_line.Create_arc());
+	Result_line.append(db_arc2.Create_arc());
 
 	return Result_line;
 }