diff --git a/GUI/Model/Data/Data2DItem.cpp b/GUI/Model/Data/Data2DItem.cpp index 2d7803c37b4ef97b68a136b325a5a8c6bd72d2d2..ff247e8b7364c6d62aef5bb112022381838b2e35 100644 --- a/GUI/Model/Data/Data2DItem.cpp +++ b/GUI/Model/Data/Data2DItem.cpp @@ -290,7 +290,7 @@ void Data2DItem::writeTo(QXmlStreamWriter* w) const // projections if (m_proj_model) { - if (auto* pi = m_proj_model->projnItem()) { + if (auto* pi = m_proj_model->prjnsSet()) { w->writeStartElement(Tag::ProjectionContainer); pi->writeTo(w); w->writeEndElement(); @@ -333,7 +333,7 @@ void Data2DItem::readFrom(QXmlStreamReader* r) // projections } else if (tag == Tag::ProjectionContainer) { - getOrCreateProjectionModel()->projnItem()->readFrom(r); + getOrCreateProjectionModel()->prjnsSet()->readFrom(r); XML::gotoEndElementOfTag(r, tag); } else @@ -396,12 +396,12 @@ Datafield* Data2DItem::createMaskedField() const ProjectionsSet* Data2DItem::projectionsSet() { - return m_proj_model ? m_proj_model->projnItem() : nullptr; + return m_proj_model ? m_proj_model->prjnsSet() : nullptr; } const ProjectionsSet* Data2DItem::projectionsSet() const { - return m_proj_model ? m_proj_model->projnItem() : nullptr; + return m_proj_model ? m_proj_model->prjnsSet() : nullptr; } MasksQModel* Data2DItem::getOrCreateProjectionModel() diff --git a/GUI/Model/Mask/MasksQModel.cpp b/GUI/Model/Mask/MasksQModel.cpp index 1a6c4ccbebd2b982ead3abdae48f1527c6a1ba03..a627e7e3d581900f007f9c92d53bffd7f8848bb9 100644 --- a/GUI/Model/Mask/MasksQModel.cpp +++ b/GUI/Model/Mask/MasksQModel.cpp @@ -105,12 +105,12 @@ void MasksQModel::clear() QAbstractListModel::endResetModel(); } -ProjectionsSet* MasksQModel::projnItem() +ProjectionsSet* MasksQModel::prjnsSet() { return dynamic_cast<ProjectionsSet*>(m_masks); } -const ProjectionsSet* MasksQModel::projnItem() const +const ProjectionsSet* MasksQModel::prjnsSet() const { return dynamic_cast<const ProjectionsSet*>(m_masks); } diff --git a/GUI/Model/Mask/MasksQModel.h b/GUI/Model/Mask/MasksQModel.h index 66ee061400c6b02d18f0b81756c34dc3bb8232b0..692ecda6e849031ccd345d66ff7e5567e07a943c 100644 --- a/GUI/Model/Mask/MasksQModel.h +++ b/GUI/Model/Mask/MasksQModel.h @@ -60,8 +60,8 @@ public: MasksSet* masksSet() { return m_masks; } const MasksSet* masksSet() const { return m_masks; } - ProjectionsSet* projnItem(); - const ProjectionsSet* projnItem() const; + ProjectionsSet* prjnsSet(); + const ProjectionsSet* prjnsSet() const; private: MasksSet* m_masks;