rm selectedRank

GUI/Model/Files/DatafilesSet.cpp

@@ -22,7 +22,6 @@ namespace Tag {
 
 const QString RealData("RealData");
 const QString CurrentIndex("CurrentIndex");
-const QString SelectedRank("SelectedRank");
 
 } // namespace Tag
 } // namespace
@@ -66,11 +65,6 @@ void DatafilesSet::writeTo(QXmlStreamWriter* w) const
     w->writeStartElement(Tag::CurrentIndex);
     XML::writeAttribute(w, XML::Attrib::value, m_current_index);
     w->writeEndElement();
-
-    // selected rank
-    w->writeStartElement(Tag::SelectedRank);
-    XML::writeAttribute(w, XML::Attrib::value, m_selected_rank);
-    w->writeEndElement();
 }
 
 void DatafilesSet::readFrom(QXmlStreamReader* r)
@@ -95,11 +89,6 @@ void DatafilesSet::readFrom(QXmlStreamReader* r)
             XML::readAttribute(r, XML::Attrib::value, &m_current_index);
             XML::gotoEndElementOfTag(r, tag);
 
-            // selected rank
-        } else if (tag == Tag::SelectedRank) {
-            XML::readAttribute(r, XML::Attrib::value, &m_selected_rank);
-            XML::gotoEndElementOfTag(r, tag);
-
         } else
             r->skipCurrentElement();
     }

GUI/Model/Files/DatafilesSet.h

@@ -54,9 +54,6 @@ public:
     int currentIndex() const { return m_current_index; }
     void setCurrentIndex(int index) { m_current_index = index; }
 
-    int selectedRank() const { return m_selected_rank; }
-    void setSelectedRank(int rank) { m_selected_rank = rank; }
-
 private:
     DatafilesCleaner dataFilesCleaner;
     std::vector<std::unique_ptr<DatafileItem>> m_dfile_items;

GUI/View/Data/DatafilesSelector.cpp

@@ -176,16 +176,7 @@ void DatafilesSelector::setCurrentDatafileItem(DatafileItem* item)
 
 void DatafilesSelector::restoreSelection()
 {
-    int lastIndex = gDoc->datafiles()->currentIndex();
-    int lastRank = gDoc->datafiles()->selectedRank();
-    QModelIndex lastUsedIndex = m_qmodel->index(lastIndex, 0, m_qmodel->indexOfHeadline(lastRank));
-
-    if (lastUsedIndex.isValid())
-        m_qview->selectionModel()->setCurrentIndex(lastUsedIndex,
-                                                   QItemSelectionModel::SelectCurrent);
-    else
-        setCurrentDatafileItem(m_qmodel->topMostItem());
-
+    setCurrentDatafileItem(m_qmodel->topMostItem());
     if (currentDatafileItem())
         m_data_frames->setStackedItem(currentDatafileItem()->dataItem());
 }
@@ -228,7 +219,6 @@ void DatafilesSelector::onSelectionChanged()
     updateActionEnabling();
 
     gDoc->datafilesModifier()->setCurrentIndex(currentDatafileIndex().row());
-    gDoc->datafilesModifier()->setSelectedRank(currentDatafileIndex().parent().row() + 1);
 
     DatafileItem* dfi = currentDatafileItem();
     m_editor->setDatafileItem(dfi);

Tests/Unit/GUI/TestDatafilesModel.cpp

@@ -99,7 +99,6 @@ TEST(TestDatafilesSet, saveXMLData)
     intensity2->linkToInstrument(instrument_model.addInstrumentItem<OffspecInstrumentItem>());
 
     // set non-default top-level model parameters
-    model1.setSelectedRank(2);
     model1.setCurrentIndex(1);
 
     // save data to project files