Pass model reference to Item/Row

Give Item/NameItem/Row access to their parent ScalarSourceModel by adding a const ScalarSourceModel& parameter and storing it in Item::_scalarSourceModel. Update construction sites (appendRow/Row) to pass *this. Use the model reference in Item::data() to respect getShowFullPathName() and use getGuiName() for display. Add getScalarSourceModel() accessor. Also change getDatasets() to return by value and remove some dead/commented code. These changes allow items to query model state reliably and simplify row construction.

Author: ThomasKroes

src/ScalarSourceModel.cpp

@@ -11,11 +11,12 @@ ScalarSourceModel::ScalarSourceModel(QObject* parent /*= nullptr*/) :
     QStandardItemModel(parent),
     _showFullPathName(true)
 {
-    appendRow(Row({}));     // Constant source
-    appendRow(Row({}));     // Selection source
+    appendRow(Row(*this, {}));  // Constant source
+    appendRow(Row(*this, {}));  // Selection source
 }
 
-ScalarSourceModel::Item::Item(const mv::Dataset<>& scalarDataset) :
+ScalarSourceModel::Item::Item(const ScalarSourceModel& scalarSourceModel, const mv::Dataset<>& scalarDataset) :
+    _scalarSourceModel(scalarSourceModel),
     _scalarDataset(scalarDataset)
 {
 }
@@ -48,8 +49,8 @@ QVariant ScalarSourceModel::Item::data(int role) const
 		    {
 			    if (rowIndex == 2)
 			    	return _scalarDataset->text();
-			    //else
-			    //    return _showFullPathName ? scalarDataset->getLocation() : scalarDataset->text();
+			    else
+			        return getScalarSourceModel().getShowFullPathName() ? getScalarDataset()->getLocation() : getScalarDataset()->getGuiName();
 		    }
 		    else {
 			    if (rowIndex == DefaultRow::Constant)
@@ -67,13 +68,18 @@ QVariant ScalarSourceModel::Item::data(int role) const
     return {};
 }
 
+const ScalarSourceModel& ScalarSourceModel::Item::getScalarSourceModel() const
+{
+	return _scalarSourceModel;
+}
+
 const mv::Dataset<>& ScalarSourceModel::Item::getScalarDataset() const
 {
     return _scalarDataset;
 }
 
-ScalarSourceModel::NameItem::NameItem(const mv::Dataset<>& scalarDataset) :
-    Item(scalarDataset)
+ScalarSourceModel::NameItem::NameItem(const ScalarSourceModel& scalarSourceModel, const mv::Dataset<>& scalarDataset) :
+    Item(scalarSourceModel, scalarDataset)
 {
 	connect(&const_cast<Dataset<>&>(getScalarDataset()), &Dataset<>::guiNameChanged, this, [this]() {
         emitDataChanged();
@@ -158,27 +164,12 @@ QVariant ScalarSourceModel::IdItem::data(int role) const
     return Item::data(role);
 }
 
-/*
-int ScalarSourceModel::rowIndex(const Dataset<DatasetImpl>& dataset) const
-{
-    // Only proceed if we have a valid dataset
-    if (!dataset.isValid())
-        return -1;
-
-    // Return the index of the dataset and add one for the constant point size option
-    return _datasets.indexOf(dataset) + DefaultRow::DatasetStart;
-}
-*/
-
-
-
 void ScalarSourceModel::addDataset(const Dataset<DatasetImpl>& dataset)
 {
-    // Avoid duplicates
     if (hasDataset(dataset))
         return;
 
-    appendRow(Row(dataset));
+    appendRow(Row(*this, dataset));
 }
 
 bool ScalarSourceModel::hasDataset(const Dataset<DatasetImpl>& dataset) const
@@ -205,7 +196,7 @@ void ScalarSourceModel::removeAllDatasets()
     removeRows(DefaultRow::DatasetStart, rowCount() - DefaultRow::DatasetStart);
 }
 
-const Datasets& ScalarSourceModel::getDatasets() const
+Datasets ScalarSourceModel::getDatasets() const
 {
     Datasets datasets;
 

src/ScalarSourceModel.h

@@ -44,36 +44,45 @@ class ScalarSourceModel : public QStandardItemModel
     public:
 
         /**
-         * Construct with pointer to \p scalarDataset
+         * Construct with reference to \p scalarSourceModel and pointer to \p scalarDataset
+         * @param scalarSourceModel Reference to the scalar source model
          * @param scalarDataset Pointer to scalar dataset (maybe nullptr)
          */
-        Item(const mv::Dataset<DatasetImpl>& scalarDataset);
+        Item(const ScalarSourceModel& scalarSourceModel, const mv::Dataset<DatasetImpl>& scalarDataset);
 
         /**
          * Get model data for \p role
          * @return Data for \p role in variant form
          */
         QVariant data(int role = Qt::UserRole + 1) const override;
 
+        /**
+         * Get reference to the scalar source model
+         * @return Reference to the scalar source model
+         */
+        const ScalarSourceModel& getScalarSourceModel() const;
+
         /**
          * Get the scalar dataset associated with this item (if any)
          * @return Pointer to scalar dataset (maybe nullptr)
          */ 
         const mv::Dataset<>& getScalarDataset() const;
 
     private:
-        mv::Dataset<> _scalarDataset;    /** Pointer to scalar dataset (maybe nullptr) */
+        const ScalarSourceModel&    _scalarSourceModel;     /** Reference to the scalar source model */
+        mv::Dataset<>               _scalarDataset;         /** Pointer to scalar dataset (maybe nullptr) */
     };
 
     /** Standard model item class for displaying the dataset GUI name */
     class NameItem final : public Item, public QObject {
     public:
 
         /**
-         * Construct with pointer to \p scalarDataset
+         * Construct with reference to \p scalarSourceModel and pointer to \p scalarDataset
+         * @param scalarSourceModel Reference to the scalar source model
          * @param scalarDataset Pointer to scalar dataset (maybe nullptr)
          */
-        NameItem(const mv::Dataset<>& scalarDataset);
+        NameItem(const ScalarSourceModel& scalarSourceModel, const mv::Dataset<>& scalarDataset);
 
         /**
          * Get model data for \p role
@@ -168,7 +177,7 @@ class ScalarSourceModel : public QStandardItemModel
      * Get datasets
      * @return Vector of smart pointers to datasets
      */
-    const Datasets& getDatasets() const;
+    Datasets getDatasets() const;
 
     /**
      * Get dataset at the specified row index
@@ -210,10 +219,11 @@ class ScalarSourceModel : public QStandardItemModel
          * Construct with pointer to \p scalarDataset
          * @param scalarDataset Pointer to scalar dataset (maybe nullptr)
          */
-        Row(const mv::Dataset<>& scalarDataset) : QList<QStandardItem*>()
+        Row(const ScalarSourceModel& scalarSourceModel, const mv::Dataset<>& scalarDataset) :
+    		QList<QStandardItem*>()
         {
-            append(new NameItem(scalarDataset));
-            append(new IdItem(scalarDataset));
+            append(new NameItem(scalarSourceModel, scalarDataset));
+            append(new IdItem(scalarSourceModel, scalarDataset));
         }
     };