Changeset 5101 in ntrip

Timestamp:

Apr 12, 2013, 4:28:55 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/inpedit

Files:

• keyword.cpp (modified) (7 diffs)
• keyword.h (modified) (1 diff)

trunk/GnssCenter/inpedit/keyword.cpp

@@ -41 +41 @@
 
     if      (numVal == 1) {
-      _values.append(in.readLine().trimmed());
+      _origValues.append(in.readLine().trimmed());
     }
     else if (numVal > 1) {
       for (int ii = 0; ii < numVal; ii++) {
-        _values.append(inStream.readLine().trimmed());
+        _origValues.append(inStream.readLine().trimmed());
       }
     }
@@ -76 +76 @@
     // Remove leading and trailing double-quotes
     // -----------------------------------------
-    _values.replaceInStrings(QRegExp("^\\s*\"|\"\\s*$"), QString());
+    _origValues.replaceInStrings(QRegExp("^\\s*\"|\"\\s*$"), QString());
   }
 }
@@ -97 +97 @@
   if      (widgetType == "checkbox") {
     QCheckBox* chBox = new QCheckBox(); 
-    if (_values.size() && _values[0] == "1") {
+    if (_origValues.size() && _origValues[0] == "1") {
       chBox->setChecked(true);
     }
@@ -105 +105 @@
     QComboBox* cmbBox = new QComboBox();
     cmbBox->addItems(_desc.value("cards").split(QRegExp("\\s"), QString::SkipEmptyParts));
-    if (_values.size()) {
-      int index = cmbBox->findText(_values[0]);
+    if (_origValues.size()) {
+      int index = cmbBox->findText(_origValues[0]);
       if (index != -1) {
         cmbBox->setCurrentIndex(index);
@@ -115 +115 @@
   else if (widgetType == "lineedit") {
     t_lineEdit* lineEdit = new t_lineEdit();
-    if (_values.size()) {
-      lineEdit->setText(_values[0]);
+    if (_origValues.size()) {
+      lineEdit->setText(_origValues[0]);
     }
     _widget = lineEdit;
@@ -122 +122 @@
   else if (widgetType == "radiobutton") {
     QRadioButton* radButt = new QRadioButton();
-    if (_values.size() && _values[0] == "1") {
+    if (_origValues.size() && _origValues[0] == "1") {
       radButt->setChecked(true);
     }
@@ -129 +129 @@
   else if (widgetType == "selwin") {
     t_selWin* selWin = new t_selWin();
-    if (_values.size()) {
-      selWin->setFileName(_values[0]);
+    if (_origValues.size()) {
+      selWin->setFileName(_origValues[0]);
     }
     _widget = selWin;

trunk/GnssCenter/inpedit/keyword.h

@@ -14 +14 @@
   bool ok() const {return _ok;}
   QWidget* createWidget(const QString& fldMask);
-  const QStringList& values() const {return _values;}
+  const QStringList& values() const;
 
  private:
   bool                   _ok;
   QString                _name;
-  QStringList            _values;
+  QStringList            _origValues;
   QWidget*               _widget;
   QMap<QString, QString> _desc;