#3312 Well Path Creation update preparations. Rename of method

This commit is contained in:
Jacob Støren 2018-09-11 12:41:45 +02:00
parent 63354c7fd0
commit 3d752995d2
25 changed files with 31 additions and 32 deletions

View File

@ -78,7 +78,7 @@ void RicWellPathImportCompletionsFileFeature::onActionTriggered(bool isChecked)
if (app->project()) if (app->project())
{ {
app->project()->createDisplayModelAndRedrawAllViews(); app->project()->scheduleCreateDisplayModelAndRedrawAllViews();
} }
} }

View File

@ -101,7 +101,7 @@ void RicWellPathImportPerforationIntervalsFeature::onActionTriggered(bool isChec
if (app->project()) if (app->project())
{ {
app->project()->createDisplayModelAndRedrawAllViews(); app->project()->scheduleCreateDisplayModelAndRedrawAllViews();
} }
if (lastPerforationInterval) if (lastPerforationInterval)

View File

@ -160,7 +160,7 @@ void RicDeleteItemExec::redo()
parentObj->firstAncestorOrThisOfType(proj); parentObj->firstAncestorOrThisOfType(proj);
if (proj) if (proj)
{ {
proj->createDisplayModelAndRedrawAllViews(); proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
std::vector<Rim3dView*> views; std::vector<Rim3dView*> views;

View File

@ -65,7 +65,7 @@ void RicAdd3dWellLogCurveFeature::onActionTriggered(bool isChecked)
selectedWellPath->add3dWellLogCurve(rim3dWellLogExtractionCurve); selectedWellPath->add3dWellLogCurve(rim3dWellLogExtractionCurve);
RiaApplication::instance()->project()->createDisplayModelAndRedrawAllViews(); RiaApplication::instance()->project()->scheduleCreateDisplayModelAndRedrawAllViews();
RiaApplication::instance()->project()->updateConnectedEditors(); RiaApplication::instance()->project()->updateConnectedEditors();

View File

@ -57,7 +57,7 @@ void RicAdd3dWellLogFileCurveFeature::onActionTriggered(bool isChecked)
rim3dWellLogFileCurve->setDefaultFileCurveDataInfo(); rim3dWellLogFileCurve->setDefaultFileCurveDataInfo();
RiaApplication::instance()->project()->createDisplayModelAndRedrawAllViews(); RiaApplication::instance()->project()->scheduleCreateDisplayModelAndRedrawAllViews();
RiaApplication::instance()->project()->updateConnectedEditors(); RiaApplication::instance()->project()->updateConnectedEditors();
Riu3DMainWindowTools::selectAsCurrentItem(rim3dWellLogFileCurve); Riu3DMainWindowTools::selectAsCurrentItem(rim3dWellLogFileCurve);

View File

@ -62,7 +62,7 @@ void RicAdd3dWellLogRftCurveFeature::onActionTriggered(bool isChecked)
Rim3dWellLogRftCurve* rim3dWellLogRftCurve = new Rim3dWellLogRftCurve(); Rim3dWellLogRftCurve* rim3dWellLogRftCurve = new Rim3dWellLogRftCurve();
selectedWellPath->add3dWellLogCurve(rim3dWellLogRftCurve); selectedWellPath->add3dWellLogCurve(rim3dWellLogRftCurve);
RiaApplication::instance()->project()->createDisplayModelAndRedrawAllViews(); RiaApplication::instance()->project()->scheduleCreateDisplayModelAndRedrawAllViews();
RiaApplication::instance()->project()->updateConnectedEditors(); RiaApplication::instance()->project()->updateConnectedEditors();
Riu3DMainWindowTools::selectAsCurrentItem(rim3dWellLogRftCurve); Riu3DMainWindowTools::selectAsCurrentItem(rim3dWellLogRftCurve);

View File

@ -81,7 +81,7 @@ void RicNewEditableWellPathFeature::onActionTriggered(bool isChecked)
RimProject* project; RimProject* project;
wellPathCollection->firstAncestorOrThisOfTypeAsserted(project); wellPathCollection->firstAncestorOrThisOfTypeAsserted(project);
project->createDisplayModelAndRedrawAllViews(); project->scheduleCreateDisplayModelAndRedrawAllViews();
Riu3DMainWindowTools::selectAsCurrentItem(newModeledWellPath->geometryDefinition()); Riu3DMainWindowTools::selectAsCurrentItem(newModeledWellPath->geometryDefinition());
} }

View File

@ -65,7 +65,7 @@ void RicWellPathFormationsImportFileFeature::onActionTriggered(bool isChecked)
if (project) if (project)
{ {
project->createDisplayModelAndRedrawAllViews(); project->scheduleCreateDisplayModelAndRedrawAllViews();
if (project->mainPlotCollection()) if (project->mainPlotCollection())
{ {
project->mainPlotCollection->updatePlotsWithFormations(); project->mainPlotCollection->updatePlotsWithFormations();

View File

@ -63,7 +63,7 @@ void RicWellPathsImportFileFeature::onActionTriggered(bool isChecked)
if (project) if (project)
{ {
project->createDisplayModelAndRedrawAllViews(); project->scheduleCreateDisplayModelAndRedrawAllViews();
RimOilField* oilField = project->activeOilField(); RimOilField* oilField = project->activeOilField();
if (!oilField) return; if (!oilField) return;

View File

@ -100,7 +100,7 @@ void RicWellPathsImportSsihubFeature::onActionTriggered(bool isChecked)
if (wellPaths.size() > 0) if (wellPaths.size() > 0)
{ {
app->addWellPathsToModel(wellPaths); app->addWellPathsToModel(wellPaths);
app->project()->createDisplayModelAndRedrawAllViews(); app->project()->scheduleCreateDisplayModelAndRedrawAllViews();
} }
app->setCacheDataObject("ssihub_username", wellImportwizard.field("username")); app->setCacheDataObject("ssihub_username", wellImportwizard.field("username"));

View File

@ -139,7 +139,7 @@ void Rim3dWellLogCurveCollection::redrawAffectedViewsAndEditors()
this->firstAncestorOrThisOfType(proj); this->firstAncestorOrThisOfType(proj);
if (proj) if (proj)
{ {
proj->createDisplayModelAndRedrawAllViews(); proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
RimWellPath* path = nullptr; RimWellPath* path = nullptr;
this->firstAncestorOrThisOfType(path); this->firstAncestorOrThisOfType(path);
@ -186,7 +186,7 @@ void Rim3dWellLogCurveCollection::fieldChangedByUi(const caf::PdmFieldHandle* ch
{ {
RimProject* proj; RimProject* proj;
this->firstAncestorOrThisOfTypeAsserted(proj); this->firstAncestorOrThisOfTypeAsserted(proj);
proj->createDisplayModelAndRedrawAllViews(); proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

View File

@ -77,7 +77,7 @@ void RimFishboneWellPath::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
{ {
RimProject* proj; RimProject* proj;
this->firstAncestorOrThisOfType(proj); this->firstAncestorOrThisOfType(proj);
if (proj) proj->createDisplayModelAndRedrawAllViews(); if (proj) proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

View File

@ -90,7 +90,7 @@ void RimFishboneWellPathCollection::fieldChangedByUi(const caf::PdmFieldHandle*
{ {
RimProject* proj; RimProject* proj;
this->firstAncestorOrThisOfTypeAsserted(proj); this->firstAncestorOrThisOfTypeAsserted(proj);
proj->createDisplayModelAndRedrawAllViews(); proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

View File

@ -102,7 +102,7 @@ void RimFishbonesCollection::fieldChangedByUi(const caf::PdmFieldHandle* changed
} }
else else
{ {
proj->createDisplayModelAndRedrawAllViews(); proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
} }

View File

@ -734,7 +734,7 @@ void RimFractureTemplate::disconnectAllFracturesAndRedrawViews() const
this->firstAncestorOrThisOfType(proj); this->firstAncestorOrThisOfType(proj);
if (proj) if (proj)
{ {
proj->createDisplayModelAndRedrawAllViews(); proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
} }

View File

@ -70,7 +70,7 @@ void RimPerforationCollection::fieldChangedByUi(const caf::PdmFieldHandle* chang
} }
else else
{ {
proj->createDisplayModelAndRedrawAllViews(); proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
} }

View File

@ -208,7 +208,7 @@ void RimSimWellFracture::updateFracturePositionFromLocation()
RimProject* proj; RimProject* proj;
this->firstAncestorOrThisOfType(proj); this->firstAncestorOrThisOfType(proj);
if (proj) proj->createDisplayModelAndRedrawAllViews(); if (proj) proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
} }

View File

@ -133,7 +133,7 @@ void RimStimPlanFractureTemplate::fieldChangedByUi(const caf::PdmFieldHandle* ch
fracture->setStimPlanTimeIndexToPlot(m_activeTimeStepIndex); fracture->setStimPlanTimeIndexToPlot(m_activeTimeStepIndex);
} }
} }
proj->createDisplayModelAndRedrawAllViews(); proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
} }
@ -147,7 +147,7 @@ void RimStimPlanFractureTemplate::fieldChangedByUi(const caf::PdmFieldHandle* ch
this->firstAncestorOrThisOfType(proj); this->firstAncestorOrThisOfType(proj);
if (proj) if (proj)
{ {
proj->createDisplayModelAndRedrawAllViews(); proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
} }
@ -693,8 +693,7 @@ void RimStimPlanFractureTemplate::reload()
this->firstAncestorOrThisOfType(proj); this->firstAncestorOrThisOfType(proj);
if (proj) if (proj)
{ {
proj->createDisplayModelAndRedrawAllViews(); proj->scheduleCreateDisplayModelAndRedrawAllViews();
RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews(); RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews();
} }
} }

View File

@ -173,6 +173,6 @@ void RimWellPathFractureCollection::fieldChangedByUi(const caf::PdmFieldHandle*
} }
else else
{ {
proj->createDisplayModelAndRedrawAllViews(); proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
} }

View File

@ -86,7 +86,7 @@ void Rim3dWellLogCurve::updateCurveIn3dView()
{ {
RimProject* proj; RimProject* proj;
this->firstAncestorOrThisOfTypeAsserted(proj); this->firstAncestorOrThisOfTypeAsserted(proj);
proj->createDisplayModelAndRedrawAllViews(); proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -211,7 +211,7 @@ void Rim3dWellLogCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField
} }
else else
{ {
proj->createDisplayModelAndRedrawAllViews(); proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
} }

View File

@ -69,7 +69,7 @@ void RimModeledWellPath::updateWellPathVisualization()
this->setWellPathGeometry(m_geometryDefinition->createWellPathGeometry().p()); this->setWellPathGeometry(m_geometryDefinition->createWellPathGeometry().p());
RimProject* proj; RimProject* proj;
this->firstAncestorOrThisOfTypeAsserted(proj); this->firstAncestorOrThisOfTypeAsserted(proj);
proj->createDisplayModelAndRedrawAllViews(); proj->scheduleCreateDisplayModelAndRedrawAllViews();
std::vector<RimPlotCurve*> refferingCurves; std::vector<RimPlotCurve*> refferingCurves;
this->objectsWithReferringPtrFieldsOfType(refferingCurves); this->objectsWithReferringPtrFieldsOfType(refferingCurves);

View File

@ -718,7 +718,7 @@ void RimProject::allVisibleGridViews(std::vector<RimGridView*>& views)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimProject::createDisplayModelAndRedrawAllViews() void RimProject::scheduleCreateDisplayModelAndRedrawAllViews()
{ {
std::vector<RimCase*> cases; std::vector<RimCase*> cases;
allCases(cases); allCases(cases);
@ -846,7 +846,7 @@ bool RimProject::showPlotWindow() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimProject::reloadCompletionTypeResultsInAllViews() void RimProject::reloadCompletionTypeResultsInAllViews()
{ {
createDisplayModelAndRedrawAllViews(); scheduleCreateDisplayModelAndRedrawAllViews();
RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews(); RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews();
} }

View File

@ -116,7 +116,7 @@ public:
void allVisibleGridViews(std::vector<RimGridView*>& views); void allVisibleGridViews(std::vector<RimGridView*>& views);
void allNotLinkedViews(std::vector<RimGridView*>& views); void allNotLinkedViews(std::vector<RimGridView*>& views);
void createDisplayModelAndRedrawAllViews(); void scheduleCreateDisplayModelAndRedrawAllViews();
void computeUtmAreaOfInterest(); void computeUtmAreaOfInterest();

View File

@ -208,7 +208,7 @@ void RimStimPlanColors::fieldChangedByUi(const caf::PdmFieldHandle* changedField
this->firstAncestorOrThisOfType(proj); this->firstAncestorOrThisOfType(proj);
if (proj) if (proj)
{ {
proj->createDisplayModelAndRedrawAllViews(); proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
} }
@ -314,7 +314,7 @@ void RimStimPlanColors::updateStimPlanTemplates() const
{ {
stimPlanFracTemplate->updateFractureGrid(); stimPlanFracTemplate->updateFractureGrid();
} }
proj->createDisplayModelAndRedrawAllViews(); proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
} }

View File

@ -287,7 +287,7 @@ void RimWellPath::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
} }
else else
{ {
proj->createDisplayModelAndRedrawAllViews(); proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
} }