[Kst] branches/work/kst/hierarchy/kst/src/libkstapp

[Eli Fidler]

SVN commit 613552 by fidler:

revert curve dialog changes, as the stored curve was not always correct


 M  +8 -7      kstfitdialog_i.cpp  
 M  +1 -1      kstfitdialog_i.h  


--- branches/work/kst/hierarchy/kst/src/libkstapp/kstfitdialog_i.cpp #613551:613552
@@ -76,12 +76,13 @@
 
   _strWindow   = strWindow;
   _strPlotName = strPlotName;
-  _curve = *vcurves.findTag(strCurve);
-  if (!_curve) {
-    KstReadLocker rl(_curve);
-    _yvector = _curve->yVTag().tag();  // FIXME: is this right? I don't think so.
-    _xvector = _curve->xVTag().tag();
-    _evector = _curve->yETag().tag();
+  _strCurve    = strCurve;
+  curve = *vcurves.findTag(strCurve);
+  if (curve) {
+    KstReadLocker rl(curve);
+    _yvector = curve->yVTag().tag();  // FIXME: is this right? I don't think so.
+    _xvector = curve->xVTag().tag();
+    _evector = curve->yETag().tag();
   }
   if (_xvector == "<None>" || _yvector == "<None>") {
     return;
@@ -199,7 +200,7 @@
         plugin->setPlugin(pPtr);
 
         if (tagName == plugin_defaultTag) {
-          tagName = KST::suggestPluginName(_pluginList[pitem], _curve->tag());
+          tagName = KST::suggestPluginName(_pluginList[pitem], KstObjectTag::fromString(_strCurve));
         }
 
         plugin->setTagName(KstObjectTag(tagName, KstObjectTag::globalTagContext)); // FIXME: tag context always global?
--- branches/work/kst/hierarchy/kst/src/libkstapp/kstfitdialog_i.h #613551:613552
@@ -40,7 +40,7 @@
     QString _evector;
     QString _strWindow;
     QString _strPlotName;
-    KstVCurvePtr _curve;
+    QString _strCurve;
     
     bool createCurve(KstCPluginPtr plugin);