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

[Barth Netterfield]

SVN commit 745218 by netterfield:

Start to get the names to work in dialogs.



 M  +1 -0      libkst/objectstore.h  
 M  +6 -1      libkstapp/curvedialog.cpp  
 M  +1 -1      libkstapp/datadialog.cpp  
 M  +5 -1      libkstapp/vectordialog.cpp  


--- branches/work/kst/portto4/kst/src/libkst/objectstore.h #745217:745218
@@ -193,6 +193,7 @@
     return tag;
   } else {
     QString name = QString("%1-%2").arg(abbreviate(T::staticTypeString)).arg(basedOn);
+    tag.setName(name);
     return getUniqueTag(tag);
   }
 }
--- branches/work/kst/portto4/kst/src/libkstapp/curvedialog.cpp #745217:745218
@@ -268,7 +268,12 @@
 
 
 QString CurveDialog::tagString() const {
-  return DataDialog::tagString();
+  QString tagString = DataDialog::tagString();
+  if (_curveTab->yVector()) {
+    // FIXME: not sure I like this name...
+    tagString.replace(defaultTagString(), _curveTab->yVector()->tag().name());
+  }
+  return tagString;
 }
 
 
--- branches/work/kst/portto4/kst/src/libkstapp/datadialog.cpp #745217:745218
@@ -82,7 +82,7 @@
   if (_dataObject) {
     setTagString(_dataObject->tag().tagString()); // FIXME: should this be displayString()?
   } else {
-    setTagString(tagString());
+    setTagString(_defaultTagString);
     button->setVisible(false);
   }
 
--- branches/work/kst/portto4/kst/src/libkstapp/vectordialog.cpp #745217:745218
@@ -372,7 +372,8 @@
 //            << "\n\tfileName:" << dataSource->fileName()
 //            << "\n\tfileType:" << dataSource->fileType()
 //            << "\n\tfield:" << field
-//            << "\n\ttag:" << tag.tag()
+//            << "\n\ttag:" << tag.displayString()
+// 	   << "\n\ttagString:" << tagString()
 //            << "\n\tstart:" << (dataRange->countFromEnd() ? -1 : int(dataRange->start()))
 //            << "\n\trange:" << (dataRange->readToEnd() ? -1 : int(dataRange->range()))
 //            << "\n\tskip:" << dataRange->skip()
@@ -478,6 +479,9 @@
         dataRange->skip(),
         dataRange->doSkip(),
         dataRange->doFilter());
+      
+      // FIXME update the data vector tag, if it changed!
+
       dataVector->update(0);
       dataVector->unlock();