Remove 'native data' and 'native units' (#331)

Resolves #331 (closed)

Somehow resolves #850 (closed)

GUI/Model/Axis/PointwiseAxisItem.cpp

@@ -25,7 +25,7 @@
 namespace {
 namespace Tag {
 
-const QString NativeUnits("NativeUnits");
+const QString NativeUnits("NativeUnits"); // obsolete since v22.0
 const QString BinaryData("BinaryData");
 const QString BaseData("BaseData");
 
@@ -34,7 +34,6 @@ const QString BaseData("BaseData");
 
 PointwiseAxisItem::PointwiseAxisItem(QObject* parent)
     : BasicAxisItem(parent)
-    , m_nativeAxisUnits("bin")
 {
 }
 
@@ -43,7 +42,6 @@ PointwiseAxisItem::~PointwiseAxisItem() = default;
 void PointwiseAxisItem::setAxis(const Scale& axis)
 {
     m_axis = std::unique_ptr<Scale>(axis.clone());
-    m_nativeAxisUnits = QString::fromStdString(axis.unit());
 }
 
 const Scale* PointwiseAxisItem::axis() const
@@ -51,11 +49,6 @@ const Scale* PointwiseAxisItem::axis() const
     return m_axis.get();
 }
 
-QString PointwiseAxisItem::nativeAxisUnits() const
-{
-    return m_nativeAxisUnits;
-}
-
 QByteArray PointwiseAxisItem::serializeBinaryData() const
 {
     if (!m_axis)
@@ -79,7 +72,7 @@ void PointwiseAxisItem::deserializeBinaryData(const QByteArray& data)
 
 void PointwiseAxisItem::writeTo(QXmlStreamWriter* w) const
 {
-    XML::writeAttribute(w, XML::Attrib::version, uint(1));
+    XML::writeAttribute(w, XML::Attrib::version, uint(2));
 
     // parameters from base class
     w->writeStartElement(Tag::BaseData);
@@ -93,11 +86,6 @@ void PointwiseAxisItem::writeTo(QXmlStreamWriter* w) const
         w->writeCharacters(a.toBase64());
         w->writeEndElement();
     }
-
-    // native units
-    w->writeStartElement(Tag::NativeUnits);
-    XML::writeAttribute(w, XML::Attrib::value, m_nativeAxisUnits);
-    w->writeEndElement();
 }
 
 void PointwiseAxisItem::readFrom(QXmlStreamReader* r)
@@ -120,11 +108,6 @@ void PointwiseAxisItem::readFrom(QXmlStreamReader* r)
             deserializeBinaryData(data);
             XML::gotoEndElementOfTag(r, tag);
 
-            // native units
-        } else if (tag == Tag::NativeUnits) {
-            XML::readAttribute(r, XML::Attrib::value, &m_nativeAxisUnits);
-            XML::gotoEndElementOfTag(r, tag);
-
         } else
             r->skipCurrentElement();
     }
@@ -132,7 +115,7 @@ void PointwiseAxisItem::readFrom(QXmlStreamReader* r)
 
 void PointwiseAxisItem::updateAxIndicators(const Frame& frame)
 {
-    if (!m_axis || nativeAxisUnits() == "bin")
+    if (!m_axis || m_axis->unit() == "bin")
         return;
 
     if (frame.axis(0).unit() == "rad") {