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

Minor code adjustments

Browse Source
This commit is contained in:
Magne Sjaastad
2019-12-19 11:55:34 +01:00
parent 4ccbd274b8
commit 4d3113255e
6 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp
View File

@@ -398,7 +398,7 @@ void RimWellDistributionPlot::populatePlotWidgetWithCurveData( const RigTofWellD
plotWidget->setAxisAutoScale( QwtPlot::xBottom, true );
plotWidget->setAxisAutoScale( QwtPlot::yLeft, true );
const std::vector<double>& tofValuesDays = calculator.sortedUniqueTOFValues();
const std::vector<double>& tofValuesDays = calculator.sortedUniqueTofValues();
if ( tofValuesDays.size() == 0 )
{
// cvf::Trace::show("No TOF values!");
@@ -422,7 +422,7 @@ void RimWellDistributionPlot::populatePlotWidgetWithCurveData( const RigTofWellD
for ( size_t i = 0; i < numWells; i++ )
{
QString wellName = calculator.contributingWellName( i );
const QString& wellName = calculator.contributingWellName( i );
const std::vector<double>& volArr = calculator.accumulatedVolumeForContributingWell( i );
cvf::Color3f cvfClr = flowDiagSolution.tracerColor( wellName );

53
ApplicationCode/ProjectDataModel/Flow/RimWellDistributionPlot.h
View File

@@ -47,35 +47,35 @@ public:
void setPlotOptions( bool groupSmallContributions, double smallContributionsRelativeThreshold );
// RimPlot implementations
virtual RiuQwtPlotWidget* viewer() override;
virtual void setAutoScaleXEnabled( bool enabled ) override;
virtual void setAutoScaleYEnabled( bool enabled ) override;
virtual void updateAxes() override;
virtual void updateLegend() override;
virtual void updateZoomInQwt() override;
virtual void updateZoomFromQwt() override;
virtual QString asciiDataForPlotExport() const override;
virtual void reattachAllCurves() override;
virtual void detachAllCurves() override;
virtual caf::PdmObject* findPdmObjectFromQwtCurve( const QwtPlotCurve* curve ) const override;
virtual void onAxisSelected( int axis, bool toggle ) override;
RiuQwtPlotWidget* viewer() override;
void setAutoScaleXEnabled( bool enabled ) override;
void setAutoScaleYEnabled( bool enabled ) override;
void updateAxes() override;
void updateLegend() override;
void updateZoomInQwt() override;
void updateZoomFromQwt() override;
QString asciiDataForPlotExport() const override;
void reattachAllCurves() override;
void detachAllCurves() override;
caf::PdmObject* findPdmObjectFromQwtCurve( const QwtPlotCurve* curve ) const override;
void onAxisSelected( int axis, bool toggle ) override;
// RimPlotWindow implementations
virtual QString description() const override;
QString description() const override;
// RimViewWindow implementations
virtual QWidget* viewWidget() override;
virtual QImage snapshotWindowContent() override;
virtual void zoomAll() override;
QWidget* viewWidget() override;
QImage snapshotWindowContent() override;
void zoomAll() override;
private:
// RimPlot implementations
virtual void doRemoveFromCollection() override;
void doRemoveFromCollection() override;
// RimViewWindow implementations
virtual QWidget* createViewWidget( QWidget* mainWindowParent ) override;
virtual void deleteViewWidget() override;
virtual void onLoadDataAndUpdate() override;
QWidget* createViewWidget( QWidget* mainWindowParent ) override;
void deleteViewWidget() override;
void onLoadDataAndUpdate() override;
private:
void fixupDependentFieldsAfterCaseChange();
@@ -83,12 +83,13 @@ private:
const RimFlowDiagSolution& flowDiagSolution,
RiuQwtPlotWidget* plotWidget );
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
private:
caf::PdmPtrField<RimEclipseResultCase*> m_case;

18
ApplicationCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.h
View File

@@ -49,18 +49,18 @@ public:
private:
// RimPlotWindow overrides
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
virtual void onLoadDataAndUpdate() override;
void onLoadDataAndUpdate() override;
private:
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fixupDependentFieldsAfterCaseChange();
void applyPlotParametersToContainedPlots();
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fixupDependentFieldsAfterCaseChange();
void applyPlotParametersToContainedPlots();
private:
caf::PdmPtrField<RimEclipseResultCase*> m_case;