refs #325, name variant pair allows test for existing values

* equal value updates can be skipped
* equalsQVariant in CValueObject
* resizing parameter for views

src/blackgui/models/namevariantpairlistmodel.cpp

@@ -40,25 +40,27 @@ namespace BlackGui
             this->m_sortOrder = Qt::AscendingOrder;
         }
 
-        void CNameVariantPairModel::addOrUpdateByName(const QString &name, const QString &value, const CIcon &icon)
+        bool CNameVariantPairModel::addOrUpdateByName(const QString &name, const QVariant &value, const CIcon &icon, bool skipEqualValues)
         {
-            int index = this->getNameRowIndex(name);
-            QVariant qv(value);
-            CNameVariantPair pair(name, qv, icon);
+            int index = this->getRowIndexForName(name);
+            CNameVariantPair pair(name, value, icon);
 
             if (index < 0)
             {
                 // not in the list yet, append
                 this->push_back(pair);
+                return true;
             }
             else
             {
                 // already in list, update
+                if (skipEqualValues  && this->containsNameValue(name, value)) { return false; }
                 this->update(index, pair);
+                return true;
             }
         }
 
-        int CNameVariantPairModel::getNameRowIndex(const QString &name)
+        int CNameVariantPairModel::getRowIndexForName(const QString &name) const
         {
             int rowIndex = this->m_container.getNameRowIndex(name);
             return rowIndex;
@@ -66,10 +68,24 @@ namespace BlackGui
 
         void CNameVariantPairModel::removeByName(const QString &name)
         {
-            int rowIndex = this->getNameRowIndex(name);
+            int rowIndex = this->getRowIndexForName(name);
             if (rowIndex < 0) return;
             QModelIndex i = this->index(rowIndex, 0);
             this->remove(this->at(i));
         }
-    }
-}
+
+        bool CNameVariantPairModel::containsName(const QString &name) const
+        {
+            return this->m_container.containsName(name);
+        }
+
+        bool CNameVariantPairModel::containsNameValue(const QString &name, const QVariant &value) const
+        {
+            int rowIndex = this->getRowIndexForName(name);
+            if (rowIndex < 0) return false;
+            QModelIndex i = this->index(rowIndex, 0);
+            const CNameVariantPair cv = this->at(i);
+            return BlackMisc::equalQVariants(value, cv.toQVariant());
+        }
+    } // namespace
+} // namespace

src/blackgui/models/namevariantpairlistmodel.h

@@ -33,20 +33,26 @@ namespace BlackGui
             //! Constructor
             explicit CNameVariantPairModel(bool withIcon, QObject *parent = nullptr);
 
+            //! Destructor
+            virtual ~CNameVariantPairModel() {}
+
             //! Icon on / off
             void setIconMode(bool withIcon);
 
             //! Remove by given name
             void removeByName(const QString &name);
 
+            //! Contains name already?
+            bool containsName(const QString &name) const;
+
+            //! Contains name / value?
+            bool containsNameValue(const QString &name, const QVariant &value) const;
+
             //! Add our update a value
-            void addOrUpdateByName(const QString &name, const QString &value, const BlackMisc::CIcon &icon);
+            bool addOrUpdateByName(const QString &name, const QVariant &value, const BlackMisc::CIcon &icon, bool skipEqualValues);
 
             //! Current row index of given name
-            int getNameRowIndex(const QString &name);
-
-            //! Destructor
-            virtual ~CNameVariantPairModel() {}
+            int getRowIndexForName(const QString &name) const;
 
         };
     }

src/blackgui/views/namevariantpairview.cpp

@@ -28,17 +28,23 @@ namespace BlackGui
             this->m_model->setIconMode(withIcon);
         }
 
-        void CNameVariantPairView::addOrUpdateByName(const QString &name, const QString &value, const CIcon &icon)
+        bool CNameVariantPairView::addOrUpdateByName(const QString &name, const QVariant &value, const CIcon &icon, bool resize, bool skipEqualValues)
         {
             Q_ASSERT(this->m_model);
-            this->m_model->addOrUpdateByName(name, value, icon);
-            this->resizeToContents();
+            bool changed = this->m_model->addOrUpdateByName(name, value, icon, skipEqualValues);
+            if (resize && changed) { this->resizeToContents(); }
+            return changed;
         }
 
-        void CNameVariantPairView::removeByName(const QString &name)
+        void CNameVariantPairView::removeByName(const QString &name, bool resize)
         {
             this->m_model->removeByName(name);
-            this->resizeToContents();
+            if (resize) { this->resizeToContents(); }
+        }
+
+        bool CNameVariantPairView::containsName(const QString &name)
+        {
+            return this->m_model->containsName(name);
         }
     }
 }

src/blackgui/views/namevariantpairview.h

@@ -30,11 +30,15 @@ namespace BlackGui
             //! Icon mode
             void setIconMode(bool withIcon);
 
-            //! Update or add value, simple string version
-            void addOrUpdateByName(const QString &name, const QString &value, const BlackMisc::CIcon &icon = BlackMisc::CIcon());
+            //! Update or add value, QVariant version
+            bool addOrUpdateByName(const QString &name, const QVariant &value, const BlackMisc::CIcon &icon = BlackMisc::CIcon(), bool resize = true, bool skipEqualValues = true);
 
             //! Remove by name
-            void removeByName(const QString &name);
+            void removeByName(const QString &name, bool resize = true);
+
+            //! Contains name
+            bool containsName(const QString &name);
+
         };
     }
 }

src/blackmisc/namevariantpairlist.cpp

@@ -27,7 +27,7 @@ namespace BlackMisc
     /*
      * Name contained?
      */
-    bool CNameVariantPairList::containsName(const QString &name)
+    bool CNameVariantPairList::containsName(const QString &name)const
     {
         return this->contains(&CNameVariantPair::getName, name);
     }
@@ -35,7 +35,7 @@ namespace BlackMisc
     /*
      * Name index
      */
-    int CNameVariantPairList::getNameRowIndex(const QString &name)
+    int CNameVariantPairList::getNameRowIndex(const QString &name) const
     {
         for (int i = 0; i < this->size(); i++)
         {

src/blackmisc/namevariantpairlist.h

@@ -30,11 +30,11 @@ namespace BlackMisc
         //! Construct from a base class object.
         CNameVariantPairList(const CSequence<CNameVariantPair> &other);
 
-        //! Contains name
-        bool containsName(const QString &name);
-
         //! Get name index
-        int getNameRowIndex(const QString &name);
+        int getNameRowIndex(const QString &name) const;
+
+        //! Contains name
+        bool containsName(const QString &name) const;
 
         //! \copydoc CValueObject::toQVariant
         virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }

src/blackmisc/valueobject.cpp

@@ -172,6 +172,14 @@ namespace BlackMisc
         return changed;
     }
 
+    /*
+     * equals QVariant?
+     */
+    bool CValueObject::equalsQVariant(const QVariant &qVariant) const
+    {
+        return BlackMisc::equalQVariants(this->toQVariant(), qVariant);
+    }
+
     /*
      * Icon
      */

src/blackmisc/valueobject.h

@@ -195,6 +195,9 @@ namespace BlackMisc
         //! Virtual method to return CVariant
         virtual CVariant toCVariant() const { return CVariant(this->toQVariant()); }
 
+        //! Equals another CValueObject in QVariant?
+        virtual bool equalsQVariant(const QVariant &qVariant) const;
+
         //! Set from QVariant
         virtual void convertFromQVariant(const QVariant &variant) = 0;