[qet] [4422] dxftoqet converter

[subversion@xxxxxxxxxxxxx]

Revision: 4422
Author:   rdsivd
Date:     2016-04-04 21:51:24 +0200 (Mon, 04 Apr 2016)
Log Message:
-----------
dxftoqet converter
sisablet symbols into symbols conversion

Modified Paths:
--------------
    branches/dxftoqet2/dxftoqet_mainwindow.cpp
    branches/dxftoqet2/dxftoqet_mainwindow.ui
    branches/dxftoqet2/src/dxf_block/dxf_block_entitie_insert.cpp
    branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.cpp
    branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.cpp

Modified: branches/dxftoqet2/dxftoqet_mainwindow.cpp
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.cpp	2016-04-03 19:51:32 UTC (rev 4421)
+++ branches/dxftoqet2/dxftoqet_mainwindow.cpp	2016-04-04 19:51:24 UTC (rev 4422)
@@ -192,6 +192,15 @@
 	ui->Insert_block_color->addItem("yello");
 	ui->Insert_block_color->addItem("lightgray");
 
+
+
+	ui->Block_color->currentText()="black";
+	ui->Entitie_color->currentText()="blue";
+	ui->Insert_block_color->currentText()="green";
+	//ui->X_factor_elmt->value()="1";
+	//ui->Y_factor_elmt->value()="1";
+
+
 	on_Open_config_file_clicked();
 
 	Set_Tables_sizes();

Modified: branches/dxftoqet2/dxftoqet_mainwindow.ui
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.ui	2016-04-03 19:51:32 UTC (rev 4421)
+++ branches/dxftoqet2/dxftoqet_mainwindow.ui	2016-04-04 19:51:24 UTC (rev 4422)
@@ -1372,8 +1372,8 @@
                 <rect>
                  <x>10</x>
                  <y>10</y>
-                 <width>697</width>
-                 <height>532</height>
+                 <width>841</width>
+                 <height>541</height>
                 </rect>
                </property>
                <layout class="QGridLayout" name="gridLayout">
@@ -2424,9 +2424,9 @@
                <property name="geometry">
                 <rect>
                  <x>10</x>
-                 <y>20</y>
-                 <width>697</width>
-                 <height>532</height>
+                 <y>11</y>
+                 <width>851</width>
+                 <height>551</height>
                 </rect>
                </property>
                <layout class="QGridLayout" name="gridLayout_4">
@@ -3277,7 +3277,7 @@
                   <property name="maximumSize">
                    <size>
                     <width>50</width>
-                    <height>16777215</height>
+                    <height>27</height>
                    </size>
                   </property>
                   <property name="styleSheet">

Modified: branches/dxftoqet2/src/dxf_block/dxf_block_entitie_insert.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_entitie_insert.cpp	2016-04-03 19:51:32 UTC (rev 4421)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_entitie_insert.cpp	2016-04-04 19:51:24 UTC (rev 4422)
@@ -244,7 +244,7 @@
 	if (Flag_Entitie_block_insert==0)
 	{
 		//insert_Make_Block_Entitie_insert.fla
-		Result_insert.append(insert_Make_Block_insert.Make_Block_Insert());
+		//Result_insert.append(insert_Make_Block_insert.Make_Block_Insert());
 		Flag_Entitie_block_insert=1;
 	}
 	else

Modified: branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.cpp	2016-04-03 19:51:32 UTC (rev 4421)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.cpp	2016-04-04 19:51:24 UTC (rev 4422)
@@ -31,7 +31,7 @@
 
 		Count_block_lwpolyline2=DXF_main_base[0].DXF_block_lwpolyline_count[Insert_block_nr];
 
-		while (Count_lines2<Count_block_lwpolyline2)
+		while ((Count_lines2<Count_block_lwpolyline2)and(Count_lines2>=0))
 		{
 			vector_max=DXF_input_block_lwpolyline[Insert_block_nr][Count_lines2].DXF_block_lwpolyline_code_90; // max number of vectors
 

Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.cpp	2016-04-03 19:51:32 UTC (rev 4421)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.cpp	2016-04-04 19:51:24 UTC (rev 4422)
@@ -26,7 +26,7 @@
    Count_lines=0;
    count_vertex=1;
 
-   while (Count_lines<Count_entitie_polyline)
+   while ((Count_lines<Count_entitie_polyline)and(Count_lines>=0))
    {
 
 	  for(counter_x=0;counter_x<=Polyline_vertex;counter_x++)