#3312 Well Path Creation update preparations. Rename of method

2025-02-25 18:55:39 -06:00 · 2018-09-11 12:41:45 +02:00 · 2018-09-11 12:41:45 +02:00 · 3d752995d2
commit 3d752995d2
parent 63354c7fd0
25 changed files with 31 additions and 32 deletions
--- a/ApplicationCode/Commands/CompletionCommands/RicWellPathImportCompletionsFileFeature.cpp
+++ b/ApplicationCode/Commands/CompletionCommands/RicWellPathImportCompletionsFileFeature.cpp
@ -78,7 +78,7 @@ void RicWellPathImportCompletionsFileFeature::onActionTriggered(bool isChecked)

    if (app->project())
    {
-        app->project()->createDisplayModelAndRedrawAllViews();
+        app->project()->scheduleCreateDisplayModelAndRedrawAllViews();
    }
 }

--- a/ApplicationCode/Commands/CompletionCommands/RicWellPathImportPerforationIntervalsFeature.cpp
+++ b/ApplicationCode/Commands/CompletionCommands/RicWellPathImportPerforationIntervalsFeature.cpp
@ -101,7 +101,7 @@ void RicWellPathImportPerforationIntervalsFeature::onActionTriggered(bool isChec

    if (app->project())
    {
-        app->project()->createDisplayModelAndRedrawAllViews();
+        app->project()->scheduleCreateDisplayModelAndRedrawAllViews();
    }

    if (lastPerforationInterval)
--- a/ApplicationCode/Commands/RicDeleteItemExec.cpp
+++ b/ApplicationCode/Commands/RicDeleteItemExec.cpp
@ -160,7 +160,7 @@ void RicDeleteItemExec::redo()
            parentObj->firstAncestorOrThisOfType(proj);
            if (proj)
            {
-                proj->createDisplayModelAndRedrawAllViews();
+                proj->scheduleCreateDisplayModelAndRedrawAllViews();
            }

            std::vector<Rim3dView*> views;
--- a/ApplicationCode/Commands/WellLogCommands/RicAdd3dWellLogCurveFeature.cpp
+++ b/ApplicationCode/Commands/WellLogCommands/RicAdd3dWellLogCurveFeature.cpp
@ -65,7 +65,7 @@ void RicAdd3dWellLogCurveFeature::onActionTriggered(bool isChecked)
    
    selectedWellPath->add3dWellLogCurve(rim3dWellLogExtractionCurve);
    
-    RiaApplication::instance()->project()->createDisplayModelAndRedrawAllViews();
+    RiaApplication::instance()->project()->scheduleCreateDisplayModelAndRedrawAllViews();

    RiaApplication::instance()->project()->updateConnectedEditors();

--- a/ApplicationCode/Commands/WellLogCommands/RicAdd3dWellLogFileCurveFeature.cpp
+++ b/ApplicationCode/Commands/WellLogCommands/RicAdd3dWellLogFileCurveFeature.cpp
@ -57,7 +57,7 @@ void RicAdd3dWellLogFileCurveFeature::onActionTriggered(bool isChecked)

    rim3dWellLogFileCurve->setDefaultFileCurveDataInfo();
    
-    RiaApplication::instance()->project()->createDisplayModelAndRedrawAllViews();
+    RiaApplication::instance()->project()->scheduleCreateDisplayModelAndRedrawAllViews();
    RiaApplication::instance()->project()->updateConnectedEditors();

    Riu3DMainWindowTools::selectAsCurrentItem(rim3dWellLogFileCurve);
--- a/ApplicationCode/Commands/WellLogCommands/RicAdd3dWellLogRftCurveFeature.cpp
+++ b/ApplicationCode/Commands/WellLogCommands/RicAdd3dWellLogRftCurveFeature.cpp
@ -62,7 +62,7 @@ void RicAdd3dWellLogRftCurveFeature::onActionTriggered(bool isChecked)
    Rim3dWellLogRftCurve* rim3dWellLogRftCurve = new Rim3dWellLogRftCurve();
    selectedWellPath->add3dWellLogCurve(rim3dWellLogRftCurve);

-    RiaApplication::instance()->project()->createDisplayModelAndRedrawAllViews();
+    RiaApplication::instance()->project()->scheduleCreateDisplayModelAndRedrawAllViews();
    RiaApplication::instance()->project()->updateConnectedEditors();

    Riu3DMainWindowTools::selectAsCurrentItem(rim3dWellLogRftCurve);
--- a/ApplicationCode/Commands/WellPathCommands/RicNewEditableWellPathFeature.cpp
+++ b/ApplicationCode/Commands/WellPathCommands/RicNewEditableWellPathFeature.cpp
@ -81,7 +81,7 @@ void RicNewEditableWellPathFeature::onActionTriggered(bool isChecked)

            RimProject* project;
            wellPathCollection->firstAncestorOrThisOfTypeAsserted(project);
-            project->createDisplayModelAndRedrawAllViews();
+            project->scheduleCreateDisplayModelAndRedrawAllViews();

            Riu3DMainWindowTools::selectAsCurrentItem(newModeledWellPath->geometryDefinition());
        }
--- a/ApplicationCode/Commands/WellPathCommands/RicWellPathFormationsImportFileFeature.cpp
+++ b/ApplicationCode/Commands/WellPathCommands/RicWellPathFormationsImportFileFeature.cpp
@ -65,7 +65,7 @@ void RicWellPathFormationsImportFileFeature::onActionTriggered(bool isChecked)

    if (project)
    {
-        project->createDisplayModelAndRedrawAllViews();
+        project->scheduleCreateDisplayModelAndRedrawAllViews();
        if (project->mainPlotCollection())
        {
            project->mainPlotCollection->updatePlotsWithFormations();
--- a/ApplicationCode/Commands/WellPathCommands/RicWellPathsImportFileFeature.cpp
+++ b/ApplicationCode/Commands/WellPathCommands/RicWellPathsImportFileFeature.cpp
@ -63,7 +63,7 @@ void RicWellPathsImportFileFeature::onActionTriggered(bool isChecked)

    if (project)
    {
-        project->createDisplayModelAndRedrawAllViews();
+        project->scheduleCreateDisplayModelAndRedrawAllViews();
        RimOilField* oilField = project->activeOilField();

        if (!oilField) return;
--- a/ApplicationCode/Commands/WellPathCommands/RicWellPathsImportSsihubFeature.cpp
+++ b/ApplicationCode/Commands/WellPathCommands/RicWellPathsImportSsihubFeature.cpp
@ -100,7 +100,7 @@ void RicWellPathsImportSsihubFeature::onActionTriggered(bool isChecked)
        if (wellPaths.size() > 0)
        {
            app->addWellPathsToModel(wellPaths);
-            app->project()->createDisplayModelAndRedrawAllViews();
+            app->project()->scheduleCreateDisplayModelAndRedrawAllViews();
        }

        app->setCacheDataObject("ssihub_username", wellImportwizard.field("username"));
--- a/ApplicationCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp
@ -139,7 +139,7 @@ void Rim3dWellLogCurveCollection::redrawAffectedViewsAndEditors()
    this->firstAncestorOrThisOfType(proj);
    if (proj)
    {
-        proj->createDisplayModelAndRedrawAllViews();
+        proj->scheduleCreateDisplayModelAndRedrawAllViews();
    }
    RimWellPath* path = nullptr;
    this->firstAncestorOrThisOfType(path);
@ -186,7 +186,7 @@ void Rim3dWellLogCurveCollection::fieldChangedByUi(const caf::PdmFieldHandle* ch
 {
    RimProject* proj;
    this->firstAncestorOrThisOfTypeAsserted(proj);
-    proj->createDisplayModelAndRedrawAllViews();
+    proj->scheduleCreateDisplayModelAndRedrawAllViews();
 }

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

 //--------------------------------------------------------------------------------------------------
--- a/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.cpp
@ -90,7 +90,7 @@ void RimFishboneWellPathCollection::fieldChangedByUi(const caf::PdmFieldHandle*
 {
    RimProject* proj;
    this->firstAncestorOrThisOfTypeAsserted(proj);
-    proj->createDisplayModelAndRedrawAllViews();
+    proj->scheduleCreateDisplayModelAndRedrawAllViews();
 }

 //--------------------------------------------------------------------------------------------------
--- a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp
@ -102,7 +102,7 @@ void RimFishbonesCollection::fieldChangedByUi(const caf::PdmFieldHandle* changed
    }
    else
    {
-        proj->createDisplayModelAndRedrawAllViews();
+        proj->scheduleCreateDisplayModelAndRedrawAllViews();
    }
 }

--- a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp
@ -734,7 +734,7 @@ void RimFractureTemplate::disconnectAllFracturesAndRedrawViews() const
    this->firstAncestorOrThisOfType(proj);
    if (proj)
    {
-        proj->createDisplayModelAndRedrawAllViews();
+        proj->scheduleCreateDisplayModelAndRedrawAllViews();
    }
 }

--- a/ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.cpp
@ -70,7 +70,7 @@ void RimPerforationCollection::fieldChangedByUi(const caf::PdmFieldHandle* chang
    }
    else
    {
-        proj->createDisplayModelAndRedrawAllViews();
+        proj->scheduleCreateDisplayModelAndRedrawAllViews();
    }
 }

--- a/ApplicationCode/ProjectDataModel/Completions/RimSimWellFracture.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimSimWellFracture.cpp
@ -208,7 +208,7 @@ void RimSimWellFracture::updateFracturePositionFromLocation()

        RimProject* proj;
        this->firstAncestorOrThisOfType(proj);
-        if (proj) proj->createDisplayModelAndRedrawAllViews();
+        if (proj) proj->scheduleCreateDisplayModelAndRedrawAllViews();
    }
 }

--- a/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
@ -133,7 +133,7 @@ void RimStimPlanFractureTemplate::fieldChangedByUi(const caf::PdmFieldHandle* ch
                    fracture->setStimPlanTimeIndexToPlot(m_activeTimeStepIndex);
                }
            }
-            proj->createDisplayModelAndRedrawAllViews();
+            proj->scheduleCreateDisplayModelAndRedrawAllViews();
        }
    }

@ -147,7 +147,7 @@ void RimStimPlanFractureTemplate::fieldChangedByUi(const caf::PdmFieldHandle* ch
        this->firstAncestorOrThisOfType(proj);
        if (proj)
        {
-            proj->createDisplayModelAndRedrawAllViews();
+            proj->scheduleCreateDisplayModelAndRedrawAllViews();
        }
    }

@ -693,8 +693,7 @@ void RimStimPlanFractureTemplate::reload()
    this->firstAncestorOrThisOfType(proj);
    if (proj)
    {
-        proj->createDisplayModelAndRedrawAllViews();
-
+        proj->scheduleCreateDisplayModelAndRedrawAllViews();
        RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews();
    }
 }
--- a/ApplicationCode/ProjectDataModel/Completions/RimWellPathFractureCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimWellPathFractureCollection.cpp
@ -173,6 +173,6 @@ void RimWellPathFractureCollection::fieldChangedByUi(const caf::PdmFieldHandle*
    }
    else
    {
-        proj->createDisplayModelAndRedrawAllViews();
+        proj->scheduleCreateDisplayModelAndRedrawAllViews();
    }
 }
--- a/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.cpp
@ -86,7 +86,7 @@ void Rim3dWellLogCurve::updateCurveIn3dView()
 {
    RimProject* proj;
    this->firstAncestorOrThisOfTypeAsserted(proj);
-    proj->createDisplayModelAndRedrawAllViews();
+    proj->scheduleCreateDisplayModelAndRedrawAllViews();
 }

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

--- a/ApplicationCode/ProjectDataModel/RimModeledWellPath.cpp
+++ b/ApplicationCode/ProjectDataModel/RimModeledWellPath.cpp
@ -69,7 +69,7 @@ void RimModeledWellPath::updateWellPathVisualization()
    this->setWellPathGeometry(m_geometryDefinition->createWellPathGeometry().p());
    RimProject* proj;
    this->firstAncestorOrThisOfTypeAsserted(proj);
-    proj->createDisplayModelAndRedrawAllViews();
+    proj->scheduleCreateDisplayModelAndRedrawAllViews();
    
    std::vector<RimPlotCurve*> refferingCurves;
    this->objectsWithReferringPtrFieldsOfType(refferingCurves);
--- a/ApplicationCode/ProjectDataModel/RimProject.cpp
+++ b/ApplicationCode/ProjectDataModel/RimProject.cpp
@ -718,7 +718,7 @@ void RimProject::allVisibleGridViews(std::vector<RimGridView*>& views)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimProject::createDisplayModelAndRedrawAllViews()
+void RimProject::scheduleCreateDisplayModelAndRedrawAllViews()
 {
    std::vector<RimCase*> cases;
    allCases(cases);
@ -846,7 +846,7 @@ bool RimProject::showPlotWindow() const
 //--------------------------------------------------------------------------------------------------
 void RimProject::reloadCompletionTypeResultsInAllViews()
 {
-    createDisplayModelAndRedrawAllViews();
+    scheduleCreateDisplayModelAndRedrawAllViews();
    RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews();
 }

--- a/ApplicationCode/ProjectDataModel/RimProject.h
+++ b/ApplicationCode/ProjectDataModel/RimProject.h
@ -116,7 +116,7 @@ public:
    void            allVisibleGridViews(std::vector<RimGridView*>& views);
    void            allNotLinkedViews(std::vector<RimGridView*>& views);

-    void            createDisplayModelAndRedrawAllViews(); 
+    void            scheduleCreateDisplayModelAndRedrawAllViews(); 

    void            computeUtmAreaOfInterest();

--- a/ApplicationCode/ProjectDataModel/RimStimPlanColors.cpp
+++ b/ApplicationCode/ProjectDataModel/RimStimPlanColors.cpp
@ -208,7 +208,7 @@ void RimStimPlanColors::fieldChangedByUi(const caf::PdmFieldHandle* changedField
        this->firstAncestorOrThisOfType(proj);
        if (proj)
        {
-            proj->createDisplayModelAndRedrawAllViews();
+            proj->scheduleCreateDisplayModelAndRedrawAllViews();
        }
    }

@ -314,7 +314,7 @@ void RimStimPlanColors::updateStimPlanTemplates() const
        {
            stimPlanFracTemplate->updateFractureGrid();
        }
-        proj->createDisplayModelAndRedrawAllViews();
+        proj->scheduleCreateDisplayModelAndRedrawAllViews();
    }
 }

--- a/ApplicationCode/ProjectDataModel/RimWellPath.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellPath.cpp
@ -287,7 +287,7 @@ void RimWellPath::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
    }
    else
    {
-        proj->createDisplayModelAndRedrawAllViews();
+        proj->scheduleCreateDisplayModelAndRedrawAllViews();
    }
 }