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

#4219 Contact Pressure plots : Simplify creation of plots, hide obsolete title

Browse Source
This commit is contained in:
Magne Sjaastad 2019-03-22 15:56:06 +01:00
parent 0dd5d40199
commit 31c54bab0b
7 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/Commands/GridCrossPlotCommands/RicCreateSaturationPressurePlotsFeature.cpp
View File

@ -102,22 +102,32 @@ void RicCreateSaturationPressurePlotsFeature::onActionTriggered(bool isChecked)
}
}
caf::PdmObject* objectToSelect = nullptr;
if (eclipseResultCase)
{
eclipseResultCase->ensureReservoirCaseIsOpen();
collection->createSaturationPressurePlots(eclipseResultCase);
std::vector<RimSaturationPressurePlot*> plots = collection->plots();
std::vector<RimSaturationPressurePlot*> plots = collection->createSaturationPressurePlots(eclipseResultCase);
for (auto plot : plots)
{
plot->loadDataAndUpdate();
plot->zoomAll();
plot->updateConnectedEditors();
}
if (!plots.empty())
{
objectToSelect = plots.front();
}
}
collection->updateAllRequiredEditors();
RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
if (objectToSelect)
{
RiuPlotMainWindowTools::selectAsCurrentItem(objectToSelect);
}
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h
View File

@ -99,7 +99,7 @@ protected:
void updatePlot();
QString xAxisParameterString() const;
virtual QString xAxisParameterString() const;
QString yAxisParameterString() const;
void updateAxisInQwt(RiaDefines::PlotAxis axisType);

2
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurveSet.cpp
View File

@ -124,7 +124,9 @@ RimGridCrossPlotCurveSet::RimGridCrossPlotCurveSet()
CAF_PDM_InitField(&m_customColor, "CustomColor", cvf::Color3f(cvf::Color3f::BLACK), "Custom Color", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_plotCellFilterCollection, "PlotCellFilterCollection", "Cell Filters", "", "", "");
m_plotCellFilterCollection.uiCapability()->setUiHidden(true);
m_plotCellFilterCollection.uiCapability()->setUiTreeHidden(true);
m_plotCellFilterCollection.uiCapability()->setUiTreeChildrenHidden(true);
m_plotCellFilterCollection = new RimPlotCellFilterCollection;
setDefaults();

8
ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.cpp
View File

@ -177,6 +177,14 @@ void RimSaturationPressurePlot::initAfterRead()
RimGridCrossPlot::initAfterRead();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimSaturationPressurePlot::xAxisParameterString() const
{
return "";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.h
View File

@ -40,7 +40,8 @@ public:
int zeroBasedEquilRegionIndex);
protected:
void initAfterRead() override;
void initAfterRead() override;
QString xAxisParameterString() const override;
private:
RimPlotCellPropertyFilter* createEquilibriumRegionPropertyFilter(RimEclipseResultCase* eclipseResultCase,

15
ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp
View File

@ -45,14 +45,15 @@ RimSaturationPressurePlotCollection::~RimSaturationPressurePlotCollection() {}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSaturationPressurePlotCollection::createSaturationPressurePlots(RimEclipseResultCase* eclipseResultCase)
std::vector<RimSaturationPressurePlot*>
RimSaturationPressurePlotCollection::createSaturationPressurePlots(RimEclipseResultCase* eclipseResultCase)
{
if (!eclipseResultCase) return;
std::vector<RimSaturationPressurePlot*> generatedPlots;
if (!eclipseResultCase) return generatedPlots;
RigEclipseCaseData* eclipseCaseData = eclipseResultCase->eclipseCaseData();
if (!eclipseCaseData) return;
m_saturationPressurePlots.deleteAllChildObjects();
if (!eclipseCaseData) return generatedPlots;
std::vector<RigEquil> equilData = eclipseCaseData->equilData();
for (size_t i = 0; i < equilData.size(); i++)
@ -67,7 +68,11 @@ void RimSaturationPressurePlotCollection::createSaturationPressurePlots(RimEclip
plot->assignCaseAndEquilibriumRegion(RiaDefines::MATRIX_MODEL, eclipseResultCase, equilibriumRegion);
m_saturationPressurePlots.push_back(plot);
generatedPlots.push_back(plot);
}
return generatedPlots;
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.h
View File

@ -35,7 +35,7 @@ public:
RimSaturationPressurePlotCollection();
~RimSaturationPressurePlotCollection() override;
void createSaturationPressurePlots(RimEclipseResultCase* eclipseResultCase);
std::vector<RimSaturationPressurePlot*> createSaturationPressurePlots(RimEclipseResultCase* eclipseResultCase);
std::vector<RimSaturationPressurePlot*> plots();
void deleteAllChildObjects();