#1596 Rename to RiaEclipseUnitTools

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -14,7 +14,7 @@ ${CEE_CURRENT_LIST_DIR}RimEclipsePropertyFilterCollection.h
 ${CEE_CURRENT_LIST_DIR}RimCellRangeFilter.h
 ${CEE_CURRENT_LIST_DIR}RimCellRangeFilterCollection.h
 ${CEE_CURRENT_LIST_DIR}RimDefines.h
-${CEE_CURRENT_LIST_DIR}RimUnitSystem.h
+${CEE_CURRENT_LIST_DIR}RiaEclipseUnitTools.h
 ${CEE_CURRENT_LIST_DIR}RimLegendConfig.h
 ${CEE_CURRENT_LIST_DIR}RimOilField.h
 ${CEE_CURRENT_LIST_DIR}RimProject.h
@@ -103,7 +103,7 @@ ${CEE_CURRENT_LIST_DIR}RimEclipsePropertyFilterCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimCellRangeFilter.cpp
 ${CEE_CURRENT_LIST_DIR}RimCellRangeFilterCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimDefines.cpp
-${CEE_CURRENT_LIST_DIR}RimUnitSystem.cpp
+${CEE_CURRENT_LIST_DIR}RiaEclipseUnitTools.cpp
 ${CEE_CURRENT_LIST_DIR}RimLegendConfig.cpp
 ${CEE_CURRENT_LIST_DIR}RimOilField.cpp
 ${CEE_CURRENT_LIST_DIR}RimProject.cpp

ApplicationCode/ProjectDataModel/RiaEclipseUnitTools.cpp

@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimUnitSystem.h"
+#include "RiaEclipseUnitTools.h"
 
 #include "cafAppEnum.h"
 
@@ -25,20 +25,20 @@
 namespace caf
 {
     template<>
-    void RimUnitSystem::UnitSystemType::setUp()
+    void RiaEclipseUnitTools::UnitSystemType::setUp()
     {
-        addItem(RimUnitSystem::UNITS_METRIC,  "UNITS_METRIC",  "Metric");
-        addItem(RimUnitSystem::UNITS_FIELD,   "UNITS_FIELD",   "Field");
-        addItem(RimUnitSystem::UNITS_UNKNOWN, "UNITS_UNKNOWN", "Unknown");
+        addItem(RiaEclipseUnitTools::UNITS_METRIC,  "UNITS_METRIC",  "Metric");
+        addItem(RiaEclipseUnitTools::UNITS_FIELD,   "UNITS_FIELD",   "Field");
+        addItem(RiaEclipseUnitTools::UNITS_UNKNOWN, "UNITS_UNKNOWN", "Unknown");
 
-        setDefault(RimUnitSystem::UNITS_METRIC);
+        setDefault(RiaEclipseUnitTools::UNITS_METRIC);
     }
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-double RimUnitSystem::darcysConstant(UnitSystem unitSystem)
+double RiaEclipseUnitTools::darcysConstant(UnitSystem unitSystem)
 {
     // See "Cartesian transmissibility calculations" in the "Eclipse Technical Description"
     //     CDARCY Darcys constant

ApplicationCode/ProjectDataModel/RiaEclipseUnitTools.h

@@ -20,7 +20,7 @@
 
 #include "cafAppEnum.h"
 
-class RimUnitSystem
+class RiaEclipseUnitTools
 {
 
 public:
@@ -32,7 +32,7 @@ public:
         //UNITS_LAB
     };
 
-    typedef caf::AppEnum< RimUnitSystem::UnitSystem > UnitSystemType;
+    typedef caf::AppEnum< RiaEclipseUnitTools::UnitSystem > UnitSystemType;
 
     static double feetPerMeter()                    { return 3.2808399; }
     static double meterPerFeet()                    { return 0.3048000; }

ApplicationCode/ProjectDataModel/RimWellPath.cpp

@@ -451,7 +451,7 @@ double RimWellPath::combinedScaleFactor() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellPath::setUnitSystem(RimUnitSystem::UnitSystem unitSystem)
+void RimWellPath::setUnitSystem(RiaEclipseUnitTools::UnitSystem unitSystem)
 {
     m_unitSystem = unitSystem;
 }
@@ -459,7 +459,7 @@ void RimWellPath::setUnitSystem(RimUnitSystem::UnitSystem unitSystem)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimUnitSystem::UnitSystem RimWellPath::unitSystem() const
+RiaEclipseUnitTools::UnitSystem RimWellPath::unitSystem() const
 {
     return m_unitSystem();
 }

ApplicationCode/ProjectDataModel/RimWellPath.h

@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "RimUnitSystem.h"
+#include "RiaEclipseUnitTools.h"
 
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
@@ -91,8 +91,8 @@ public:
 
     double                              combinedScaleFactor() const;
 
-    void                                setUnitSystem(RimUnitSystem::UnitSystem unitSystem);
-    RimUnitSystem::UnitSystem           unitSystem() const;
+    void                                setUnitSystem(RiaEclipseUnitTools::UnitSystem unitSystem);
+    RiaEclipseUnitTools::UnitSystem     unitSystem() const;
 
 private:
 
@@ -117,7 +117,7 @@ private:
     caf::PdmField<QString>              m_surveyType;
     caf::PdmField<double>               m_datumElevation;
 
-    caf::PdmField<RimUnitSystem::UnitSystemType> m_unitSystem;
+    caf::PdmField<RiaEclipseUnitTools::UnitSystemType> m_unitSystem;
     
     caf::PdmChildField<RimWellPathCompletions*> m_completions;
 

ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp

@@ -420,13 +420,13 @@ void RimWellPathCollection::sortWellsByName()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimUnitSystem::UnitSystemType RimWellPathCollection::findUnitSystemForWellPath(const RimWellPath* wellPath)
+RiaEclipseUnitTools::UnitSystemType RimWellPathCollection::findUnitSystemForWellPath(const RimWellPath* wellPath)
 {
     RimProject* project;
     firstAncestorOrThisOfTypeAsserted(project);
     if (project->activeOilField()->analysisModels->cases.empty())
     {
-        return RimUnitSystem::UNITS_UNKNOWN;
+        return RiaEclipseUnitTools::UNITS_UNKNOWN;
     }
 
     const RigEclipseCaseData* eclipseCaseData = project->activeOilField()->analysisModels->cases()[0]->eclipseCaseData();
@@ -441,12 +441,12 @@ RimUnitSystem::UnitSystemType RimWellPathCollection::findUnitSystemForWellPath(c
     {
         if (eclipseCaseData->unitsType() == RigEclipseCaseData::UNITS_FIELD)
         {
-            return RimUnitSystem::UNITS_FIELD;
+            return RiaEclipseUnitTools::UNITS_FIELD;
         }
         else if (eclipseCaseData->unitsType() == RigEclipseCaseData::UNITS_METRIC)
         {
-            return RimUnitSystem::UNITS_METRIC;
+            return RiaEclipseUnitTools::UNITS_METRIC;
         }
     }
-    return RimUnitSystem::UNITS_UNKNOWN;
+    return RiaEclipseUnitTools::UNITS_UNKNOWN;
 }

ApplicationCode/ProjectDataModel/RimWellPathCollection.h

@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "RimUnitSystem.h"
+#include "RiaEclipseUnitTools.h"
 
 #include "cafPdmChildArrayField.h"
 #include "cafPdmField.h"
@@ -102,7 +102,7 @@ private:
     void                                readAndAddWellPaths(std::vector<RimWellPath*>& wellPathArray);
     void                                sortWellsByName();
 
-    RimUnitSystem::UnitSystemType       findUnitSystemForWellPath(const RimWellPath* wellPath);
+    RiaEclipseUnitTools::UnitSystemType findUnitSystemForWellPath(const RimWellPath* wellPath);
 
     cvf::ref<RivWellPathCollectionPartMgr> m_wellPathCollectionPartManager;