#1114 WIP: Added field in Sim Well Collection, renamed a bit as preparations

ApplicationCode/ModelVisualization/CMakeLists_files.cmake

@@ -15,7 +15,7 @@ ${CEE_CURRENT_LIST_DIR}RivReservoirPartMgr.h
 ${CEE_CURRENT_LIST_DIR}RivReservoirViewPartMgr.h
 ${CEE_CURRENT_LIST_DIR}RivPipeGeometryGenerator.h
 ${CEE_CURRENT_LIST_DIR}RivReservoirFaultsPartMgr.h
-${CEE_CURRENT_LIST_DIR}RivReservoirPipesPartMgr.h
+${CEE_CURRENT_LIST_DIR}RivReservoirSimWellsPartMgr.h
 ${CEE_CURRENT_LIST_DIR}RivSourceInfo.h
 ${CEE_CURRENT_LIST_DIR}RivWellPathSourceInfo.h
 ${CEE_CURRENT_LIST_DIR}RivWellPathPartMgr.h
@@ -49,7 +49,7 @@ ${CEE_CURRENT_LIST_DIR}RivReservoirFaultsPartMgr.cpp
 ${CEE_CURRENT_LIST_DIR}RivReservoirPartMgr.cpp
 ${CEE_CURRENT_LIST_DIR}RivReservoirViewPartMgr.cpp
 ${CEE_CURRENT_LIST_DIR}RivPipeGeometryGenerator.cpp
-${CEE_CURRENT_LIST_DIR}RivReservoirPipesPartMgr.cpp
+${CEE_CURRENT_LIST_DIR}RivReservoirSimWellsPartMgr.cpp
 ${CEE_CURRENT_LIST_DIR}RivSourceInfo.cpp
 ${CEE_CURRENT_LIST_DIR}RivWellPathSourceInfo.cpp
 ${CEE_CURRENT_LIST_DIR}RivWellPathPartMgr.cpp

ApplicationCode/ModelVisualization/RivReservoirSimWellsPartMgr.cpp

@@ -18,7 +18,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RivReservoirPipesPartMgr.h"
+#include "RivReservoirSimWellsPartMgr.h"
 
 #include "Rim3dOverlayInfoConfig.h"
 #include "RimCellEdgeColors.h"
@@ -40,7 +40,7 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RivReservoirPipesPartMgr::RivReservoirPipesPartMgr(RimEclipseView* reservoirView)
+RivReservoirSimWellsPartMgr::RivReservoirSimWellsPartMgr(RimEclipseView* reservoirView)
 {
     m_reservoirView = reservoirView;
 
@@ -50,7 +50,7 @@ RivReservoirPipesPartMgr::RivReservoirPipesPartMgr(RimEclipseView* reservoirView
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RivReservoirPipesPartMgr::~RivReservoirPipesPartMgr()
+RivReservoirSimWellsPartMgr::~RivReservoirSimWellsPartMgr()
 {
 
 }
@@ -58,7 +58,7 @@ RivReservoirPipesPartMgr::~RivReservoirPipesPartMgr()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivReservoirPipesPartMgr::clearGeometryCache()
+void RivReservoirSimWellsPartMgr::clearGeometryCache()
 {
     m_wellPipesPartMgrs.clear();
     m_wellHeadPartMgrs.clear();
@@ -67,7 +67,7 @@ void RivReservoirPipesPartMgr::clearGeometryCache()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivReservoirPipesPartMgr::scheduleGeometryRegen()
+void RivReservoirSimWellsPartMgr::scheduleGeometryRegen()
 {
     for (size_t wIdx = 0; wIdx != m_wellPipesPartMgrs.size(); ++ wIdx)
     {
@@ -83,7 +83,7 @@ void RivReservoirPipesPartMgr::scheduleGeometryRegen()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivReservoirPipesPartMgr::setScaleTransform(cvf::Transform * scaleTransform)
+void RivReservoirSimWellsPartMgr::setScaleTransform(cvf::Transform * scaleTransform)
 {
     m_scaleTransform = scaleTransform;
 
@@ -101,7 +101,7 @@ void RivReservoirPipesPartMgr::setScaleTransform(cvf::Transform * scaleTransform
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivReservoirPipesPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, size_t frameIndex)
+void RivReservoirSimWellsPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, size_t frameIndex)
 {
     if (!m_reservoirView->wellCollection()->isActive()) return;
 
@@ -131,7 +131,7 @@ void RivReservoirPipesPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasic
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivReservoirPipesPartMgr::updatePipeResultColor(size_t frameIndex)
+void RivReservoirSimWellsPartMgr::updatePipeResultColor(size_t frameIndex)
 {
     for (size_t wIdx = 0; wIdx != m_wellPipesPartMgrs.size(); ++ wIdx)
     {
@@ -142,7 +142,7 @@ void RivReservoirPipesPartMgr::updatePipeResultColor(size_t frameIndex)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-const std::vector< std::vector <cvf::Vec3d> >* RivReservoirPipesPartMgr::centerLineOfWellBranches(int wellIdx)
+const std::vector< std::vector <cvf::Vec3d> >* RivReservoirSimWellsPartMgr::centerLineOfWellBranches(int wellIdx)
 {
     if (wellIdx < static_cast<int>(m_wellPipesPartMgrs.size()))
     {

ApplicationCode/ModelVisualization/RivReservoirSimWellsPartMgr.h

@@ -35,11 +35,11 @@ class RimEclipseView;
 class RivSimWellPipesPartMgr;
 class RivWellHeadPartMgr;
 
-class RivReservoirPipesPartMgr : public cvf::Object
+class RivReservoirSimWellsPartMgr : public cvf::Object
 {
 public:
-    explicit RivReservoirPipesPartMgr(RimEclipseView* reservoirView);
+    explicit RivReservoirSimWellsPartMgr(RimEclipseView* reservoirView);
-    ~RivReservoirPipesPartMgr();
+    ~RivReservoirSimWellsPartMgr();
 
     void clearGeometryCache();
     void scheduleGeometryRegen();

ApplicationCode/ProjectDataModel/RimEclipseCase.cpp

@@ -306,7 +306,7 @@ void RimEclipseCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
                 RimEclipseView* reservoirView = reservoirViews()[i];
 
                 reservoirView->scheduleReservoirGridGeometryRegen();
-                reservoirView->schedulePipeGeometryRegen();
+                reservoirView->scheduleSimWellGeometryRegen();
                 reservoirView->createDisplayModelAndRedraw();
             }
         }

ApplicationCode/ProjectDataModel/RimEclipseView.cpp

@@ -61,7 +61,7 @@
 #include "RiuSelectionManager.h"
 #include "RiuViewer.h"
 
-#include "RivReservoirPipesPartMgr.h"
+#include "RivReservoirSimWellsPartMgr.h"
 #include "RivReservoirViewPartMgr.h"
 #include "RivReservoirWellSpheresPartMgr.h"
 #include "RivSingleCellPartGenerator.h"
@@ -137,7 +137,7 @@ RimEclipseView::RimEclipseView()
     this->faultResultSettings()->setReservoirView(this);
 
     m_reservoirGridPartManager = new RivReservoirViewPartMgr(this);
-    m_pipesPartManager = new RivReservoirPipesPartMgr(this);
+    m_pipesPartManager = new RivReservoirSimWellsPartMgr(this);
 	m_wellSpheresPartManager = new RivReservoirWellSpheresPartMgr(this);
 	
 	m_reservoir = NULL;
@@ -871,7 +871,7 @@ void RimEclipseView::scheduleReservoirGridGeometryRegen()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimEclipseView::schedulePipeGeometryRegen()
+void RimEclipseView::scheduleSimWellGeometryRegen()
 {
     m_pipesPartManager->scheduleGeometryRegen();
     m_wellSpheresPartManager->clearGeometryCache();

ApplicationCode/ProjectDataModel/RimEclipseView.h

@@ -54,7 +54,7 @@ class RimReservoirCellResultsStorage;
 class RimEclipseCellColors;
 class RimEclipseWellCollection;
 class RiuViewer;
-class RivReservoirPipesPartMgr;
+class RivReservoirSimWellsPartMgr;
 class RivReservoirWellSpheresPartMgr;
 class RivIntersectionPartMgr;
 class RivReservoirViewPartMgr;
@@ -125,7 +125,7 @@ public:
 
     virtual void                                    scheduleGeometryRegen(RivCellSetEnum geometryType);
     void                                            scheduleReservoirGridGeometryRegen();
-    void                                            schedulePipeGeometryRegen();
+    void                                            scheduleSimWellGeometryRegen();
     void                                            updateDisplayModelForWellResults();
 
     const std::vector<RivCellSetEnum>&              visibleGridParts() const;
@@ -180,7 +180,7 @@ private:
     caf::PdmPointer<RimEclipseCase>                 m_reservoir;
 
     cvf::ref<RivReservoirViewPartMgr>               m_reservoirGridPartManager;
-    cvf::ref<RivReservoirPipesPartMgr>              m_pipesPartManager;
+    cvf::ref<RivReservoirSimWellsPartMgr>              m_pipesPartManager;
 	cvf::ref<RivReservoirWellSpheresPartMgr>        m_wellSpheresPartManager;
 	
     std::vector<RivCellSetEnum>                     m_visibleGridParts;

ApplicationCode/ProjectDataModel/RimEclipseWell.cpp

@@ -107,7 +107,7 @@ void RimEclipseWell::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
         {
             if (reservoirView)
             {
-                reservoirView->schedulePipeGeometryRegen();
+                reservoirView->scheduleSimWellGeometryRegen();
                 reservoirView->scheduleCreateDisplayModelAndRedraw();
             }
         }

ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp

@@ -39,6 +39,7 @@
 
 #include "cafPdmUiPushButtonEditor.h"
 #include "cafPdmUiCheckBoxTristateEditor.h"
+#include "RimEclipseResultCase.h"
 
 
 namespace caf
@@ -198,6 +199,8 @@ RimEclipseWellCollection::RimEclipseWellCollection()
     CAF_PDM_InitField(&obsoleteField_showWellLabel,             "ShowWellLabel",    true, "Show Well Label", "", "", "");
     CAF_PDM_InitField(&obsoleteField_showWellCellFence,         "ShowWellFences",   false,  "Show Well Cell Fence", "", "", "");
 
+    CAF_PDM_InitField(&m_showWellCommunicationLines,         "ShowWellCommunicationLines",   false,  "Show Communication Lines", "", "", "");
+
     obsoleteField_showWellHead.uiCapability()->setUiHidden(true);
     obsoleteField_showWellLabel.uiCapability()->setUiHidden(true);
     obsoleteField_showWellCellFence.uiCapability()->setUiHidden(true);
@@ -392,7 +395,7 @@ void RimEclipseWellCollection::fieldChangedByUi(const caf::PdmFieldHandle* chang
                 || &m_showWellSpheres == changedField
                 || &showConnectionStatusColors == changedField)
         {
-            m_reservoirView->schedulePipeGeometryRegen();
+            m_reservoirView->scheduleSimWellGeometryRegen();
             m_reservoirView->scheduleCreateDisplayModelAndRedraw();
         }
         else if (  &pipeCrossSectionVertexCount == changedField 
@@ -405,13 +408,13 @@ void RimEclipseWellCollection::fieldChangedByUi(const caf::PdmFieldHandle* chang
                 || &wellPipeCoordType == changedField
                 || &m_showWellPipe == changedField)
         {
-            m_reservoirView->schedulePipeGeometryRegen();
+            m_reservoirView->scheduleSimWellGeometryRegen();
             m_reservoirView->scheduleCreateDisplayModelAndRedraw();
         }
         else if (&showWellsIntersectingVisibleCells == changedField)
         {
             m_reservoirView->scheduleGeometryRegen(VISIBLE_WELL_CELLS);
-            m_reservoirView->schedulePipeGeometryRegen();
+            m_reservoirView->scheduleSimWellGeometryRegen();
             m_reservoirView->scheduleCreateDisplayModelAndRedraw();
         }
     }
@@ -446,6 +449,11 @@ void RimEclipseWellCollection::fieldChangedByUi(const caf::PdmFieldHandle* chang
     {
         RiuMainWindow::instance()->refreshDrawStyleActions();
     }
+
+    if (&m_showWellCommunicationLines == changedField)
+    {
+        if (m_reservoirView) m_reservoirView->scheduleCreateDisplayModelAndRedraw();
+    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -539,6 +547,10 @@ void RimEclipseWellCollection::defineUiOrdering(QString uiConfigName, caf::PdmUi
     filterGroup->add(&m_showWellCellFence);
     filterGroup->add(&wellCellFenceType);
 
+    RimEclipseResultCase* ownerCase; 
+    firstAncestorOrThisOfTypeAsserted(ownerCase);
+    m_showWellCommunicationLines.uiCapability()->setUiHidden(!ownerCase->flowDiagSolverInterface());
+
     m_showWellCellFence.uiCapability()->setUiReadOnly(!showWellCells());
     wellCellFenceType.uiCapability()->setUiReadOnly(!showWellCells());
 }

ApplicationCode/ProjectDataModel/RimEclipseWellCollection.h

@@ -98,6 +98,8 @@ public:
     void                                setShowWellCellsState(bool enable);
     bool                                showWellCells();
 
+    bool                                showWellCommunicationLines() { return m_showWellCommunicationLines();}
+
     caf::PdmField<WellFenceEnum>        wellCellFenceType;
     caf::PdmField<double>               wellCellTransparencyLevel;
 
@@ -155,6 +157,8 @@ private:
     caf::PdmField<caf::Tristate>        m_showWellCells;
     caf::PdmField<caf::Tristate>        m_showWellCellFence;
 
+    caf::PdmField<bool>                 m_showWellCommunicationLines; 
+
     // Obsolete fields
     caf::PdmField<WellVisibilityEnum>       obsoleteField_wellPipeVisibility;
     caf::PdmField<WellCellsRangeFilterEnum> obsoleteField_wellCellsToRangeFilterMode;

ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp

@@ -422,7 +422,7 @@ QString RimWellLogPlot::asciiDataForPlotExport() const
         }
 
         
-        for (int i = curveDepths.size() -1; i >= 0; i--)
+        for (int i = static_cast<int>( curveDepths.size()) - 1; i >= 0; i--)
         {
             if (i == curveDepths.size() - 1)
             {