Skip to content
Snippets Groups Projects
Commit f086f576 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

replace 'insertDatafileItem' by 'appendDatafileItem'

parent b371d369
No related branches found
No related tags found
1 merge request!2359Use same tree view with delegate for datafiles, samples, and instruments. Also move some code between GUI/View directories. Restore Py wrappers lost in previous MR.
......@@ -35,7 +35,7 @@ bool DatafilesQModel::setData(const QModelIndex& index, const QVariant& value, i
void DatafilesQModel::injectDatafileItem(DatafileItem* item)
{
m_model->insertDatafileItem(item);
m_model->appendDatafileItem(item);
const int row = m_model->dfileItems().indexOf(item);
beginInsertRows(indexOfHeadline(), row, row);
m_items = m_model->dfileItems();
......
......@@ -33,7 +33,7 @@ DatafilesSet::DatafilesSet()
DatafilesSet::~DatafilesSet() = default;
void DatafilesSet::insertDatafileItem(DatafileItem* dfi)
void DatafilesSet::appendDatafileItem(DatafileItem* dfi)
{
m_dfile_items.emplace_back(dfi);
}
......
......@@ -31,7 +31,7 @@ public:
explicit DatafilesSet();
~DatafilesSet();
void insertDatafileItem(DatafileItem* dfi);
void appendDatafileItem(DatafileItem* dfi);
void removeDatafileItem(DatafileItem* dfi);
void clear();
void readFrom(QXmlStreamReader* r);
......
......@@ -83,18 +83,18 @@ TEST(TestDatafilesSet, saveXMLData)
// add specular DatafileItems with non-default parameters
auto* spec1 = new DatafileItem("spec1", df1);
model1.insertDatafileItem(spec1);
model1.appendDatafileItem(spec1);
spec1->linkToInstrument(instrument_model.addInstrumentItem<SpecularInstrumentItem>());
// add second specular DatafileItem
auto* spec2 = new DatafileItem("spec2", df2);
model1.insertDatafileItem(spec2);
model1.appendDatafileItem(spec2);
// add 2D DatafileItems with non-default parameters
auto* intensity1 = new DatafileItem("GISAS", df2);
auto* intensity2 = new DatafileItem("Offspec", df2);
model1.insertDatafileItem(intensity1);
model1.insertDatafileItem(intensity2);
model1.appendDatafileItem(intensity1);
model1.appendDatafileItem(intensity2);
intensity1->linkToInstrument(instrument_model.addInstrumentItem<GISASInstrumentItem>());
intensity2->linkToInstrument(instrument_model.addInstrumentItem<OffspecInstrumentItem>());
......
......@@ -57,14 +57,14 @@ Datafield UTest::GUI::makeData2D(double value, int nx, double x_min, double x_ma
DatafileItem* UTest::GUI::createRealData1D(const QString& name, DatafilesSet& model, double value)
{
auto* dfi = new DatafileItem(name, makeData1D(value));
model.insertDatafileItem(dfi);
model.appendDatafileItem(dfi);
return dfi;
}
DatafileItem* UTest::GUI::createRealData2D(const QString& name, DatafilesSet& model, double value)
{
auto* dfi = new DatafileItem(name, makeData2D(value));
model.insertDatafileItem(dfi);
model.appendDatafileItem(dfi);
return dfi;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment