[Kst] extragear/graphics/kst/src

[Eli Fidler]

SVN commit 621728 by fidler:

use displayString instead of tagName in vector/scalar/string selectors


 M  +1 -1      libkstapp/datawizard.ui.h  
 M  +3 -3      libkstapp/kstbasicdialog_i.cpp  
 M  +7 -7      libkstapp/kstcurvedialog_i.cpp  
 M  +1 -1      libkstapp/ksteqdialog_i.cpp  
 M  +3 -3      libkstapp/kstplugindialog_i.cpp  
 M  +1 -1      libkstapp/view2dplotwidget.ui.h  
 M  +2 -2      libkstmath/kstcsd.cpp  
 M  +1 -1      libkstmath/ksthistogram.cpp  
 M  +2 -2      libkstmath/kstimage.cpp  
 M  +1 -1      libkstmath/kstpsd.cpp  


--- trunk/extragear/graphics/kst/src/libkstapp/datawizard.ui.h #621727:621728
@@ -618,7 +618,7 @@
     // same X vector, so... lets set that as the default.
     _xAxisUseExisting->setChecked(true);
     _xVectorExisting->update();
-    _xVectorExisting->setSelection(xv->tagName());
+    _xVectorExisting->setSelection(xv->tag().displayString());
 
     // create the y-vectors
     {
--- trunk/extragear/graphics/kst/src/libkstapp/kstbasicdialog_i.cpp #621727:621728
@@ -433,7 +433,7 @@
   QStringList::ConstIterator ivI = iv.begin();
   for (; ivI != iv.end(); ++ivI) {
     KstVectorPtr p = ptr->inputVector(*ivI);
-    QString t = p ? p->tagName() : QString::null;
+    QString t = p ? p->tag().displayString() : QString::null;
     if (VectorSelector *w = vector(*ivI)) {
       w->setSelection(t);
     }
@@ -444,7 +444,7 @@
   QStringList::ConstIterator isI = is.begin();
   for (; isI != is.end(); ++isI) {
     KstScalarPtr p = ptr->inputScalar(*isI);
-    QString t = p ? p->tagName() : QString::null;
+    QString t = p ? p->tag().displayString() : QString::null;
     if (ScalarSelector *w = scalar(*isI)) {
       w->setSelection(t);
     }
@@ -455,7 +455,7 @@
   QStringList::ConstIterator istrI = istr.begin();
   for (; istrI != istr.end(); ++istrI) {
     KstStringPtr p = ptr->inputString(*istrI);
-    QString t = p ? p->tagName() : QString::null;
+    QString t = p ? p->tag().displayString() : QString::null;
     if (StringSelector *w = string(*istrI)) {
       w->setSelection(t);
     }
--- trunk/extragear/graphics/kst/src/libkstapp/kstcurvedialog_i.cpp #621727:621728
@@ -133,12 +133,12 @@
     _legendText->setText(cp->legendText());
   }
 
-  _w->_xVector->setSelection(cp->xVTag().tag());  // FIXME: is this the right tag?
-  _w->_yVector->setSelection(cp->yVTag().tag());
-  _w->_xError->setSelection(cp->xETag().tag());
-  _w->_yError->setSelection(cp->yETag().tag());
-  _w->_xMinusError->setSelection(cp->xEMinusTag().tag());
-  _w->_yMinusError->setSelection(cp->yEMinusTag().tag());
+  _w->_xVector->setSelection(cp->xVTag().displayString());
+  _w->_yVector->setSelection(cp->yVTag().displayString());
+  _w->_xError->setSelection(cp->xETag().displayString());
+  _w->_yError->setSelection(cp->yETag().displayString());
+  _w->_xMinusError->setSelection(cp->xEMinusTag().displayString());
+  _w->_yMinusError->setSelection(cp->yEMinusTag().displayString());
 
   if (cp->xEMinusTag() == cp->xETag()) {
     _w->_checkBoxXMinusSameAsPlus->setChecked(true);
@@ -179,7 +179,7 @@
   // set the X Axis Vector to the X axis vector of 
   // the last curve on the global curve list...
   if (curves.count() >0) {
-    _w->_xVector->setSelection(curves.last()->xVTag().tag());
+    _w->_xVector->setSelection(curves.last()->xVTag().displayString());
   }
 
   // for some reason the lower widget needs to be shown first to prevent overlapping?
--- trunk/extragear/graphics/kst/src/libkstapp/ksteqdialog_i.cpp #621727:621728
@@ -92,7 +92,7 @@
 
   _w->_doInterpolation->setChecked(ep->doInterp());
   if (ep->vXIn()) {
-    _w->_xVectors->setSelection(ep->vXIn()->tagName());
+    _w->_xVectors->setSelection(ep->vXIn()->tag().displayString());
   }
 
   ep->unlock();
--- trunk/extragear/graphics/kst/src/libkstapp/kstplugindialog_i.cpp #621727:621728
@@ -215,7 +215,7 @@
           QString selectedVector = vs->selectedVector();
           vs->update();
           if (DPvalid) {
-            vs->setSelection(pp->inputVectors()[(*it)._name]->tagName());
+            vs->setSelection(pp->inputVectors()[(*it)._name]->tag().displayString());
           } else {
             vs->setSelection(selectedVector);
           }
@@ -228,7 +228,7 @@
           QString selectedString = ss->selectedString();
           ss->update();
           if (DPvalid) {
-            ss->setSelection(pp->inputStrings()[(*it)._name]->tagName());
+            ss->setSelection(pp->inputStrings()[(*it)._name]->tag().displayString());
           } else {
             ss->setSelection(selectedString);
           }
@@ -243,7 +243,7 @@
           QString selectedScalar = ss->selectedScalar();
           ss->update();
           if (DPvalid) {
-            ss->setSelection(pp->inputScalars()[(*it)._name]->tagName());
+            ss->setSelection(pp->inputScalars()[(*it)._name]->tag().displayString());
           } else {
             ss->setSelection(selectedScalar);
           }
--- trunk/extragear/graphics/kst/src/libkstapp/view2dplotwidget.ui.h #621727:621728
@@ -459,7 +459,7 @@
   
   if (plot->hasVectorToMarkers()) {
     UseVector->setChecked(true);
-    _vectorForMarkers->setSelection(plot->vectorToMarkers()->tagName());
+    _vectorForMarkers->setSelection(plot->vectorToMarkers()->tag().displayString());
   } else {
     UseVector->setChecked(false);
   }
--- trunk/extragear/graphics/kst/src/libkstmath/kstcsd.cpp #621727:621728
@@ -249,7 +249,7 @@
 
 
 QString KstCSD::vTag() const {
-  return _inputVectors[INVECTOR]->tagName();
+  return _inputVectors[INVECTOR]->tag().displayString();
 }
 
 
@@ -275,7 +275,7 @@
 
 
 QString KstCSD::propertyString() const {
-  return i18n("CSD: %1").arg(_inputVectors[INVECTOR]->tagName());
+  return i18n("CSD: %1").arg(_inputVectors[INVECTOR]->tag().displayString());
 }
 
 
--- trunk/extragear/graphics/kst/src/libkstmath/ksthistogram.cpp #621727:621728
@@ -314,7 +314,7 @@
 
 
 QString KstHistogram::vTag() const {
-  return _inputVectors[RAWVECTOR]->tagName();
+  return _inputVectors[RAWVECTOR]->tag().displayString();
 }
 
 
--- trunk/extragear/graphics/kst/src/libkstmath/kstimage.cpp #621727:621728
@@ -263,7 +263,7 @@
 
 QString KstImage::propertyString() const {
   if (_inputMatrices.contains(THEMATRIX)) {
-    return i18n("Using matrix %1" ).arg(_inputMatrices[THEMATRIX]->tagName());
+    return i18n("Using matrix %1" ).arg(_inputMatrices[THEMATRIX]->tag().displayString());
   } else {
     return QString();
   }
@@ -489,7 +489,7 @@
 
 QString KstImage::matrixTag() const {
   if (_inputMatrices.contains(THEMATRIX)) { 
-    return _inputMatrices[THEMATRIX]->tagName(); 
+    return _inputMatrices[THEMATRIX]->tag().displayString(); 
   } else {
     return QString();
   }
--- trunk/extragear/graphics/kst/src/libkstmath/kstpsd.cpp #621727:621728
@@ -363,7 +363,7 @@
 
 
 QString KstPSD::vTag() const {
-  return _inputVectors[INVECTOR]->tagName();
+  return _inputVectors[INVECTOR]->tag().displayString();
 }