AppFwk : Fixed typo of firstAncestorOrThisOfType

This commit is contained in:
Magne Sjaastad
2016-09-21 13:59:41 +02:00
parent 1bcfc41542
commit 531aaaa445
60 changed files with 124 additions and 122 deletions

View File

@@ -292,7 +292,7 @@ QList<caf::PdmOptionItemInfo> RimCellRangeFilter::calculateValueOptions(const ca
bool RimCellRangeFilter::isRangeFilterControlled()
{
RimView* rimView = NULL;
firstAnchestorOrThisOfType(rimView);
firstAncestorOrThisOfType(rimView);
CVF_ASSERT(rimView);
bool isRangeFilterControlled = false;

View File

@@ -150,7 +150,7 @@ void RimCellRangeFilterCollection::fieldChangedByUi(const caf::PdmFieldHandle* c
void RimCellRangeFilterCollection::updateDisplayModeNotifyManagedViews(RimCellRangeFilter* changedRangeFilter)
{
RimView* view = NULL;
firstAnchestorOrThisOfType(view);
firstAncestorOrThisOfType(view);
if (view->isMasterView())
{
@@ -306,7 +306,7 @@ RigFemPartCollection* RimCellRangeFilterCollection::femPartColl() const
RimView* RimCellRangeFilterCollection::baseView() const
{
RimView* rimView = NULL;
firstAnchestorOrThisOfType(rimView);
firstAncestorOrThisOfType(rimView);
return rimView;
}

View File

@@ -275,7 +275,7 @@ caf::PdmFieldHandle* RimCrossSection::objectToggleField()
RimEclipseWellCollection* RimCrossSection::simulationWellCollection()
{
RimEclipseView* eclipseView = NULL;
firstAnchestorOrThisOfType(eclipseView);
firstAncestorOrThisOfType(eclipseView);
if (eclipseView)
{
@@ -425,7 +425,7 @@ void RimCrossSection::addExtents(std::vector<cvf::Vec3d> &polyLine) const
void RimCrossSection::updateWellExtentDefaultValue()
{
RimCase* ownerCase = NULL;
firstAnchestorOrThisOfType(ownerCase);
firstAncestorOrThisOfType(ownerCase);
if (ownerCase)
{
@@ -463,7 +463,7 @@ void RimCrossSection::updateName()
void RimCrossSection::clipToReservoir(std::vector<cvf::Vec3d> &polyLine) const
{
RimCase* ownerCase = NULL;
firstAnchestorOrThisOfType(ownerCase);
firstAncestorOrThisOfType(ownerCase);
std::vector<cvf::Vec3d> clippedPolyLine;
@@ -551,7 +551,7 @@ void RimCrossSection::rebuildGeometryAndScheduleCreateDisplayModel()
m_crossSectionPartMgr = NULL;
RimView* rimView = NULL;
this->firstAnchestorOrThisOfType(rimView);
this->firstAncestorOrThisOfType(rimView);
if (rimView)
{
rimView->scheduleCreateDisplayModelAndRedraw();

View File

@@ -124,7 +124,7 @@ void RimCrossSectionCollection::appendCrossSection(RimCrossSection* crossSection
RiuMainWindow::instance()->selectAsCurrentItem(crossSection);
RimView* rimView = NULL;
firstAnchestorOrThisOfType(rimView);
firstAncestorOrThisOfType(rimView);
if (rimView)
{
rimView->scheduleCreateDisplayModelAndRedraw();
@@ -139,7 +139,7 @@ void RimCrossSectionCollection::fieldChangedByUi(const caf::PdmFieldHandle* chan
if (changedField == &isActive)
{
RimView* rimView = NULL;
firstAnchestorOrThisOfType(rimView);
firstAncestorOrThisOfType(rimView);
if (rimView)
{
rimView->scheduleCreateDisplayModelAndRedraw();

View File

@@ -235,7 +235,7 @@ void RimEclipsePropertyFilter::updateReadOnlyStateOfAllFields()
bool RimEclipsePropertyFilter::isPropertyFilterControlled()
{
RimView* rimView = NULL;
firstAnchestorOrThisOfType(rimView);
firstAncestorOrThisOfType(rimView);
CVF_ASSERT(rimView);
bool isPropertyFilterControlled = false;

View File

@@ -56,7 +56,7 @@ RimEclipsePropertyFilterCollection::~RimEclipsePropertyFilterCollection()
RimEclipseView* RimEclipsePropertyFilterCollection::reservoirView()
{
RimEclipseView* eclipseView = NULL;
firstAnchestorOrThisOfType(eclipseView);
firstAncestorOrThisOfType(eclipseView);
return eclipseView;
}
@@ -122,7 +122,7 @@ void RimEclipsePropertyFilterCollection::updateIconState()
bool activeIcon = true;
RimEclipseView* view = NULL;
this->firstAnchestorOrThisOfType(view);
this->firstAncestorOrThisOfType(view);
RimViewController* viewController = view->viewController();
if (viewController && (viewController->isPropertyFilterOveridden()
|| viewController->isVisibleCellsOveridden()))

View File

@@ -128,12 +128,12 @@ void RimEclipseResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
RimEclipsePropertyFilter* propFilter = dynamic_cast<RimEclipsePropertyFilter*>(this->parentField()->ownerObject());
RimView* view = NULL;
this->firstAnchestorOrThisOfType(view);
this->firstAncestorOrThisOfType(view);
RimWellLogCurve* curve = NULL;
this->firstAnchestorOrThisOfType(curve);
this->firstAncestorOrThisOfType(curve);
RimCellEdgeColors* cellEdgeColors = NULL;
this->firstAnchestorOrThisOfType(cellEdgeColors);
this->firstAncestorOrThisOfType(cellEdgeColors);
if (&m_resultVariableUiField == changedField)
{
@@ -217,19 +217,19 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(
bool showPerFaceResultsFirst = false;
RimEclipseFaultColors* rimEclipseFaultColors = NULL;
this->firstAnchestorOrThisOfType(rimEclipseFaultColors);
this->firstAncestorOrThisOfType(rimEclipseFaultColors);
if (rimEclipseFaultColors) showPerFaceResultsFirst = true;
QList<caf::PdmOptionItemInfo> optionItems = calculateValueOptionsForSpecifiedDerivedListPosition(showPerFaceResultsFirst, fieldNeedingOptions, useOptionsOnly);
RimWellLogCurve* curve = NULL;
this->firstAnchestorOrThisOfType(curve);
this->firstAncestorOrThisOfType(curve);
RimEclipsePropertyFilter* propFilter = NULL;
this->firstAnchestorOrThisOfType(propFilter);
this->firstAncestorOrThisOfType(propFilter);
RimCellEdgeColors* cellEdge = NULL;
this->firstAnchestorOrThisOfType(cellEdge);
this->firstAncestorOrThisOfType(cellEdge);
if (propFilter || curve || cellEdge)
{

View File

@@ -70,7 +70,7 @@ void RimFault::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const Q
{
RimEclipseView* reservoirView = NULL;
this->firstAnchestorOrThisOfType(reservoirView);
this->firstAncestorOrThisOfType(reservoirView);
if (reservoirView)
{

View File

@@ -52,7 +52,7 @@ RimGeoMechCellColors::~RimGeoMechCellColors(void)
void RimGeoMechCellColors::updateIconState()
{
RimView* rimView = NULL;
this->firstAnchestorOrThisOfType(rimView);
this->firstAncestorOrThisOfType(rimView);
CVF_ASSERT(rimView);
RimViewController* viewController = rimView->viewController();

View File

@@ -184,7 +184,7 @@ void RimGeoMechPropertyFilter::updateReadOnlyStateOfAllFields()
bool RimGeoMechPropertyFilter::isPropertyFilterControlled()
{
RimView* rimView = NULL;
firstAnchestorOrThisOfType(rimView);
firstAncestorOrThisOfType(rimView);
CVF_ASSERT(rimView);
bool isPropertyFilterControlled = false;

View File

@@ -56,7 +56,7 @@ RimGeoMechPropertyFilterCollection::~RimGeoMechPropertyFilterCollection()
RimGeoMechView* RimGeoMechPropertyFilterCollection::reservoirView()
{
RimGeoMechView* geoMechView = NULL;
firstAnchestorOrThisOfType(geoMechView);
firstAncestorOrThisOfType(geoMechView);
return geoMechView;
}
@@ -126,7 +126,7 @@ void RimGeoMechPropertyFilterCollection::updateIconState()
bool activeIcon = true;
RimGeoMechView* view = NULL;
this->firstAnchestorOrThisOfType(view);
this->firstAncestorOrThisOfType(view);
RimViewController* viewController = view->viewController();
if (viewController && ( viewController->isPropertyFilterOveridden()
|| viewController->isVisibleCellsOveridden()))

View File

@@ -149,9 +149,9 @@ void RimGeoMechResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
// Get the possible property filter owner
RimGeoMechPropertyFilter* propFilter = dynamic_cast<RimGeoMechPropertyFilter*>(this->parentField()->ownerObject());
RimView* view = NULL;
this->firstAnchestorOrThisOfType(view);
this->firstAncestorOrThisOfType(view);
RimWellLogCurve* curve = NULL;
this->firstAnchestorOrThisOfType(curve);
this->firstAncestorOrThisOfType(curve);
if (&m_resultVariableUiField == changedField)

View File

@@ -58,7 +58,7 @@ void RimGridCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField
if (changedField == &isActive)
{
RimView* rimView = NULL;
this->firstAnchestorOrThisOfType(rimView);
this->firstAncestorOrThisOfType(rimView);
CVF_ASSERT(rimView);
rimView->showGridCells(isActive);

View File

@@ -774,11 +774,11 @@ QList<caf::PdmOptionItemInfo> RimLegendConfig::calculateValueOptions(const caf::
bool isCategoryResult = false;
{
RimEclipseCellColors* eclCellColors = nullptr;
this->firstAnchestorOrThisOfType(eclCellColors);
this->firstAncestorOrThisOfType(eclCellColors);
RimGeoMechCellColors* gmCellColors = nullptr;
this->firstAnchestorOrThisOfType(gmCellColors);
this->firstAncestorOrThisOfType(gmCellColors);
RimCellEdgeColors* eclCellEdgColors = nullptr;
this->firstAnchestorOrThisOfType(eclCellEdgColors);
this->firstAncestorOrThisOfType(eclCellEdgColors);
if ( ( eclCellColors && eclCellColors->hasCategoryResult())
|| ( gmCellColors && gmCellColors->hasCategoryResult())

View File

@@ -47,7 +47,7 @@ RimPropertyFilterCollection::~RimPropertyFilterCollection()
void RimPropertyFilterCollection::updateDisplayModelNotifyManagedViews() const
{
RimView* view = NULL;
this->firstAnchestorOrThisOfType(view);
this->firstAncestorOrThisOfType(view);
CVF_ASSERT(view);
view->scheduleGeometryRegen(PROPERTY_FILTERED);
@@ -83,7 +83,7 @@ void RimPropertyFilterCollection::defineUiTreeOrdering(caf::PdmUiTreeOrdering& u
PdmObject::defineUiTreeOrdering(uiTreeOrdering, uiConfigName);
RimView* rimView = NULL;
this->firstAnchestorOrThisOfType(rimView);
this->firstAncestorOrThisOfType(rimView);
RimViewController* viewController = rimView->viewController();
if (viewController && (viewController->isPropertyFilterOveridden()
|| viewController->isVisibleCellsOveridden()))

View File

@@ -1514,7 +1514,7 @@ double RimReservoirCellResultsStorage::darchysValue()
double darchy = 0.008527; // (ECLIPSE 100) (METRIC)
RimEclipseCase* rimCase = NULL;
this->firstAnchestorOrThisOfType(rimCase);
this->firstAncestorOrThisOfType(rimCase);
if (rimCase && rimCase->reservoirData())
{

View File

@@ -72,7 +72,7 @@ void RimSummaryCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
}
RimProject* proj = NULL;
this->firstAnchestorOrThisOfType(proj);
this->firstAncestorOrThisOfType(proj);
RimMainPlotCollection* mainPlotColl = proj->mainPlotCollection();
RimSummaryPlotCollection* summaryPlotColl = mainPlotColl->summaryPlotCollection();
@@ -124,7 +124,7 @@ void RimSummaryCase::updateAutoShortName()
if(m_useAutoShortName)
{
RimSummaryCaseCollection* summaryCaseCollection = NULL;
this->firstAnchestorOrThisOfType(summaryCaseCollection);
this->firstAncestorOrThisOfType(summaryCaseCollection);
CVF_ASSERT(summaryCaseCollection);
m_shortName = summaryCaseCollection->uniqueShortNameForCase(this);

View File

@@ -53,7 +53,7 @@ RimSummaryCaseCollection::~RimSummaryCaseCollection()
void RimSummaryCaseCollection::createSummaryCasesFromRelevantEclipseResultCases()
{
RimProject* proj = nullptr;
firstAnchestorOrThisOfType(proj);
firstAncestorOrThisOfType(proj);
if (proj)
{
std::vector<RimCase*> all3DCases;

View File

@@ -321,7 +321,7 @@ QString RimSummaryCurve::createCurveAutoName()
void RimSummaryCurve::updateZoomInParentPlot()
{
RimSummaryPlot* plot = nullptr;
firstAnchestorOrThisOfType(plot);
firstAncestorOrThisOfType(plot);
plot->updateZoom();
}
@@ -407,13 +407,13 @@ void RimSummaryCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
this->loadDataAndUpdate();
RimSummaryPlot* plot = nullptr;
firstAnchestorOrThisOfType(plot);
firstAncestorOrThisOfType(plot);
plot->updateYAxisUnit();
}
else if (&m_showCurve == changedField)
{
RimSummaryPlot* plot = nullptr;
firstAnchestorOrThisOfType(plot);
firstAncestorOrThisOfType(plot);
plot->updateYAxisUnit();
}
else if (changedField == &m_addCaseNameToCurveName)

View File

@@ -233,7 +233,7 @@ void RimSummaryCurveFilter::fieldChangedByUi(const caf::PdmFieldHandle* changedF
m_applyButtonField = false;
RimSummaryPlot* plot = nullptr;
firstAnchestorOrThisOfType(plot);
firstAncestorOrThisOfType(plot);
plot->updateYAxisUnit();
}
}

View File

@@ -108,14 +108,14 @@ QList<caf::PdmOptionItemInfo> RimViewController::calculateValueOptions(const caf
}
RimViewLinker* linkedViews = NULL;
this->firstAnchestorOrThisOfType(linkedViews);
this->firstAncestorOrThisOfType(linkedViews);
for (size_t i = 0; i< views.size(); i++)
{
if (views[i] != linkedViews->masterView())
{
RimCase* rimCase = NULL;
views[i]->firstAnchestorOrThisOfType(rimCase);
views[i]->firstAncestorOrThisOfType(rimCase);
QIcon icon;
if (rimCase)
{
@@ -351,7 +351,7 @@ void RimViewController::removeOverrides(RimView* view)
void RimViewController::updateOptionSensitivity()
{
RimViewLinker* linkedViews = NULL;
firstAnchestorOrThisOfType(linkedViews);
firstAncestorOrThisOfType(linkedViews);
CVF_ASSERT(linkedViews);
RimView* mainView = linkedViews->masterView();
@@ -504,7 +504,7 @@ void RimViewController::updateResultColorsControl()
RimViewLinker* RimViewController::ownerViewLinker()
{
RimViewLinker* viewLinker = NULL;
this->firstAnchestorOrThisOfType(viewLinker);
this->firstAncestorOrThisOfType(viewLinker);
return viewLinker;
}

View File

@@ -275,7 +275,7 @@ QString RimViewLinker::displayNameForView(RimView* view)
if (view)
{
RimCase* rimCase = NULL;
view->firstAnchestorOrThisOfType(rimCase);
view->firstAncestorOrThisOfType(rimCase);
displayName = rimCase->caseUserDescription() + ": " + view->name;
}
@@ -370,7 +370,7 @@ void RimViewLinker::updateScaleZ(RimView* sourceView, double scaleZ)
bool RimViewLinker::isActive()
{
RimViewLinkerCollection* viewLinkerCollection = NULL;
this->firstAnchestorOrThisOfType(viewLinkerCollection);
this->firstAncestorOrThisOfType(viewLinkerCollection);
if (!viewLinkerCollection)
{
@@ -446,7 +446,7 @@ void RimViewLinker::findNameAndIconFromView(QString* name, QIcon* icon, RimView*
if (view)
{
RimCase* rimCase = NULL;
view->firstAnchestorOrThisOfType(rimCase);
view->firstAncestorOrThisOfType(rimCase);
if (dynamic_cast<RimGeoMechCase*>(rimCase))
{

View File

@@ -109,7 +109,7 @@ bool RimWellLogCurve::valueRange(double* minimumValue, double* maximumValue) con
void RimWellLogCurve::updateZoomInParentPlot()
{
RimWellLogPlot* wellLogPlot;
firstAnchestorOrThisOfType(wellLogPlot);
firstAncestorOrThisOfType(wellLogPlot);
if (wellLogPlot)
{
wellLogPlot->calculateAvailableDepthRange();
@@ -117,7 +117,7 @@ void RimWellLogCurve::updateZoomInParentPlot()
}
RimWellLogTrack* plotTrack;
firstAnchestorOrThisOfType(plotTrack);
firstAncestorOrThisOfType(plotTrack);
if (plotTrack)
{
plotTrack->updateXZoomAndParentPlotDepthZoom();

View File

@@ -204,7 +204,7 @@ void RimWellLogExtractionCurve::onLoadDataAndUpdate()
m_geomResultDefinition->setGeoMechCase(geomCase);
RimWellLogPlotCollection* wellLogCollection = NULL;
this->firstAnchestorOrThisOfType(wellLogCollection);
this->firstAncestorOrThisOfType(wellLogCollection);
CVF_ASSERT(wellLogCollection);
cvf::ref<RigEclipseWellLogExtractor> eclExtractor = wellLogCollection->findOrCreateExtractor(m_wellPath, eclipseCase);
@@ -269,7 +269,7 @@ void RimWellLogExtractionCurve::onLoadDataAndUpdate()
RimDefines::DepthUnitType displayUnit = RimDefines::UNIT_METER;
RimWellLogPlot* wellLogPlot;
firstAnchestorOrThisOfType(wellLogPlot);
firstAncestorOrThisOfType(wellLogPlot);
CVF_ASSERT(wellLogPlot);
displayUnit = wellLogPlot->depthUnit();
@@ -442,7 +442,7 @@ void RimWellLogExtractionCurve::setLogScaleFromSelectedResult()
if (resVar.toUpper().contains("PERM"))
{
RimWellLogTrack* track = NULL;
this->firstAnchestorOrThisOfType(track);
this->firstAncestorOrThisOfType(track);
if (track)
{
if (track->curveCount() == 1)

View File

@@ -143,7 +143,7 @@ bool RimWellLogFile::readFile(QString* errorMessage)
}
RimWellPath* wellPath;
firstAnchestorOrThisOfType(wellPath);
firstAncestorOrThisOfType(wellPath);
if (wellPath)
{
if (wellPath->filepath().isEmpty())

View File

@@ -77,7 +77,7 @@ void RimWellLogFileCurve::onLoadDataAndUpdate()
m_curveData = new RigWellLogCurveData;
RimWellLogPlot* wellLogPlot;
firstAnchestorOrThisOfType(wellLogPlot);
firstAncestorOrThisOfType(wellLogPlot);
CVF_ASSERT(wellLogPlot);
if (wellLogPlot->depthType() == RimWellLogPlot::TRUE_VERTICAL_DEPTH)
@@ -267,7 +267,7 @@ QString RimWellLogFileCurve::createCurveAutoName()
if (wellLogFile)
{
RimWellLogPlot* wellLogPlot;
firstAnchestorOrThisOfType(wellLogPlot);
firstAncestorOrThisOfType(wellLogPlot);
CVF_ASSERT(wellLogPlot);
QString unitName = wellLogFile->wellLogChannelUnitString(m_wellLogChannnelName, wellLogPlot->depthUnit());

View File

@@ -248,7 +248,7 @@ void RimWellLogPlot::moveTracks(RimWellLogTrack* insertAfterTrack, const std::ve
RimWellLogTrack* track = tracksToMove[tIdx];
RimWellLogPlot* wellLogPlot;
track->firstAnchestorOrThisOfType(wellLogPlot);
track->firstAncestorOrThisOfType(wellLogPlot);
if (wellLogPlot)
{
wellLogPlot->removeTrack(track);

View File

@@ -96,7 +96,7 @@ void RimWellLogTrack::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
}
RimWellLogPlot* wellLogPlot;
this->firstAnchestorOrThisOfType(wellLogPlot);
this->firstAncestorOrThisOfType(wellLogPlot);
if (wellLogPlot)
{
wellLogPlot->calculateAvailableDepthRange();
@@ -239,7 +239,7 @@ void RimWellLogTrack::loadDataAndUpdate()
CVF_ASSERT(m_wellLogTrackPlotWidget);
RimWellLogPlot* wellLogPlot;
firstAnchestorOrThisOfType(wellLogPlot);
firstAncestorOrThisOfType(wellLogPlot);
if (wellLogPlot)
{
m_wellLogTrackPlotWidget->setDepthTitle(wellLogPlot->depthPlotTitle());
@@ -287,7 +287,7 @@ void RimWellLogTrack::updateXZoomAndParentPlotDepthZoom()
if (m_wellLogTrackPlotWidget)
{
RimWellLogPlot* wellLogPlot;
firstAnchestorOrThisOfType(wellLogPlot);
firstAncestorOrThisOfType(wellLogPlot);
if (wellLogPlot)
{
wellLogPlot->updateDepthZoom();

View File

@@ -105,7 +105,7 @@ RimWellPath::~RimWellPath()
}
RimProject* project;
firstAnchestorOrThisOfType(project);
firstAncestorOrThisOfType(project);
if (project)
{
if (project->mainPlotCollection())
@@ -149,7 +149,7 @@ RivWellPathPartMgr* RimWellPath::partMgr()
if (m_wellPathPartMgr.isNull())
{
RimWellPathCollection* wpColl;
this->firstAnchestorOrThisOfType(wpColl);
this->firstAncestorOrThisOfType(wpColl);
if (wpColl) m_wellPathPartMgr = new RivWellPathPartMgr(this);
}
@@ -164,7 +164,7 @@ void RimWellPath::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
partMgr()->scheduleGeometryRegen();
RimProject* proj;
this->firstAnchestorOrThisOfType(proj);
this->firstAncestorOrThisOfType(proj);
if (proj) proj->createDisplayModelAndRedrawAllViews();
}

View File

@@ -303,7 +303,7 @@ void RimWellPathCollection::scheduleGeometryRegenAndRedrawViews()
{
m_wellPathCollectionPartManager->scheduleGeometryRegen();
RimProject* proj;
this->firstAnchestorOrThisOfType(proj);
this->firstAncestorOrThisOfType(proj);
if (proj) proj->createDisplayModelAndRedrawAllViews();
}