OPM · magnesj · Feb 15, 2024 · Feb 15, 2024 · Feb 16, 2024 · Feb 8, 2024
diff --git a/.github/workflows/ResInsightWithCache.yml b/.github/workflows/ResInsightWithCache.yml
@@ -177,7 +177,7 @@ jobs:
           cache: true
 
       - name: Restore from cache and install vcpkg
-        uses: lukka/run-vcpkg@v7
+        uses: lukka/run-vcpkg@dev/node20-v7
         id: runvcpkg
         with:
           vcpkgArguments: "@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}"

diff --git a/.github/workflows/ResInsightWithCacheManualPaths.yml b/.github/workflows/ResInsightWithCacheManualPaths.yml
@@ -109,7 +109,7 @@ jobs:
         with:
           VCPKGRESPONSEFILE: ${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}
       - name: Run vcpkg
-        uses: lukka/run-vcpkg@v5
+        uses: lukka/run-vcpkg@dev/node20-v7
         id: runvcpkg
         with:
           vcpkgArguments: "@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}"

diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
@@ -36,7 +36,7 @@ jobs:
           cd Fwk/AppFwk
           find -name '*.h' -o -name '*.cpp' -o -name '*.inl' | grep -v gtest | xargs clang-format-15 -i
           git diff
-      - uses: peter-evans/create-pull-request@v5
+      - uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "Fixes by clang-format"

diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
@@ -51,7 +51,7 @@ jobs:
           cache: true
 
       - name: Run vcpkg
-        uses: lukka/run-vcpkg@v7
+        uses: lukka/run-vcpkg@dev/node20-v7
         id: runvcpkg
         with:
           vcpkgArguments: "@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}"
@@ -76,7 +76,7 @@ jobs:
           find -name '*.h' -o -name '*.cpp' -o -name '*.inl' | xargs clang-format-15 -i
           cd ../GrpcInterface
           find -name '*.h' -o -name '*.cpp' -o -name '*.inl' | xargs clang-format-15 -i
-      - uses: peter-evans/create-pull-request@v5
+      - uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "Fixes by clang-tidy"

diff --git a/.github/workflows/cmake-format.yml b/.github/workflows/cmake-format.yml
@@ -28,7 +28,7 @@ jobs:
           cd ..
 
           git diff
-      - uses: peter-evans/create-pull-request@v5
+      - uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "Fixes by cmake-format"

diff --git a/.github/workflows/python-linting.yml b/.github/workflows/python-linting.yml
@@ -15,7 +15,7 @@ jobs:
           pip install black
           cd GrpcInterface
           black .
-      - uses: peter-evans/create-pull-request@v5
+      - uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "Python code linting changes detected by black"

diff --git a/.github/workflows/spell-check.yml b/.github/workflows/spell-check.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: sobolevn/misspell-fixer-action@master
         with:
           options: "-rsvnuR ApplicationLibCode/"
-      - uses: peter-evans/create-pull-request@v5
+      - uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "Fixes by misspell-fixer"

diff --git a/ApplicationExeCode/Resources/ResInsight.qrc b/ApplicationExeCode/Resources/ResInsight.qrc
@@ -277,14 +277,16 @@
         <file>SeismicDelta16x16.png</file>
         <file>SeismicView16x16.png</file>
         <file>SeismicView24x24.png</file>
-		<file>SeismicViews24x24.png</file>
-		<file>SeismicData24x24.png</file>
-		<file>SeismicSection16x16.png</file>
-		<file>Fullscreen.png</file>
+        <file>SeismicViews24x24.png</file>
+        <file>SeismicData24x24.png</file>
+        <file>SeismicSection16x16.png</file>
+        <file>Fullscreen.png</file>
         <file>plot-template-standard.svg</file>
         <file>plot-template-ensemble.svg</file>
         <file>decline-curve.svg</file>
         <file>regression-curve.svg</file>
+        <file>padlock.svg</file>
+        <file>warning.svg</file>
     </qresource>
     <qresource prefix="/Shader">
         <file>fs_CellFace.glsl</file>

diff --git a/ApplicationExeCode/Resources/padlock.svg b/ApplicationExeCode/Resources/padlock.svg
diff --git a/ApplicationExeCode/Resources/warning.svg b/ApplicationExeCode/Resources/warning.svg
diff --git a/ApplicationExeCode/RiaGrpcConsoleApplication.cpp b/ApplicationExeCode/RiaGrpcConsoleApplication.cpp
@@ -46,7 +46,7 @@ RiaGrpcConsoleApplication::RiaGrpcConsoleApplication( int& argc, char** argv )
 {
     m_idleTimer = new QTimer( this );
     connect( m_idleTimer, SIGNAL( timeout() ), this, SLOT( doIdleProcessing() ) );
-    m_idleTimer->start( 0 );
+    m_idleTimer->start( 5 );
 }
 
 //--------------------------------------------------------------------------------------------------

diff --git a/ApplicationExeCode/RiaMain.cpp b/ApplicationExeCode/RiaMain.cpp
@@ -48,7 +48,7 @@ RiaApplication* createApplication( int& argc, char* argv[] )
 {
     for ( int i = 1; i < argc; ++i )
     {
-        if ( !qstrcmp( argv[i], "--console" ) || !qstrcmp( argv[i], "--unittest" ) || !qstrcmp( argv[i], "--version" ) )
+        if ( !qstrcmp( argv[i], "--console" ) || !qstrcmp( argv[i], "--unittest" ) )
         {
 #ifdef ENABLE_GRPC
             return new RiaGrpcConsoleApplication( argc, argv );

diff --git a/ApplicationLibCode/Adm/RiaVersionInfo.h.cmake b/ApplicationLibCode/Adm/RiaVersionInfo.h.cmake
@@ -34,3 +34,5 @@
 #define RESINSIGHT_OCTAVE_VERSION "@OCTAVE_VERSION_STRING@"
 
 #define RESINSIGHT_PYTHON_VERSION "@Python3_VERSION@"
+
+#define RESINSIGHT_GIT_HASH "@RESINSIGHT_GIT_HASH@"
diff --git a/ApplicationLibCode/Application/RiaApplication.cpp b/ApplicationLibCode/Application/RiaApplication.cpp
@@ -40,6 +40,8 @@
 #include "RicfCommandObject.h"
 
 #include "PlotTemplates/RimPlotTemplateFolderItem.h"
+#include "Polygons/RimPolygonCollection.h"
+
 #include "Rim2dIntersectionViewCollection.h"
 #include "RimAnnotationCollection.h"
 #include "RimAnnotationInViewCollection.h"
@@ -544,6 +546,8 @@ bool RiaApplication::loadProject( const QString& projectFileName, ProjectLoadAct
         {
             seismicData->ensureFileReaderIsInitialized();
         }
+
+        oilField->polygonCollection()->loadData();
     }
 
     {
@@ -658,7 +662,10 @@ bool RiaApplication::loadProject( const QString& projectFileName, ProjectLoadAct
                         }
                     }
 
-                    setActiveReservoirView( riv );
+                    if ( riv->showWindow() )
+                    {
+                        setActiveReservoirView( riv );
+                    }
 
                     RimGridView* rigv = dynamic_cast<RimGridView*>( riv );
                     if ( rigv ) rigv->cellFilterCollection()->updateIconState();

diff --git a/ApplicationLibCode/Application/RiaApplication.h b/ApplicationLibCode/Application/RiaApplication.h
@@ -21,12 +21,11 @@
 
 #include "RiaDefines.h"
 
-#include "cafPdmField.h"
-#include "cafPdmObject.h"
-
-#include "cvfFont.h"
+#include "cafPdmPointer.h"
 #include "cvfObject.h"
 
+#include <QEventLoop>
+#include <QMap>
 #include <QMutex>
 #include <QPointer>
 #include <QProcess>
@@ -35,7 +34,6 @@
 
 #include <gsl/gsl>
 
-#include <iostream>
 #include <memory>
 
 class QAction;
@@ -79,7 +77,8 @@ class UiProcess;
 namespace cvf
 {
 class ProgramOptions;
-}
+class Font;
+} // namespace cvf
 
 //==================================================================================================
 /// Base class for all ResInsight applications. I.e. console and GUI

diff --git a/ApplicationLibCode/Application/RiaConsoleApplication.cpp b/ApplicationLibCode/Application/RiaConsoleApplication.cpp
@@ -131,6 +131,7 @@ RiaApplication::ApplicationStatus RiaConsoleApplication::handleArguments( gsl::n
     if ( progOpt->option( "version" ) )
     {
         QString text = QString( STRPRODUCTVER ) + "\n";
+        text += "SHA " + QString( RESINSIGHT_GIT_HASH ) + "\n";
 
         showFormattedTextInMessageBoxOrConsole( text );
 

diff --git a/ApplicationLibCode/Application/RiaDefines.h b/ApplicationLibCode/Application/RiaDefines.h
@@ -243,8 +243,17 @@ enum class View3dContent
     ALL               = 0b00011111
 };
 
+enum class ItemIn3dView
+{
+    NONE    = 0b00000000,
+    SURFACE = 0b00000001,
+    POLYGON = 0b00000010,
+    ALL     = 0b00000011
+};
+
 }; // namespace RiaDefines
 
 // Activate bit mask operators at global scope
 ENABLE_BITMASK_OPERATORS( RiaDefines::MultiPlotPageUpdateType )
 ENABLE_BITMASK_OPERATORS( RiaDefines::View3dContent )
+ENABLE_BITMASK_OPERATORS( RiaDefines::ItemIn3dView )
diff --git a/ApplicationLibCode/Application/RiaFontCache.cpp b/ApplicationLibCode/Application/RiaFontCache.cpp
@@ -20,9 +20,11 @@
 
 #include "RiaGuiApplication.h"
 
+#include "cafAssert.h"
 #include "cafFixedAtlasFont.h"
 
 #include <QDesktopWidget>
+
 #include <cmath>
 
 //--------------------------------------------------------------------------------------------------

diff --git a/ApplicationLibCode/Application/RiaGuiApplication.cpp b/ApplicationLibCode/Application/RiaGuiApplication.cpp
@@ -463,6 +463,16 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( gsl::not_n
         return RiaApplication::ApplicationStatus::EXIT_COMPLETED;
     }
 
+    if ( progOpt->option( "version" ) )
+    {
+        QString text = QString( STRPRODUCTVER ) + "\n";
+        text += "SHA " + QString( RESINSIGHT_GIT_HASH ) + "\n";
+
+        showFormattedTextInMessageBoxOrConsole( text );
+
+        return RiaApplication::ApplicationStatus::EXIT_COMPLETED;
+    }
+
     // Code generation
     // -----------------
     if ( cvf::Option o = progOpt->option( "generate" ) )

diff --git a/ApplicationLibCode/Application/RiaGuiApplication.h b/ApplicationLibCode/Application/RiaGuiApplication.h
@@ -21,11 +21,6 @@
 #include "RiaApplication.h"
 #include "RiaDefines.h"
 
-#include "cafPdmField.h"
-#include "cafPdmObject.h"
-
-#include "cvfObject.h"
-
 #include <QApplication>
 #include <QMutex>
 #include <QPointer>

diff --git a/ApplicationLibCode/Application/RiaMemoryCleanup.cpp b/ApplicationLibCode/Application/RiaMemoryCleanup.cpp
@@ -59,10 +59,10 @@ RiaMemoryCleanup::RiaMemoryCleanup()
     m_resultsToDelete.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() );
 
     CAF_PDM_InitFieldNoDefault( &m_performDelete, "ClearSelectedData", "" );
-    caf::PdmUiPushButtonEditor::configureEditorForField( &m_performDelete );
+    caf::PdmUiPushButtonEditor::configureEditorLabelLeft( &m_performDelete );
 
     CAF_PDM_InitFieldNoDefault( &m_showMemoryReport, "ShowMemoryReport", "" );
-    caf::PdmUiPushButtonEditor::configureEditorForField( &m_showMemoryReport );
+    caf::PdmUiPushButtonEditor::configureEditorLabelLeft( &m_showMemoryReport );
 }
 
 //--------------------------------------------------------------------------------------------------

diff --git a/ApplicationLibCode/Application/RiaPreferences.cpp b/ApplicationLibCode/Application/RiaPreferences.cpp
@@ -41,6 +41,7 @@
 #include "cafPdmUiFilePathEditor.h"
 #include "cafPdmUiLineEditor.h"
 
+#include <QCoreApplication>
 #include <QDate>
 #include <QDir>
 #include <QLocale>

diff --git a/ApplicationLibCode/Application/RiaPreferencesSummary.cpp b/ApplicationLibCode/Application/RiaPreferencesSummary.cpp
@@ -121,8 +121,7 @@ RiaPreferencesSummary::RiaPreferencesSummary()
                        "" );
 
     CAF_PDM_InitField( &m_selectDefaultTemplates, "selectDefaultTemplate", false, "", "", "Select Default Templates" );
-    m_selectDefaultTemplates.xmlCapability()->disableIO();
-    m_selectDefaultTemplates.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() );
+    caf::PdmUiPushButtonEditor::configureEditorLabelHidden( &m_selectDefaultTemplates );
 
     CAF_PDM_InitFieldNoDefault( &m_selectedDefaultTemplates, "defaultSummaryTemplates", "Select Summary Plot Templates" );
     m_selectedDefaultTemplates.uiCapability()->setUiReadOnly( true );

diff --git a/ApplicationLibCode/Application/Tools/RiaEclipseUnitTools.cpp b/ApplicationLibCode/Application/Tools/RiaEclipseUnitTools.cpp
@@ -48,26 +48,32 @@ double RiaEclipseUnitTools::darcysConstant( RiaDefines::EclipseUnitSystem unitSy
 
 //--------------------------------------------------------------------------------------------------
 /// Convert Gas to oil equivalents
-/// If field unit, the Gas is in Mega ft^3 while the others are in [stb] (barrel)
+/// If field unit, the Gas is in Mft^3(=1000ft^3) while the others are in [stb] (barrel)
 //--------------------------------------------------------------------------------------------------
 double RiaEclipseUnitTools::convertSurfaceGasFlowRateToOilEquivalents( RiaDefines::EclipseUnitSystem caseUnitSystem, double eclGasFlowRate )
 {
     /// Unused Gas to Barrel conversion :
     /// we convert gas to stb as well. Based on
     /// 1 [stb] = 0.15898729492800007 [m^3]
     /// 1 [ft]  = 0.3048 [m]
-    /// megaFt3ToStbFactor = 1.0 / (1.0e-6 * 0.15898729492800007 * ( 1.0 / 0.3048 )^3 )
-    /// double megaFt3ToStbFactor = 178107.60668;
+    ///
+    /// NB Mft^3 = 1000 ft^3 - can wrongly be interpreted as M for Mega in metric units
 
-    double fieldGasToOilEquivalent  = 1.0e6 / 5800; // Mega ft^3 to BOE
-    double metricGasToOilEquivalent = 1.0 / 1.0e3; // Sm^3 Gas to Sm^3 oe
+    if ( caseUnitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD )
+    {
+        const double fieldGasToOilEquivalent = 1000.0 / 5614.63;
 
-    double oilEquivalentGasRate = HUGE_VAL;
+        return fieldGasToOilEquivalent * eclGasFlowRate;
+    }
 
-    if ( caseUnitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) oilEquivalentGasRate = fieldGasToOilEquivalent * eclGasFlowRate;
-    if ( caseUnitSystem == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) oilEquivalentGasRate = metricGasToOilEquivalent * eclGasFlowRate;
+    if ( caseUnitSystem == RiaDefines::EclipseUnitSystem::UNITS_METRIC )
+    {
+        double metricGasToOilEquivalent = 1.0 / 1000.0; // Sm^3 Gas to Sm^3 oe
+
+        return metricGasToOilEquivalent * eclGasFlowRate;
+    }
 
-    return oilEquivalentGasRate;
+    return HUGE_VAL;
 }
 
 //--------------------------------------------------------------------------------------------------

diff --git a/ApplicationLibCode/Application/Tools/RiaStdStringTools.cpp b/ApplicationLibCode/Application/Tools/RiaStdStringTools.cpp
@@ -20,7 +20,6 @@
 
 #include "fast_float/include/fast_float/fast_float.h"
 
-#include <cctype>
 #include <charconv>
 #include <regex>
 #include <sstream>

diff --git a/ApplicationLibCode/CMakeLists.txt b/ApplicationLibCode/CMakeLists.txt
@@ -123,6 +123,7 @@ list(
   ProjectDataModel/Intersections/CMakeLists_files.cmake
   ProjectDataModel/CellFilters/CMakeLists_files.cmake
   ProjectDataModel/ProcessControl/CMakeLists_files.cmake
+  ProjectDataModel/Polygons/CMakeLists_files.cmake
   ProjectDataModel/WellLog/CMakeLists_files.cmake
   ProjectDataModel/WellMeasurement/CMakeLists_files.cmake
   ProjectDataModel/WellPath/CMakeLists_files.cmake

diff --git a/ApplicationLibCode/Commands/CMakeLists.txt b/ApplicationLibCode/Commands/CMakeLists.txt
@@ -41,6 +41,7 @@ set(COMMAND_REFERENCED_CMAKE_FILES
     PlotTemplateCommands/CMakeLists_files.cmake
     FractureCommands/CMakeLists_files.cmake
     PlotBuilderCommands/CMakeLists_files.cmake
+    PolygonCommands/CMakeLists_files.cmake
 )
 
 # Include source file lists from *.cmake files

diff --git a/ApplicationLibCode/Commands/CellFilterCommands/RicNewPolygonFilter3dviewFeature.cpp b/ApplicationLibCode/Commands/CellFilterCommands/RicNewPolygonFilter3dviewFeature.cpp
@@ -18,6 +18,8 @@
 
 #include "RicNewPolygonFilter3dviewFeature.h"
 
+#include "Polygons/RimPolygonInView.h"
+
 #include "RiaApplication.h"
 #include "RimCase.h"
 #include "RimCellFilterCollection.h"
@@ -46,7 +48,7 @@ void RicNewPolygonFilter3dviewFeature::onActionTriggered( bool isChecked )
     // and the case to use
     RimCase* sourceCase = viewOrComparisonView->ownerCase();
 
-    RimPolygonFilter* lastCreatedOrUpdated = filtColl->addNewPolygonFilter( sourceCase );
+    RimPolygonFilter* lastCreatedOrUpdated = filtColl->addNewPolygonFilter( sourceCase, nullptr );
     if ( lastCreatedOrUpdated )
     {
         Riu3DMainWindowTools::selectAsCurrentItem( lastCreatedOrUpdated );
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,3 +34,5 @@
		#define RESINSIGHT_OCTAVE_VERSION "@OCTAVE_VERSION_STRING@"

		#define RESINSIGHT_PYTHON_VERSION "@Python3_VERSION@"

		#define RESINSIGHT_GIT_HASH "@RESINSIGHT_GIT_HASH@"