src/libkst/datavector.cpp

@@ -285,10 +285,7 @@ int DataVector::reqStartFrame() const {
 
 /** Save vector information */
 void DataVector::save(QXmlStreamWriter &s) {
-  if (saveData()) { // The vector has been modified manually => use basic saving
-    Kst::Vector::save(s);
-  }
-  else if (dataSource()) {
+  if (dataSource()) {
     s.writeStartElement("datavector");
     saveFilename(s);
     s.writeAttribute("field", _field);
@@ -827,26 +824,30 @@ QString DataVector::descriptionTip() const {
   QString IDstring;
   //QString range_string;
 
-  IDstring = tr(
-      "Data Vector: %1\n"
-      "  %2\n"
-      "  Field: %3"
-      ).arg(Name()).arg(dataSource()->fileName()).arg(_field);
-
-  if (countFromEOF()) {
-    IDstring += tr("\n  Last %1 frames.").arg(numFrames());
-  } else if (readToEOF()) {
-    IDstring += tr("\n  Frame %1 to end.").arg(startFrame());
-  } else {
-    IDstring += tr("\n  %1 Frames starting at %2.").arg(numFrames()).arg(startFrame());
-  }
-  if (skip()) {
-    if (!doAve()) {
-      IDstring+=tr("\n  Read 1 sample per %1 frames.").arg(skip());
+  if (dataSource()) {
+    IDstring = tr(
+                 "Data Vector: %1\n"
+                 "  %2\n"
+                 "  Field: %3"
+                 ).arg(Name()).arg(dataSource()->fileName()).arg(_field);
+    if (countFromEOF()) {
+      IDstring += tr("\n  Last %1 frames.").arg(numFrames());
+    } else if (readToEOF()) {
+      IDstring += tr("\n  Frame %1 to end.").arg(startFrame());
     } else {
-      IDstring+=tr("\n  Average each %1 frames.").arg(skip());
+      IDstring += tr("\n  %1 Frames starting at %2.").arg(numFrames()).arg(startFrame());
     }
+    if (skip()) {
+      if (!doAve()) {
+        IDstring+=tr("\n  Read 1 sample per %1 frames.").arg(skip());
+      } else {
+        IDstring+=tr("\n  Average each %1 frames.").arg(skip());
+      }
+    }
+  } else{
+    IDstring.clear();
   }
+
   return IDstring;
 }
 

src/libkstapp/viewvectordialog.cpp

@@ -221,7 +221,6 @@ void ViewVectorDialog::makeEditable() {
 //      VectorPtr vector = kst_cast<Vector>(_doc->objectStore()->retrieveObject(objectName));
         _model->vectorAtIndex(column)->setEditable(true);
         _model->vectorAtIndex(column)->setSaveData(true);
-        _model->vectorAtIndex(column)->setSaveable(true);
     }
 }