(#2168) Summary Plot : Add support for modifying identifier for curves

This commit is contained in:
Magne Sjaastad 2017-11-23 09:15:29 +01:00
parent f8f4fbc332
commit b46c19d90f
9 changed files with 552 additions and 5 deletions

View File

@ -21,6 +21,7 @@ ${CEE_CURRENT_LIST_DIR}RiaQDateTimeTools.h
${CEE_CURRENT_LIST_DIR}RiaSummaryTools.h
${CEE_CURRENT_LIST_DIR}RiaWellNameComparer.h
${CEE_CURRENT_LIST_DIR}RiaStdStringTools.h
${CEE_CURRENT_LIST_DIR}RiaSummaryCurveDefTools.h
)
set (SOURCE_GROUP_SOURCE_FILES
@ -39,6 +40,7 @@ ${CEE_CURRENT_LIST_DIR}RiaQDateTimeTools.cpp
${CEE_CURRENT_LIST_DIR}RiaSummaryTools.cpp
${CEE_CURRENT_LIST_DIR}RiaWellNameComparer.cpp
${CEE_CURRENT_LIST_DIR}RiaStdStringTools.cpp
${CEE_CURRENT_LIST_DIR}RiaSummaryCurveDefTools.cpp
)
list(APPEND CODE_HEADER_FILES

View File

@ -0,0 +1,111 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2017 Statoil ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RiaSummaryCurveDefTools.h"
#include "RiaSummaryCurveDefinition.h"
#include <set>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaSummaryCurveDefTools::RiaSummaryCurveDefTools(const std::vector<RiaSummaryCurveDefinition>& curveDefinitions)
: m_curveDefinitions(curveDefinitions), m_isEvaluated(false)
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<std::string> RiaSummaryCurveDefTools::uniqueWellNames() const
{
computeUniqueValues();
return std::vector<std::string>(m_wellNames.begin(), m_wellNames.end());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<std::string> RiaSummaryCurveDefTools::uniqueGroupNames() const
{
computeUniqueValues();
return std::vector<std::string>(m_groupName.begin(), m_groupName.end());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<int> RiaSummaryCurveDefTools::uniqueRegions() const
{
computeUniqueValues();
return std::vector<int>(m_regionNumbers.begin(), m_regionNumbers.end());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCase*> RiaSummaryCurveDefTools::uniqueSummaryCases() const
{
computeUniqueValues();
return std::vector<RimSummaryCase*>(m_summaryCases.begin(), m_summaryCases.end());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaSummaryCurveDefTools::computeUniqueValues() const
{
if (m_isEvaluated)
{
return;
}
// m_wellNames.clear();
// m_groupName.clear();
// m_summaryCases.clear();
for (const auto& curveDef : m_curveDefinitions)
{
if (curveDef.summaryCase() != nullptr)
{
m_summaryCases.insert(curveDef.summaryCase());
}
if (!curveDef.summaryAddress().wellName().empty())
{
m_wellNames.insert(curveDef.summaryAddress().wellName());
}
if (!curveDef.summaryAddress().wellGroupName().empty())
{
m_groupName.insert(curveDef.summaryAddress().wellGroupName());
}
if (curveDef.summaryAddress().regionNumber() != -1)
{
m_regionNumbers.insert(curveDef.summaryAddress().regionNumber());
}
}
m_isEvaluated = true;
}

View File

@ -0,0 +1,52 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2017 Statoil ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include <set>
#include <string>
#include <vector>
class RiaSummaryCurveDefinition;
class RimSummaryCase;
//==================================================================================================
//
//==================================================================================================
class RiaSummaryCurveDefTools
{
public:
RiaSummaryCurveDefTools(const std::vector<RiaSummaryCurveDefinition>& curveDefinitions);
std::vector<std::string> uniqueWellNames() const;
std::vector<std::string> uniqueGroupNames() const;
std::vector<int> uniqueRegions() const;
std::vector<RimSummaryCase*> uniqueSummaryCases() const;
private:
void computeUniqueValues() const;
private:
const std::vector<RiaSummaryCurveDefinition>& m_curveDefinitions;
mutable bool m_isEvaluated;
mutable std::set<std::string> m_wellNames;
mutable std::set<std::string> m_groupName;
mutable std::set<int> m_regionNumbers;
mutable std::set<RimSummaryCase*> m_summaryCases;
};

View File

@ -133,6 +133,7 @@ public:
bool isValid() const;
void setWellName(const std::string& wellName) { m_wellName = wellName; }
void setWellGroupName(const std::string& wellGroupName) { m_wellGroupName = wellGroupName; }
void setRegion(int region) { m_regionNumber = region; }
private:

View File

@ -31,6 +31,7 @@ ${CEE_CURRENT_LIST_DIR}RimCalculatedSummaryCase.h
${CEE_CURRENT_LIST_DIR}RimCalculatedSummaryCurveReader.h
${CEE_CURRENT_LIST_DIR}RimSummaryAddress.h
${CEE_CURRENT_LIST_DIR}RimSummaryCrossPlot.h
${CEE_CURRENT_LIST_DIR}RimSummaryCurvesModifier.h
${CEE_CURRENT_LIST_DIR}RimCsvUserData.h
)
@ -61,6 +62,7 @@ ${CEE_CURRENT_LIST_DIR}RimCalculatedSummaryCase.cpp
${CEE_CURRENT_LIST_DIR}RimCalculatedSummaryCurveReader.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryAddress.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryCrossPlot.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryCurvesModifier.cpp
${CEE_CURRENT_LIST_DIR}RimCsvUserData.cpp
)

View File

@ -24,6 +24,7 @@
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurvesModifier.h"
#include "RimSummaryPlot.h"
#include "RiuLineSegmentQwtPlotCurve.h"
@ -39,13 +40,19 @@ CAF_PDM_SOURCE_INIT(RimSummaryCurveCollection, "RimSummaryCurveCollection");
RimSummaryCurveCollection::RimSummaryCurveCollection()
{
CAF_PDM_InitObject("Summary Curves", ":/SummaryCurveFilter16x16.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_curves, "CollectionCurves", "Collection Curves", "", "", "");
m_curves.uiCapability()->setUiHidden(true);
m_curves.uiCapability()->setUiTreeChildrenHidden(false);
CAF_PDM_InitField(&m_showCurves, "IsActive", true, "Show Curves", "", "", "");
m_showCurves.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_curvesModifier, "CurvesModifier", "Curves Modifier", "", "", "");
m_curvesModifier = new RimSummaryCurvesModifier;
m_curvesModifier.uiCapability()->setUiHidden(true);
m_curvesModifier.uiCapability()->setUiTreeChildrenHidden(true);
m_curvesModifier.xmlCapability()->disableIO();
}
//--------------------------------------------------------------------------------------------------
@ -235,6 +242,16 @@ void RimSummaryCurveCollection::fieldChangedByUi(const caf::PdmFieldHandle* chan
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurveCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
auto group = uiOrdering.addNewGroup("Curve Modifier");
m_curvesModifier()->uiOrdering(uiConfigName, *group);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@ -20,15 +20,16 @@
#pragma once
#include "cafPdmChildArrayField.h"
#include "cafPdmChildField.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cafPdmPtrArrayField.h"
class QwtPlot;
class QwtPlotCurve;
class RimSummaryCase;
class RimSummaryCurve;
class RimSummaryCurvesModifier;
//==================================================================================================
///
@ -64,13 +65,18 @@ private:
virtual void defineObjectEditorAttribute(QString uiConfigName,
caf::PdmUiEditorAttribute* attribute) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue, const QVariant& newValue) override;
private:
caf::PdmField<bool> m_showCurves;
caf::PdmChildArrayField<RimSummaryCurve*> m_curves;
caf::PdmField<bool> m_showCurves;
caf::PdmChildArrayField<RimSummaryCurve*> m_curves;
caf::PdmChildField<RimSummaryCurvesModifier*> m_curvesModifier;
caf::PdmPointer<RimSummaryCurve> m_currentSummaryCurve;
protected:
caf::PdmPointer<RimSummaryCurve> m_currentSummaryCurve;
};

View File

@ -0,0 +1,294 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2017- Statoil ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimSummaryCurvesModifier.h"
#include "RiaSummaryCurveDefTools.h"
#include "RiaSummaryCurveDefinition.h"
#include "RimSummaryCase.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveCollection.h"
#include "RifSummaryReaderInterface.h"
#include "RimSummaryPlot.h"
#include "cafPdmUiItem.h"
#include "cafPdmUiListEditor.h"
CAF_PDM_SOURCE_INIT(RimSummaryCurvesModifier, "RimSummaryCurveCollectionModifier");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCurvesModifier::RimSummaryCurvesModifier()
{
// clang-format off
CAF_PDM_InitObject("Summary Curves Modifier", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_summaryCase, "CurveCase", "Case", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_wellName, "WellName", "Well Name", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_groupName, "GroupName", "Group Name", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_region, "Region", "Region", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_wellNameProxy, "WellNameProxy", "WellNameProxy", "", "", "");
m_wellNameProxy.registerGetMethod(this, &RimSummaryCurvesModifier::wellName);
m_wellNameProxy.registerSetMethod(this, &RimSummaryCurvesModifier::setWellName);
m_wellNameProxy.uiCapability()->setUiEditorTypeName(caf::PdmUiListEditor::uiEditorTypeName());
// clang-format on
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<QString> findAvailableIdentifierTexts(const std::vector<RifEclipseSummaryAddress>& allAddresses,
RifEclipseSummaryAddress::SummaryVarCategory category)
{
std::set<QString> mySet;
for (const auto& adr : allAddresses)
{
if (adr.category() == category)
{
if (category == RifEclipseSummaryAddress::SUMMARY_REGION)
{
mySet.insert(QString::number(adr.regionNumber()));
}
else if (category == RifEclipseSummaryAddress::SUMMARY_WELL)
{
mySet.insert(QString::fromStdString(adr.wellName()));
}
else if (category == RifEclipseSummaryAddress::SUMMARY_WELL_GROUP)
{
mySet.insert(QString::fromStdString(adr.wellGroupName()));
}
}
}
return mySet;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimSummaryCurvesModifier::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly)
{
std::set<QString> identifierTexts;
RifSummaryReaderInterface* reader = summaryReader();
{
if (fieldNeedingOptions == &m_wellName || fieldNeedingOptions == &m_wellNameProxy)
{
const std::vector<RifEclipseSummaryAddress> allAddresses = reader->allResultAddresses();
identifierTexts = findAvailableIdentifierTexts(allAddresses, RifEclipseSummaryAddress::SUMMARY_WELL);
}
else if (fieldNeedingOptions == &m_region)
{
const std::vector<RifEclipseSummaryAddress> allAddresses = reader->allResultAddresses();
identifierTexts = findAvailableIdentifierTexts(allAddresses, RifEclipseSummaryAddress::SUMMARY_REGION);
}
else if (fieldNeedingOptions == &m_groupName)
{
const std::vector<RifEclipseSummaryAddress> allAddresses = reader->allResultAddresses();
identifierTexts = findAvailableIdentifierTexts(allAddresses, RifEclipseSummaryAddress::SUMMARY_WELL_GROUP);
}
}
QList<caf::PdmOptionItemInfo> options;
if (identifierTexts.size() > 0)
{
for (const auto& text : identifierTexts)
{
options.append(caf::PdmOptionItemInfo(text, text));
}
}
else
{
options.push_back(caf::PdmOptionItemInfo("None", "None"));
}
return options;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifSummaryReaderInterface* RimSummaryCurvesModifier::summaryReader() const
{
RimSummaryCase* sumCase = singleSummaryCase();
if (sumCase)
{
return sumCase->summaryReader();
}
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCase* RimSummaryCurvesModifier::singleSummaryCase() const
{
RimSummaryCurveCollection* curveCollection = nullptr;
this->firstAncestorOrThisOfTypeAsserted(curveCollection);
std::set<RimSummaryCase*> cases;
for (auto curve : curveCollection->curves())
{
cases.insert(curve->summaryCaseY());
}
if (cases.size() == 1)
{
return *(cases.begin());
}
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimSummaryCurvesModifier::wellName() const
{
return m_wellName();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurvesModifier::setWellName(const QString& wellName)
{
m_wellName.setValueWithFieldChanged(wellName);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurvesModifier::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue,
const QVariant& newValue)
{
RimSummaryCurveCollection* curveCollection = nullptr;
this->firstAncestorOrThisOfTypeAsserted(curveCollection);
bool triggerLoadDataAndUpdate = false;
if (changedField == &m_wellName || changedField == &m_wellNameProxy)
{
for (auto curve : curveCollection->curves())
{
RifEclipseSummaryAddress adr = curve->summaryAddressY();
adr.setWellName(m_wellName().toStdString());
curve->setSummaryAddressY(adr);
}
triggerLoadDataAndUpdate = true;
}
else if (changedField == &m_region)
{
for (auto curve : curveCollection->curves())
{
RifEclipseSummaryAddress adr = curve->summaryAddressY();
adr.setRegion(m_region());
curve->setSummaryAddressY(adr);
}
triggerLoadDataAndUpdate = true;
}
else if (changedField == &m_groupName)
{
for (auto curve : curveCollection->curves())
{
RifEclipseSummaryAddress adr = curve->summaryAddressY();
adr.setWellGroupName(m_groupName().toStdString());
curve->setSummaryAddressY(adr);
}
triggerLoadDataAndUpdate = true;
}
if (triggerLoadDataAndUpdate)
{
RimSummaryPlot* summaryPlot = nullptr;
this->firstAncestorOrThisOfTypeAsserted(summaryPlot);
summaryPlot->loadDataAndUpdate();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurvesModifier::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
RimSummaryCurveCollection* curveCollection = nullptr;
this->firstAncestorOrThisOfTypeAsserted(curveCollection);
std::vector<RiaSummaryCurveDefinition> curveDefinitions;
for (auto curve : curveCollection->curves())
{
curveDefinitions.push_back(RiaSummaryCurveDefinition(curve->summaryCaseY(), curve->summaryAddressY()));
}
RiaSummaryCurveDefTools tools(curveDefinitions);
// m_summaryCase.uiCapability()->setUiReadOnly(true);
// m_wellName.uiCapability()->setUiReadOnly(true);
// m_groupName.uiCapability()->setUiReadOnly(true);
// m_region.uiCapability()->setUiReadOnly(true);
/*
if (tools.uniqueSummaryCases().size() > 1)
{
m_summaryCase.uiCapability()->setUiReadOnly(true);
}
else
{
m_summaryCase.uiCapability()->setUiReadOnly(false);
}
if (tools.uniqueWellNames().size() < 2)
{
m_wellName.uiCapability()->setUiReadOnly(true);
}
else
{
m_wellName.uiCapability()->setUiReadOnly(false);
}
if (tools.uniqueGroupNames().size() < 2)
{
m_groupName.uiCapability()->setUiReadOnly(true);
}
else
{
m_groupName.uiCapability()->setUiReadOnly(false);
}
if (tools.uniqueRegions().size() < 2)
{
m_region.uiCapability()->setUiReadOnly(true);
}
else
{
m_region.uiCapability()->setUiReadOnly(false);
}
*/
}

View File

@ -0,0 +1,62 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2017- Statoil ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cafPdmProxyValueField.h"
#include "cafPdmPtrField.h"
#include <QString>
class RimSummaryCase;
class RifSummaryReaderInterface;
//==================================================================================================
///
//==================================================================================================
class RimSummaryCurvesModifier : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimSummaryCurvesModifier();
private:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue,
const QVariant& newValue) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly) override;
private:
RifSummaryReaderInterface* summaryReader() const;
RimSummaryCase* singleSummaryCase() const;
QString wellName() const;
void setWellName(const QString& wellName);
private:
caf::PdmPtrField<RimSummaryCase*> m_summaryCase;
caf::PdmField<QString> m_wellName;
caf::PdmField<QString> m_groupName;
caf::PdmField<int> m_region;
caf::PdmProxyValueField<QString> m_wellNameProxy;
};