[qet] [4332] qetdxf : minor update

[subversion@xxxxxxxxxxxxx]

Revision: 4332
Author:   rdsivd
Date:     2016-01-19 22:37:48 +0100 (Tue, 19 Jan 2016)
Log Message:
-----------
qetdxf : minor update

Modified Paths:
--------------
    branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.cpp
    branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_arc.cpp
    branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_attdef.cpp
    branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_line.cpp

Modified: branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.cpp	2016-01-19 21:35:41 UTC (rev 4331)
+++ branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.cpp	2016-01-19 21:37:48 UTC (rev 4332)
@@ -349,7 +349,7 @@
 		}
 
 		QTextStream out(&file);
-		out << ui->ELMT_result->toPlainText();
+		out << ui->ELMT_result->toPlainText(); // converted dxf
 
 		file.close();
 		QMessageBox::information(this, tr("Export as elmt file"), tr("L'element %1 a bien ete enregistre").arg(ui->dxf_open_file->text()));

Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_arc.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_arc.cpp	2016-01-19 21:35:41 UTC (rev 4331)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_arc.cpp	2016-01-19 21:37:48 UTC (rev 4332)
@@ -21,16 +21,24 @@
 
 	DXF_Ltype_control db_line_ltype_control;
 
-	db_arc2_ltype_control.dxf_FindLT=ltype;
-	db_arc2_ltype_control.dxf_Layer=layer;
+	db_line_ltype_control.dxf_FindLT=ltype;
+	db_line_ltype_control.dxf_Layer=layer;
 
 
 	db_arc2.QET_line_style=db_line_ltype_control.dxf2_Ltype_control();
 
-	db_arc2.QET_line_weight="thin";
-	db_arc2.QET_filling="none";
+	//changed rds 2016 01 19
+	//db_arc2.QET_line_weight="thin";
+	//db_arc2.QET_filling="none";
+
+	db_arc2.QET_line_weight=line_weight;
+	db_arc2.QET_filling=filling;
 	db_arc2.QET_color=color;
 
+	//db_arc2.QET_color=color;
+
+	// rds 2016 01 19
+
 	/*
 		h = (450° - acad°)/30
 		qet° = 30* (450° - acad°)/30 = 450° - acad°

Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_attdef.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_attdef.cpp	2016-01-19 21:35:41 UTC (rev 4331)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_attdef.cpp	2016-01-19 21:37:48 UTC (rev 4332)
@@ -21,6 +21,9 @@
 	db_attdef.QET_rotate=rotate;
 	db_attdef.QET_rotation=rotation;
 
+	//added rds 2016 01 19
+	db_attdef.QET_color=color_attdef;
+	//
 
 	Result_attdef.append(db_attdef.Create_input());
 

Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_line.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_line.cpp	2016-01-19 21:35:41 UTC (rev 4331)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_line.cpp	2016-01-19 21:37:48 UTC (rev 4332)
@@ -31,8 +31,15 @@
 
 	db_line.QETline_style=db_line_ltype_control.dxf2_Ltype_control();
 
-	db_line.QETline_weight="thin";
-	db_line.QETfilling="none";
+
+	//changed rds 2016 01 19
+	//db_line.QETline_weight="thin";
+	//db_line.QETfilling="none";
+	db_line.QETline_weight=line_weight;
+	db_line.QETfilling=filling;
+	// rds 2016 01 19
+
+
 	db_line.QETcolor=color;
 
 	Result_line.append(db_line.CreateElmt());