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

[Mike Fenton]

SVN commit 802158 by fenton:

Fix of DataVector creation.  Object name was being changed resulting in tag name not matching registered name in ObjectStore.
Disable name update in Edit of DataVector.


 M  +2 -1      datadialog.cpp  
 M  +6 -4      vectordialog.cpp  


--- branches/work/kst/portto4/kst/src/libkstapp/datadialog.cpp #802157:802158
@@ -56,10 +56,11 @@
 
   if (_mode == New) {
     buttonBox()->button(QDialogButtonBox::Apply)->setVisible(false);
+  } else {
+    connect(this, SIGNAL(apply()), this, SLOT(slotApply()));
   }
 
   connect(this, SIGNAL(ok()), this, SLOT(slotApply()));
-  connect(this, SIGNAL(apply()), this, SLOT(slotApply()));
 
   QWidget *extension = extensionWidget();
 
--- branches/work/kst/portto4/kst/src/libkstapp/vectordialog.cpp #802157:802158
@@ -481,10 +481,12 @@
         dataRange->doSkip(),
         dataRange->doFilter());
 
-      if (dataVector->tag().name()!=tagString()) {
-	//FIXME: needs a gaurd against being not unique
-	dataVector->tag().setName(tagString()); 
-      }
+//  Disable until new tag system is fully implemented.
+//
+//       if (dataVector->tag().name()!=tagString()) {
+// 	//FIXME: needs a gaurd against being not unique
+// 	dataVector->tag().setName(tagString()); 
+//       }
 
       dataVector->update(0);
       dataVector->unlock();