#5007 Janitor : Do not call virtual methods from constructors

This commit is contained in:
Magne Sjaastad
2019-11-07 09:01:31 +01:00
parent a413f672ec
commit 388b92c092
3 changed files with 16 additions and 5 deletions

View File

@@ -72,7 +72,8 @@ const RigFemPartGrid* RigFemPart::getOrCreateStructGrid() const
{
if ( m_structGrid.isNull() )
{
m_structGrid = new RigFemPartGrid( this );
m_structGrid = new RigFemPartGrid();
m_structGrid->setFemPart( this );
}
return m_structGrid.p();

View File

@@ -26,10 +26,9 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigFemPartGrid::RigFemPartGrid( const RigFemPart* femPart )
RigFemPartGrid::RigFemPartGrid()
: m_femPart( nullptr )
{
m_femPart = femPart;
generateStructGridData();
}
//--------------------------------------------------------------------------------------------------
@@ -37,6 +36,15 @@ RigFemPartGrid::RigFemPartGrid( const RigFemPart* femPart )
//--------------------------------------------------------------------------------------------------
RigFemPartGrid::~RigFemPartGrid() {}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigFemPartGrid::setFemPart( const RigFemPart* femPart )
{
m_femPart = femPart;
generateStructGridData();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -26,9 +26,11 @@ class RigFemPart;
class RigFemPartGrid : public cvf::StructGridInterface
{
public:
explicit RigFemPartGrid( const RigFemPart* femPart );
RigFemPartGrid();
~RigFemPartGrid() override;
void setFemPart( const RigFemPart* femPart );
bool ijkFromCellIndex( size_t cellIndex, size_t* i, size_t* j, size_t* k ) const override;
size_t cellIndexFromIJK( size_t i, size_t j, size_t k ) const override;