diff --git a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp index 203d4c0df4..1b40c1c273 100644 --- a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp @@ -653,8 +653,23 @@ caf::FaceCulling RivFaultPartMgr::faceCullingMode() const return caf::FC_BACK; } } + else + { + return caf::FC_NONE; + } + } + else + { + // Always show cell behind fault if we are in grid visualization mode + if (m_grid->mainGrid()->faceNormalsIsOutwards()) + { + return caf::FC_BACK; + } + else + { + return caf::FC_FRONT; + } } - return caf::FC_NONE; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp index c40b43242e..afa0f26938 100644 --- a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp @@ -221,3 +221,18 @@ bool RimFaultCollection::isGridVisualizationMode() const return m_reservoirView->isGridVisualizationMode(); } + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimFaultCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) +{ + bool isGridVizMode = isGridVisualizationMode(); + + faultResult.setUiReadOnly(isGridVizMode); + if (faultResult() != caf::FC_FRONT) + { + // Todo: Make the ui show front + } +} + diff --git a/ApplicationCode/ProjectDataModel/RimFaultCollection.h b/ApplicationCode/ProjectDataModel/RimFaultCollection.h index 37f7574d93..632c3bd7c8 100644 --- a/ApplicationCode/ProjectDataModel/RimFaultCollection.h +++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.h @@ -80,6 +80,8 @@ public: private: RimFault* findFaultByName(QString name); + virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ); + private: RimReservoirView* m_reservoirView; diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp index 422380dab5..deee636e21 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp +++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp @@ -1271,6 +1271,8 @@ void RimReservoirView::updateDisplayModelVisibility() m_viewer->setEnableMask(mask); m_viewer->update(); + + faultCollection->updateConnectedEditors(); } //--------------------------------------------------------------------------------------------------