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

#1888 Curve appearance. Added curly braces and minor refactoring

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2017-09-15 08:30:29 +02:00
parent a049b5755f
commit ca7ebe16e6
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
View File

@ -260,7 +260,9 @@ QList<caf::PdmOptionItemInfo> RicSummaryCurveCreator::calculateValueOptions(cons
itemNames.insert(name); itemNames.insert(name);
} }
for (const auto& iName : itemNames) for (const auto& iName : itemNames)
{
options.push_back(caf::PdmOptionItemInfo(iName, iName)); options.push_back(caf::PdmOptionItemInfo(iName, iName));
}
} }
} }
return options; return options;
@ -482,10 +484,6 @@ void RicSummaryCurveCreator::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
} }
*/ */
//caf::PdmUiGroup* curvesGroup = uiOrdering.addNewGroup("Curves");
//curvesGroup->add(&m_selectedCurveTexts);
uiOrdering.skipRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }
@ -499,7 +497,9 @@ std::set<RifEclipseSummaryAddress> RicSummaryCurveCreator::findPossibleSummaryAd
auto isVectorField = identifierAndField != nullptr && identifierAndField->summaryIdentifier() == RifEclipseSummaryAddress::INPUT_VECTOR_NAME; auto isVectorField = identifierAndField != nullptr && identifierAndField->summaryIdentifier() == RifEclipseSummaryAddress::INPUT_VECTOR_NAME;
auto controllingIdentifierAndField = identifierAndField != nullptr ? lookupControllingField(identifierAndField) : nullptr; auto controllingIdentifierAndField = identifierAndField != nullptr ? lookupControllingField(identifierAndField) : nullptr;
if (!isVectorField && controllingIdentifierAndField != nullptr && controllingIdentifierAndField->pdmField()->v().size() == 0) if (!isVectorField && controllingIdentifierAndField != nullptr && controllingIdentifierAndField->pdmField()->v().size() == 0)
{
return addrUnion; return addrUnion;
}
for (RimSummaryCase* currCase : m_selectedCases) for (RimSummaryCase* currCase : m_selectedCases)
{ {
@ -528,7 +528,9 @@ std::set<RifEclipseSummaryAddress> RicSummaryCurveCreator::findPossibleSummaryAd
//if (!m_summaryFilter->isIncludedByFilter(allAddresses[i])) continue; //if (!m_summaryFilter->isIncludedByFilter(allAddresses[i])) continue;
if (addressSelected) if (addressSelected)
{
addrUnion.insert(allAddresses[i]); addrUnion.insert(allAddresses[i]);
}
} }
} }
} }
@ -546,7 +548,9 @@ std::vector<RicSummaryCurveCreator::SummaryIdentifierAndField*> RicSummaryCurveC
for (const auto& identifierAndFieldItem : identifierAndFieldList) for (const auto& identifierAndFieldItem : identifierAndFieldList)
{ {
if (identifierAndFieldItem == identifierAndField) if (identifierAndFieldItem == identifierAndField)
{
break; break;
}
selections.push_back(identifierAndFieldItem); selections.push_back(identifierAndFieldItem);
} }
return selections; return selections;
@ -554,6 +558,7 @@ std::vector<RicSummaryCurveCreator::SummaryIdentifierAndField*> RicSummaryCurveC
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Returns the stringified value for the specified value in the specfied address object /// Returns the stringified value for the specified value in the specfied address object
/// Todo: Move this method to RicElipseSummaryAddress class
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RicSummaryCurveCreator::getIdentifierTextFromAddress(RifEclipseSummaryAddress::SummaryIdentifierType itemTypeInput, const RifEclipseSummaryAddress &address) QString RicSummaryCurveCreator::getIdentifierTextFromAddress(RifEclipseSummaryAddress::SummaryIdentifierType itemTypeInput, const RifEclipseSummaryAddress &address)
{ {
@ -582,7 +587,9 @@ RicSummaryCurveCreator::SummaryIdentifierAndField* RicSummaryCurveCreator::findI
for (const auto& itemTypeInput : itemTypes.second) for (const auto& itemTypeInput : itemTypes.second)
{ {
if (pdmFieldHandle == itemTypeInput->pdmField()) if (pdmFieldHandle == itemTypeInput->pdmField())
{
return itemTypeInput; return itemTypeInput;
}
} }
} }
return nullptr; return nullptr;
@ -626,7 +633,9 @@ bool RicSummaryCurveCreator::isAddressSelected(const RifEclipseSummaryAddress &a
} }
} }
if (!match) if (!match)
{
return false; return false;
}
} }
return true; return true;
} }
@ -753,14 +762,14 @@ void RicSummaryCurveCreator::syncCurvesFromUiSelection()
currentCurveDefs.begin(), currentCurveDefs.end(), currentCurveDefs.begin(), currentCurveDefs.end(),
std::inserter(newCurveDefs, newCurveDefs.end())); std::inserter(newCurveDefs, newCurveDefs.end()));
} }
createCurvesFromCurveDefinitions(newCurveDefs, deleteCurves); updateCurvesFromCurveDefinitions(newCurveDefs, deleteCurves);
} }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::createCurvesFromCurveDefinitions(const std::set<std::pair<RimSummaryCase*, RifEclipseSummaryAddress> >& curveDefsToAdd, void RicSummaryCurveCreator::updateCurvesFromCurveDefinitions(const std::set<std::pair<RimSummaryCase*, RifEclipseSummaryAddress> >& curveDefsToAdd,
const std::set<RimSummaryCurve*>& curvesToDelete) const std::set<RimSummaryCurve*>& curvesToDelete)
{ {
RimSummaryCase* prevCase = nullptr; RimSummaryCase* prevCase = nullptr;

2
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.h
View File

@ -99,7 +99,7 @@ private:
void loadDataAndUpdatePlot(); void loadDataAndUpdatePlot();
void syncCurvesFromUiSelection(); void syncCurvesFromUiSelection();
void createCurvesFromCurveDefinitions(const std::set<std::pair<RimSummaryCase*, RifEclipseSummaryAddress> >& curveDefsToAdd, void updateCurvesFromCurveDefinitions(const std::set<std::pair<RimSummaryCase*, RifEclipseSummaryAddress> >& curveDefsToAdd,
const std::set<RimSummaryCurve*>& curvesToDelete); const std::set<RimSummaryCurve*>& curvesToDelete);
std::set<std::string> getAllSummaryCaseNames(); std::set<std::string> getAllSummaryCaseNames();
std::set<std::string> getAllSummaryWellNames(); std::set<std::string> getAllSummaryWellNames();