OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-24 07:16:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

Summary: Whitespace, rename method and hide unused variables display field

Browse Source
This commit is contained in:
Jacob Støren 2016-06-17 13:30:25 +02:00
parent 2f83194a5e
commit 9f54d74c7f
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ProjectDataModel/RimSummaryCurveFilter.cpp
View File

@ -68,6 +68,7 @@ RimSummaryCurveFilter::RimSummaryCurveFilter()
m_selectedVariableDisplayField.xmlCapability()->setIOWritable(false);
m_selectedVariableDisplayField.xmlCapability()->setIOReadable(false);
m_selectedVariableDisplayField.uiCapability()->setUiReadOnly(true);
m_selectedVariableDisplayField.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_summaryFilter, "VarListFilter", "Filter", "", "", "");
m_summaryFilter.uiCapability()->setUiChildrenHidden(true);
@ -228,7 +229,7 @@ void RimSummaryCurveFilter::setParentQwtPlot(QwtPlot* plot)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurveFilter::detachQwtCurve()
void RimSummaryCurveFilter::detachQwtCurves()
{
for(RimSummaryCurve* curve : m_curves)
{

12
ApplicationCode/ProjectDataModel/RimSummaryCurveFilter.h
View File

@ -50,9 +50,9 @@ public:
RimSummaryCurveFilter();
virtual ~RimSummaryCurveFilter();
void loadDataAndUpdate();
void setParentQwtPlot(QwtPlot* plot);
void detachQwtCurve();
void loadDataAndUpdate();
void setParentQwtPlot(QwtPlot* plot);
void detachQwtCurves();
private:
RifReaderEclipseSummary* summaryReader();
@ -69,15 +69,15 @@ private:
// Fields
caf::PdmPtrField<RimSummaryCase*> m_selectedSummaryCase;
caf::PdmChildArrayField<RimSummaryCurve*> m_curves;
caf::PdmChildArrayField<RimSummaryCurve*> m_curves;
caf::PdmField<QString> m_selectedVariableDisplayField;
// Filter fields
caf::PdmChildField<RimSummaryFilter*> m_summaryFilter;
caf::PdmField<std::vector<RifEclipseSummaryAddress> > m_uiFilterResultMultiSelection;
caf::PdmField<std::vector<RifEclipseSummaryAddress> >
m_uiFilterResultMultiSelection;
caf::PdmField<bool> m_applyButtonField;
};

2
ApplicationCode/ProjectDataModel/RimSummaryPlot.cpp
View File

@ -232,7 +232,7 @@ void RimSummaryPlot::detachAllCurves()
{
for(RimSummaryCurveFilter* curveFilter: m_curveFilters)
{
curveFilter->detachQwtCurve();
curveFilter->detachQwtCurves();
}
for(RimSummaryCurve* curve : m_curves)