[qet] [4314] qetdxf fix errors on forms

[subversion@xxxxxxxxxxxxx]

Revision: 4314
Author:   rdsivd
Date:     2016-01-08 20:12:44 +0100 (Fri, 08 Jan 2016)
Log Message:
-----------
qetdxf fix errors on forms

Modified Paths:
--------------
    branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.cpp
    branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.ui
    branches/Qetdxf/sources/dxftoqet2/src/dxf_split.cpp

Modified: branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.cpp	2016-01-08 17:44:55 UTC (rev 4313)
+++ branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.cpp	2016-01-08 19:12:44 UTC (rev 4314)
@@ -1332,7 +1332,7 @@
 	{
 
 			QModelIndex index = model3->index(row2,0,QModelIndex());
-			model3->setData(index,DXF_input_table_block_record[row2].dxf_table_block_record_code_2.remove(QRegExp("[$*+-/\_=#<>]")));
+			model3->setData(index,DXF_input_table_block_record[row2].dxf_table_block_record_code_2.remove(QRegExp("[$*+-_=#<>]")));
 
 			blockcount=blockcount+1;
 

Modified: branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.ui
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.ui	2016-01-08 17:44:55 UTC (rev 4313)
+++ branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.ui	2016-01-08 19:12:44 UTC (rev 4314)
@@ -24,7 +24,7 @@
    <string notr="true">qlineargradient:(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(58, 91, 113, 255), stop:1 rgba(255, 255, 255, 255))</string>
   </property>
   <widget class="QWidget" name="centralWidget">
-   <widget class="QWidget" name="layoutWidget">
+   <widget class="QWidget" name="layoutWidget_1">
     <property name="geometry">
      <rect>
       <x>10</x>
@@ -509,7 +509,7 @@
             <attribute name="title">
              <string>ELMT Langue</string>
             </attribute>
-            <widget class="QWidget" name="layoutWidget">
+            <widget class="QWidget" name="layoutWidget_2">
              <property name="geometry">
               <rect>
                <x>10</x>
@@ -1365,7 +1365,7 @@
               <attribute name="title">
                <string>Entities</string>
               </attribute>
-              <widget class="QWidget" name="layoutWidget">
+              <widget class="QWidget" name="layoutWidget_3">
                <property name="geometry">
                 <rect>
                  <x>10</x>
@@ -2449,7 +2449,7 @@
             <attribute name="title">
              <string>CSV items</string>
             </attribute>
-            <widget class="QWidget" name="layoutWidget">
+            <widget class="QWidget" name="layoutWidget_4">
              <property name="geometry">
               <rect>
                <x>10</x>
@@ -2636,14 +2636,14 @@
              </property>
             </widget>
             <zorder>CSV_Tablesettings</zorder>
-            <zorder>layoutWidget</zorder>
+            <zorder>layoutWidget_4</zorder>
             <zorder>plainTextEdit_2</zorder>
            </widget>
            <widget class="QWidget" name="tab_log">
             <attribute name="title">
              <string>Log</string>
             </attribute>
-            <widget class="QWidget" name="layoutWidget">
+            <widget class="QWidget" name="layoutWidget_51">
              <property name="geometry">
               <rect>
                <x>10</x>
@@ -2740,7 +2740,7 @@
               <string>Open config file</string>
              </property>
             </widget>
-            <widget class="QWidget" name="layoutWidget">
+            <widget class="QWidget" name="layoutWidget_5">
              <property name="geometry">
               <rect>
                <x>40</x>
@@ -2801,7 +2801,7 @@
               </item>
              </layout>
             </widget>
-            <widget class="QWidget" name="layoutWidget">
+            <widget class="QWidget" name="layoutWidget_6">
              <property name="geometry">
               <rect>
                <x>40</x>
@@ -2842,7 +2842,7 @@
               </item>
              </layout>
             </widget>
-            <widget class="QWidget" name="layoutWidget">
+            <widget class="QWidget" name="layoutWidget_7">
              <property name="geometry">
               <rect>
                <x>40</x>

Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_split.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_split.cpp	2016-01-08 17:44:55 UTC (rev 4313)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_split.cpp	2016-01-08 19:12:44 UTC (rev 4314)
@@ -9037,8 +9037,8 @@
 																}
 																break;
 
-																int count_block_arc_100;
 
+
 															case 280:
 
 																if(sw_block_line[280]==0)
@@ -20036,7 +20036,7 @@
 
 											if(sw_block[2]==0)
 											{
-												DXF_input_block[block_count1].DXF_block_code_2=line4.remove(QRegExp("[$*+-/\_=]"));
+												DXF_input_block[block_count1].DXF_block_code_2=line4.remove(QRegExp("[$*+-_=]"));
 												sw_block[2]=1;
 											}
 											else
@@ -23723,7 +23723,7 @@
 
 											if(sw_entities_insert[2]==0)
 											{
-												DXF_input_entities_insert[entities_INSERT_count2].DXF_entities_insert_code_2=line6.remove(QRegExp("[$*+-/\_=]"));
+												DXF_input_entities_insert[entities_INSERT_count2].DXF_entities_insert_code_2=line6.remove(QRegExp("[$*+-_=]"));
 												sw_entities_insert[2]=1;
 											}
 											else