src/libkst/datamatrix.cpp

@@ -78,7 +78,7 @@ void DataMatrix::save(QXmlStreamWriter &xml) {
     xml.writeAttribute("ymin", QString::number(minY()));
     xml.writeAttribute("xstep", QString::number(xStepSize()));
     xml.writeAttribute("ystep", QString::number(yStepSize()));
-    saveNameInfo(xml, VNUM|MNUM|XNUM);
+    saveNameInfo(xml, VECTORNUM|MATRIXNUM|SCALARNUM);
 
     xml.writeEndElement();
   }

src/libkst/datascalar.cpp

@@ -108,7 +108,7 @@ void DataScalar::save(QXmlStreamWriter &s) {
     saveFilename(s);
     s.writeAttribute("field", _field);
 
-    saveNameInfo(s, XNUM);
+    saveNameInfo(s, SCALARNUM);
     s.writeEndElement();
   }
 }

src/libkst/datasource.cpp

@@ -96,10 +96,10 @@ Object::UpdateType DataSource::objectUpdate(qint64 newSerial) {
 
 
 void DataSource::_initializeShortName() {
-  _shortName = QString("DS%1").arg(_dsnum);
-  if (_dsnum>max_dsnum)
-    max_dsnum = _dsnum;
-  _dsnum++;
+  _shortName = QString("DS%1").arg(_datasourcenum);
+  if (_datasourcenum>max_datasourcenum)
+    max_datasourcenum = _datasourcenum;
+  _datasourcenum++;
 }
 
 bool DataSource::isValid() const {
@@ -316,6 +316,8 @@ void DataSource::saveSource(QXmlStreamWriter &s) {
   s.writeAttribute("updateType", QString::number(int(_updateCheckType)));
   DataPrimitive::saveFilename(name, s);
   save(s);
+
+  saveNameInfo(s, DATASOURCENUM);
   s.writeEndElement();
 }
 

src/libkst/datastring.cpp

@@ -113,7 +113,7 @@ void DataString::save(QXmlStreamWriter &s) {
     saveFilename(s);
     s.writeAttribute("field", _field);
 
-    saveNameInfo(s, TNUM);
+    saveNameInfo(s, STRINGNUM);
     s.writeEndElement();
   }
 }

src/libkst/datavector.cpp

@@ -305,7 +305,7 @@ void DataVector::save(QXmlStreamWriter &s) {
     s.writeAttribute("startUnits", startUnits());
     s.writeAttribute("rangeUnits", rangeUnits());
 
-    saveNameInfo(s, VNUM|XNUM);
+    saveNameInfo(s, VECTORNUM|SCALARNUM);
     s.writeEndElement();
   }
 }

src/libkst/editablematrix.cpp

@@ -53,7 +53,7 @@ void EditableMatrix::save(QXmlStreamWriter &xml) {
   }
 
   xml.writeStartElement(staticTypeTag);
-  saveNameInfo(xml, VNUM|MNUM|XNUM);
+  saveNameInfo(xml, VECTORNUM|MATRIXNUM|SCALARNUM);
   xml.writeAttribute("xmin", QString::number(minX()));
   xml.writeAttribute("ymin", QString::number(minY()));
   xml.writeAttribute("nx", QString::number(xNumSteps()));

src/libkst/editablevector.cpp

@@ -72,7 +72,7 @@ void EditableVector::setValue(const int &i, const double &val) { //sa Vector::ch
 /** Save vector information */
 void EditableVector::save(QXmlStreamWriter &s) {
   s.writeStartElement("editablevector");
-  saveNameInfo(s, VNUM|XNUM);
+  saveNameInfo(s, VECTORNUM|SCALARNUM);
 
   if (_saveData) {
     QByteArray qba(length()*sizeof(double), '\0');

src/libkst/generatedmatrix.cpp

@@ -48,7 +48,7 @@ void GeneratedMatrix::save(QXmlStreamWriter &xml) {
   xml.writeAttribute("gradzmin", QString::number(_gradZMin));
   xml.writeAttribute("gradzmax", QString::number(_gradZMax));
   xml.writeAttribute("xdirection", QVariant(_xDirection).toString());
-  saveNameInfo(xml, VNUM|MNUM|XNUM);
+  saveNameInfo(xml, VECTORNUM|MATRIXNUM|SCALARNUM);
 
   xml.writeEndElement();
 

src/libkst/generatedvector.cpp

@@ -48,7 +48,7 @@ void GeneratedVector::save(QXmlStreamWriter &s) {
   s.writeAttribute("min", QString::number(min()));
   s.writeAttribute("max", QString::number(max()));
   s.writeAttribute("count", QString::number(length()));
-  saveNameInfo(s, VNUM|XNUM);
+  saveNameInfo(s, VECTORNUM|SCALARNUM);
 
   s.writeEndElement();
 }

src/libkst/matrix.cpp

@@ -66,10 +66,10 @@ Matrix::~Matrix() {
 }
 
 void Matrix::_initializeShortName() {
-  _shortName = 'M'+QString::number(_mnum);
-  if (_mnum>max_mnum)
-    max_mnum = _mnum;
-  _mnum++;
+  _shortName = 'M'+QString::number(_matrixnum);
+  if (_matrixnum>max_matrixnum)
+    max_matrixnum = _matrixnum;
+  _matrixnum++;
 }