Cached units has gone from ComboProperty. Simplification in JobItem loading from disk.

GUI/coregui/Models/ComboProperty.cpp

@@ -33,6 +33,19 @@ void ComboProperty::setValue(const QString& name)
     m_current_value = name;
 }
 
+//! Sets new list of values. Current value will be preserved, if exists in a new list.
+
+void ComboProperty::setValues(const QStringList& values)
+{
+    QString current = getValue();
+
+    m_values = values;
+
+    // if no currentValue in the new list of values, take first value from the list
+    if(!m_values.contains(current) && !current.isEmpty())
+        setValue(m_values.front());
+}
+
 //! returns list of tool tips for all values
 QStringList ComboProperty::getToolTips() const
 {
@@ -69,19 +82,12 @@ QString ComboProperty::toString(int index) const
     return name_list[index];
 }
 
-void ComboProperty::setCachedValue(const QString& name)
-{
-    m_cached_value = name;
-}
-
 bool ComboProperty::operator==(const ComboProperty& other) const
 {
     if (m_current_value != other.m_current_value)
         return false;
     if (!GUIHelpers::isTheSame(m_values, other.m_values))
         return false;
-    if (m_cached_value != other.m_cached_value)
-        return false;
     return true;
 }
 
@@ -94,9 +100,13 @@ bool ComboProperty::operator<(const ComboProperty& other) const
 
 void ComboProperty::setStringOfValues(const QString& values)
 {
+    QString currentValue = getValue();
+
     m_values = values.split(QStringLiteral(";"));
-    if(!m_values.contains(m_current_value) && !m_current_value.isEmpty())
-        m_current_value = m_values.front();
+
+    // if no currentValue in the new list of values, take first value from the list
+    if(!m_values.contains(currentValue) && !currentValue.isEmpty())
+        setValue(m_values.front());
 }
 
 //! Returns a single string containing values delimited with ';'.

GUI/coregui/Models/ComboProperty.h

@@ -34,6 +34,7 @@ public:
     QString getValue() const;
 
     void setValue(const QString& name);
+    void setValues(const QStringList& values);
     bool isDefined();
 
     QStringList getValues() const;
@@ -51,9 +52,6 @@ public:
 
     QVariant getVariant() const;
 
-    QString getCachedValue() const;
-    void setCachedValue(const QString& name);
-
     bool operator==(const ComboProperty& other) const;
     bool operator!=(const ComboProperty& other) const
     {
@@ -68,7 +66,6 @@ private:
     QStringList m_values;
     QStringList m_values_tooltips;
     QString m_current_value;
-    QString m_cached_value; // for comboboxes with dynamically generated value lists
 };
 
 inline QString ComboProperty::getValue() const
@@ -109,11 +106,6 @@ inline QVariant ComboProperty::getVariant() const
     return result;
 }
 
-inline QString ComboProperty::getCachedValue() const
-{
-    return m_cached_value;
-}
-
 Q_DECLARE_METATYPE(ComboProperty)
 
 #endif // COMBOPROPERTY_H

GUI/coregui/Models/JobItemHelper.cpp

@@ -149,7 +149,6 @@ void JobItemHelper::loadIntensityData(JobItem *jobItem, const QString &projectDi
     if (info.exists()) {
         std::unique_ptr<OutputData<double>> rawData(
             IntensityDataIOFactory::readOutputData(filename.toStdString()));
-        setIntensityItemAxesUnits(intensityItem, jobItem->instrumentItem());
         intensityItem->setOutputData(rawData.release());
 
     } else {
@@ -204,29 +203,15 @@ void JobItemHelper::setIntensityItemAxesUnits(IntensityDataItem *intensityItem,
 void JobItemHelper::setIntensityItemAxesUnits(IntensityDataItem *intensityItem,
                                               const IDetector2D *detector)
 {
-    ComboProperty orig = intensityItem->getItemValue(IntensityDataItem::P_AXES_UNITS)
-                              .value<ComboProperty>();
-
-//    if(!combo.getValues().isEmpty())
-//        return;
-
-    QString cachedUnits = orig.getCachedValue();
-
-    intensityItem->getItem(IntensityDataItem::P_AXES_UNITS)->setVisible(true);
-
     ComboProperty combo;
-    foreach (auto units, detector->getValidAxesUnits()) {
+
+    foreach (auto units, detector->getValidAxesUnits())
         combo << getNameFromAxesUnits(units);
-    }
 
-    if (cachedUnits.isEmpty()) {
-        IDetector2D::EAxesUnits preferrable_units
+    IDetector2D::EAxesUnits preferrable_units
             = preferableGUIAxesUnits(detector->getDefaultAxesUnits());
-        combo.setValue(getNameFromAxesUnits(preferrable_units));
-    } else {
-        combo.setValue(cachedUnits);
-    }
 
+    combo.setValue(getNameFromAxesUnits(preferrable_units));
     intensityItem->setItemValue(IntensityDataItem::P_AXES_UNITS, combo.getVariant());
 }
 

GUI/coregui/Models/SessionXML.cpp

@@ -306,16 +306,9 @@ QString SessionReader::readProperty(QXmlStreamReader *reader,
             = reader->attributes().value(SessionXML::ParameterExtAttribute).toString();
 
         ComboProperty combo_property;
-        if(parameterExt.isEmpty()) {
-            combo_property = item->value().value<ComboProperty>();
-            if (combo_property.getValues().contains(parameter_value)) {
-                combo_property.setValue(parameter_value);
-            }
-        } else {
-            combo_property.setStringOfValues(parameterExt);
-            combo_property.setValue(parameter_value);
-        }
-        combo_property.setCachedValue(parameter_value);
+        combo_property.setStringOfValues(parameterExt);
+        combo_property.setValue(parameter_value);
+
         variant = combo_property.getVariant();
     }
 

GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp

@@ -355,7 +355,6 @@ QString ComboPropertyEdit::comboValueText()
 void ComboPropertyEdit::onCurrentIndexChanged(QString current_value)
 {
     m_combo_property.setValue(current_value);
-    m_combo_property.setCachedValue(current_value);
     emit comboPropertyChanged(m_combo_property);
 }
 

Tests/UnitTests/GUI/TestComboProperty.h

@@ -67,6 +67,18 @@ inline void TestComboProperty::test_setValue()
     ComboProperty combo = ComboProperty() << expectedValues;
 
     QCOMPARE(combo.getValue(), QString("a1"));
+
+    QStringList newValues = QStringList() << "b1" << "b2" << "b3";
+    combo.setValues(newValues);
+    QCOMPARE(combo.getValue(), QString("b1"));
+    QCOMPARE(combo.getValues(), newValues);
+
+    // checking that old value is preserved
+    newValues = QStringList() << "c1" << "b1" << "c2";
+    combo.setValues(newValues);
+    QCOMPARE(combo.getValue(), QString("b1"));
+    QCOMPARE(combo.getValues(), newValues);
+
 }
 
 inline void TestComboProperty::test_stringOfValues()