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

[Barth Netterfield]

SVN commit 1254493 by netterfield:

BUG:
Plot shortnames were not being properly read in.  Now they are.



 M  +9 -5      plotitem.cpp  


--- branches/work/kst/portto4/kst/src/libkstapp/plotitem.cpp #1254492:1254493
@@ -292,10 +292,10 @@
 
 void PlotItem::_initializeShortName() {
   _shortName = 'P'+QString::number(_plotnum);
-  if (_plotnum>max_plotnum)
+  if (_plotnum>max_plotnum) {
     max_plotnum = _plotnum;
+  }
   _plotnum++;
-
 }
 
 QString PlotItem::plotName() const {
@@ -3783,12 +3783,17 @@
     if (xml.isStartElement()) {
       if (!rc && xml.name().toString() == "plot") {
         Q_ASSERT(!rc);
+
+        QXmlStreamAttributes attrs = xml.attributes();
+        QStringRef av;
+
+        Object::processShortNameIndexAttributes(attrs);
+
         rc = new PlotItem(view);
         if (parent) {
           rc->setParentViewItem(parent);
         }
-        QXmlStreamAttributes attrs = xml.attributes();
-        QStringRef av;
+
         bool xTiedZoom = false, yTiedZoom = false;
         av = attrs.value("tiedxzoom");
         if (!av.isNull()) {
@@ -3857,7 +3862,6 @@
         if (attrs.value("descriptiveNameIsManual").toString() == "true") {
           rc->setDescriptiveName(attrs.value("descriptiveName").toString());
         }
-        Object::processShortNameIndexAttributes(attrs);
 
         // Add any new specialized PlotItem Properties here.
       } else if (xml.name().toString() == "projectionrect") {