From 3a31199365cfa1235118415323d9a8bd6aadb9be Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Mon, 3 Dec 2018 10:40:15 +0100
Subject: [PATCH] #3784 Completion Export : Use isCompletionWellPathEqual()

---
 ...ellPathExportCompletionDataFeatureImpl.cpp | 35 +++++++++++--------
 ...cWellPathExportCompletionDataFeatureImpl.h |  1 +
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
index bee3f8d389..379c0ff6fb 100644
--- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
+++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
@@ -328,13 +328,7 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve
                 std::vector<RigCompletionData> completionsForWell;
                 for (const auto& completion : completions)
                 {
-                    RimWellPath* parentWellPath = nullptr;
-                    if (completion.sourcePdmObject())
-                    {
-                        completion.sourcePdmObject()->firstAncestorOrThisOfType(parentWellPath);
-                    }
-
-                    if (parentWellPath == wellPath)
+                    if (RicWellPathExportCompletionDataFeatureImpl::isCompletionWellPathEqual(completion, wellPath))
                     {
                         completionsForWell.push_back(completion);
                     }
@@ -375,15 +369,9 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve
                     std::vector<RigCompletionData> completionsForWell;
                     for (const auto& completion : completions)
                     {
-                        RimWellPath* parentWellPath = nullptr;
-                        if (completion.sourcePdmObject())
+                        if (completionType == completion.completionType())
                         {
-                            completion.sourcePdmObject()->firstAncestorOrThisOfType(parentWellPath);
-                        }
-
-                        if (parentWellPath == wellPath)
-                        {
-                            if (completionType == completion.completionType())
+                            if (RicWellPathExportCompletionDataFeatureImpl::isCompletionWellPathEqual(completion, wellPath))
                             {
                                 completionsForWell.push_back(completion);
                             }
@@ -2691,6 +2679,23 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCarfinForTemporaryLgrs(co
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RicWellPathExportCompletionDataFeatureImpl::isCompletionWellPathEqual(const RigCompletionData& completion,
+                                                                           const RimWellPath*       wellPath)
+{
+    if (!wellPath) return false;
+
+    RimWellPath* parentWellPath = nullptr;
+    if (completion.sourcePdmObject())
+    {
+        completion.sourcePdmObject()->firstAncestorOrThisOfType(parentWellPath);
+    }
+
+    return (parentWellPath == wellPath);
+}
+
 //--------------------------------------------------------------------------------------------------
 /// Internal function
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h
index 176fdb70c4..ca64c86b02 100644
--- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h
+++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h
@@ -290,4 +290,5 @@ private:
 
     static void                           exportCarfinForTemporaryLgrs(const RimEclipseCase* sourceCase, const QString& folder);
 
+    static bool                           isCompletionWellPathEqual(const RigCompletionData& completion, const RimWellPath* wellPath);
 };