OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fault result : Moved config from FaultCollection to FaultResultSettings

Browse Source
This commit is contained in:
Magne Sjaastad 2014-07-31 14:05:40 +02:00
parent 07b25a2f60
commit 51d4bd6023
7 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Application/RiaApplication.cpp
View File

@ -2066,7 +2066,7 @@ void RiaApplication::regressionTestConfigureProject()
}
riv->faultCollection->showFaultsOutsideFilters.setValueFromUi(false);
riv->faultCollection->showResultsOnFaults.setValueFromUi(true);
riv->faultResultSettings->visualizationMode.setValueFromUi(RimFaultResultSettings::CELL_RESULT_MAPPING);
}
}
}

4
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@ -131,7 +131,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
rivFaultPart->appendOppositeFaultFacesToModel(&parts);
}
if (faultCollection->showFaultFaces() || faultCollection->showOppositeFaultFaces() || faultCollection->showNNCs() || forceDisplayOfFault)
if (faultCollection->showFaultFaces() || faultCollection->showOppositeFaultFaces() || m_reservoirView->faultResultSettings()->showNNCs() || forceDisplayOfFault)
{
rivFaultPart->appendMeshLinePartsToModel(&parts);
}
@ -141,7 +141,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
if (rimFault->showFault() && faultCollection->showFaultCollection())
{
if (faultCollection->showNNCs())
if (m_reservoirView->faultResultSettings()->showNNCs())
{
rivFaultPart->appendNNCFacesToModel(&parts);
}

5
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
View File

@ -23,12 +23,13 @@
#include "RimCase.h"
#include "RimCellEdgeResultSlot.h"
#include "RimCellPropertyFilterCollection.h"
#include "RimFaultCollection.h"
#include "RimFaultResultSettings.h"
#include "RimReservoirCellResultsStorage.h"
#include "RimReservoirView.h"
#include "RimResultSlot.h"
#include "RimWellCollection.h"
#include "RiuViewer.h"
#include "RimFaultCollection.h"
CAF_PDM_SOURCE_INIT(Rim3dOverlayInfoConfig, "View3dOverlayInfoConfig");
@ -159,7 +160,7 @@ void Rim3dOverlayInfoConfig::update3DInfo()
infoText += QString("<table border=0 cellspacing=5 ><tr><td>Min</td><td>P10</td> <td>Mean</td> <td>P90</td> <td>Max</td> </tr>"
"<tr><td>%1</td><td> %2</td><td> %3</td><td> %4</td><td> %5 </td></tr></table>").arg(min).arg(p10).arg(mean).arg(p90).arg(max);
if (m_reservoirView->faultCollection()->showResultsOnFaults())
if (m_reservoirView->faultResultSettings()->visualizationMode() != RimFaultResultSettings::FAULT_COLOR)
{
QString faultMapping;
bool isShowingGrid = m_reservoirView->faultCollection()->isGridVisualizationMode();

14
ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
View File

@ -57,13 +57,8 @@ RimFaultCollection::RimFaultCollection()
CAF_PDM_InitField(&showFaultCollection, "Active", true, "Active", "", "", "");
showFaultCollection.setUiHidden(true);
CAF_PDM_InitField(&showGeometryDetectedFaults, "ShowGeometryDetectedFaults", false, "Show geometry detected faults", "", "", "");
showGeometryDetectedFaults.setUiHidden(true);
CAF_PDM_InitField(&showFaultFaces, "ShowFaultFaces", true, "Show defined faces", "", "", "");
CAF_PDM_InitField(&showOppositeFaultFaces, "ShowOppositeFaultFaces", true, "Show opposite faces", "", "", "");
CAF_PDM_InitField(&showNNCs, "ShowNNCs", false, "Show NNCs", "", "", "");
CAF_PDM_InitField(&showResultsOnFaults, "ShowResultsOnFaults", true, "Show results on faults", "", "", "");
CAF_PDM_InitField(&showFaultsOutsideFilters,"ShowFaultsOutsideFilters", true, "Show faults outside filters", "", "", "");
CAF_PDM_InitField(&faultResult, "FaultFaceCulling", caf::AppEnum<RimFaultCollection::FaultFaceCullingMode>(RimFaultCollection::FAULT_BACK_FACE_CULLING), "Dynamic Face Selection", "", "", "");
@ -101,16 +96,13 @@ void RimFaultCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedFiel
m_reservoirView->scheduleReservoirGridGeometryRegen();
}
if (&showGeometryDetectedFaults == changedField ||
&showFaultFaces == changedField ||
if (&showFaultFaces == changedField ||
&showOppositeFaultFaces == changedField ||
&showNNCs == changedField ||
&showFaultCollection == changedField ||
&showFaultLabel == changedField ||
&showFaultsOutsideFilters == changedField ||
&faultLabelColor == changedField ||
&faultResult == changedField ||
&showResultsOnFaults == changedField
&faultResult == changedField
)
{
if (m_reservoirView)
@ -266,8 +258,6 @@ void RimFaultCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderi
caf::PdmUiGroup* adv = uiOrdering.addNewGroup("Fault Options");
adv->add(&showFaultsOutsideFilters);
adv->add(&showResultsOnFaults);
adv->add(&showNNCs);
caf::PdmUiGroup* ffviz = uiOrdering.addNewGroup("Fault Face Visibility");
ffviz->add(&showFaultFaces);

4
ApplicationCode/ProjectDataModel/RimFaultCollection.h
View File

@ -58,13 +58,9 @@ public:
bool isGridVisualizationMode() const;
caf::PdmField<bool> showGeometryDetectedFaults; // Obsolete, to be removed
caf::PdmField<bool> showFaultFaces;
caf::PdmField<bool> showOppositeFaultFaces;
caf::PdmField<bool> showFaultsOutsideFilters;
caf::PdmField<bool> showNNCs;
caf::PdmField<bool> showResultsOnFaults;
caf::PdmField<caf::AppEnum< FaultFaceCullingMode > > faultResult;

11
ApplicationCode/ProjectDataModel/RimFaultResultSettings.cpp
View File

@ -46,11 +46,12 @@ RimFaultResultSettings::RimFaultResultSettings()
CAF_PDM_InitObject("Fault Result Slot", "", "", "");
CAF_PDM_InitField(&visualizationMode, "VisualizationMode", caf::AppEnum<RimFaultResultSettings::FaultVisualizationMode>(RimFaultResultSettings::CELL_RESULT_MAPPING), "Fault Color Mapping", "", "", "");
CAF_PDM_InitField(&showNNCs, "ShowNNCs", false, "Show NNCs", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_customFaultResult, "CustomResultSlot", "Custom Fault Result", ":/CellResult.png", "", "");
m_customFaultResult = new RimResultSlot();
CAF_PDM_InitFieldNoDefault(&m_customFaultResult, "CustomResultSlot", "Custom Fault Result", ":/CellResult.png", "", "");
m_customFaultResult = new RimResultSlot();
updateVisibility();
updateVisibility();
}
//--------------------------------------------------------------------------------------------------
@ -79,9 +80,11 @@ void RimFaultResultSettings::fieldChangedByUi(const caf::PdmFieldHandle* changed
updateVisibility();
RiuMainWindow::instance()->uiPdmModel()->updateUiSubTree(this);
RiuMainWindow::instance()->setExpanded(this, true);
}
if (m_reservoirView) m_reservoirView->createDisplayModelAndRedraw();
if (m_reservoirView) m_reservoirView->scheduleCreateDisplayModelAndRedraw();
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimFaultResultSettings.h
View File

@ -47,6 +47,8 @@ public:
void setReservoirView(RimReservoirView* ownerReservoirView);
caf::PdmField< caf::AppEnum< FaultVisualizationMode > > visualizationMode;
caf::PdmField<bool> showNNCs;
RimResultSlot* customFaultResult();
void updateVisibility();