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

Fix of missing changes from previous merge commits. Missing rename of anchestor to ancestor

Browse Source
This commit is contained in:
Jacob Støren 2016-09-28 14:35:57 +02:00
parent cbb626aa31
commit 3bca03a722
10 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/IntersectionBoxCommands/RicAppendIntersectionBoxFeature.cpp
View File

@ -64,7 +64,7 @@ void RicAppendIntersectionBoxFeature::onActionTriggered(bool isChecked)
RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox); RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox);
RimView* rimView = NULL; RimView* rimView = NULL;
coll->firstAnchestorOrThisOfType(rimView); coll->firstAncestorOrThisOfType(rimView);
if (rimView) if (rimView)
{ {
rimView->showGridCells(false); rimView->showGridCells(false);
@ -93,7 +93,7 @@ RimIntersectionBoxCollection* RicAppendIntersectionBoxFeature::intersectionBoxCo
caf::SelectionManager::instance()->objectsByType(&selectedObjects); caf::SelectionManager::instance()->objectsByType(&selectedObjects);
if (selectedObjects.size() == 1) if (selectedObjects.size() == 1)
{ {
selectedObjects[0]->firstAnchestorOrThisOfType(intersectionBoxColl); selectedObjects[0]->firstAncestorOrThisOfType(intersectionBoxColl);
} }
return intersectionBoxColl; return intersectionBoxColl;

2
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxXSliceFeature.cpp
View File

@ -68,7 +68,7 @@ void RicIntersectionBoxXSliceFeature::onActionTriggered(bool isChecked)
RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox); RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox);
RimView* rimView = NULL; RimView* rimView = NULL;
coll->firstAnchestorOrThisOfType(rimView); coll->firstAncestorOrThisOfType(rimView);
if (rimView) if (rimView)
{ {
rimView->showGridCells(false); rimView->showGridCells(false);

2
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxYSliceFeature.cpp
View File

@ -68,7 +68,7 @@ void RicIntersectionBoxYSliceFeature::onActionTriggered(bool isChecked)
RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox); RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox);
RimView* rimView = NULL; RimView* rimView = NULL;
coll->firstAnchestorOrThisOfType(rimView); coll->firstAncestorOrThisOfType(rimView);
if (rimView) if (rimView)
{ {
rimView->showGridCells(false); rimView->showGridCells(false);

2
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxZSliceFeature.cpp
View File

@ -67,7 +67,7 @@ void RicIntersectionBoxZSliceFeature::onActionTriggered(bool isChecked)
RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox); RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox);
RimView* rimView = NULL; RimView* rimView = NULL;
coll->firstAnchestorOrThisOfType(rimView); coll->firstAncestorOrThisOfType(rimView);
if (rimView) if (rimView)
{ {
rimView->showGridCells(false); rimView->showGridCells(false);

2
ApplicationCode/Commands/RicDeleteItemExec.cpp
View File

@ -112,7 +112,7 @@ void RicDeleteItemExec::redo()
} }
RimIntersectionBoxCollection* intersectionBoxColl; RimIntersectionBoxCollection* intersectionBoxColl;
parentObj->firstAnchestorOrThisOfType(intersectionBoxColl); parentObj->firstAncestorOrThisOfType(intersectionBoxColl);
if (view && intersectionBoxColl) if (view && intersectionBoxColl)
{ {
view->scheduleCreateDisplayModelAndRedraw(); view->scheduleCreateDisplayModelAndRedraw();

8
ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp
View File

@ -85,7 +85,7 @@ void RivIntersectionBoxPartMgr::updateCellResultColor(size_t timeStepIndex)
if (!m_intersectionBoxGenerator->isAnyGeometryPresent()) return; if (!m_intersectionBoxGenerator->isAnyGeometryPresent()) return;
RimEclipseView* eclipseView; RimEclipseView* eclipseView;
m_rimIntersectionBox->firstAnchestorOrThisOfType(eclipseView); m_rimIntersectionBox->firstAncestorOrThisOfType(eclipseView);
if (eclipseView) if (eclipseView)
{ {
@ -148,7 +148,7 @@ void RivIntersectionBoxPartMgr::updateCellResultColor(size_t timeStepIndex)
} }
RimGeoMechView* geoView; RimGeoMechView* geoView;
m_rimIntersectionBox->firstAnchestorOrThisOfType(geoView); m_rimIntersectionBox->firstAncestorOrThisOfType(geoView);
if (geoView) if (geoView)
{ {
@ -405,7 +405,7 @@ cvf::ref<RivIntersectionHexGridInterface> RivIntersectionBoxPartMgr::createHexGr
{ {
RimEclipseView* eclipseView; RimEclipseView* eclipseView;
m_rimIntersectionBox->firstAnchestorOrThisOfType(eclipseView); m_rimIntersectionBox->firstAncestorOrThisOfType(eclipseView);
if (eclipseView) if (eclipseView)
{ {
RigMainGrid* grid = NULL; RigMainGrid* grid = NULL;
@ -416,7 +416,7 @@ cvf::ref<RivIntersectionHexGridInterface> RivIntersectionBoxPartMgr::createHexGr
} }
RimGeoMechView* geoView; RimGeoMechView* geoView;
m_rimIntersectionBox->firstAnchestorOrThisOfType(geoView); m_rimIntersectionBox->firstAncestorOrThisOfType(geoView);
if (geoView) if (geoView)
{ {
RigFemPart* femPart = geoView->geoMechCase()->geoMechData()->femParts()->part(0); RigFemPart* femPart = geoView->geoMechCase()->geoMechData()->femParts()->part(0);

6
ApplicationCode/ProjectDataModel/RimIntersectionBox.cpp
View File

@ -329,7 +329,7 @@ void RimIntersectionBox::rebuildGeometryAndScheduleCreateDisplayModel()
m_intersectionBoxPartMgr = nullptr; m_intersectionBoxPartMgr = nullptr;
RimView* rimView = NULL; RimView* rimView = NULL;
this->firstAnchestorOrThisOfType(rimView); this->firstAncestorOrThisOfType(rimView);
if (rimView) if (rimView)
{ {
rimView->scheduleCreateDisplayModelAndRedraw(); rimView->scheduleCreateDisplayModelAndRedraw();
@ -384,12 +384,12 @@ void RimIntersectionBox::clampSinglePlaneValues()
cvf::BoundingBox RimIntersectionBox::currentCellBoundingBox() cvf::BoundingBox RimIntersectionBox::currentCellBoundingBox()
{ {
RimCase* rimCase = NULL; RimCase* rimCase = NULL;
this->firstAnchestorOrThisOfType(rimCase); this->firstAncestorOrThisOfType(rimCase);
CVF_ASSERT(rimCase); CVF_ASSERT(rimCase);
RimEclipseView* eclView = nullptr; RimEclipseView* eclView = nullptr;
this->firstAnchestorOrThisOfType(eclView); this->firstAncestorOrThisOfType(eclView);
bool useAllCells = true; bool useAllCells = true;
if (eclView) if (eclView)

2
ApplicationCode/ProjectDataModel/RimIntersectionBoxCollection.cpp
View File

@ -129,7 +129,7 @@ void RimIntersectionBoxCollection::fieldChangedByUi(const caf::PdmFieldHandle* c
if (changedField == &isActive) if (changedField == &isActive)
{ {
RimView* rimView = NULL; RimView* rimView = NULL;
firstAnchestorOrThisOfType(rimView); firstAncestorOrThisOfType(rimView);
if (rimView) if (rimView)
{ {
rimView->scheduleCreateDisplayModelAndRedraw(); rimView->scheduleCreateDisplayModelAndRedraw();

2
ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp
View File

@ -109,7 +109,7 @@ void RimMainPlotCollection::showPlotWindow()
dockWidget->setWidget(projPropView); dockWidget->setWidget(projPropView);
RimProject* proj = NULL; RimProject* proj = NULL;
this->firstAnchestorOrThisOfType(proj); this->firstAncestorOrThisOfType(proj);
projPropView->setPdmItem(this); projPropView->setPdmItem(this);

2
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -158,7 +158,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
CVF_ASSERT(activeView); CVF_ASSERT(activeView);
RimCase* rimCase = NULL; RimCase* rimCase = NULL;
activeView->firstAnchestorOrThisOfType(rimCase); activeView->firstAncestorOrThisOfType(rimCase);
if (rimCase) if (rimCase)
{ {
displayModelOffset = rimCase->displayModelOffset(); displayModelOffset = rimCase->displayModelOffset();