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

#10367 Janitor: Remove unneccessary 'this' pointers

Browse Source
This commit is contained in:
Kristian Bendiksen
2023-08-04 09:04:14 +02:00
parent 2614cf3d62
commit 5bf2c2a89d
292 changed files with 1625 additions and 1664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp
View File

@@ -170,15 +170,15 @@ RimGeoMechCase::~RimGeoMechCase()
RimWellLogPlotCollection* plotCollection = project->mainPlotCollection()->wellLogPlotCollection();
if ( plotCollection )
{
plotCollection->removeExtractors( this->geoMechData() );
plotCollection->removeExtractors( geoMechData() );
}
}
}
if ( this->geoMechData() )
if ( geoMechData() )
{
// At this point, we assume that memory should be released
CVF_ASSERT( this->geoMechData()->refCount() == 1 );
CVF_ASSERT( geoMechData()->refCount() == 1 );
}
}
@@ -203,11 +203,11 @@ const RigGeoMechCaseData* RimGeoMechCase::geoMechData() const
//--------------------------------------------------------------------------------------------------
void RimGeoMechCase::reloadDataAndUpdate()
{
if ( this->geoMechData() )
if ( geoMechData() )
{
m_geoMechCaseData = nullptr;
std::string errMsg;
if ( this->openGeoMechCase( &errMsg ) == CASE_OPEN_ERROR )
if ( openGeoMechCase( &errMsg ) == CASE_OPEN_ERROR )
{
RiaLogging::error( QString::fromStdString( errMsg ) );
}
@@ -268,7 +268,7 @@ RimGeoMechCase* RimGeoMechCase::createCopy( const QString& newInputFileName )
RimProject* project = RimProject::current();
RimGeoMechCase* copycase =
dynamic_cast<RimGeoMechCase*>( this->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );
dynamic_cast<RimGeoMechCase*>( xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );
CVF_ASSERT( copycase );
QFileInfo filenameInfo( newInputFileName );
@@ -288,7 +288,7 @@ RimGeoMechCase* RimGeoMechCase::createCopy( const QString& newInputFileName )
RimGeoMechCase::CaseOpenStatus RimGeoMechCase::openGeoMechCase( std::string* errorMessage )
{
// If read already, return
if ( this->m_geoMechCaseData.notNull() ) return CASE_OPEN_OK;
if ( m_geoMechCaseData.notNull() ) return CASE_OPEN_OK;
if ( !caf::Utils::fileExists( m_caseFileName().path() ) )
{
@@ -495,7 +495,7 @@ cvf::BoundingBox RimGeoMechCase::reservoirBoundingBox()
{
cvf::BoundingBox boundingBox;
RigGeoMechCaseData* rigCaseData = this->geoMechData();
RigGeoMechCaseData* rigCaseData = geoMechData();
if ( rigCaseData && rigCaseData->femPartResults() && rigCaseData->femParts() )
{
for ( int p = 0; p < rigCaseData->femParts()->partCount(); p++ )
@@ -592,7 +592,7 @@ void RimGeoMechCase::addElementPropertyFiles( const std::vector<caf::FilePath>&
}
}
this->updateConnectedEditors();
updateConnectedEditors();
if ( m_geoMechCaseData.notNull() )
{
@@ -686,10 +686,10 @@ void RimGeoMechCase::setApplyTimeFilter( bool applyTimeFilter )
//--------------------------------------------------------------------------------------------------
cvf::Vec3d RimGeoMechCase::displayModelOffset() const
{
auto bb = this->allCellsBoundingBox();
auto bb = allCellsBoundingBox();
if ( bb.isValid() )
{
return this->allCellsBoundingBox().min();
return allCellsBoundingBox().min();
}
return cvf::Vec3d::ZERO;

4
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCellColors.cpp
View File

@@ -33,7 +33,7 @@ RimGeoMechCellColors::RimGeoMechCellColors()
: legendConfigChanged( this )
{
CAF_PDM_InitFieldNoDefault( &legendConfig, "LegendDefinition", "Color Legend" );
this->legendConfig = new RimRegularLegendConfig();
legendConfig = new RimRegularLegendConfig();
legendConfig.uiCapability()->setUiTreeHidden( true );
legendConfig->changed.connect( this, &RimGeoMechCellColors::onLegendConfigChanged );
}
@@ -82,7 +82,7 @@ void RimGeoMechCellColors::initAfterRead()
//--------------------------------------------------------------------------------------------------
void RimGeoMechCellColors::updateLegendCategorySettings()
{
if ( this->hasCategoryResult() )
if ( hasCategoryResult() )
{
legendConfig->setMappingMode( RimRegularLegendConfig::MappingType::CATEGORY_INTEGER );
legendConfig->setColorLegend( RimRegularLegendConfig::mapToColorLegend( RimRegularLegendConfig::ColorRangesType::CATEGORY ) );

16
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapView.cpp
View File

@@ -195,15 +195,15 @@ void RimGeoMechContourMapView::onCreateDisplayModel()
{
RimGeoMechView::onCreateDisplayModel();
if ( !this->isTimeStepDependentDataVisible() )
if ( !isTimeStepDependentDataVisible() )
{
// Need to add geometry even if it hasn't happened during dynamic time step update.
updateGeometry();
}
if ( this->viewer()->mainCamera()->viewMatrix() == sm_defaultViewMatrix )
if ( viewer()->mainCamera()->viewMatrix() == sm_defaultViewMatrix )
{
this->zoomAll();
zoomAll();
}
}
@@ -213,8 +213,8 @@ void RimGeoMechContourMapView::onCreateDisplayModel()
void RimGeoMechContourMapView::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
caf::PdmUiGroup* viewGroup = uiOrdering.addNewGroup( "Viewer" );
viewGroup->add( this->userDescriptionField() );
viewGroup->add( this->backgroundColorField() );
viewGroup->add( userDescriptionField() );
viewGroup->add( backgroundColorField() );
viewGroup->add( &m_showAxisLines );
viewGroup->add( &m_showScaleLegend );
@@ -305,7 +305,7 @@ void RimGeoMechContourMapView::appendContourMapProjectionToModel()
cvf::ref<cvf::ModelBasicList> contourMapProjectionModelBasicList = new cvf::ModelBasicList;
contourMapProjectionModelBasicList->setName( name );
cvf::ref<caf::DisplayCoordTransform> transForm = this->displayCoordTransform();
cvf::ref<caf::DisplayCoordTransform> transForm = displayCoordTransform();
m_contourMapProjectionPartMgr->appendProjectionToModel( contourMapProjectionModelBasicList.p(), transForm.p() );
contourMapProjectionModelBasicList->updateBoundingBoxesRecursive();
@@ -330,7 +330,7 @@ void RimGeoMechContourMapView::appendContourLinesToModel()
cvf::ref<cvf::ModelBasicList> contourMapLabelModelBasicList = new cvf::ModelBasicList;
contourMapLabelModelBasicList->setName( name );
cvf::ref<caf::DisplayCoordTransform> transForm = this->displayCoordTransform();
cvf::ref<caf::DisplayCoordTransform> transForm = displayCoordTransform();
m_contourMapProjectionPartMgr->appendContourLinesToModel( viewer()->mainCamera(), contourMapLabelModelBasicList.p(), transForm.p() );
contourMapLabelModelBasicList->updateBoundingBoxesRecursive();
@@ -355,7 +355,7 @@ void RimGeoMechContourMapView::appendPickPointVisToModel()
cvf::ref<cvf::ModelBasicList> contourMapProjectionModelBasicList = new cvf::ModelBasicList;
contourMapProjectionModelBasicList->setName( name );
cvf::ref<caf::DisplayCoordTransform> transForm = this->displayCoordTransform();
cvf::ref<caf::DisplayCoordTransform> transForm = displayCoordTransform();
m_contourMapProjectionPartMgr->appendPickPointVisToModel( contourMapProjectionModelBasicList.p(), transForm.p() );
contourMapProjectionModelBasicList->updateBoundingBoxesRecursive();

2
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechModels.cpp
View File

@@ -98,7 +98,7 @@ RimGeoMechCase* RimGeoMechModels::copyCase( RimGeoMechCase* thecase, const QStri
copy->resolveReferencesRecursively();
copy->updateConnectedEditors();
this->updateConnectedEditors();
updateConnectedEditors();
for ( auto riv : copy->views() )
{

54
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechResultDefinition.cpp
View File

@@ -351,7 +351,7 @@ void RimGeoMechResultDefinition::fieldChangedByUi( const caf::PdmFieldHandle* ch
}
// Get the possible property filter owner
auto propFilter = dynamic_cast<RimGeoMechPropertyFilter*>( this->parentField()->ownerObject() );
auto propFilter = dynamic_cast<RimGeoMechPropertyFilter*>( parentField()->ownerObject() );
auto view = firstAncestorOrThisOfType<RimGridView>();
auto curve = firstAncestorOrThisOfType<RimPlotCurve>();
auto rim3dWellLogCurve = firstAncestorOrThisOfType<Rim3dWellLogCurve>();
@@ -400,7 +400,7 @@ void RimGeoMechResultDefinition::fieldChangedByUi( const caf::PdmFieldHandle* ch
if ( dynamic_cast<RimGeoMechCellColors*>( this ) )
{
this->updateLegendCategorySettings();
updateLegendCategorySettings();
if ( view )
{
@@ -566,8 +566,8 @@ void RimGeoMechResultDefinition::loadResult()
{
if ( m_geomCase && m_geomCase->geoMechData() )
{
if ( this->resultAddress().fieldName == RiaResultNames::wbsFGResult().toStdString() ||
this->resultAddress().fieldName == RiaResultNames::wbsSFGResult().toStdString() )
if ( resultAddress().fieldName == RiaResultNames::wbsFGResult().toStdString() ||
resultAddress().fieldName == RiaResultNames::wbsSFGResult().toStdString() )
{
RigFemResultAddress stressResAddr( RIG_ELEMENT_NODAL, std::string( "ST" ), "" );
RigFemResultAddress porBarResAddr( RIG_ELEMENT_NODAL, std::string( "POR-Bar" ), "" );
@@ -576,7 +576,7 @@ void RimGeoMechResultDefinition::loadResult()
}
else
{
m_geomCase->geoMechData()->femPartResults()->assertResultsLoaded( this->resultAddress() );
m_geomCase->geoMechData()->femPartResults()->assertResultsLoaded( resultAddress() );
}
}
}
@@ -730,7 +730,7 @@ bool RimGeoMechResultDefinition::hasResult()
RigFemPartResultsCollection* results = caseData->femPartResults();
if ( results )
{
return results->assertResultsLoaded( this->resultAddress() );
return results->assertResultsLoaded( resultAddress() );
}
}
return false;
@@ -789,17 +789,17 @@ QString RimGeoMechResultDefinition::resultVariableName() const
//--------------------------------------------------------------------------------------------------
QString RimGeoMechResultDefinition::currentResultUnits() const
{
RigFemResultAddress rigFemResultAddress = this->resultAddress();
RigFemResultAddress rigFemResultAddress = resultAddress();
if ( RigFemPartResultCalculatorStressAnisotropy::isAnisotropyResult( rigFemResultAddress ) )
{
return RiaWellLogUnitTools<double>::noUnitString();
}
if ( this->resultFieldName() == "SE" || this->resultFieldName() == "ST" || this->resultFieldName() == "POR-Bar" ||
this->resultFieldName() == "SM" || this->resultFieldName() == "SEM" || this->resultFieldName() == "Q" )
if ( resultFieldName() == "SE" || resultFieldName() == "ST" || resultFieldName() == "POR-Bar" || resultFieldName() == "SM" ||
resultFieldName() == "SEM" || resultFieldName() == "Q" )
{
auto componentName = this->resultComponentName();
auto componentName = resultComponentName();
if ( componentName.endsWith( "azi" ) || componentName.endsWith( "inc" ) )
{
return "Deg";
@@ -807,16 +807,15 @@ QString RimGeoMechResultDefinition::currentResultUnits() const
return "Bar";
}
else if ( this->resultFieldName() == "MODULUS" )
else if ( resultFieldName() == "MODULUS" )
{
return "GPa";
}
else if ( this->resultFieldName() == "COMPRESSIBILITY" &&
( this->resultComponentName() == "PORE" || this->resultComponentName() == "VERTICAL" ) )
else if ( resultFieldName() == "COMPRESSIBILITY" && ( resultComponentName() == "PORE" || resultComponentName() == "VERTICAL" ) )
{
return "1/GPa";
}
else if ( this->resultFieldName() == "PORO-PERM" && this->resultComponentName() == "PERM" )
else if ( resultFieldName() == "PORO-PERM" && resultComponentName() == "PERM" )
{
return "mD";
}
@@ -824,7 +823,7 @@ QString RimGeoMechResultDefinition::currentResultUnits() const
{
for ( auto resultName : RiaResultNames::wbsDerivedResultNames() )
{
if ( resultName == this->resultFieldName() )
if ( resultName == resultFieldName() )
{
return RiaWellLogUnitTools<double>::sg_emwUnitString();
}
@@ -889,7 +888,7 @@ QString RimGeoMechResultDefinition::convertToUiResultFieldName( QString resultFi
//--------------------------------------------------------------------------------------------------
bool RimGeoMechResultDefinition::normalizableResultSelected() const
{
return RigFemPartResultsCollection::isNormalizableResult( this->resultAddress() );
return RigFemPartResultsCollection::isNormalizableResult( resultAddress() );
}
//--------------------------------------------------------------------------------------------------
@@ -897,7 +896,7 @@ bool RimGeoMechResultDefinition::normalizableResultSelected() const
//--------------------------------------------------------------------------------------------------
bool RimGeoMechResultDefinition::referenceCaseDependentResultSelected() const
{
return RigFemPartResultsCollection::isReferenceCaseDependentResult( this->resultAddress() );
return RigFemPartResultsCollection::isReferenceCaseDependentResult( resultAddress() );
}
//--------------------------------------------------------------------------------------------------
@@ -924,7 +923,7 @@ void RimGeoMechResultDefinition::updateLegendTextAndRanges( RimRegularLegendConf
const QString& legendHeading,
int viewerStepIndex )
{
if ( !this->ownerCaseData() || !( this->resultAddress().isValid() ) )
if ( !ownerCaseData() || !( resultAddress().isValid() ) )
{
return;
}
@@ -934,10 +933,10 @@ void RimGeoMechResultDefinition::updateLegendTextAndRanges( RimRegularLegendConf
double globalMin, globalMax;
double globalPosClosestToZero, globalNegClosestToZero;
RigGeoMechCaseData* gmCase = this->ownerCaseData();
RigGeoMechCaseData* gmCase = ownerCaseData();
CVF_ASSERT( gmCase );
RigFemResultAddress resVarAddress = this->resultAddress();
RigFemResultAddress resVarAddress = resultAddress();
auto [stepIdx, frameIdx] = gmCase->femPartResults()->stepListIndexToTimeStepAndDataFrameIndex( viewerStepIndex );
@@ -950,18 +949,17 @@ void RimGeoMechResultDefinition::updateLegendTextAndRanges( RimRegularLegendConf
legendConfigToUpdate->setClosestToZeroValues( globalPosClosestToZero, globalNegClosestToZero, localPosClosestToZero, localNegClosestToZero );
legendConfigToUpdate->setAutomaticRanges( globalMin, globalMax, localMin, localMax );
if ( this->hasCategoryResult() )
if ( hasCategoryResult() )
{
std::vector<QString> fnVector = gmCase->femPartResults()->formationNames();
legendConfigToUpdate->setNamedCategories( fnVector );
}
QString legendTitle = legendHeading + caf::AppEnum<RigFemResultPosEnum>( this->resultPositionType() ).uiText() + "\n" +
this->resultFieldUiName();
QString legendTitle = legendHeading + caf::AppEnum<RigFemResultPosEnum>( resultPositionType() ).uiText() + "\n" + resultFieldUiName();
if ( !this->resultComponentUiName().isEmpty() )
if ( !resultComponentUiName().isEmpty() )
{
legendTitle += ", " + this->resultComponentUiName();
legendTitle += ", " + resultComponentUiName();
}
QString unitString = currentResultUnits();
@@ -970,9 +968,9 @@ void RimGeoMechResultDefinition::updateLegendTextAndRanges( RimRegularLegendConf
legendTitle += QString( " [%1]" ).arg( unitString );
}
if ( !this->diffResultUiShortName().isEmpty() )
if ( !diffResultUiShortName().isEmpty() )
{
legendTitle += QString( "\nTime Diff:\n%1" ).arg( this->diffResultUiShortName() );
legendTitle += QString( "\nTime Diff:\n%1" ).arg( diffResultUiShortName() );
}
legendConfigToUpdate->setTitle( legendTitle );
@@ -983,5 +981,5 @@ void RimGeoMechResultDefinition::updateLegendTextAndRanges( RimRegularLegendConf
//--------------------------------------------------------------------------------------------------
bool RimGeoMechResultDefinition::isBiotCoefficientDependent() const
{
return ( this->resultFieldName() == "COMPRESSIBILITY" || this->resultFieldName() == "PORO-PERM" );
return ( resultFieldName() == "COMPRESSIBILITY" || resultFieldName() == "PORO-PERM" );
}

66
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp
View File

@@ -157,7 +157,7 @@ void RimGeoMechView::onLoadDataAndUpdate()
onUpdateScaleTransform();
this->updateSurfacesInViewTreeItems();
updateSurfacesInViewTreeItems();
if ( m_geomechCase )
{
@@ -186,22 +186,22 @@ void RimGeoMechView::onLoadDataAndUpdate()
progress.setProgressDescription( "Reading Current Result" );
CVF_ASSERT( this->cellResult() != nullptr );
m_geomechCase->geoMechData()->femPartResults()->setNormalizationAirGap( this->cellResult()->normalizationAirGap() );
m_geomechCase->geoMechData()->femPartResults()->assertResultsLoaded( this->cellResult()->resultAddress() );
CVF_ASSERT( cellResult() != nullptr );
m_geomechCase->geoMechData()->femPartResults()->setNormalizationAirGap( cellResult()->normalizationAirGap() );
m_geomechCase->geoMechData()->femPartResults()->assertResultsLoaded( cellResult()->resultAddress() );
progress.incrementProgress();
progress.setProgressDescription( "Create Display model" );
updateMdiWindowVisibility();
this->geoMechPropertyFilterCollection()->loadAndInitializePropertyFilters();
geoMechPropertyFilterCollection()->loadAndInitializePropertyFilters();
m_wellMeasurementCollection->syncWithChangesInWellMeasurementCollection();
if ( m_surfaceCollection ) m_surfaceCollection->loadData();
if ( m_partsCollection ) m_partsCollection->syncWithCase( m_geomechCase );
this->scheduleCreateDisplayModelAndRedraw();
scheduleCreateDisplayModelAndRedraw();
progress.incrementProgress();
}
@@ -215,7 +215,7 @@ void RimGeoMechView::onUpdateScaleTransform()
cvf::Mat4d scale = cvf::Mat4d::IDENTITY;
scale( 2, 2 ) = scaleZ();
this->scaleTransform()->setLocalTransform( scale );
scaleTransform()->setLocalTransform( scale );
if ( nativeOrOverrideViewer() ) nativeOrOverrideViewer()->updateCachedValuesInScene();
}
@@ -414,7 +414,7 @@ void RimGeoMechView::onUpdateDisplayModelForCurrentTimeStep()
updateElementDisplacements();
if ( this->isTimeStepDependentDataVisibleInThisOrComparisonView() )
if ( isTimeStepDependentDataVisibleInThisOrComparisonView() )
{
if ( nativeOrOverrideViewer() )
{
@@ -469,10 +469,10 @@ void RimGeoMechView::onUpdateDisplayModelForCurrentTimeStep()
}
}
bool hasGeneralCellResult = this->cellResult()->hasResult();
bool hasGeneralCellResult = cellResult()->hasResult();
if ( hasGeneralCellResult )
m_vizLogic->updateCellResultColor( m_currentTimeStep(), m_currentInternalTimeStep, m_currentDataFrameIndex, this->cellResult() );
m_vizLogic->updateCellResultColor( m_currentTimeStep(), m_currentInternalTimeStep, m_currentDataFrameIndex, cellResult() );
else
m_vizLogic->updateStaticCellColors( m_currentTimeStep() );
@@ -550,7 +550,7 @@ void RimGeoMechView::onUpdateLegends()
}
else
{
std::vector<RimLegendConfig*> legendConfs = this->legendConfigs();
std::vector<RimLegendConfig*> legendConfs = legendConfigs();
for ( auto legendConf : legendConfs )
{
@@ -558,7 +558,7 @@ void RimGeoMechView::onUpdateLegends()
}
}
this->updateLegendTextAndRanges( cellResult()->legendConfig(), m_currentTimeStep() );
updateLegendTextAndRanges( cellResult()->legendConfig(), m_currentTimeStep() );
if ( cellResult()->hasResult() && cellResult()->legendConfig()->showLegend() )
{
@@ -566,12 +566,12 @@ void RimGeoMechView::onUpdateLegends()
isUsingOverrideViewer() );
}
for ( RimIntersectionResultDefinition* sepInterResDef : this->separateIntersectionResultsCollection()->intersectionResultsDefinitions() )
for ( RimIntersectionResultDefinition* sepInterResDef : separateIntersectionResultsCollection()->intersectionResultsDefinitions() )
{
sepInterResDef->updateLegendRangesTextAndVisibility( "Intersection Results:\n", nativeOrOverrideViewer(), isUsingOverrideViewer() );
}
for ( RimIntersectionResultDefinition* sepInterResDef : this->separateSurfaceResultsCollection()->intersectionResultsDefinitions() )
for ( RimIntersectionResultDefinition* sepInterResDef : separateSurfaceResultsCollection()->intersectionResultsDefinitions() )
{
sepInterResDef->updateLegendRangesTextAndVisibility( "Surface Results:\n", nativeOrOverrideViewer(), isUsingOverrideViewer() );
}
@@ -655,7 +655,7 @@ void RimGeoMechView::updateTensorLegendTextAndRanges( RimRegularLegendConfig* le
//--------------------------------------------------------------------------------------------------
void RimGeoMechView::updateLegendTextAndRanges( RimRegularLegendConfig* legendConfig, int timeStepIndex )
{
if ( !this->isTimeStepDependentDataVisible() )
if ( !isTimeStepDependentDataVisible() )
{
return;
}
@@ -697,12 +697,12 @@ std::vector<RimLegendConfig*> RimGeoMechView::legendConfigs() const
absLegendConfigs.push_back( cellResult()->legendConfig() );
absLegendConfigs.push_back( tensorResults()->arrowColorLegendConfig() );
for ( RimIntersectionResultDefinition* sepInterResDef : this->separateIntersectionResultsCollection()->intersectionResultsDefinitions() )
for ( RimIntersectionResultDefinition* sepInterResDef : separateIntersectionResultsCollection()->intersectionResultsDefinitions() )
{
absLegendConfigs.push_back( sepInterResDef->regularLegendConfig() );
}
for ( RimIntersectionResultDefinition* sepInterResDef : this->separateSurfaceResultsCollection()->intersectionResultsDefinitions() )
for ( RimIntersectionResultDefinition* sepInterResDef : separateSurfaceResultsCollection()->intersectionResultsDefinitions() )
{
absLegendConfigs.push_back( sepInterResDef->regularLegendConfig() );
}
@@ -768,10 +768,10 @@ void RimGeoMechView::convertCameraPositionFromOldProjectFiles()
RimCase* rimCase = geoMechCase;
RiuViewerToViewInterface* viewerToViewInterface = this;
cvf::Vec3d offset = rimCase->displayModelOffset();
auto diplayCoordTrans = this->displayCoordTransform();
auto diplayCoordTrans = displayCoordTransform();
{
cvf::Mat4d cameraMx = this->cameraPosition().getInverted();
cvf::Mat4d cameraMx = cameraPosition().getInverted();
cvf::Vec3d translation = cameraMx.translation();
@@ -786,7 +786,7 @@ void RimGeoMechView::convertCameraPositionFromOldProjectFiles()
}
{
cvf::Vec3d pointOfInterest = this->cameraPointOfInterest();
cvf::Vec3d pointOfInterest = cameraPointOfInterest();
cvf::Vec3d pointOfInterestDomain = diplayCoordTrans->scaleToDomainSize( pointOfInterest );
pointOfInterestDomain -= offset;
@@ -798,8 +798,8 @@ void RimGeoMechView::convertCameraPositionFromOldProjectFiles()
if ( viewer() )
{
viewer()->mainCamera()->setViewMatrix( this->cameraPosition() );
viewer()->setPointOfInterest( this->cameraPointOfInterest() );
viewer()->mainCamera()->setViewMatrix( cameraPosition() );
viewer()->setPointOfInterest( cameraPointOfInterest() );
}
}
}
@@ -847,22 +847,22 @@ size_t RimGeoMechView::onTimeStepCountRequested()
//--------------------------------------------------------------------------------------------------
bool RimGeoMechView::isTimeStepDependentDataVisible() const
{
if ( this->cellResult()->hasResult() || this->geoMechPropertyFilterCollection()->hasActiveFilters() )
if ( cellResult()->hasResult() || geoMechPropertyFilterCollection()->hasActiveFilters() )
{
return true;
}
if ( this->hasVisibleTimeStepDependent3dWellLogCurves() )
if ( hasVisibleTimeStepDependent3dWellLogCurves() )
{
return true;
}
if ( this->intersectionCollection()->hasAnyActiveSeparateResults() )
if ( intersectionCollection()->hasAnyActiveSeparateResults() )
{
return true;
}
if ( this->surfaceInViewCollection() && this->surfaceInViewCollection()->hasAnyActiveSeparateResults() )
if ( surfaceInViewCollection() && surfaceInViewCollection()->hasAnyActiveSeparateResults() )
{
return true;
}
@@ -897,7 +897,7 @@ void RimGeoMechView::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
if ( ( changedField == &m_showDisplacement ) || ( ( changedField == &m_displacementScaling ) && m_showDisplacement() ) )
{
this->createDisplayModelAndRedraw();
createDisplayModelAndRedraw();
}
}
@@ -907,9 +907,9 @@ void RimGeoMechView::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
void RimGeoMechView::initAfterRead()
{
RimGridView::initAfterRead();
this->cellResult()->setGeoMechCase( m_geomechCase );
cellResult()->setGeoMechCase( m_geomechCase );
this->updateUiIconFromToggleField();
updateUiIconFromToggleField();
}
//--------------------------------------------------------------------------------------------------
@@ -927,9 +927,9 @@ void RimGeoMechView::scheduleGeometryRegen( RivCellSetEnum geometryType )
{
m_vizLogic->scheduleGeometryRegen( geometryType );
if ( this->isMasterView() )
if ( isMasterView() )
{
RimViewLinker* viewLinker = this->assosiatedViewLinker();
RimViewLinker* viewLinker = assosiatedViewLinker();
if ( viewLinker )
{
viewLinker->scheduleGeometryRegenForDepViews( geometryType );
@@ -950,8 +950,8 @@ void RimGeoMechView::setOverridePropertyFilterCollection( RimGeoMechPropertyFilt
}
m_propertyFilterCollection.uiCapability()->updateConnectedEditors();
this->scheduleGeometryRegen( PROPERTY_FILTERED );
this->scheduleCreateDisplayModelAndRedraw();
scheduleGeometryRegen( PROPERTY_FILTERED );
scheduleCreateDisplayModelAndRedraw();
}
//--------------------------------------------------------------------------------------------------