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

[Andrew Walker]

SVN commit 748562 by arwalker:

BUG:153393 update tag name when file is changed

 M  +4 -5      libkst/kstrvector.cpp  
 M  +0 -1      libkstapp/kstvectordialog_i.cpp  


--- branches/work/kst/1.6/kst/src/libkst/kstrvector.cpp #748561:748562
@@ -178,6 +178,7 @@
                         int reqStartingFrame, int reqNumberFrames,
                         int skip, bool doSkip, bool doAve) {
   Q_ASSERT(myLockStatus() == KstRWLock::WRITELOCKED);
+  Q_UNUSED(in_tag);
 
   _skip = skip;
   _doSkip = doSkip;
@@ -187,13 +188,12 @@
   }
 
   _dontUseSkipAccel = false;
-  _file = in_file;
+  if (in_file != _file) {
+    changeFile(in_file);
+  }
   _reqStartingFrame = reqStartingFrame;
   _reqNumberFrames = reqNumberFrames;
   _field = in_field;
-  if (in_tag != tag()) {
-    setTagName(in_tag);
-  }
 
   if (_file) {
     _file->writeLock();
@@ -206,7 +206,6 @@
   if (_reqNumberFrames <= 0 && _reqStartingFrame < 0) {
     _reqStartingFrame = 0;
   }
-
 }
 
 
--- branches/work/kst/1.6/kst/src/libkstapp/kstvectordialog_i.cpp #748561:748562
@@ -638,7 +638,6 @@
 
     svp->writeLock();
     svp->changeRange(x0, x1, n);
-printf("s-change\n");
     svp->setTagName(KstObjectTag(_tagName->text(), svp->tag().context())); // FIXME: doesn't verify uniqueness, doesn't allow changing tag context
     svp->unlock();
   }