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

#2114 Remove code causing timesteps to be unchecked

Browse Source
This commit is contained in:
Jacob Støren 2017-11-12 23:46:12 +01:00
parent 49c6fd9ac4
commit efa48c2cf5
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp
View File

@ -255,6 +255,7 @@ void RimWellPltPlot::deleteViewWidget()
// newCurve->setLineStyle(currentLineStyle); // newCurve->setLineStyle(currentLineStyle);
//} //}
#if 0
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -280,7 +281,7 @@ void RimWellPltPlot::updateSelectedTimeStepsFromSelectedSources()
} }
m_selectedTimeSteps = newTimeStepsSelections; m_selectedTimeSteps = newTimeStepsSelections;
} }
#endif
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -775,8 +776,6 @@ void RimWellPltPlot::syncCurvesFromUiSelection()
RimProject* proj = RiaApplication::instance()->project(); RimProject* proj = RiaApplication::instance()->project();
RimWellPath* wellPath = RimWellPlotTools::wellPathByWellPathNameOrSimWellName(m_wellPathName); RimWellPath* wellPath = RimWellPlotTools::wellPathByWellPathNameOrSimWellName(m_wellPathName);
RimWellLogPlotCollection* wellLogCollection = proj->mainPlotCollection()->wellLogPlotCollection();
// Add curves // Add curves
for (const std::pair<RifWellRftAddress, QDateTime>& curveDefToAdd : curveDefs) for (const std::pair<RifWellRftAddress, QDateTime>& curveDefToAdd : curveDefs)
@ -789,11 +788,14 @@ void RimWellPltPlot::syncCurvesFromUiSelection()
QDateTime timeStep = curveDefToAdd.second; QDateTime timeStep = curveDefToAdd.second;
std::unique_ptr<RigResultPointCalculator> resultPointCalc; std::unique_ptr<RigResultPointCalculator> resultPointCalc;
QString curveName; QString curveName;
curveName += sourceDef.eclCase() ? sourceDef.eclCase()->caseUserDescription() : ""; {
curveName += sourceDef.wellLogFile() ? sourceDef.wellLogFile()->name() : ""; curveName += sourceDef.eclCase() ? sourceDef.eclCase()->caseUserDescription() : "";
if (sourceDef.sourceType() == RifWellRftAddress::RFT) curveName += ", RFT"; curveName += sourceDef.wellLogFile() ? sourceDef.wellLogFile()->name() : "";
curveName += ", " + timeStep.toString(); if ( sourceDef.sourceType() == RifWellRftAddress::RFT ) curveName += ", RFT";
curveName += ", " + timeStep.toString();
}
if ( sourceDef.sourceType() == RifWellRftAddress::RFT ) if ( sourceDef.sourceType() == RifWellRftAddress::RFT )
{ {
@ -848,11 +850,11 @@ void RimWellPltPlot::syncCurvesFromUiSelection()
else if ( sourceDef.sourceType() == RifWellRftAddress::OBSERVED ) else if ( sourceDef.sourceType() == RifWellRftAddress::OBSERVED )
{ {
RimWellLogFile* const wellLogFile = sourceDef.wellLogFile(); RimWellLogFile* const wellLogFile = sourceDef.wellLogFile();
if(wellLogFile!= nullptr) if ( wellLogFile )
{ {
RigWellLogFile* rigWellLogFile = wellLogFile->wellLogFile(); RigWellLogFile* rigWellLogFile = wellLogFile->wellLogFile();
if (rigWellLogFile != nullptr) if ( rigWellLogFile )
{ {
for (RimWellLogFileChannel* channel : RimWellPlotTools::getFlowChannelsFromWellFile(wellLogFile)) for (RimWellLogFileChannel* channel : RimWellPlotTools::getFlowChannelsFromWellFile(wellLogFile))
{ {
@ -1120,8 +1122,7 @@ void RimWellPltPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
} }
else if (changedField == &m_selectedSources) else if (changedField == &m_selectedSources)
{ {
// Update time steps selections based on source selections
updateSelectedTimeStepsFromSelectedSources();
} }
if (changedField == &m_selectedSources || if (changedField == &m_selectedSources ||