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

#2186 Summary Plot : Rename to RimSummaryPlotSourceStepping

Browse Source
This commit is contained in:
Magne Sjaastad 2017-11-29 10:35:52 +01:00
parent b9ff4b743b
commit 6bc79b812b
5 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake
View File

@ -31,7 +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}RimSummaryPlotSourceStepping.h
${CEE_CURRENT_LIST_DIR}RimCsvUserData.h
)
@ -62,7 +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}RimSummaryPlotSourceStepping.cpp
${CEE_CURRENT_LIST_DIR}RimCsvUserData.cpp
)

20
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp
View File

@ -26,7 +26,7 @@
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurvesModifier.h"
#include "RimSummaryPlotSourceStepping.h"
#include "RimSummaryPlot.h"
#include "RiuLineSegmentQwtPlotCurve.h"
@ -50,11 +50,11 @@ RimSummaryCurveCollection::RimSummaryCurveCollection()
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();
CAF_PDM_InitFieldNoDefault(&m_sourceStepping, "SourceStepping", "Plot Source Stepping", "", "", "");
m_sourceStepping = new RimSummaryPlotSourceStepping;
m_sourceStepping.uiCapability()->setUiHidden(true);
m_sourceStepping.uiCapability()->setUiTreeChildrenHidden(true);
m_sourceStepping.xmlCapability()->disableIO();
}
//--------------------------------------------------------------------------------------------------
@ -231,7 +231,7 @@ void RimSummaryCurveCollection::setCurrentSummaryCurve(RimSummaryCurve* curve)
//--------------------------------------------------------------------------------------------------
void RimSummaryCurveCollection::applyNextIdentifier()
{
m_curvesModifier->applyNextIdentifier();
m_sourceStepping->applyNextIdentifier();
}
//--------------------------------------------------------------------------------------------------
@ -239,7 +239,7 @@ void RimSummaryCurveCollection::applyNextIdentifier()
//--------------------------------------------------------------------------------------------------
void RimSummaryCurveCollection::applyPreviousIdentifier()
{
m_curvesModifier->applyPreviousIdentifier();
m_sourceStepping->applyPreviousIdentifier();
}
//--------------------------------------------------------------------------------------------------
@ -294,9 +294,9 @@ void RimSummaryCurveCollection::fieldChangedByUi(const caf::PdmFieldHandle* chan
//--------------------------------------------------------------------------------------------------
void RimSummaryCurveCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
auto group = uiOrdering.addNewGroup("Curve Modifier");
auto group = uiOrdering.addNewGroup("Plot Source Stepping");
m_curvesModifier()->uiOrdering(uiConfigName, *group);
m_sourceStepping()->uiOrdering(uiConfigName, *group);
}
//--------------------------------------------------------------------------------------------------

12
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveCollection.h
View File

@ -29,7 +29,7 @@ class QwtPlot;
class QwtPlotCurve;
class RimSummaryCase;
class RimSummaryCurve;
class RimSummaryCurvesModifier;
class RimSummaryPlotSourceStepping;
//==================================================================================================
///
@ -76,12 +76,10 @@ private:
const QVariant& oldValue, const QVariant& newValue) override;
private:
caf::PdmField<bool> m_showCurves;
caf::PdmChildArrayField<RimSummaryCurve*> m_curves;
caf::PdmChildField<RimSummaryCurvesModifier*> m_curvesModifier;
caf::PdmPointer<RimSummaryCurve> m_currentSummaryCurve;
protected:
caf::PdmField<bool> m_showCurves;
caf::PdmChildArrayField<RimSummaryCurve*> m_curves;
caf::PdmChildField<RimSummaryPlotSourceStepping*> m_sourceStepping;
caf::PdmPointer<RimSummaryCurve> m_currentSummaryCurve;
};

34
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesModifier.cpp → ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp
View File

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimSummaryCurvesModifier.h"
#include "RimSummaryPlotSourceStepping.h"
#include "RiaApplication.h"
#include "RiaSummaryCurveAnalyzer.h"
@ -35,12 +35,12 @@
#include "cafPdmUiItem.h"
#include "cafPdmUiListEditor.h"
CAF_PDM_SOURCE_INIT(RimSummaryCurvesModifier, "RimSummaryCurveCollectionModifier");
CAF_PDM_SOURCE_INIT(RimSummaryPlotSourceStepping, "RimSummaryCurveCollectionModifier");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCurvesModifier::RimSummaryCurvesModifier()
RimSummaryPlotSourceStepping::RimSummaryPlotSourceStepping()
{
// clang-format off
CAF_PDM_InitObject("Summary Curves Modifier", "", "", "");
@ -52,8 +52,8 @@ RimSummaryCurvesModifier::RimSummaryCurvesModifier()
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.registerGetMethod(this, &RimSummaryPlotSourceStepping::wellName);
m_wellNameProxy.registerSetMethod(this, &RimSummaryPlotSourceStepping::setWellName);
m_wellNameProxy.uiCapability()->setUiEditorTypeName(caf::PdmUiListEditor::uiEditorTypeName());
m_wellNameProxy.uiCapability()->setUiHidden(true);
// clang-format on
@ -62,7 +62,7 @@ RimSummaryCurvesModifier::RimSummaryCurvesModifier()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurvesModifier::applyNextIdentifier()
void RimSummaryPlotSourceStepping::applyNextIdentifier()
{
updateUiFromCurves();
@ -111,7 +111,7 @@ void RimSummaryCurvesModifier::applyNextIdentifier()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurvesModifier::applyPreviousIdentifier()
void RimSummaryPlotSourceStepping::applyPreviousIdentifier()
{
updateUiFromCurves();
@ -160,7 +160,7 @@ void RimSummaryCurvesModifier::applyPreviousIdentifier()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurvesModifier::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimSummaryPlotSourceStepping::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
updateUiFromCurves();
}
@ -168,7 +168,7 @@ void RimSummaryCurvesModifier::defineUiOrdering(QString uiConfigName, caf::PdmUi
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimSummaryCurvesModifier::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
QList<caf::PdmOptionItemInfo> RimSummaryPlotSourceStepping::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly)
{
if (fieldNeedingOptions == &m_summaryCase)
@ -255,7 +255,7 @@ QList<caf::PdmOptionItemInfo> RimSummaryCurvesModifier::calculateValueOptions(co
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurvesModifier::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue,
void RimSummaryPlotSourceStepping::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue,
const QVariant& newValue)
{
RimSummaryCurveCollection* curveCollection = nullptr;
@ -346,7 +346,7 @@ void RimSummaryCurvesModifier::fieldChangedByUi(const caf::PdmFieldHandle* chang
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifSummaryReaderInterface* RimSummaryCurvesModifier::summaryReader() const
RifSummaryReaderInterface* RimSummaryPlotSourceStepping::summaryReader() const
{
RimSummaryCase* sumCase = singleSummaryCase();
if (sumCase)
@ -360,7 +360,7 @@ RifSummaryReaderInterface* RimSummaryCurvesModifier::summaryReader() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCase* RimSummaryCurvesModifier::singleSummaryCase() const
RimSummaryCase* RimSummaryPlotSourceStepping::singleSummaryCase() const
{
RimSummaryCurveCollection* curveCollection = nullptr;
this->firstAncestorOrThisOfTypeAsserted(curveCollection);
@ -382,7 +382,7 @@ RimSummaryCase* RimSummaryCurvesModifier::singleSummaryCase() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimSummaryCurvesModifier::wellName() const
QString RimSummaryPlotSourceStepping::wellName() const
{
return m_wellName();
}
@ -390,7 +390,7 @@ QString RimSummaryCurvesModifier::wellName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurvesModifier::setWellName(const QString& wellName)
void RimSummaryPlotSourceStepping::setWellName(const QString& wellName)
{
m_wellName.setValueWithFieldChanged(wellName);
}
@ -398,7 +398,7 @@ void RimSummaryCurvesModifier::setWellName(const QString& wellName)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurvesModifier::updateUiFromCurves()
void RimSummaryPlotSourceStepping::updateUiFromCurves()
{
m_summaryCase.uiCapability()->setUiHidden(true);
m_wellName.uiCapability()->setUiHidden(true);
@ -460,7 +460,7 @@ void RimSummaryCurvesModifier::updateUiFromCurves()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimSummaryCurvesModifier::fieldToModify()
caf::PdmFieldHandle* RimSummaryPlotSourceStepping::fieldToModify()
{
RimSummaryCurveCollection* curveCollection = nullptr;
this->firstAncestorOrThisOfTypeAsserted(curveCollection);
@ -501,7 +501,7 @@ caf::PdmFieldHandle* RimSummaryCurvesModifier::fieldToModify()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmValueField* RimSummaryCurvesModifier::valueFieldToModify()
caf::PdmValueField* RimSummaryPlotSourceStepping::valueFieldToModify()
{
// This will return a null pointer for summary case modifier

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesModifier.h → ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.h
View File

@ -31,12 +31,12 @@ class RifSummaryReaderInterface;
//==================================================================================================
///
//==================================================================================================
class RimSummaryCurvesModifier : public caf::PdmObject
class RimSummaryPlotSourceStepping : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimSummaryCurvesModifier();
RimSummaryPlotSourceStepping();
void applyNextIdentifier();
void applyPreviousIdentifier();