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

#2751 Rename ensamble to ensemble

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-04-19 14:00:00 +02:00
parent 6ff50f3bca
commit e5570441f6
26 changed files with 193 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,8 +29,8 @@ ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCrossPlot.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotSourceStepping.h
${CMAKE_CURRENT_LIST_DIR}/RimCsvUserData.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotNameHelper.h
${CMAKE_CURRENT_LIST_DIR}/RimEnsambleCurveSetCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimEnsambleCurveSet.h
${CMAKE_CURRENT_LIST_DIR}/RimEnsembleCurveSetCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimEnsembleCurveSet.h
)
set (SOURCE_GROUP_SOURCE_FILES
@@ -63,8 +63,8 @@ ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCrossPlot.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotSourceStepping.cpp
${CMAKE_CURRENT_LIST_DIR}/RimCsvUserData.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotNameHelper.cpp
${CMAKE_CURRENT_LIST_DIR}/RimEnsambleCurveSetCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimEnsambleCurveSet.cpp
${CMAKE_CURRENT_LIST_DIR}/RimEnsembleCurveSetCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimEnsembleCurveSet.cpp
)
list(APPEND CODE_HEADER_FILES

90
ApplicationCode/ProjectDataModel/Summary/RimEnsambleCurveSet.cpp → ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimEnsambleCurveSet.h"
#include "RimEnsembleCurveSet.h"
#include "RiaApplication.h"
@@ -29,7 +29,7 @@
#include "RimSummaryPlot.h"
#include "RimSummaryFilter.h"
#include "RimSummaryAddress.h"
#include "RimEnsambleCurveSetCollection.h"
#include "RimEnsembleCurveSetCollection.h"
#include "RiuSummaryQwtPlot.h"
@@ -44,25 +44,25 @@
namespace caf
{
template<>
void AppEnum< RimEnsambleCurveSet::ColorMode >::setUp()
void AppEnum< RimEnsembleCurveSet::ColorMode >::setUp()
{
addItem(RimEnsambleCurveSet::SINGLE_COLOR, "SINGLE_COLOR", "Single Color");
addItem(RimEnsambleCurveSet::BY_ENSAMBLE_PARAM, "BY_ENSAMBLE_PARAM", "By Ensamble Parameter");
setDefault(RimEnsambleCurveSet::SINGLE_COLOR);
addItem(RimEnsembleCurveSet::SINGLE_COLOR, "SINGLE_COLOR", "Single Color");
addItem(RimEnsembleCurveSet::BY_ENSEMBLE_PARAM, "BY_ENSEMBLE_PARAM", "By Ensemble Parameter");
setDefault(RimEnsembleCurveSet::SINGLE_COLOR);
}
}
CAF_PDM_SOURCE_INIT(RimEnsambleCurveSet, "RimEnsambleCurveSet");
CAF_PDM_SOURCE_INIT(RimEnsembleCurveSet, "RimEnsembleCurveSet");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEnsambleCurveSet::RimEnsambleCurveSet()
RimEnsembleCurveSet::RimEnsembleCurveSet()
{
CAF_PDM_InitObject("Ensamble Curve Set", ":/SummaryCurveFilter16x16.png", "", "");
CAF_PDM_InitObject("Ensemble Curve Set", ":/SummaryCurveFilter16x16.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_curves, "EnsambleCurveSet", "Ensamble Curve Set", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_curves, "EnsembleCurveSet", "Ensemble Curve Set", "", "", "");
m_curves.uiCapability()->setUiHidden(true);
m_curves.uiCapability()->setUiTreeChildrenHidden(false);
@@ -105,7 +105,7 @@ RimEnsambleCurveSet::RimEnsambleCurveSet()
CAF_PDM_InitField(&m_color, "Color", cvf::Color3f(cvf::Color3::BLACK), "Color", "", "", "");
CAF_PDM_InitField(&m_ensambleParameter, "EnsambleParameter", QString(""), "Ensamble Parameter", "", "", "");
CAF_PDM_InitField(&m_ensembleParameter, "EnsembleParameter", QString(""), "Ensemble Parameter", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_plotAxis, "PlotAxis", "Axis", "", "", "");
@@ -116,7 +116,7 @@ RimEnsambleCurveSet::RimEnsambleCurveSet()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEnsambleCurveSet::~RimEnsambleCurveSet()
RimEnsembleCurveSet::~RimEnsembleCurveSet()
{
m_curves.deleteAllChildObjects();
@@ -124,16 +124,16 @@ RimEnsambleCurveSet::~RimEnsambleCurveSet()
firstAncestorOrThisOfType(parentPlot);
if (parentPlot && parentPlot->qwtPlot())
{
parentPlot->qwtPlot()->removeEnsambleCurveSetLegend(this);
parentPlot->qwtPlot()->removeEnsembleCurveSetLegend(this);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimEnsambleCurveSet::isCurvesVisible()
bool RimEnsembleCurveSet::isCurvesVisible()
{
RimEnsambleCurveSetCollection* coll = nullptr;
RimEnsembleCurveSetCollection* coll = nullptr;
firstAncestorOrThisOfType(coll);
return m_showCurves() && (coll ? coll->isCurveSetsVisible() : true);
}
@@ -141,7 +141,7 @@ bool RimEnsambleCurveSet::isCurvesVisible()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSet::setColor(cvf::Color3f color)
void RimEnsembleCurveSet::setColor(cvf::Color3f color)
{
m_color = color;
}
@@ -149,7 +149,7 @@ void RimEnsambleCurveSet::setColor(cvf::Color3f color)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSet::loadDataAndUpdate(bool updateParentPlot)
void RimEnsembleCurveSet::loadDataAndUpdate(bool updateParentPlot)
{
m_yValuesSelectedVariableDisplayField = QString::fromStdString(m_yValuesCurveVariable->address().uiText());
@@ -171,13 +171,13 @@ void RimEnsambleCurveSet::loadDataAndUpdate(bool updateParentPlot)
parentPlot->updateAxes();
parentPlot->updateZoomInQwt();
if (m_showCurves() && m_colorMode() == BY_ENSAMBLE_PARAM)
if (m_showCurves() && m_colorMode() == BY_ENSEMBLE_PARAM)
{
parentPlot->qwtPlot()->addOrUpdateEnsambleCurveSetLegend(this);
parentPlot->qwtPlot()->addOrUpdateEnsembleCurveSetLegend(this);
}
else
{
parentPlot->qwtPlot()->removeEnsambleCurveSetLegend(this);
parentPlot->qwtPlot()->removeEnsembleCurveSetLegend(this);
}
}
}
@@ -186,7 +186,7 @@ void RimEnsambleCurveSet::loadDataAndUpdate(bool updateParentPlot)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSet::setParentQwtPlotNoReplot(QwtPlot* plot)
void RimEnsembleCurveSet::setParentQwtPlotNoReplot(QwtPlot* plot)
{
for (RimSummaryCurve* curve : m_curves)
{
@@ -197,7 +197,7 @@ void RimEnsambleCurveSet::setParentQwtPlotNoReplot(QwtPlot* plot)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSet::detachQwtCurves()
void RimEnsembleCurveSet::detachQwtCurves()
{
for (RimSummaryCurve* curve : m_curves)
{
@@ -208,7 +208,7 @@ void RimEnsambleCurveSet::detachQwtCurves()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSet::addCurve(RimSummaryCurve* curve)
void RimEnsembleCurveSet::addCurve(RimSummaryCurve* curve)
{
if (curve)
{
@@ -224,7 +224,7 @@ void RimEnsambleCurveSet::addCurve(RimSummaryCurve* curve)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSet::deleteCurve(RimSummaryCurve* curve)
void RimEnsembleCurveSet::deleteCurve(RimSummaryCurve* curve)
{
if (curve)
{
@@ -236,7 +236,7 @@ void RimEnsambleCurveSet::deleteCurve(RimSummaryCurve* curve)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCurve*> RimEnsambleCurveSet::curves() const
std::vector<RimSummaryCurve*> RimEnsembleCurveSet::curves() const
{
return m_curves.childObjects();
}
@@ -244,7 +244,7 @@ std::vector<RimSummaryCurve*> RimEnsambleCurveSet::curves() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCurve*> RimEnsambleCurveSet::visibleCurves() const
std::vector<RimSummaryCurve*> RimEnsembleCurveSet::visibleCurves() const
{
std::vector<RimSummaryCurve*> visible;
@@ -262,7 +262,7 @@ std::vector<RimSummaryCurve*> RimEnsambleCurveSet::visibleCurves() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSet::deleteAllCurves()
void RimEnsembleCurveSet::deleteAllCurves()
{
m_curves.deleteAllChildObjects();
}
@@ -270,7 +270,7 @@ void RimEnsambleCurveSet::deleteAllCurves()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimRegularLegendConfig* RimEnsambleCurveSet::legendConfig()
RimRegularLegendConfig* RimEnsembleCurveSet::legendConfig()
{
return m_legendConfig;
}
@@ -278,7 +278,7 @@ RimRegularLegendConfig* RimEnsambleCurveSet::legendConfig()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSet::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimEnsembleCurveSet::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
RimSummaryPlot* plot = nullptr;
firstAncestorOrThisOfType(plot);
@@ -298,7 +298,7 @@ void RimEnsambleCurveSet::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
{
updateAllCurves();
}
else if (changedField == &m_ensambleParameter ||
else if (changedField == &m_ensembleParameter ||
changedField == &m_color ||
changedField == &m_colorMode)
{
@@ -321,7 +321,7 @@ void RimEnsambleCurveSet::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSet::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimEnsembleCurveSet::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
{
QString curveDataGroupName = "Summary Vector";
@@ -346,9 +346,9 @@ void RimEnsambleCurveSet::defineUiOrdering(QString uiConfigName, caf::PdmUiOrder
{
colorsGroup->add(&m_color);
}
else if (m_colorMode == BY_ENSAMBLE_PARAM)
else if (m_colorMode == BY_ENSEMBLE_PARAM)
{
colorsGroup->add(&m_ensambleParameter);
colorsGroup->add(&m_ensembleParameter);
}
uiOrdering.skipRemainingFields(true);
}
@@ -356,7 +356,7 @@ void RimEnsambleCurveSet::defineUiOrdering(QString uiConfigName, caf::PdmUiOrder
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSet::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
void RimEnsembleCurveSet::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
{
uiTreeOrdering.add(m_legendConfig());
uiTreeOrdering.skipRemainingChildren(true);
@@ -365,7 +365,7 @@ void RimEnsambleCurveSet::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrd
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimEnsambleCurveSet::objectToggleField()
caf::PdmFieldHandle* RimEnsembleCurveSet::objectToggleField()
{
return &m_showCurves;
}
@@ -373,7 +373,7 @@ caf::PdmFieldHandle* RimEnsambleCurveSet::objectToggleField()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSet::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
void RimEnsembleCurveSet::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
{
caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*> (attribute);
if (attrib)
@@ -385,7 +385,7 @@ void RimEnsambleCurveSet::defineEditorAttribute(const caf::PdmFieldHandle* field
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimEnsambleCurveSet::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
QList<caf::PdmOptionItemInfo> RimEnsembleCurveSet::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
{
QList<caf::PdmOptionItemInfo> options;
@@ -401,7 +401,7 @@ QList<caf::PdmOptionItemInfo> RimEnsambleCurveSet::calculateValueOptions(const c
options.push_front(caf::PdmOptionItemInfo("None", nullptr));
}
else if (fieldNeedingOptions == &m_ensambleParameter)
else if (fieldNeedingOptions == &m_ensembleParameter)
{
RimSummaryCaseCollection* group = m_yValuesSummaryGroup;
@@ -434,7 +434,7 @@ QList<caf::PdmOptionItemInfo> RimEnsambleCurveSet::calculateValueOptions(const c
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSet::getOptionsForSummaryAddresses(std::map<QString, RifEclipseSummaryAddress>* options,
void RimEnsembleCurveSet::getOptionsForSummaryAddresses(std::map<QString, RifEclipseSummaryAddress>* options,
RimSummaryCase* summaryCase,
RimSummaryFilter* summaryFilter)
{
@@ -460,7 +460,7 @@ void RimEnsambleCurveSet::getOptionsForSummaryAddresses(std::map<QString, RifEcl
//--------------------------------------------------------------------------------------------------
/// Optimization candidate
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSet::appendOptionItemsForSummaryAddresses(QList<caf::PdmOptionItemInfo>* options,
void RimEnsembleCurveSet::appendOptionItemsForSummaryAddresses(QList<caf::PdmOptionItemInfo>* options,
RimSummaryCaseCollection* summaryCaseGroup,
RimSummaryFilter* summaryFilter)
{
@@ -490,12 +490,12 @@ void RimEnsambleCurveSet::appendOptionItemsForSummaryAddresses(QList<caf::PdmOpt
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSet::updateCurveColors()
void RimEnsembleCurveSet::updateCurveColors()
{
if(m_colorMode == BY_ENSAMBLE_PARAM)
if(m_colorMode == BY_ENSEMBLE_PARAM)
{
RimSummaryCaseCollection* group = m_yValuesSummaryGroup();
QString parameterName = m_ensambleParameter();
QString parameterName = m_ensembleParameter();
if (group && !parameterName.isEmpty())
{
double minValue = std::numeric_limits<double>::infinity();
@@ -543,7 +543,7 @@ void RimEnsambleCurveSet::updateCurveColors()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSet::updateQwtPlotAxis()
void RimEnsembleCurveSet::updateQwtPlotAxis()
{
for (RimSummaryCurve* curve : curves())
{
@@ -554,7 +554,7 @@ void RimEnsambleCurveSet::updateQwtPlotAxis()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSet::updateAllCurves()
void RimEnsembleCurveSet::updateAllCurves()
{
RimSummaryPlot* plot = nullptr;
firstAncestorOrThisOfType(plot);

10
ApplicationCode/ProjectDataModel/Summary/RimEnsambleCurveSet.h → ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
View File

@@ -47,15 +47,15 @@ class QKeyEvent;
//==================================================================================================
///
//==================================================================================================
class RimEnsambleCurveSet : public caf::PdmObject
class RimEnsembleCurveSet : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
enum ColorMode {SINGLE_COLOR, BY_ENSAMBLE_PARAM};
enum ColorMode {SINGLE_COLOR, BY_ENSEMBLE_PARAM};
RimEnsambleCurveSet();
virtual ~RimEnsambleCurveSet();
RimEnsembleCurveSet();
virtual ~RimEnsembleCurveSet();
bool isCurvesVisible();
void setColor(cvf::Color3f color);
@@ -113,7 +113,7 @@ private:
caf::PdmField<caf::AppEnum<ColorMode>> m_colorMode;
caf::PdmField<cvf::Color3f> m_color;
caf::PdmField<QString> m_ensambleParameter;
caf::PdmField<QString> m_ensembleParameter;
caf::PdmField<caf::AppEnum< RiaDefines::PlotAxis>> m_plotAxis;

56
ApplicationCode/ProjectDataModel/Summary/RimEnsambleCurveSetCollection.cpp → ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp
View File

@@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimEnsambleCurveSetCollection.h"
#include "RimEnsembleCurveSetCollection.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
@@ -24,7 +24,7 @@
#include "RifReaderEclipseSummary.h"
#include "RimProject.h"
#include "RimEnsambleCurveSet.h"
#include "RimEnsembleCurveSet.h"
#include "RimSummaryCase.h"
#include "RimSummaryCrossPlot.h"
#include "RimSummaryCurve.h"
@@ -39,16 +39,16 @@
#include <QKeyEvent>
CAF_PDM_SOURCE_INIT(RimEnsambleCurveSetCollection, "RimEnsambleCurveSetCollection");
CAF_PDM_SOURCE_INIT(RimEnsembleCurveSetCollection, "RimEnsembleCurveSetCollection");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEnsambleCurveSetCollection::RimEnsambleCurveSetCollection()
RimEnsembleCurveSetCollection::RimEnsembleCurveSetCollection()
{
CAF_PDM_InitObject("Ensamble Curve Sets", ":/SummaryCurveFilter16x16.png", "", "");
CAF_PDM_InitObject("Ensemble Curve Sets", ":/SummaryCurveFilter16x16.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_curveSets, "EnsambleCurveSets", "Ensamble Curve Sets", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_curveSets, "EnsembleCurveSets", "Ensemble Curve Sets", "", "", "");
m_curveSets.uiCapability()->setUiHidden(true);
m_curveSets.uiCapability()->setUiTreeChildrenHidden(false);
@@ -80,7 +80,7 @@ RimEnsambleCurveSetCollection::RimEnsambleCurveSetCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEnsambleCurveSetCollection::~RimEnsambleCurveSetCollection()
RimEnsembleCurveSetCollection::~RimEnsembleCurveSetCollection()
{
m_curveSets.deleteAllChildObjects();
}
@@ -88,7 +88,7 @@ RimEnsambleCurveSetCollection::~RimEnsambleCurveSetCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimEnsambleCurveSetCollection::isCurveSetsVisible()
bool RimEnsembleCurveSetCollection::isCurveSetsVisible()
{
return m_showCurves();
}
@@ -96,9 +96,9 @@ bool RimEnsambleCurveSetCollection::isCurveSetsVisible()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSetCollection::loadDataAndUpdate(bool updateParentPlot)
void RimEnsembleCurveSetCollection::loadDataAndUpdate(bool updateParentPlot)
{
for (RimEnsambleCurveSet* curveSet : m_curveSets)
for (RimEnsembleCurveSet* curveSet : m_curveSets)
{
curveSet->loadDataAndUpdate(updateParentPlot);
}
@@ -125,9 +125,9 @@ void RimEnsambleCurveSetCollection::loadDataAndUpdate(bool updateParentPlot)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSetCollection::setParentQwtPlotAndReplot(QwtPlot* plot)
void RimEnsembleCurveSetCollection::setParentQwtPlotAndReplot(QwtPlot* plot)
{
for (RimEnsambleCurveSet* curveSet : m_curveSets)
for (RimEnsembleCurveSet* curveSet : m_curveSets)
{
curveSet->setParentQwtPlotNoReplot(plot);
}
@@ -138,7 +138,7 @@ void RimEnsambleCurveSetCollection::setParentQwtPlotAndReplot(QwtPlot* plot)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSetCollection::detachQwtCurves()
void RimEnsembleCurveSetCollection::detachQwtCurves()
{
for(const auto& curveSet : m_curveSets)
{
@@ -149,7 +149,7 @@ void RimEnsambleCurveSetCollection::detachQwtCurves()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSetCollection::addCurveSet(RimEnsambleCurveSet* curveSet)
void RimEnsembleCurveSetCollection::addCurveSet(RimEnsembleCurveSet* curveSet)
{
static int nextAutoColorIndex = 1;
static int numberOfColors = (int)RiaColorTables::summaryCurveDefaultPaletteColors().size();
@@ -166,7 +166,7 @@ void RimEnsambleCurveSetCollection::addCurveSet(RimEnsambleCurveSet* curveSet)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSetCollection::deleteCurveSet(RimEnsambleCurveSet* curveSet)
void RimEnsembleCurveSetCollection::deleteCurveSet(RimEnsembleCurveSet* curveSet)
{
if (curveSet)
{
@@ -178,7 +178,7 @@ void RimEnsambleCurveSetCollection::deleteCurveSet(RimEnsambleCurveSet* curveSet
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimEnsambleCurveSet*> RimEnsambleCurveSetCollection::curveSets() const
std::vector<RimEnsembleCurveSet*> RimEnsembleCurveSetCollection::curveSets() const
{
return m_curveSets.childObjects();
}
@@ -186,9 +186,9 @@ std::vector<RimEnsambleCurveSet*> RimEnsambleCurveSetCollection::curveSets() con
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimEnsambleCurveSet*> RimEnsambleCurveSetCollection::visibleCurveSets() const
std::vector<RimEnsembleCurveSet*> RimEnsembleCurveSetCollection::visibleCurveSets() const
{
std::vector<RimEnsambleCurveSet*> visible;
std::vector<RimEnsembleCurveSet*> visible;
for (auto c : m_curveSets)
{
@@ -204,7 +204,7 @@ std::vector<RimEnsambleCurveSet*> RimEnsambleCurveSetCollection::visibleCurveSet
////--------------------------------------------------------------------------------------------------
/////
////--------------------------------------------------------------------------------------------------
//void RimEnsambleCurveSetCollection::deleteCurvesAssosiatedWithCase(RimSummaryCase* summaryCase)
//void RimEnsembleCurveSetCollection::deleteCurvesAssosiatedWithCase(RimSummaryCase* summaryCase)
//{
// std::vector<RimSummaryCurve*> summaryCurvesToDelete;
//
@@ -229,7 +229,7 @@ std::vector<RimEnsambleCurveSet*> RimEnsambleCurveSetCollection::visibleCurveSet
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSetCollection::deleteAllCurveSets()
void RimEnsembleCurveSetCollection::deleteAllCurveSets()
{
m_curveSets.deleteAllChildObjects();
}
@@ -237,7 +237,7 @@ void RimEnsambleCurveSetCollection::deleteAllCurveSets()
////--------------------------------------------------------------------------------------------------
/////
////--------------------------------------------------------------------------------------------------
//void RimEnsambleCurveSetCollection::updateCaseNameHasChanged()
//void RimEnsembleCurveSetCollection::updateCaseNameHasChanged()
//{
// for (RimSummaryCurve* curve : m_curves)
// {
@@ -253,7 +253,7 @@ void RimEnsambleCurveSetCollection::deleteAllCurveSets()
////--------------------------------------------------------------------------------------------------
/////
////--------------------------------------------------------------------------------------------------
//void RimEnsambleCurveSetCollection::setCurrentSummaryCurve(RimSummaryCurve* curve)
//void RimEnsembleCurveSetCollection::setCurrentSummaryCurve(RimSummaryCurve* curve)
//{
// m_currentSummaryCurve = curve;
//
@@ -263,7 +263,7 @@ void RimEnsambleCurveSetCollection::deleteAllCurveSets()
////--------------------------------------------------------------------------------------------------
/////
////--------------------------------------------------------------------------------------------------
//std::vector<caf::PdmFieldHandle*> RimEnsambleCurveSetCollection::fieldsToShowInToolbar()
//std::vector<caf::PdmFieldHandle*> RimEnsembleCurveSetCollection::fieldsToShowInToolbar()
//{
// RimSummaryCrossPlot* parentCrossPlot;
// firstAncestorOrThisOfType(parentCrossPlot);
@@ -279,7 +279,7 @@ void RimEnsambleCurveSetCollection::deleteAllCurveSets()
////--------------------------------------------------------------------------------------------------
/////
////--------------------------------------------------------------------------------------------------
//void RimEnsambleCurveSetCollection::handleKeyPressEvent(QKeyEvent* keyEvent)
//void RimEnsembleCurveSetCollection::handleKeyPressEvent(QKeyEvent* keyEvent)
//{
// if (!keyEvent) return;
//
@@ -345,7 +345,7 @@ void RimEnsambleCurveSetCollection::deleteAllCurveSets()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSetCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimEnsembleCurveSetCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (changedField == &m_showCurves)
{
@@ -356,7 +356,7 @@ void RimEnsambleCurveSetCollection::fieldChangedByUi(const caf::PdmFieldHandle*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSetCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimEnsembleCurveSetCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
//RimSummaryCrossPlot* parentCrossPlot;
//firstAncestorOrThisOfType(parentCrossPlot);
@@ -392,7 +392,7 @@ void RimEnsambleCurveSetCollection::defineUiOrdering(QString uiConfigName, caf::
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimEnsambleCurveSetCollection::objectToggleField()
caf::PdmFieldHandle* RimEnsembleCurveSetCollection::objectToggleField()
{
return &m_showCurves;
}
@@ -400,7 +400,7 @@ caf::PdmFieldHandle* RimEnsambleCurveSetCollection::objectToggleField()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsambleCurveSetCollection::defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
void RimEnsembleCurveSetCollection::defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
{
//caf::PdmUiTreeViewEditorAttribute* myAttr = dynamic_cast<caf::PdmUiTreeViewEditorAttribute*>(attribute);
//if (myAttr && m_currentSummaryCurve.notNull())

18
ApplicationCode/ProjectDataModel/Summary/RimEnsambleCurveSetCollection.h → ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.h
View File

@@ -26,19 +26,19 @@
#include "cafPdmPtrArrayField.h"
class RimSummaryCase;
class RimEnsambleCurveSet;
class RimEnsembleCurveSet;
class QwtPlot;
//==================================================================================================
///
//==================================================================================================
class RimEnsambleCurveSetCollection : public caf::PdmObject
class RimEnsembleCurveSetCollection : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimEnsambleCurveSetCollection();
virtual ~RimEnsambleCurveSetCollection();
RimEnsembleCurveSetCollection();
virtual ~RimEnsembleCurveSetCollection();
bool isCurveSetsVisible();
@@ -48,11 +48,11 @@ public:
//RimSummaryCurve* findRimCurveFromQwtCurve(const QwtPlotCurve* qwtCurve) const;
void addCurveSet(RimEnsambleCurveSet* curveSet);
void deleteCurveSet(RimEnsambleCurveSet* curveSet);
void addCurveSet(RimEnsembleCurveSet* curveSet);
void deleteCurveSet(RimEnsembleCurveSet* curveSet);
std::vector<RimEnsambleCurveSet*> curveSets() const;
std::vector<RimEnsambleCurveSet*> visibleCurveSets() const;
std::vector<RimEnsembleCurveSet*> curveSets() const;
std::vector<RimEnsembleCurveSet*> visibleCurveSets() const;
//void deleteCurvesAssosiatedWithCase(RimSummaryCase* summaryCase);
void deleteAllCurveSets();
@@ -76,7 +76,7 @@ private:
private:
caf::PdmField<bool> m_showCurves;
caf::PdmChildArrayField<RimEnsambleCurveSet*> m_curveSets;
caf::PdmChildArrayField<RimEnsembleCurveSet*> m_curveSets;
//caf::PdmPointer<RimSummaryCurve> m_currentSummaryCurve;
};

36
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -22,14 +22,14 @@
#include "RiaSummaryCurveAnalyzer.h"
#include "RimAsciiDataCurve.h"
#include "RimEnsambleCurveSet.h"
#include "RimEnsembleCurveSet.h"
#include "RimGridTimeHistoryCurve.h"
#include "RimProject.h"
#include "RimSummaryAxisProperties.h"
#include "RimSummaryCase.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveCollection.h"
#include "RimEnsambleCurveSetCollection.h"
#include "RimEnsembleCurveSetCollection.h"
#include "RimSummaryCurveFilter.h"
#include "RimSummaryCurvesCalculator.h"
#include "RimSummaryPlotCollection.h"
@@ -85,9 +85,9 @@ RimSummaryPlot::RimSummaryPlot()
m_summaryCurveCollection.uiCapability()->setUiTreeHidden(true);
m_summaryCurveCollection = new RimSummaryCurveCollection;
CAF_PDM_InitFieldNoDefault(&m_ensambleCurveSetCollection, "EnsambleCurveSetCollection", "", "", "", "");
m_ensambleCurveSetCollection.uiCapability()->setUiTreeHidden(true);
m_ensambleCurveSetCollection = new RimEnsambleCurveSetCollection();
CAF_PDM_InitFieldNoDefault(&m_ensembleCurveSetCollection, "EnsembleCurveSetCollection", "", "", "", "");
m_ensembleCurveSetCollection.uiCapability()->setUiTreeHidden(true);
m_ensembleCurveSetCollection = new RimEnsembleCurveSetCollection();
CAF_PDM_InitFieldNoDefault(&m_summaryCurves_OBSOLETE, "SummaryCurves", "", "", "", "");
m_summaryCurves_OBSOLETE.uiCapability()->setUiTreeHidden(true);
@@ -139,7 +139,7 @@ RimSummaryPlot::~RimSummaryPlot()
m_summaryCurves_OBSOLETE.deleteAllChildObjects();
m_curveFilters_OBSOLETE.deleteAllChildObjects();
delete m_summaryCurveCollection;
delete m_ensambleCurveSetCollection;
delete m_ensembleCurveSetCollection;
}
//--------------------------------------------------------------------------------------------------
@@ -672,9 +672,9 @@ std::vector<RimSummaryCurve*> RimSummaryPlot::visibleSummaryCurvesForAxis(RiaDef
}
}
if (m_ensambleCurveSetCollection && m_ensambleCurveSetCollection->isCurveSetsVisible())
if (m_ensembleCurveSetCollection && m_ensembleCurveSetCollection->isCurveSetsVisible())
{
for (RimEnsambleCurveSet* curveSet : m_ensambleCurveSetCollection->curveSets())
for (RimEnsembleCurveSet* curveSet : m_ensembleCurveSetCollection->curveSets())
{
for (RimSummaryCurve* curve : curveSet->curves())
{
@@ -961,13 +961,13 @@ void RimSummaryPlot::addCurveNoUpdate(RimSummaryCurve* curve)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
//void RimSummaryPlot::addEnsambleCurve(const RimEnsambleCurveSet* curveSet, RimSummaryCurve* curve)
//void RimSummaryPlot::addEnsembleCurve(const RimEnsembleCurveSet* curveSet, RimSummaryCurve* curve)
//{
// if (curveSet && curve)
// {
// curve->setColor(RimSummaryCurveAppearanceCalculator::cycledPaletteColor((int)m_ensambleCurveSetCollection->curveSets().size()));
// curve->setColor(RimSummaryCurveAppearanceCalculator::cycledPaletteColor((int)m_ensembleCurveSetCollection->curveSets().size()));
//
// const_cast<RimEnsambleCurveSet*>(curveSet)->addCurve(curve);
// const_cast<RimEnsembleCurveSet*>(curveSet)->addCurve(curve);
// curve->setParentQwtPlotAndReplot(m_qwtPlot);
// }
//}
@@ -1000,9 +1000,9 @@ void RimSummaryPlot::deleteCurvesAssosiatedWithCase(RimSummaryCase* summaryCase)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEnsambleCurveSetCollection* RimSummaryPlot::ensambleCurveSets() const
RimEnsembleCurveSetCollection* RimSummaryPlot::ensembleCurveSets() const
{
return m_ensambleCurveSetCollection;
return m_ensembleCurveSetCollection;
}
//--------------------------------------------------------------------------------------------------
@@ -1162,7 +1162,7 @@ void RimSummaryPlot::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
uiTreeOrdering.add(&m_summaryCurveCollection);
if (!m_isCrossPlot)
{
uiTreeOrdering.add(&m_ensambleCurveSetCollection);
uiTreeOrdering.add(&m_ensembleCurveSetCollection);
}
uiTreeOrdering.add(&m_gridTimeHistoryCurves);
uiTreeOrdering.add(&m_asciiDataCurves);
@@ -1184,7 +1184,7 @@ void RimSummaryPlot::onLoadDataAndUpdate()
m_summaryCurveCollection->loadDataAndUpdate(false);
}
m_ensambleCurveSetCollection->loadDataAndUpdate(false);
m_ensembleCurveSetCollection->loadDataAndUpdate(false);
for (RimGridTimeHistoryCurve* curve : m_gridTimeHistoryCurves)
{
@@ -1358,9 +1358,9 @@ QWidget* RimSummaryPlot::createViewWidget(QWidget* mainWindowParent)
m_summaryCurveCollection->setParentQwtPlotAndReplot(m_qwtPlot);
}
if (m_ensambleCurveSetCollection)
if (m_ensembleCurveSetCollection)
{
m_ensambleCurveSetCollection->setParentQwtPlotAndReplot(m_qwtPlot);
m_ensembleCurveSetCollection->setParentQwtPlotAndReplot(m_qwtPlot);
}
}
@@ -1519,7 +1519,7 @@ void RimSummaryPlot::detachAllCurves()
m_summaryCurveCollection->detachQwtCurves();
}
m_ensambleCurveSetCollection->detachQwtCurves();
m_ensembleCurveSetCollection->detachQwtCurves();
for (RimGridTimeHistoryCurve* curve : m_gridTimeHistoryCurves)
{

10
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h
View File

@@ -38,8 +38,8 @@ class RimGridTimeHistoryCurve;
class RimSummaryCase;
class RimSummaryCurve;
class RimSummaryCurveCollection;
class RimEnsambleCurveSet;
class RimEnsambleCurveSetCollection;
class RimEnsembleCurveSet;
class RimEnsembleCurveSetCollection;
class RimSummaryCurveFilter_OBSOLETE;
class RimSummaryTimeAxisProperties;
class RimSummaryAxisProperties;
@@ -71,13 +71,13 @@ public:
void addCurveAndUpdate(RimSummaryCurve* curve);
void addCurveNoUpdate(RimSummaryCurve* curve);
//void addEnsambleCurve(const RimEnsambleCurveSet* curveSet, RimSummaryCurve* curve);
//void addEnsembleCurve(const RimEnsembleCurveSet* curveSet, RimSummaryCurve* curve);
void deleteCurve(RimSummaryCurve* curve);
void setCurveCollection(RimSummaryCurveCollection* curveCollection);
void deleteCurvesAssosiatedWithCase(RimSummaryCase* summaryCase);
RimEnsambleCurveSetCollection* ensambleCurveSets() const;
RimEnsembleCurveSetCollection* ensembleCurveSets() const;
void addGridTimeHistoryCurve(RimGridTimeHistoryCurve* curve);
@@ -171,7 +171,7 @@ private:
caf::PdmChildArrayField<RimGridTimeHistoryCurve*> m_gridTimeHistoryCurves;
caf::PdmChildField<RimSummaryCurveCollection*> m_summaryCurveCollection;
caf::PdmChildField<RimEnsambleCurveSetCollection*> m_ensambleCurveSetCollection;
caf::PdmChildField<RimEnsembleCurveSetCollection*> m_ensembleCurveSetCollection;
caf::PdmChildArrayField<RimAsciiDataCurve*> m_asciiDataCurves;