#3958 Refactoring: EclipseResultAddress can now be used with type and variable in addition to index (which is to be removed)

2025-02-25 18:55:39 -06:00 · 2019-01-23 14:14:14 +01:00
parent 726f5ee596
commit 8ee1d1491f
3 changed files with 55 additions and 25 deletions
--- a/ApplicationCode/ReservoirDataModel/RigEclipseResultAddress.h
+++ b/ApplicationCode/ReservoirDataModel/RigEclipseResultAddress.h
@@ -41,13 +41,14 @@ public:

    bool isValid() const
    {
-        return (scalarResultIndex != -1);
-        // Todo
+        if (scalarResultIndex != -1) return true;
+        if (!m_resultName.isEmpty()) return true;
+
+        return false;
    }

    bool operator< (const RigEclipseResultAddress& other ) const
    {
-        // Todo
        if (scalarResultIndex !=  other.scalarResultIndex)
        {
            return (scalarResultIndex <  other.scalarResultIndex);