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

[Peter Kümmel]

SVN commit 1217493 by kuemmel:

line numbers start at 1 in the dialog, internal we start at 0

 M  +9 -0      asciiconfig.ui  
 M  +8 -4      asciiplugin.cpp  
 M  +2 -2      asciisourceconfig.cpp  


--- branches/work/kst/portto4/kst/src/datasources/ascii/asciiconfig.ui #1217492:1217493
@@ -150,6 +150,9 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="minimum">
+         <number>1</number>
+        </property>
         <property name="maximum">
          <number>9999999</number>
         </property>
@@ -173,6 +176,9 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="minimum">
+         <number>1</number>
+        </property>
         <property name="maximum">
          <number>9999999</number>
         </property>
@@ -199,6 +205,9 @@
         <property name="maximum">
          <number>9999999</number>
         </property>
+        <property name="value">
+         <number>1</number>
+        </property>
        </widget>
       </item>
       <item row="3" column="0">
--- branches/work/kst/portto4/kst/src/datasources/ascii/asciiplugin.cpp #1217492:1217493
@@ -70,10 +70,12 @@
   config._columnDelimiter = _columnDelimiter->text();
   config._columnWidth = _columnWidth->value();
   config._columnWidthIsConst = _columnWidthIsConst->isChecked();
-  config._dataLine = _startLine->value();
+  config._dataLine = _startLine->value() - 1;
   config._readFields = _readFields->isChecked();
+  //config._readUnits = _readUnits->isChecked();
   config._useDot = _useDot->isChecked();
-  config._fieldsLine = _fieldsLine->value();
+  config._fieldsLine = _fieldsLine->value() - 1;
+  //config._unitsLine = _unitsLine->value() - 1;
 
   return config;
 }
@@ -86,10 +88,12 @@
   _columnDelimiter->setText(config._columnDelimiter);
   _columnWidth->setValue(config._columnWidth);
   _columnWidthIsConst->setChecked(config._columnWidthIsConst);
-  _startLine->setValue(config._dataLine);
+  _startLine->setValue(config._dataLine + 1);
   _readFields->setChecked(config._readFields);
+  //_readUnits->setChecked(config._readUnits);
   _useDot->setChecked(config._useDot);
-  _fieldsLine->setValue(config._fieldsLine);
+  _fieldsLine->setValue(config._fieldsLine + 1);
+  //_unitsLine->setValue(config._unitsLine + 1);
 
   AsciiSourceConfig::ColumnType ct = (AsciiSourceConfig::ColumnType) config._columnType.value();
   if (ct == AsciiSourceConfig::Fixed) {
--- branches/work/kst/portto4/kst/src/datasources/ascii/asciisourceconfig.cpp #1217492:1217493
@@ -66,9 +66,9 @@
   _columnDelimiter(","),
   _columnWidth(DEFAULT_COLUMN_WIDTH),
   _columnWidthIsConst(false),
-  _dataLine(0),
+  _dataLine(1),
   _readFields(false),
-  _fieldsLine(0),
+  _fieldsLine(1),
   _useDot(true),
   _localSeparator(QLocale().decimalPoint().toAscii())
 {