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

Janitor : Use const ref when possible (2)

Browse Source
This commit is contained in:
Magne Sjaastad
2019-11-03 14:08:21 +01:00
parent b46124efd7
commit cd054f2170
18 changed files with 87 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/Application/Tools/RiaProjectModifier.cpp
View File

@@ -39,7 +39,7 @@ RiaProjectModifier::RiaProjectModifier() {}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiaProjectModifier::setReplaceCaseFirstOccurrence( QString newGridFileName ) void RiaProjectModifier::setReplaceCaseFirstOccurrence( const QString& newGridFileName )
{ {
m_caseIdToGridFileNameMap[RiaProjectModifier::firstOccurrenceId()] = makeFilePathAbsolute( newGridFileName ); m_caseIdToGridFileNameMap[RiaProjectModifier::firstOccurrenceId()] = makeFilePathAbsolute( newGridFileName );
} }
@@ -47,7 +47,7 @@ void RiaProjectModifier::setReplaceCaseFirstOccurrence( QString newGridFileName
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiaProjectModifier::setReplaceCase( int caseIdToReplace, QString newGridFileName ) void RiaProjectModifier::setReplaceCase( int caseIdToReplace, const QString& newGridFileName )
{ {
if ( caseIdToReplace >= 0 ) if ( caseIdToReplace >= 0 )
{ {
@@ -58,7 +58,7 @@ void RiaProjectModifier::setReplaceCase( int caseIdToReplace, QString newGridFil
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiaProjectModifier::setReplaceSourceCasesFirstOccurrence( std::vector<QString> newGridFileNames ) void RiaProjectModifier::setReplaceSourceCasesFirstOccurrence( const std::vector<QString>& newGridFileNames )
{ {
m_groupIdToGridFileNamesMap[RiaProjectModifier::firstOccurrenceId()] = newGridFileNames; m_groupIdToGridFileNamesMap[RiaProjectModifier::firstOccurrenceId()] = newGridFileNames;
} }
@@ -66,7 +66,8 @@ void RiaProjectModifier::setReplaceSourceCasesFirstOccurrence( std::vector<QStri
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiaProjectModifier::setReplaceSourceCasesById( int caseGroupIdToReplace, std::vector<QString> newGridFileNames ) void RiaProjectModifier::setReplaceSourceCasesById( int caseGroupIdToReplace,
const std::vector<QString>& newGridFileNames )
{ {
if ( caseGroupIdToReplace >= 0 ) if ( caseGroupIdToReplace >= 0 )
{ {
@@ -237,7 +238,7 @@ void RiaProjectModifier::replacePropertiesFolder( RimProject* project )
/// If \a relOrAbsolutePath is a relative, the current working directory for the process will be /// If \a relOrAbsolutePath is a relative, the current working directory for the process will be
/// used in order to make the path absolute. /// used in order to make the path absolute.
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RiaProjectModifier::makeFilePathAbsolute( QString relOrAbsolutePath ) QString RiaProjectModifier::makeFilePathAbsolute( const QString& relOrAbsolutePath )
{ {
QFileInfo theFile( relOrAbsolutePath ); QFileInfo theFile( relOrAbsolutePath );
theFile.makeAbsolute(); theFile.makeAbsolute();
@@ -247,7 +248,7 @@ QString RiaProjectModifier::makeFilePathAbsolute( QString relOrAbsolutePath )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RiaProjectModifier::caseNameFromGridFileName( QString fullGridFilePathName ) QString RiaProjectModifier::caseNameFromGridFileName( const QString& fullGridFilePathName )
{ {
QString fn = QDir::fromNativeSeparators( fullGridFilePathName ); QString fn = QDir::fromNativeSeparators( fullGridFilePathName );

12
ApplicationCode/Application/Tools/RiaProjectModifier.h
View File

@@ -38,11 +38,11 @@ class RiaProjectModifier : public cvf::Object
public: public:
RiaProjectModifier(); RiaProjectModifier();
void setReplaceCaseFirstOccurrence( QString newGridFileName ); void setReplaceCaseFirstOccurrence( const QString& newGridFileName );
void setReplaceCase( int caseIdToReplace, QString newGridFileName ); void setReplaceCase( int caseIdToReplace, const QString& newGridFileName );
void setReplaceSourceCasesFirstOccurrence( std::vector<QString> newGridFileNames ); void setReplaceSourceCasesFirstOccurrence( const std::vector<QString>& newGridFileNames );
void setReplaceSourceCasesById( int caseGroupIdToReplace, std::vector<QString> newGridFileNames ); void setReplaceSourceCasesById( int caseGroupIdToReplace, const std::vector<QString>& newGridFileNames );
void setReplacePropertiesFolderFirstOccurrence( QString newPropertiesFolder ); void setReplacePropertiesFolderFirstOccurrence( QString newPropertiesFolder );
void setReplacePropertiesFolder( int caseIdToReplace, QString newPropertiesFolder ); void setReplacePropertiesFolder( int caseIdToReplace, QString newPropertiesFolder );
@@ -54,8 +54,8 @@ private:
void replaceCase( RimProject* project ); void replaceCase( RimProject* project );
void replacePropertiesFolder( RimProject* project ); void replacePropertiesFolder( RimProject* project );
static QString makeFilePathAbsolute( QString relOrAbsolutePath ); static QString makeFilePathAbsolute( const QString& relOrAbsolutePath );
static QString caseNameFromGridFileName( QString fullGridFilePathName ); static QString caseNameFromGridFileName( const QString& fullGridFilePathName );
static int firstCaseId( RimProject* project ); static int firstCaseId( RimProject* project );
static int firstGroupId( RimProject* project ); static int firstGroupId( RimProject* project );

4
ApplicationCode/FileInterface/RifStimPlanXmlReader.cpp
View File

@@ -388,7 +388,7 @@ void RifStimPlanXmlReader::getGriddingValues( QXmlStreamReader& xmlStream,
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
double RifStimPlanXmlReader::getAttributeValueDouble( QXmlStreamReader& xmlStream, QString parameterName ) double RifStimPlanXmlReader::getAttributeValueDouble( QXmlStreamReader& xmlStream, const QString& parameterName )
{ {
double value = HUGE_VAL; double value = HUGE_VAL;
for ( const QXmlStreamAttribute& attr : xmlStream.attributes() ) for ( const QXmlStreamAttribute& attr : xmlStream.attributes() )
@@ -404,7 +404,7 @@ double RifStimPlanXmlReader::getAttributeValueDouble( QXmlStreamReader& xmlStrea
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RifStimPlanXmlReader::getAttributeValueString( QXmlStreamReader& xmlStream, QString parameterName ) QString RifStimPlanXmlReader::getAttributeValueString( QXmlStreamReader& xmlStream, const QString& parameterName )
{ {
QString parameterValue; QString parameterValue;
for ( const QXmlStreamAttribute& attr : xmlStream.attributes() ) for ( const QXmlStreamAttribute& attr : xmlStream.attributes() )

4
ApplicationCode/FileInterface/RifStimPlanXmlReader.h
View File

@@ -54,8 +54,8 @@ private:
MirrorMode mirrorMode, MirrorMode mirrorMode,
RiaEclipseUnitTools::UnitSystem requiredUnit ); RiaEclipseUnitTools::UnitSystem requiredUnit );
static double getAttributeValueDouble( QXmlStreamReader& xmlStream, QString parameterName ); static double getAttributeValueDouble( QXmlStreamReader& xmlStream, const QString& parameterName );
static QString getAttributeValueString( QXmlStreamReader& xmlStream, QString parameterName ); static QString getAttributeValueString( QXmlStreamReader& xmlStream, const QString& parameterName );
static void getGriddingValues( QXmlStreamReader& xmlStream, std::vector<double>& gridValues, size_t& startNegValues ); static void getGriddingValues( QXmlStreamReader& xmlStream, std::vector<double>& gridValues, size_t& startNegValues );
static std::vector<std::vector<double>> getAllDepthDataAtTimeStep( QXmlStreamReader& xmlStream ); static std::vector<std::vector<double>> getAllDepthDataAtTimeStep( QXmlStreamReader& xmlStream );

2
ApplicationCode/ReservoirDataModel/Completions/RigCompletionData.cpp
View File

@@ -29,7 +29,7 @@
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
RigCompletionData::RigCompletionData( const QString wellName, RigCompletionData::RigCompletionData( const QString& wellName,
const RigCompletionDataGridCell& cellIndex, const RigCompletionDataGridCell& cellIndex,
double orderingValue ) double orderingValue )
: m_wellName( wellName ) : m_wellName( wellName )

2
ApplicationCode/ReservoirDataModel/Completions/RigCompletionData.h
View File

@@ -81,7 +81,7 @@ public:
CT_UNDEFINED CT_UNDEFINED
}; };
RigCompletionData( const QString wellName, const RigCompletionDataGridCell& cellIndex, double orderingValue ); RigCompletionData( const QString& wellName, const RigCompletionDataGridCell& cellIndex, double orderingValue );
~RigCompletionData(); ~RigCompletionData();
RigCompletionData( const RigCompletionData& other ); RigCompletionData( const RigCompletionData& other );

10
ApplicationCode/ReservoirDataModel/RigNumberOfFloodedPoreVolumesCalculator.cpp
View File

@@ -37,7 +37,7 @@
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator( RimEclipseCase* caseToApply, RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator( RimEclipseCase* caseToApply,
const std::vector<QString> tracerNames ) const std::vector<QString>& tracerNames )
{ {
RigMainGrid* mainGrid = caseToApply->eclipseCaseData()->mainGrid(); RigMainGrid* mainGrid = caseToApply->eclipseCaseData()->mainGrid();
@@ -197,7 +197,7 @@ void RigNumberOfFloodedPoreVolumesCalculator::calculate( RigMainGrid*
std::vector<const std::vector<double>*> flowrateIatAllTimeSteps, std::vector<const std::vector<double>*> flowrateIatAllTimeSteps,
std::vector<const std::vector<double>*> flowrateJatAllTimeSteps, std::vector<const std::vector<double>*> flowrateJatAllTimeSteps,
std::vector<const std::vector<double>*> flowrateKatAllTimeSteps, std::vector<const std::vector<double>*> flowrateKatAllTimeSteps,
const std::vector<RigConnection> connections, const std::vector<RigConnection>& connections,
std::vector<const std::vector<double>*> flowrateNNCatAllTimeSteps, std::vector<const std::vector<double>*> flowrateNNCatAllTimeSteps,
std::vector<std::vector<double>> summedTracersAtAllTimesteps ) std::vector<std::vector<double>> summedTracersAtAllTimesteps )
{ {
@@ -290,9 +290,9 @@ void RigNumberOfFloodedPoreVolumesCalculator::calculate( RigMainGrid*
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigNumberOfFloodedPoreVolumesCalculator::distributeNNCflow( std::vector<RigConnection> connections, void RigNumberOfFloodedPoreVolumesCalculator::distributeNNCflow( const std::vector<RigConnection>& connections,
RimEclipseCase* caseToApply, RimEclipseCase* caseToApply,
std::vector<double> summedTracerValues, const std::vector<double>& summedTracerValues,
const std::vector<double>* flowrateNNC, const std::vector<double>* flowrateNNC,
std::vector<double>& flowrateIntoCell ) std::vector<double>& flowrateIntoCell )
{ {
@@ -327,7 +327,7 @@ void RigNumberOfFloodedPoreVolumesCalculator::distributeNNCflow( std::vector<Rig
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigNumberOfFloodedPoreVolumesCalculator::distributeNeighbourCellFlow( RigMainGrid* mainGrid, void RigNumberOfFloodedPoreVolumesCalculator::distributeNeighbourCellFlow( RigMainGrid* mainGrid,
RimEclipseCase* caseToApply, RimEclipseCase* caseToApply,
std::vector<double> summedTracerValues, const std::vector<double>& summedTracerValues,
const std::vector<double>* flrWatResultI, const std::vector<double>* flrWatResultI,
const std::vector<double>* flrWatResultJ, const std::vector<double>* flrWatResultJ,
const std::vector<double>* flrWatResultK, const std::vector<double>* flrWatResultK,

10
ApplicationCode/ReservoirDataModel/RigNumberOfFloodedPoreVolumesCalculator.h
View File

@@ -34,7 +34,7 @@ class RigNumberOfFloodedPoreVolumesCalculator
{ {
public: public:
explicit RigNumberOfFloodedPoreVolumesCalculator( RimEclipseCase* caseToApply, explicit RigNumberOfFloodedPoreVolumesCalculator( RimEclipseCase* caseToApply,
const std::vector<QString> tracerNames ); const std::vector<QString>& tracerNames );
// Used to "steal" the data from this one using swap // Used to "steal" the data from this one using swap
@@ -49,19 +49,19 @@ private:
std::vector<const std::vector<double>*> flowrateIatAllTimeSteps, std::vector<const std::vector<double>*> flowrateIatAllTimeSteps,
std::vector<const std::vector<double>*> flowrateJatAllTimeSteps, std::vector<const std::vector<double>*> flowrateJatAllTimeSteps,
std::vector<const std::vector<double>*> flowrateKatAllTimeSteps, std::vector<const std::vector<double>*> flowrateKatAllTimeSteps,
const std::vector<RigConnection> connections, const std::vector<RigConnection>& connections,
std::vector<const std::vector<double>*> flowrateNNCatAllTimeSteps, std::vector<const std::vector<double>*> flowrateNNCatAllTimeSteps,
std::vector<std::vector<double>> summedTracersAtAllTimesteps ); std::vector<std::vector<double>> summedTracersAtAllTimesteps );
void distributeNNCflow( std::vector<RigConnection> connections, void distributeNNCflow( const std::vector<RigConnection>& connections,
RimEclipseCase* caseToApply, RimEclipseCase* caseToApply,
std::vector<double> summedTracerValues, const std::vector<double>& summedTracerValues,
const std::vector<double>* flowrateNNC, const std::vector<double>* flowrateNNC,
std::vector<double>& flowrateIntoCell ); std::vector<double>& flowrateIntoCell );
void distributeNeighbourCellFlow( RigMainGrid* mainGrid, void distributeNeighbourCellFlow( RigMainGrid* mainGrid,
RimEclipseCase* caseToApply, RimEclipseCase* caseToApply,
std::vector<double> summedTracerValues, const std::vector<double>& summedTracerValues,
const std::vector<double>* flrWatResultI, const std::vector<double>* flrWatResultI,
const std::vector<double>* flrWatResultJ, const std::vector<double>* flrWatResultJ,
const std::vector<double>* flrWatResultK, const std::vector<double>* flrWatResultK,

6
ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp
View File

@@ -566,9 +566,9 @@ size_t RigStimPlanFractureDefinition::resultIndex( const QString& resultName, co
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigStimPlanFractureDefinition::setDataAtTimeValue( QString resultName, void RigStimPlanFractureDefinition::setDataAtTimeValue( const QString& resultName,
QString unit, const QString& unit,
std::vector<std::vector<double>> data, const std::vector<std::vector<double>>& data,
double timeStepValue ) double timeStepValue )
{ {
size_t resIndex = resultIndex( resultName, unit ); size_t resIndex = resultIndex( resultName, unit );

5
ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.h
View File

@@ -85,7 +85,10 @@ public:
std::vector<std::pair<QString, QString>> getStimPlanPropertyNamesUnits() const; std::vector<std::pair<QString, QString>> getStimPlanPropertyNamesUnits() const;
void setDataAtTimeValue( QString resultName, QString unit, std::vector<std::vector<double>> data, double timeStepValue ); void setDataAtTimeValue( const QString& resultName,
const QString& unit,
const std::vector<std::vector<double>>& data,
double timeStepValue );
const std::vector<std::vector<double>>& const std::vector<std::vector<double>>&
getDataAtTimeIndex( const QString& resultName, const QString& unit, size_t timeStepIndex ) const; getDataAtTimeIndex( const QString& resultName, const QString& unit, size_t timeStepIndex ) const;

4
ApplicationCode/UserInterface/RiuPlotAnnotationTool.cpp
View File

@@ -45,7 +45,7 @@ RiuPlotAnnotationTool::~RiuPlotAnnotationTool()
void RiuPlotAnnotationTool::attachNamedRegions( QwtPlot* plot, void RiuPlotAnnotationTool::attachNamedRegions( QwtPlot* plot,
const std::vector<QString>& names, const std::vector<QString>& names,
const std::pair<double, double> xRange, const std::pair<double, double> xRange,
const std::vector<std::pair<double, double>> yPositions, const std::vector<std::pair<double, double>>& yPositions,
RegionDisplay regionDisplay, RegionDisplay regionDisplay,
const caf::ColorTable& colorTable, const caf::ColorTable& colorTable,
int shadingAlphaByte, int shadingAlphaByte,
@@ -131,7 +131,7 @@ void RiuPlotAnnotationTool::attachNamedRegions( QwtPlot*
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuPlotAnnotationTool::attachWellPicks( QwtPlot* plot, void RiuPlotAnnotationTool::attachWellPicks( QwtPlot* plot,
const std::vector<QString>& names, const std::vector<QString>& names,
const std::vector<double> yPositions ) const std::vector<double>& yPositions )
{ {
detachAllAnnotations(); detachAllAnnotations();

4
ApplicationCode/UserInterface/RiuPlotAnnotationTool.h
View File

@@ -61,13 +61,13 @@ public:
void attachNamedRegions( QwtPlot* plot, void attachNamedRegions( QwtPlot* plot,
const std::vector<QString>& names, const std::vector<QString>& names,
const std::pair<double, double> xRange, const std::pair<double, double> xRange,
const std::vector<std::pair<double, double>> yPositions, const std::vector<std::pair<double, double>>& yPositions,
RegionDisplay regionDisplay, RegionDisplay regionDisplay,
const caf::ColorTable& colorTable, const caf::ColorTable& colorTable,
int shadingAlphaByte, int shadingAlphaByte,
bool showNames = true, bool showNames = true,
TrackSpan trackSpan = FULL_WIDTH ); TrackSpan trackSpan = FULL_WIDTH );
void attachWellPicks( QwtPlot* plot, const std::vector<QString>& names, const std::vector<double> yPositions ); void attachWellPicks( QwtPlot* plot, const std::vector<QString>& names, const std::vector<double>& yPositions );
void attachAnnotationLine( QwtPlot* plot, const QColor& color, const QString& annotationText, const double yPosition ); void attachAnnotationLine( QwtPlot* plot, const QColor& color, const QString& annotationText, const double yPosition );

14
ApplicationCode/UserInterface/RiuPvtPlotPanel.cpp
View File

@@ -192,9 +192,9 @@ void RiuPvtPlotWidget::plotCurves( RiaEclipseUnitTools::UnitSystem
const std::vector<RigFlowDiagSolverInterface::PvtCurve>& curveArr, const std::vector<RigFlowDiagSolverInterface::PvtCurve>& curveArr,
double pressure, double pressure,
double pointMarkerYValue, double pointMarkerYValue,
QString pointMarkerLabel, const QString& pointMarkerLabel,
QString plotTitle, const QString& plotTitle,
QString yAxisTitle ) const QString& yAxisTitle )
{ {
m_qwtPlot->detachItems( QwtPlotItem::Rtti_PlotCurve ); m_qwtPlot->detachItems( QwtPlotItem::Rtti_PlotCurve );
m_qwtPlot->detachItems( QwtPlotItem::Rtti_PlotMarker ); m_qwtPlot->detachItems( QwtPlotItem::Rtti_PlotMarker );
@@ -567,10 +567,10 @@ RiuPvtPlotPanel::~RiuPvtPlotPanel() {}
void RiuPvtPlotPanel::setPlotData( RiaEclipseUnitTools::UnitSystem unitSystem, void RiuPvtPlotPanel::setPlotData( RiaEclipseUnitTools::UnitSystem unitSystem,
const std::vector<RigFlowDiagSolverInterface::PvtCurve>& fvfCurveArr, const std::vector<RigFlowDiagSolverInterface::PvtCurve>& fvfCurveArr,
const std::vector<RigFlowDiagSolverInterface::PvtCurve>& viscosityCurveArr, const std::vector<RigFlowDiagSolverInterface::PvtCurve>& viscosityCurveArr,
FvfDynProps fvfDynProps, const FvfDynProps& fvfDynProps,
ViscosityDynProps viscosityDynProps, const ViscosityDynProps& viscosityDynProps,
CellValues cellValues, const CellValues& cellValues,
QString cellReferenceText ) const QString& cellReferenceText )
{ {
// cvf::Trace::show("RiuPvtPlotPanel::setPlotData()"); // cvf::Trace::show("RiuPvtPlotPanel::setPlotData()");

14
ApplicationCode/UserInterface/RiuPvtPlotPanel.h
View File

@@ -63,9 +63,9 @@ public:
const std::vector<RigFlowDiagSolverInterface::PvtCurve>& curveArr, const std::vector<RigFlowDiagSolverInterface::PvtCurve>& curveArr,
double pressure, double pressure,
double pointMarkerYValue, double pointMarkerYValue,
QString pointMarkerLabel, const QString& pointMarkerLabel,
QString plotTitle, const QString& plotTitle,
QString yAxisTitle ); const QString& yAxisTitle );
void applyFontSizes( bool replot ); void applyFontSizes( bool replot );
private: private:
@@ -127,10 +127,10 @@ public:
void setPlotData( RiaEclipseUnitTools::UnitSystem unitSystem, void setPlotData( RiaEclipseUnitTools::UnitSystem unitSystem,
const std::vector<RigFlowDiagSolverInterface::PvtCurve>& fvfCurveArr, const std::vector<RigFlowDiagSolverInterface::PvtCurve>& fvfCurveArr,
const std::vector<RigFlowDiagSolverInterface::PvtCurve>& viscosityCurveArr, const std::vector<RigFlowDiagSolverInterface::PvtCurve>& viscosityCurveArr,
FvfDynProps fvfDynProps, const FvfDynProps& fvfDynProps,
ViscosityDynProps viscosityDynProps, const ViscosityDynProps& viscosityDynProps,
CellValues cellValues, const CellValues& cellValues,
QString cellReferenceText ); const QString& cellReferenceText );
void clearPlot(); void clearPlot();
RiuPvtPlotUpdater* plotUpdater(); RiuPvtPlotUpdater* plotUpdater();
void applyFontSizes( bool replot ); void applyFontSizes( bool replot );

4
ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp
View File

@@ -184,8 +184,8 @@ void RiuRelativePermeabilityPlotPanel::setPlotData( RiaEclipseUnitTools::UnitSys
const std::vector<RigFlowDiagSolverInterface::RelPermCurve>& relPermCurves, const std::vector<RigFlowDiagSolverInterface::RelPermCurve>& relPermCurves,
double swat, double swat,
double sgas, double sgas,
QString caseName, const QString& caseName,
QString cellReferenceText ) const QString& cellReferenceText )
{ {
// cvf::Trace::show("Set RelPerm plot data"); // cvf::Trace::show("Set RelPerm plot data");

4
ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.h
View File

@@ -52,8 +52,8 @@ public:
const std::vector<RigFlowDiagSolverInterface::RelPermCurve>& relPermCurves, const std::vector<RigFlowDiagSolverInterface::RelPermCurve>& relPermCurves,
double swat, double swat,
double sgas, double sgas,
QString caseName, const QString& caseName,
QString cellReferenceText ); const QString& cellReferenceText );
void clearPlot(); void clearPlot();
RiuRelativePermeabilityPlotUpdater* plotUpdater(); RiuRelativePermeabilityPlotUpdater* plotUpdater();
void applyFontSizes( bool replot ); void applyFontSizes( bool replot );

4
ApplicationCode/UserInterface/RiuWellPathComponentPlotItem.cpp
View File

@@ -357,7 +357,7 @@ void RiuWellPathComponentPlotItem::addMarker( double posX
int size, int size,
RiuQwtSymbol::PointSymbolEnum symbolType, RiuQwtSymbol::PointSymbolEnum symbolType,
cvf::Color4f baseColor, cvf::Color4f baseColor,
QString label /*= QString("")*/, const QString& label /*= QString("")*/,
Qt::Alignment labelAlignment /*= Qt::AlignTop*/, Qt::Alignment labelAlignment /*= Qt::AlignTop*/,
Qt::Orientation labelOrientation /*= Qt::Vertical*/, Qt::Orientation labelOrientation /*= Qt::Vertical*/,
bool drawLine /*= false*/, bool drawLine /*= false*/,
@@ -384,7 +384,7 @@ QwtPlotItem* RiuWellPathComponentPlotItem::createMarker( double
int size, int size,
RiuQwtSymbol::PointSymbolEnum symbolType, RiuQwtSymbol::PointSymbolEnum symbolType,
cvf::Color4f baseColor, cvf::Color4f baseColor,
QString label /*= QString("")*/, const QString& label /*= QString("")*/,
Qt::Alignment labelAlignment /*= Qt::AlignTop*/, Qt::Alignment labelAlignment /*= Qt::AlignTop*/,
Qt::Orientation labelOrientation /*= Qt::Vertical*/, Qt::Orientation labelOrientation /*= Qt::Vertical*/,
bool drawLine /*= false*/, bool drawLine /*= false*/,

4
ApplicationCode/UserInterface/RiuWellPathComponentPlotItem.h
View File

@@ -85,7 +85,7 @@ private:
int size, int size,
RiuQwtSymbol::PointSymbolEnum symbolType, RiuQwtSymbol::PointSymbolEnum symbolType,
cvf::Color4f baseColor, cvf::Color4f baseColor,
QString label = QString( "" ), const QString& label = QString( "" ),
Qt::Alignment labelAlignment = Qt::AlignVCenter | Qt::AlignRight, Qt::Alignment labelAlignment = Qt::AlignVCenter | Qt::AlignRight,
Qt::Orientation labelOrientation = Qt::Horizontal, Qt::Orientation labelOrientation = Qt::Horizontal,
bool drawLine = false, bool drawLine = false,
@@ -95,7 +95,7 @@ private:
int size, int size,
RiuQwtSymbol::PointSymbolEnum symbolType, RiuQwtSymbol::PointSymbolEnum symbolType,
cvf::Color4f baseColor, cvf::Color4f baseColor,
QString label = QString( "" ), const QString& label = QString( "" ),
Qt::Alignment labelAlignment = Qt::AlignVCenter | Qt::AlignRight, Qt::Alignment labelAlignment = Qt::AlignVCenter | Qt::AlignRight,
Qt::Orientation labelOrientation = Qt::Horizontal, Qt::Orientation labelOrientation = Qt::Horizontal,
bool drawLine = false, bool drawLine = false,