Merge pull request #5173 from OPM/feature-well-measurement-reorg

ApplicationCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp

@@ -40,6 +40,8 @@
 #include "RimWellLogPlotCollection.h"
 #include "RimWellLogTrack.h"
 #include "RimWellLogWbsCurve.h"
+#include "RimWellMeasurement.h"
+#include "RimWellMeasurementCurve.h"
 #include "RimWellPath.h"
 
 #include "RicWellLogTools.h"
@@ -320,11 +322,12 @@ void RicNewWellBoreStabilityPlotFeature::createStabilityCurvesTrack( RimWellBore
         curve->setSmoothingThreshold( 0.002 );
     }
 
-    std::vector<QString> measurementNames;
-    measurementNames.push_back( "XLOT" );
-    for ( size_t i = 0; i < measurementNames.size(); i++ )
+    for ( QString measurementKind : RimWellMeasurement::measurementKindsForWellBoreStability() )
     {
-        RicWellLogTools::addWellMeasurementCurve( stabilityCurvesTrack, wellPath, measurementNames[i] );
+        RimWellMeasurementCurve* curve = RicWellLogTools::addWellMeasurementCurve( stabilityCurvesTrack,
+                                                                                   wellPath,
+                                                                                   measurementKind );
+        curve->loadDataAndUpdate( false );
     }
 
     stabilityCurvesTrack->setAutoScaleXEnabled( true );

ApplicationCode/Commands/WellPathCommands/RicImportWellMeasurementsFeature.cpp

@@ -21,6 +21,8 @@
 #include "RiaApplication.h"
 #include "RiaLogging.h"
 
+#include "Rim3dView.h"
+#include "RimGridView.h"
 #include "RimPerforationCollection.h"
 #include "RimPerforationInterval.h"
 #include "RimProject.h"
@@ -92,6 +94,13 @@ void RicImportWellMeasurementsFeature::onActionTriggered( bool isChecked )
         wellMeasurement->setQuality( measurement.quality );
         wellMeasurement->setKind( measurement.kind );
         wellMeasurement->setRemark( measurement.remark );
+
+        // Ignore values for kinds which is known to not have values
+        if ( !RimWellMeasurement::kindHasValue( measurement.kind ) )
+        {
+            wellMeasurement->setValue( 0.0 );
+        }
+
         wellPathCollection->measurementCollection()->appendMeasurement( wellMeasurement );
         lastWellMeasurement = wellMeasurement;
     }
@@ -99,6 +108,17 @@ void RicImportWellMeasurementsFeature::onActionTriggered( bool isChecked )
 
     if ( app->project() )
     {
+        std::vector<Rim3dView*> views;
+        app->project()->allViews( views );
+        for ( auto& view : views )
+        {
+            RimGridView* gridView = dynamic_cast<RimGridView*>( view );
+            if ( gridView )
+            {
+                gridView->updateWellMeasurements();
+            }
+        }
+
         app->project()->scheduleCreateDisplayModelAndRedrawAllViews();
     }