OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#2447 Fracture : Rename to fractureColors

Browse Source
This commit is contained in:
Magne Sjaastad
2018-02-06 12:57:50 +01:00
parent a283a468c2
commit 519771cb38
10 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp
+1 -1
View File
@@ -87,7 +87,7 @@ void setDefaultFractureColorResult()
for (RimStimPlanColors* const stimPlanColors : fractureColors)
{
stimPlanColors->setDefaultResultNameForStimPlan();
stimPlanColors->setDefaultResultName();
}
}
}
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp
+5 -5
View File
@@ -69,7 +69,7 @@ RimFractureTemplateCollection::~RimFractureTemplateCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<std::pair<QString, QString> > RimFractureTemplateCollection::stimPlanResultNamesAndUnits() const
std::vector<std::pair<QString, QString> > RimFractureTemplateCollection::resultNamesAndUnits() const
{
std::set<std::pair<QString, QString> > nameSet;
@@ -211,7 +211,7 @@ void RimFractureTemplateCollection::initAfterRead()
{
if (setAllShowMeshToFalseOnAllEclipseViews)
{
eclipseView->stimPlanColors->setShowStimPlanMesh(false);
eclipseView->fractureColors->setShowStimPlanMesh(false);
continue;
}
@@ -240,7 +240,7 @@ void RimFractureTemplateCollection::initAfterRead()
if (stimPlanFractureTemplatesInView.size() == 1)
{
eclipseView->stimPlanColors->setShowStimPlanMesh(templateIt->first->showStimPlanMesh());
eclipseView->fractureColors->setShowStimPlanMesh(templateIt->first->showStimPlanMesh());
}
else
{
@@ -255,11 +255,11 @@ void RimFractureTemplateCollection::initAfterRead()
}
if (anySetShowStimPlanMeshIsSetToFalse)
{
eclipseView->stimPlanColors->setShowStimPlanMesh(false);
eclipseView->fractureColors->setShowStimPlanMesh(false);
}
else
{
eclipseView->stimPlanColors->setShowStimPlanMesh(true);
eclipseView->fractureColors->setShowStimPlanMesh(true);
}
}
}
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h
+1 -1
View File
@@ -41,7 +41,7 @@ public:
caf::PdmChildArrayField<RimFractureTemplate*> fractureDefinitions;
caf::PdmField< RiaEclipseUnitTools::UnitSystemType > defaultUnitsForFracTemplates;
std::vector<std::pair<QString, QString> > stimPlanResultNamesAndUnits() const;
std::vector<std::pair<QString, QString> > resultNamesAndUnits() const;
void computeMinMax(const QString& uiResultName, const QString& unit, double* minValue, double* maxValue, double* posClosestToZero, double* negClosestToZero) const;
void loadAndUpdateData();
ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
+1 -1
View File
@@ -278,7 +278,7 @@ void RimStimPlanFractureTemplate::loadDataAndUpdate()
// Todo: Must update all views using this fracture template
RimEclipseView* activeView = dynamic_cast<RimEclipseView*>(RiaApplication::instance()->activeReservoirView());
if (activeView) activeView->stimPlanColors->loadDataAndUpdate();
if (activeView) activeView->fractureColors->loadDataAndUpdate();
updateConnectedEditors();
}
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
+1 -1
View File
@@ -255,7 +255,7 @@ RimEclipseView* RimEclipseCase::createAndAddReservoirView()
rimEclipseView->cellEdgeResult()->enableCellEdgeColors = false;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
rimEclipseView->stimPlanColors()->setDefaultResultNameForStimPlan();
rimEclipseView->fractureColors()->setDefaultResultName();
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
}
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
+9 -9
View File
@@ -124,9 +124,9 @@ RimEclipseView::RimEclipseView()
faultResultSettings.uiCapability()->setUiHidden(true);
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitFieldNoDefault(&stimPlanColors, "StimPlanColors", "Fracture", "", "", "");
stimPlanColors = new RimStimPlanColors();
stimPlanColors.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&fractureColors, "StimPlanColors", "Fracture", "", "", "");
fractureColors = new RimStimPlanColors();
fractureColors.uiCapability()->setUiHidden(true);
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitFieldNoDefault(&wellCollection, "WellCollection", "Simulation Wells", "", "", "");
@@ -463,7 +463,7 @@ void RimEclipseView::createDisplayModel()
// NB! StimPlan legend colors must be updated before well path geometry is added to the model
// as the fracture geometry depends on the StimPlan legend colors
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
stimPlanColors->updateLegendData();
fractureColors->updateLegendData();
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
addWellPathsToModel(m_wellPathPipeVizModel.p(), currentActiveCellInfo()->geometryBoundingBox());
@@ -771,7 +771,7 @@ void RimEclipseView::onLoadDataAndUpdate()
this->faultResultSettings()->customFaultResult()->loadResult();
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
this->stimPlanColors->loadDataAndUpdate();
this->fractureColors->loadDataAndUpdate();
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
updateMdiWindowVisibility();
@@ -1047,12 +1047,12 @@ void RimEclipseView::updateLegends()
}
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimLegendConfig* stimPlanLegend = stimPlanColors()->activeLegend();
RimLegendConfig* stimPlanLegend = fractureColors()->activeLegend();
if (stimPlanLegend)
{
stimPlanColors->updateLegendData();
fractureColors->updateLegendData();
if (stimPlanColors()->isChecked() && stimPlanLegend->legend())
if (fractureColors()->isChecked() && stimPlanLegend->legend())
{
m_viewer->addColorLegendToBottomLeftCorner(stimPlanLegend->legend());
}
@@ -1403,7 +1403,7 @@ void RimEclipseView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
{
if (!oilfield->fractureDefinitionCollection()->fractureDefinitions.empty())
{
uiTreeOrdering.add(stimPlanColors());
uiTreeOrdering.add(fractureColors());
}
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
ApplicationCode/ProjectDataModel/RimEclipseView.h
+1 -1
View File
@@ -86,7 +86,7 @@ public:
caf::PdmChildField<RimCellEdgeColors*> cellEdgeResult;
caf::PdmChildField<RimEclipseFaultColors*> faultResultSettings;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
caf::PdmChildField<RimStimPlanColors*> stimPlanColors;
caf::PdmChildField<RimStimPlanColors*> fractureColors;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
caf::PdmChildField<RimSimWellInViewCollection*> wellCollection;
ApplicationCode/ProjectDataModel/RimStimPlanColors.cpp
+8 -8
View File
@@ -56,7 +56,7 @@ namespace caf {
//--------------------------------------------------------------------------------------------------
/// Internal methods
//--------------------------------------------------------------------------------------------------
static void setDefaultResultIfStimPlan(caf::PdmField<QString> &field);
static void setDefaultFractureResult(caf::PdmField<QString> &field);
static QString toString(const std::pair<QString, QString>& resultNameAndUnit);
//--------------------------------------------------------------------------------------------------
@@ -104,7 +104,7 @@ void RimStimPlanColors::loadDataAndUpdate()
{
RimFractureTemplateCollection* fractureTemplates = fractureTemplateCollection();
std::vector<std::pair<QString, QString> > resultNameAndUnits = fractureTemplates->stimPlanResultNamesAndUnits();
std::vector<std::pair<QString, QString> > resultNameAndUnits = fractureTemplates->resultNamesAndUnits();
// Delete legends referencing results not present on file
{
@@ -178,7 +178,7 @@ QList<caf::PdmOptionItemInfo> RimStimPlanColors::calculateValueOptions(const caf
options.push_back(caf::PdmOptionItemInfo("None", ""));
for (auto resultNameAndUnit : fractureTemplates->stimPlanResultNamesAndUnits())
for (auto resultNameAndUnit : fractureTemplates->resultNamesAndUnits())
{
QString resultNameAndUnitString = toString(resultNameAndUnit);
options.push_back(caf::PdmOptionItemInfo(resultNameAndUnitString, resultNameAndUnitString));
@@ -253,9 +253,9 @@ QString RimStimPlanColors::uiResultName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimStimPlanColors::setDefaultResultNameForStimPlan()
void RimStimPlanColors::setDefaultResultName()
{
setDefaultResultIfStimPlan(m_resultNameAndUnit);
setDefaultFractureResult(m_resultNameAndUnit);
}
//--------------------------------------------------------------------------------------------------
@@ -332,7 +332,7 @@ void RimStimPlanColors::updateConductivityResultName()
if (m_resultNameAndUnit().contains("conductivity", Qt::CaseInsensitive))
{
RimFractureTemplateCollection* fractureTemplates = fractureTemplateCollection();
for (auto resultNameAndUnit : fractureTemplates->stimPlanResultNamesAndUnits())
for (auto resultNameAndUnit : fractureTemplates->resultNamesAndUnits())
{
if (resultNameAndUnit.first.contains("conductivity", Qt::CaseInsensitive))
{
@@ -447,7 +447,7 @@ QString toString(const std::pair<QString, QString>& resultNameAndUnit)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void setDefaultResultIfStimPlan(caf::PdmField<QString> &field)
void setDefaultFractureResult(caf::PdmField<QString> &field)
{
RimProject* proj = RiaApplication::instance()->project();
@@ -459,7 +459,7 @@ void setDefaultResultIfStimPlan(caf::PdmField<QString> &field)
{
RimFractureTemplateCollection* templColl = proj->allFractureTemplateCollections().front();
for (auto resultNameAndUnit : templColl->stimPlanResultNamesAndUnits())
for (auto resultNameAndUnit : templColl->resultNamesAndUnits())
{
if (resultNameAndUnit.first.contains(RiaDefines::conductivityResultName(), Qt::CaseInsensitive))
{
ApplicationCode/ProjectDataModel/RimStimPlanColors.h
+1 -1
View File
@@ -56,7 +56,7 @@ public:
RimLegendConfig* activeLegend() const;
QString uiResultName() const;
void setDefaultResultNameForStimPlan();
void setDefaultResultName();
QString unit() const;
cvf::Color3f defaultColor() const;
bool showStimPlanMesh() const { return m_showStimPlanMesh; }