mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#4003 Use the preferences settings when creating default summary plots.
Refactored to make assigning default curve appearance easier.
This commit is contained in:
@@ -71,6 +71,7 @@ void RicNewSummaryCurveFeature::onActionTriggered(bool isChecked)
|
|||||||
|
|
||||||
RimSummaryCurve* newCurve = RicSummaryPlotFeatureImpl::addDefaultCurveToPlot(plot, defaultCase);
|
RimSummaryCurve* newCurve = RicSummaryPlotFeatureImpl::addDefaultCurveToPlot(plot, defaultCase);
|
||||||
|
|
||||||
|
plot->applyDefaultCurveAppearances();
|
||||||
plot->loadDataAndUpdate();
|
plot->loadDataAndUpdate();
|
||||||
plot->updateConnectedEditors();
|
plot->updateConnectedEditors();
|
||||||
|
|
||||||
|
|||||||
@@ -196,33 +196,33 @@ void RicNewDefaultSummaryPlotFeature::onActionTriggered(bool isChecked)
|
|||||||
{
|
{
|
||||||
auto sumPlotSumCasesPair = extractSumPlotCollectionOrSelectedSumCasesFromSelection();
|
auto sumPlotSumCasesPair = extractSumPlotCollectionOrSelectedSumCasesFromSelection();
|
||||||
|
|
||||||
RimSummaryPlotCollection* sumPlotColl = RiaApplication::instance()->project()->mainPlotCollection()->summaryPlotCollection();
|
std::vector<RimSummaryCase*> summaryCasesToUse;
|
||||||
|
|
||||||
RimSummaryPlot* newPlot = nullptr;
|
|
||||||
|
|
||||||
if (sumPlotSumCasesPair.first)
|
if (sumPlotSumCasesPair.first)
|
||||||
{
|
{
|
||||||
auto sumCaseVector = RiaApplication::instance()->project()->allSummaryCases();
|
auto sumCaseVector = RiaApplication::instance()->project()->allSummaryCases();
|
||||||
|
|
||||||
newPlot = sumPlotColl->createSummaryPlotWithAutoTitle();
|
|
||||||
|
|
||||||
if (sumCaseVector.size())
|
if (sumCaseVector.size())
|
||||||
{
|
{
|
||||||
RicSummaryPlotFeatureImpl::addDefaultCurveToPlot(newPlot, sumCaseVector[0]);
|
summaryCasesToUse.push_back(sumCaseVector[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (sumPlotSumCasesPair.second.size())
|
else if (sumPlotSumCasesPair.second.size())
|
||||||
{
|
{
|
||||||
newPlot = sumPlotColl->createSummaryPlotWithAutoTitle();
|
summaryCasesToUse = sumPlotSumCasesPair.second;
|
||||||
|
|
||||||
for (RimSummaryCase* sumCase : sumPlotSumCasesPair.second)
|
|
||||||
{
|
|
||||||
RicSummaryPlotFeatureImpl::addDefaultCurveToPlot(newPlot, sumCase);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( newPlot )
|
if ( summaryCasesToUse.size() )
|
||||||
{
|
{
|
||||||
|
RimSummaryPlotCollection* sumPlotColl = RiaApplication::instance()->project()->mainPlotCollection()->summaryPlotCollection();
|
||||||
|
RimSummaryPlot* newPlot = sumPlotColl->createSummaryPlotWithAutoTitle();
|
||||||
|
|
||||||
|
for (RimSummaryCase* sumCase : summaryCasesToUse)
|
||||||
|
{
|
||||||
|
RicSummaryPlotFeatureImpl::addDefaultCurvesToPlot(newPlot, sumCase);
|
||||||
|
}
|
||||||
|
|
||||||
|
newPlot->applyDefaultCurveAppearances();
|
||||||
newPlot->loadDataAndUpdate();
|
newPlot->loadDataAndUpdate();
|
||||||
|
|
||||||
sumPlotColl->updateConnectedEditors();
|
sumPlotColl->updateConnectedEditors();
|
||||||
|
|||||||
@@ -441,8 +441,7 @@ void RicSummaryCurveCreator::updatePreviewCurvesFromCurveDefinitions(
|
|||||||
if (!def.isEnsembleCurve()) summaryCurveDefsToDisplay.insert(def);
|
if (!def.isEnsembleCurve()) summaryCurveDefsToDisplay.insert(def);
|
||||||
}
|
}
|
||||||
|
|
||||||
RimSummaryCurveAppearanceCalculator curveLookCalc(
|
RimSummaryCurveAppearanceCalculator curveLookCalc(summaryCurveDefsToDisplay);
|
||||||
summaryCurveDefsToDisplay, getAllSummaryCaseNames(), getAllSummaryWellNames());
|
|
||||||
initCurveAppearanceCalculator(curveLookCalc);
|
initCurveAppearanceCalculator(curveLookCalc);
|
||||||
|
|
||||||
// Delete curves
|
// Delete curves
|
||||||
@@ -528,55 +527,6 @@ void RicSummaryCurveCreator::updatePreviewCurvesFromCurveDefinitions(
|
|||||||
m_previewPlot->summaryCurveCollection()->updateConnectedEditors();
|
m_previewPlot->summaryCurveCollection()->updateConnectedEditors();
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
|
||||||
///
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
|
||||||
std::set<std::string> RicSummaryCurveCreator::getAllSummaryCaseNames()
|
|
||||||
{
|
|
||||||
std::set<std::string> summaryCaseHashes;
|
|
||||||
RimProject* proj = RiaApplication::instance()->project();
|
|
||||||
|
|
||||||
std::vector<RimSummaryCase*> cases = proj->allSummaryCases();
|
|
||||||
for (RimSummaryCase* rimCase : cases)
|
|
||||||
{
|
|
||||||
summaryCaseHashes.insert(rimCase->summaryHeaderFilename().toUtf8().constData());
|
|
||||||
}
|
|
||||||
|
|
||||||
return summaryCaseHashes;
|
|
||||||
}
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
|
||||||
///
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
|
||||||
std::set<std::string> RicSummaryCurveCreator::getAllSummaryWellNames()
|
|
||||||
{
|
|
||||||
std::set<std::string> summaryWellNames;
|
|
||||||
RimProject* proj = RiaApplication::instance()->project();
|
|
||||||
|
|
||||||
std::vector<RimSummaryCase*> cases = proj->allSummaryCases();
|
|
||||||
for (RimSummaryCase* rimCase : cases)
|
|
||||||
{
|
|
||||||
RifSummaryReaderInterface* reader = nullptr;
|
|
||||||
if (rimCase)
|
|
||||||
{
|
|
||||||
reader = rimCase->summaryReader();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (reader)
|
|
||||||
{
|
|
||||||
const std::set<RifEclipseSummaryAddress> allAddresses = reader->allResultAddresses();
|
|
||||||
|
|
||||||
for (auto& address : allAddresses)
|
|
||||||
{
|
|
||||||
if (address.category() == RifEclipseSummaryAddress::SUMMARY_WELL)
|
|
||||||
{
|
|
||||||
summaryWellNames.insert(address.wellName());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return summaryWellNames;
|
|
||||||
}
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
@@ -816,9 +766,9 @@ void RicSummaryCurveCreator::initCurveAppearanceCalculator(RimSummaryCurveAppear
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RicSummaryCurveCreator::applyAppearanceToAllPreviewCurves()
|
void RicSummaryCurveCreator::applyAppearanceToAllPreviewCurves()
|
||||||
{
|
{
|
||||||
std::set<RiaSummaryCurveDefinition> allCurveDefs = allPreviewCurveDefs();
|
std::set<RiaSummaryCurveDefinition> allCurveDefs = m_previewPlot->summaryAndEnsembleCurveDefinitions();
|
||||||
|
|
||||||
RimSummaryCurveAppearanceCalculator curveLookCalc(allCurveDefs, getAllSummaryCaseNames(), getAllSummaryWellNames());
|
RimSummaryCurveAppearanceCalculator curveLookCalc(allCurveDefs);
|
||||||
initCurveAppearanceCalculator(curveLookCalc);
|
initCurveAppearanceCalculator(curveLookCalc);
|
||||||
|
|
||||||
// Summary curves
|
// Summary curves
|
||||||
@@ -842,26 +792,12 @@ void RicSummaryCurveCreator::applyAppearanceToAllPreviewCurves()
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RicSummaryCurveCreator::updateAppearanceEditor()
|
void RicSummaryCurveCreator::updateAppearanceEditor()
|
||||||
{
|
{
|
||||||
std::set<RiaSummaryCurveDefinition> allCurveDefs = allPreviewCurveDefs();
|
std::set<RiaSummaryCurveDefinition> allCurveDefs = m_previewPlot->summaryAndEnsembleCurveDefinitions();
|
||||||
|
|
||||||
RimSummaryCurveAppearanceCalculator curveLookCalc(allCurveDefs, getAllSummaryCaseNames(), getAllSummaryWellNames());
|
RimSummaryCurveAppearanceCalculator curveLookCalc(allCurveDefs);
|
||||||
initCurveAppearanceCalculator(curveLookCalc);
|
initCurveAppearanceCalculator(curveLookCalc);
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
|
||||||
///
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
|
||||||
std::set<RiaSummaryCurveDefinition> RicSummaryCurveCreator::allPreviewCurveDefs() const
|
|
||||||
{
|
|
||||||
std::set<RiaSummaryCurveDefinition> allCurveDefs;
|
|
||||||
|
|
||||||
for (const auto& curve : m_previewPlot->summaryAndEnsembleCurves())
|
|
||||||
{
|
|
||||||
allCurveDefs.insert(RiaSummaryCurveDefinition(curve->summaryCaseY(), curve->summaryAddressY()));
|
|
||||||
}
|
|
||||||
return allCurveDefs;
|
|
||||||
}
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -89,8 +89,6 @@ private:
|
|||||||
const std::set<RiaSummaryCurveDefinition>& curveDefsToAdd,
|
const std::set<RiaSummaryCurveDefinition>& curveDefsToAdd,
|
||||||
const std::set<RimSummaryCurve*>& curvesToDelete,
|
const std::set<RimSummaryCurve*>& curvesToDelete,
|
||||||
const std::set<RimEnsembleCurveSet*>& curveSetsToDelete);
|
const std::set<RimEnsembleCurveSet*>& curveSetsToDelete);
|
||||||
std::set<std::string> getAllSummaryCaseNames();
|
|
||||||
std::set<std::string> getAllSummaryWellNames();
|
|
||||||
|
|
||||||
void populateCurveCreator(const RimSummaryPlot& sourceSummaryPlot);
|
void populateCurveCreator(const RimSummaryPlot& sourceSummaryPlot);
|
||||||
void updateTargetPlot();
|
void updateTargetPlot();
|
||||||
@@ -102,7 +100,6 @@ private:
|
|||||||
void initCurveAppearanceCalculator(RimSummaryCurveAppearanceCalculator& curveAppearanceCalc);
|
void initCurveAppearanceCalculator(RimSummaryCurveAppearanceCalculator& curveAppearanceCalc);
|
||||||
void applyAppearanceToAllPreviewCurves();
|
void applyAppearanceToAllPreviewCurves();
|
||||||
void updateAppearanceEditor();
|
void updateAppearanceEditor();
|
||||||
std::set<RiaSummaryCurveDefinition> allPreviewCurveDefs() const;
|
|
||||||
void createNewPlot();
|
void createNewPlot();
|
||||||
bool isObservedData(RimSummaryCase *sumCase) const;
|
bool isObservedData(RimSummaryCase *sumCase) const;
|
||||||
|
|
||||||
|
|||||||
@@ -28,6 +28,9 @@
|
|||||||
|
|
||||||
#include "RiaApplication.h"
|
#include "RiaApplication.h"
|
||||||
#include "RiaColorTables.h"
|
#include "RiaColorTables.h"
|
||||||
|
#include "RiaPreferences.h"
|
||||||
|
#include "RifSummaryReaderInterface.h"
|
||||||
|
#include "RimSummaryCase.h"
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
@@ -36,6 +39,27 @@ RimSummaryCurve* RicSummaryPlotFeatureImpl::addDefaultCurveToPlot(RimSummaryPlot
|
|||||||
{
|
{
|
||||||
if (plot)
|
if (plot)
|
||||||
{
|
{
|
||||||
|
RifEclipseSummaryAddress defaultAddressToUse;
|
||||||
|
|
||||||
|
QString curvesTextFilter = RiaApplication::instance()->preferences()->defaultSummaryCurvesTextFilter;
|
||||||
|
QStringList curveFilters = curvesTextFilter.split(";", QString::SkipEmptyParts);
|
||||||
|
|
||||||
|
if ( curveFilters.size() )
|
||||||
|
{
|
||||||
|
const std::set<RifEclipseSummaryAddress>& addrs = summaryCase->summaryReader()->allResultAddresses();
|
||||||
|
|
||||||
|
for ( const auto & addr : addrs )
|
||||||
|
{
|
||||||
|
const QString& filter = curveFilters[0];
|
||||||
|
{
|
||||||
|
if ( addr.isUiTextMatchingFilterText(filter) )
|
||||||
|
{
|
||||||
|
defaultAddressToUse = addr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
RimSummaryCurve* newCurve = new RimSummaryCurve();
|
RimSummaryCurve* newCurve = new RimSummaryCurve();
|
||||||
|
|
||||||
// Use same counting as RicNewSummaryEnsembleCurveSetFeature::onActionTriggered
|
// Use same counting as RicNewSummaryEnsembleCurveSetFeature::onActionTriggered
|
||||||
@@ -49,7 +73,7 @@ RimSummaryCurve* RicSummaryPlotFeatureImpl::addDefaultCurveToPlot(RimSummaryPlot
|
|||||||
newCurve->setSummaryCaseY(summaryCase);
|
newCurve->setSummaryCaseY(summaryCase);
|
||||||
}
|
}
|
||||||
|
|
||||||
newCurve->setSummaryAddressYAndApplyInterpolation(RifEclipseSummaryAddress::fieldAddress("FOPT"));
|
newCurve->setSummaryAddressYAndApplyInterpolation(defaultAddressToUse);
|
||||||
|
|
||||||
return newCurve;
|
return newCurve;
|
||||||
}
|
}
|
||||||
@@ -57,6 +81,45 @@ RimSummaryCurve* RicSummaryPlotFeatureImpl::addDefaultCurveToPlot(RimSummaryPlot
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
std::vector<RimSummaryCurve*> RicSummaryPlotFeatureImpl::addDefaultCurvesToPlot(RimSummaryPlot* plot, RimSummaryCase* summaryCase)
|
||||||
|
{
|
||||||
|
std::vector<RimSummaryCurve*> defaultCurves;
|
||||||
|
|
||||||
|
QString curvesTextFilter = RiaApplication::instance()->preferences()->defaultSummaryCurvesTextFilter;
|
||||||
|
QStringList curveFilters = curvesTextFilter.split(";", QString::SkipEmptyParts);
|
||||||
|
|
||||||
|
const std::set<RifEclipseSummaryAddress>& addrs = summaryCase->summaryReader()->allResultAddresses();
|
||||||
|
std::vector<RifEclipseSummaryAddress> curveAddressesToUse;
|
||||||
|
|
||||||
|
for (const auto & addr : addrs)
|
||||||
|
{
|
||||||
|
for (const QString& filter: curveFilters)
|
||||||
|
{
|
||||||
|
if ( addr.isUiTextMatchingFilterText(filter) )
|
||||||
|
{
|
||||||
|
curveAddressesToUse.push_back(addr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const auto & addr : curveAddressesToUse)
|
||||||
|
{
|
||||||
|
RimSummaryCurve* newCurve = new RimSummaryCurve();
|
||||||
|
plot->addCurveNoUpdate(newCurve);
|
||||||
|
if (summaryCase)
|
||||||
|
{
|
||||||
|
newCurve->setSummaryCaseY(summaryCase);
|
||||||
|
}
|
||||||
|
newCurve->setSummaryAddressYAndApplyInterpolation(addr);
|
||||||
|
defaultCurves.push_back(newCurve);
|
||||||
|
}
|
||||||
|
|
||||||
|
return defaultCurves;
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@@ -82,13 +145,18 @@ void RicSummaryPlotFeatureImpl::createDefaultSummaryPlot( RimSummaryCase* summar
|
|||||||
{
|
{
|
||||||
auto plot = summaryPlotCollection->createSummaryPlotWithAutoTitle();
|
auto plot = summaryPlotCollection->createSummaryPlotWithAutoTitle();
|
||||||
|
|
||||||
auto curve = RicSummaryPlotFeatureImpl::addDefaultCurveToPlot(plot, summaryCase);
|
std::vector<RimSummaryCurve*> curves = RicSummaryPlotFeatureImpl::addDefaultCurvesToPlot(plot, summaryCase);
|
||||||
|
|
||||||
|
plot->applyDefaultCurveAppearances();
|
||||||
plot->loadDataAndUpdate();
|
plot->loadDataAndUpdate();
|
||||||
|
|
||||||
summaryPlotCollection->updateConnectedEditors();
|
summaryPlotCollection->updateConnectedEditors();
|
||||||
|
|
||||||
RiuPlotMainWindowTools::setExpanded(curve);
|
caf::PdmObject* itemToSelect = plot;
|
||||||
RiuPlotMainWindowTools::selectAsCurrentItem(curve);
|
if (curves.size()) itemToSelect = curves[0];
|
||||||
|
|
||||||
|
RiuPlotMainWindowTools::setExpanded(itemToSelect);
|
||||||
|
RiuPlotMainWindowTools::selectAsCurrentItem(itemToSelect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,12 +22,16 @@ class RimSummaryPlot;
|
|||||||
class RimSummaryCase;
|
class RimSummaryCase;
|
||||||
class RimSummaryPlotCollection;
|
class RimSummaryPlotCollection;
|
||||||
|
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
class RicSummaryPlotFeatureImpl
|
class RicSummaryPlotFeatureImpl
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static RimSummaryCurve* addDefaultCurveToPlot(RimSummaryPlot* plot, RimSummaryCase* summaryCase);
|
static RimSummaryCurve* addDefaultCurveToPlot(RimSummaryPlot* plot, RimSummaryCase* summaryCase);
|
||||||
|
static std::vector<RimSummaryCurve*> addDefaultCurvesToPlot(RimSummaryPlot* plot, RimSummaryCase* summaryCase);
|
||||||
static void ensureAtLeastOnePlot(RimSummaryPlotCollection* summaryPlotCollection, RimSummaryCase* summaryCase);
|
static void ensureAtLeastOnePlot(RimSummaryPlotCollection* summaryPlotCollection, RimSummaryCase* summaryCase);
|
||||||
static void createDefaultSummaryPlot(RimSummaryCase* summaryCase);
|
static void createDefaultSummaryPlot(RimSummaryCase* summaryCase);
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -644,6 +644,24 @@ std::string RifEclipseSummaryAddress::uiText(RifEclipseSummaryAddress::SummaryId
|
|||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
bool RifEclipseSummaryAddress::isUiTextMatchingFilterText(const QString& filterString) const
|
||||||
|
{
|
||||||
|
std::string value = uiText();
|
||||||
|
if(filterString.isEmpty()) return true;
|
||||||
|
if(filterString.trimmed() == "*")
|
||||||
|
{
|
||||||
|
if(!value.empty()) return true;
|
||||||
|
else return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
QRegExp searcher(filterString, Qt::CaseInsensitive, QRegExp::WildcardUnix);
|
||||||
|
QString qstrValue = QString::fromStdString(value);
|
||||||
|
return searcher.exactMatch(qstrValue);
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
class QTextStream;
|
class QTextStream;
|
||||||
|
class QString;
|
||||||
|
|
||||||
#define ENSEMBLE_STAT_P10_QUANTITY_NAME "P10"
|
#define ENSEMBLE_STAT_P10_QUANTITY_NAME "P10"
|
||||||
#define ENSEMBLE_STAT_P50_QUANTITY_NAME "P50"
|
#define ENSEMBLE_STAT_P50_QUANTITY_NAME "P50"
|
||||||
@@ -170,6 +170,7 @@ public:
|
|||||||
|
|
||||||
std::string uiText() const;
|
std::string uiText() const;
|
||||||
std::string uiText(RifEclipseSummaryAddress::SummaryIdentifierType itemTypeInput) const;
|
std::string uiText(RifEclipseSummaryAddress::SummaryIdentifierType itemTypeInput) const;
|
||||||
|
bool isUiTextMatchingFilterText(const QString& filterString) const;
|
||||||
|
|
||||||
bool isValid() const;
|
bool isValid() const;
|
||||||
void setQuantityName(const std::string& quantity) { m_quantityName = quantity; }
|
void setQuantityName(const std::string& quantity) { m_quantityName = quantity; }
|
||||||
|
|||||||
@@ -20,10 +20,15 @@
|
|||||||
|
|
||||||
#include "RiaColorTables.h"
|
#include "RiaColorTables.h"
|
||||||
#include "RiaSummaryCurveDefinition.h"
|
#include "RiaSummaryCurveDefinition.h"
|
||||||
|
#include "RiaApplication.h"
|
||||||
|
|
||||||
#include "RiuQwtPlotCurve.h"
|
#include "RiuQwtPlotCurve.h"
|
||||||
|
|
||||||
#include "RimSummaryCurve.h"
|
#include "RimSummaryCurve.h"
|
||||||
#include "RimSummaryCase.h"
|
#include "RimSummaryCase.h"
|
||||||
|
#include "RimProject.h"
|
||||||
|
|
||||||
|
#include "RifSummaryReaderInterface.h"
|
||||||
|
|
||||||
#include "cvfVector3.h"
|
#include "cvfVector3.h"
|
||||||
|
|
||||||
@@ -61,10 +66,10 @@ bool isExcplicitHandled(char secondChar)
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
RimSummaryCurveAppearanceCalculator::RimSummaryCurveAppearanceCalculator(const std::set<RiaSummaryCurveDefinition>& curveDefinitions, const std::set<std::string>& allSummaryCaseNames, const std::set<std::string>& allSummaryWellNames)
|
RimSummaryCurveAppearanceCalculator::RimSummaryCurveAppearanceCalculator(const std::set<RiaSummaryCurveDefinition>& curveDefinitions)
|
||||||
{
|
{
|
||||||
m_allSummaryCaseNames = allSummaryCaseNames;
|
m_allSummaryCaseNames = getAllSummaryCaseNames();
|
||||||
m_allSummaryWellNames = allSummaryWellNames;
|
m_allSummaryWellNames = getAllSummaryWellNames();
|
||||||
|
|
||||||
for(const RiaSummaryCurveDefinition& curveDef : curveDefinitions)
|
for(const RiaSummaryCurveDefinition& curveDef : curveDefinitions)
|
||||||
{
|
{
|
||||||
@@ -517,3 +522,53 @@ cvf::Color3f RimSummaryCurveAppearanceCalculator::gradeColor(const cvf::Color3f&
|
|||||||
|
|
||||||
return cvf::Color3f(newColor[0], newColor[1], newColor[2]);
|
return cvf::Color3f(newColor[0], newColor[1], newColor[2]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
std::set<std::string> RimSummaryCurveAppearanceCalculator::getAllSummaryCaseNames()
|
||||||
|
{
|
||||||
|
std::set<std::string> summaryCaseHashes;
|
||||||
|
RimProject* proj = RiaApplication::instance()->project();
|
||||||
|
|
||||||
|
std::vector<RimSummaryCase*> cases = proj->allSummaryCases();
|
||||||
|
for (RimSummaryCase* rimCase : cases)
|
||||||
|
{
|
||||||
|
summaryCaseHashes.insert(rimCase->summaryHeaderFilename().toUtf8().constData());
|
||||||
|
}
|
||||||
|
|
||||||
|
return summaryCaseHashes;
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
std::set<std::string> RimSummaryCurveAppearanceCalculator::getAllSummaryWellNames()
|
||||||
|
{
|
||||||
|
std::set<std::string> summaryWellNames;
|
||||||
|
RimProject* proj = RiaApplication::instance()->project();
|
||||||
|
|
||||||
|
std::vector<RimSummaryCase*> cases = proj->allSummaryCases();
|
||||||
|
for (RimSummaryCase* rimCase : cases)
|
||||||
|
{
|
||||||
|
RifSummaryReaderInterface* reader = nullptr;
|
||||||
|
if (rimCase)
|
||||||
|
{
|
||||||
|
reader = rimCase->summaryReader();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (reader)
|
||||||
|
{
|
||||||
|
const std::set<RifEclipseSummaryAddress> allAddresses = reader->allResultAddresses();
|
||||||
|
|
||||||
|
for (auto& address : allAddresses)
|
||||||
|
{
|
||||||
|
if (address.category() == RifEclipseSummaryAddress::SUMMARY_WELL)
|
||||||
|
{
|
||||||
|
summaryWellNames.insert(address.wellName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return summaryWellNames;
|
||||||
|
}
|
||||||
|
|||||||
@@ -32,9 +32,7 @@ class RiaSummaryCurveDefinition;
|
|||||||
class RimSummaryCurveAppearanceCalculator
|
class RimSummaryCurveAppearanceCalculator
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit RimSummaryCurveAppearanceCalculator(const std::set<RiaSummaryCurveDefinition>& curveDefinitions,
|
explicit RimSummaryCurveAppearanceCalculator(const std::set<RiaSummaryCurveDefinition>& curveDefinitions);
|
||||||
const std::set<std::string>& allSummaryCaseNames,
|
|
||||||
const std::set<std::string>& allSummaryWellNames);
|
|
||||||
enum CurveAppearanceType
|
enum CurveAppearanceType
|
||||||
{
|
{
|
||||||
NONE,
|
NONE,
|
||||||
@@ -80,6 +78,9 @@ private:
|
|||||||
|
|
||||||
cvf::Color3f gradeColor(const cvf::Color3f& color , float factor);
|
cvf::Color3f gradeColor(const cvf::Color3f& color , float factor);
|
||||||
|
|
||||||
|
static std::set<std::string> getAllSummaryCaseNames();
|
||||||
|
static std::set<std::string> getAllSummaryWellNames();
|
||||||
|
|
||||||
cvf::Color3f m_currentCurveBaseColor;
|
cvf::Color3f m_currentCurveBaseColor;
|
||||||
float m_currentCurveGradient;
|
float m_currentCurveGradient;
|
||||||
|
|
||||||
|
|||||||
@@ -240,7 +240,7 @@ bool RimSummaryFilter::isIncludedByFilter(const RifEclipseSummaryAddress& addr)
|
|||||||
|
|
||||||
if(m_filterType() == SUM_FILTER_VAR_STRING)
|
if(m_filterType() == SUM_FILTER_VAR_STRING)
|
||||||
{
|
{
|
||||||
return isStringMatch(m_completeVarStringFilter(), addr.uiText());
|
return addr.isUiTextMatchingFilterText(m_completeVarStringFilter());
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!isStringMatch(m_filterQuantityName(), addr.quantityName())) return false;
|
if(!isStringMatch(m_filterQuantityName(), addr.quantityName())) return false;
|
||||||
|
|||||||
@@ -63,6 +63,8 @@
|
|||||||
#include <set>
|
#include <set>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
#include "RiaSummaryCurveDefinition.h"
|
||||||
|
#include "RiaColorTables.h"
|
||||||
|
|
||||||
CAF_PDM_SOURCE_INIT(RimSummaryPlot, "SummaryPlot");
|
CAF_PDM_SOURCE_INIT(RimSummaryPlot, "SummaryPlot");
|
||||||
|
|
||||||
@@ -342,6 +344,20 @@ std::vector<RimSummaryCurve*> RimSummaryPlot::summaryAndEnsembleCurves() const
|
|||||||
return curves;
|
return curves;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
std::set<RiaSummaryCurveDefinition> RimSummaryPlot::summaryAndEnsembleCurveDefinitions() const
|
||||||
|
{
|
||||||
|
std::set<RiaSummaryCurveDefinition> allCurveDefs;
|
||||||
|
|
||||||
|
for (const auto& curve : this->summaryAndEnsembleCurves())
|
||||||
|
{
|
||||||
|
allCurveDefs.insert(RiaSummaryCurveDefinition(curve->summaryCaseY(), curve->summaryAddressY()));
|
||||||
|
}
|
||||||
|
return allCurveDefs;
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@@ -539,6 +555,31 @@ size_t RimSummaryPlot::singleColorCurveCount() const
|
|||||||
return colorIndex;
|
return colorIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
void RimSummaryPlot::applyDefaultCurveAppearances()
|
||||||
|
{
|
||||||
|
std::set<RiaSummaryCurveDefinition> allCurveDefs = this->summaryAndEnsembleCurveDefinitions();
|
||||||
|
|
||||||
|
RimSummaryCurveAppearanceCalculator curveLookCalc(allCurveDefs);
|
||||||
|
|
||||||
|
// Summary curves
|
||||||
|
for (auto& curve : this->summaryCurves())
|
||||||
|
{
|
||||||
|
curve->resetAppearance();
|
||||||
|
curveLookCalc.setupCurveLook(curve);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensemble curve sets
|
||||||
|
int colorIndex = 0;
|
||||||
|
for (auto& curveSet : this->ensembleCurveSetCollection()->curveSets())
|
||||||
|
{
|
||||||
|
if (curveSet->colorMode() != RimEnsembleCurveSet::SINGLE_COLOR) continue;
|
||||||
|
curveSet->setColor(RiaColorTables::summaryCurveDefaultPaletteColors().cycledColor3f(colorIndex++));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -23,6 +23,7 @@
|
|||||||
|
|
||||||
#include "RiaDefines.h"
|
#include "RiaDefines.h"
|
||||||
#include "RiaQDateTimeTools.h"
|
#include "RiaQDateTimeTools.h"
|
||||||
|
#include "RiaSummaryCurveDefinition.h"
|
||||||
|
|
||||||
#include "RifEclipseSummaryAddress.h"
|
#include "RifEclipseSummaryAddress.h"
|
||||||
|
|
||||||
@@ -107,6 +108,7 @@ public:
|
|||||||
QString asciiDataForPlotExport(DateTimePeriod resamplingPeriod = DateTimePeriod::NONE) const;
|
QString asciiDataForPlotExport(DateTimePeriod resamplingPeriod = DateTimePeriod::NONE) const;
|
||||||
|
|
||||||
std::vector<RimSummaryCurve*> summaryAndEnsembleCurves() const;
|
std::vector<RimSummaryCurve*> summaryAndEnsembleCurves() const;
|
||||||
|
std::set<RiaSummaryCurveDefinition> summaryAndEnsembleCurveDefinitions() const;
|
||||||
std::vector<RimSummaryCurve*> summaryCurves() const;
|
std::vector<RimSummaryCurve*> summaryCurves() const;
|
||||||
void deleteAllSummaryCurves();
|
void deleteAllSummaryCurves();
|
||||||
RimSummaryCurveCollection* summaryCurveCollection() const;
|
RimSummaryCurveCollection* summaryCurveCollection() const;
|
||||||
@@ -132,6 +134,7 @@ public:
|
|||||||
bool containsResamplableCurves() const;
|
bool containsResamplableCurves() const;
|
||||||
|
|
||||||
size_t singleColorCurveCount() const;
|
size_t singleColorCurveCount() const;
|
||||||
|
void applyDefaultCurveAppearances();
|
||||||
|
|
||||||
|
|
||||||
bool hasCustomFontSizes(RiaDefines::FontSettingType fontSettingType, int defaultFontSize) const override;
|
bool hasCustomFontSizes(RiaDefines::FontSettingType fontSettingType, int defaultFontSize) const override;
|
||||||
|
|||||||
Reference in New Issue
Block a user