[Kst] branches/work/kst/portto4/kst/src/datasources/ascii

[Nicolas Brisset]

SVN commit 1217106 by brisset:

Commit GUI part of the ASCII update that will allow us to make the most
of the recent round of performance optimizations.
While at it, I have already prepared the addition of units (as vector
metadata).


 M  +77 -34    asciiconfig.ui  


--- branches/work/kst/portto4/kst/src/datasources/ascii/asciiconfig.ui #1217105:1217106
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>356</width>
-    <height>383</height>
+    <width>355</width>
+    <height>509</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -122,12 +122,7 @@
      <property name="title">
       <string>Header</string>
      </property>
-     <layout class="QHBoxLayout">
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <layout class="QGridLayout">
+     <layout class="QGridLayout" name="gridLayout">
         <item row="0" column="0">
          <widget class="QLabel" name="textLabel1_3">
           <property name="sizePolicy">
@@ -183,7 +178,30 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="0" colspan="2">
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="_readUnits">
+        <property name="text">
+         <string>Read units from line:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QSpinBox" name="_unitsLine">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>2</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximum">
+         <number>9999999</number>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
          <widget class="QLabel" name="textLabel1_9">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -200,34 +218,71 @@
          </widget>
         </item>
        </layout>
-      </item>
-     </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="buttonGroup1">
      <property name="title">
-      <string>Data Format</string>
+      <string>Data Format: Delimiters</string>
      </property>
-     <layout class="QFormLayout" name="formLayout">
-      <item row="0" column="0">
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
        <widget class="QRadioButton" name="_whitespace">
         <property name="text">
-         <string>Whitespace delimited</string>
+         <string>Space/tab delimited</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QRadioButton" name="_custom">
+          <property name="text">
+           <string>Custom delimiter</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="_columnDelimiter">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Data Format: Fixed-Width Options</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QRadioButton" name="radioButton">
+        <property name="text">
+         <string>Do not make assumptions on column width</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
        <widget class="QRadioButton" name="_fixed">
         <property name="text">
-         <string>Fixed width columns</string>
+           <string>All columns have the same width</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
+        <item>
        <widget class="QSpinBox" name="_columnWidth">
         <property name="enabled">
          <bool>false</bool>
@@ -243,24 +298,12 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QRadioButton" name="_custom">
-        <property name="text">
-         <string>Custom delimiter</string>
-        </property>
-       </widget>
+       </layout>
       </item>
-      <item row="2" column="1">
-       <widget class="QLineEdit" name="_columnDelimiter">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="2">
-       <widget class="QCheckBox" name="_columnWidthIsConst">
+      <item>
+       <widget class="QRadioButton" name="_columnWidthIsConst">
         <property name="text">
-         <string>All column widths doesn't change</string>
+         <string>Each column has a constant width</string>
         </property>
        </widget>
       </item>