From d6e7c2521024e02ccdb3fdbdfa1903720383a90a Mon Sep 17 00:00:00 2001 From: Adam Paquette Date: Fri, 2 Oct 2020 09:14:49 -0700 Subject: [PATCH] Addressed PR feedback --- .../src/base/apps/findimageoverlaps/findimageoverlaps.cpp | 8 ++++---- isis/src/base/apps/findimageoverlaps/findimageoverlaps.h | 4 ++-- isis/src/base/objs/ImageOverlapSet/ImageOverlapSet.cpp | 4 ++-- isis/src/base/objs/ImageOverlapSet/ImageOverlapSet.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/isis/src/base/apps/findimageoverlaps/findimageoverlaps.cpp b/isis/src/base/apps/findimageoverlaps/findimageoverlaps.cpp index 58b96a7a0d..06dcacd857 100644 --- a/isis/src/base/apps/findimageoverlaps/findimageoverlaps.cpp +++ b/isis/src/base/apps/findimageoverlaps/findimageoverlaps.cpp @@ -11,13 +11,13 @@ using namespace std; namespace Isis { - void findimageoverlaps(UserInterface &ui, bool threadedCalculate, Pvl *log) { + void findimageoverlaps(UserInterface &ui, bool useThread, Pvl *log) { FileList images(ui.GetFileName("FROMLIST")); - findimageoverlaps(images, ui, threadedCalculate, log); + findimageoverlaps(images, ui, useThread, log); } - void findimageoverlaps(FileList &images, UserInterface &ui, bool threadedCalculate, Pvl *log) { + void findimageoverlaps(FileList &images, UserInterface &ui, bool useThread, Pvl *log) { // list of sns/filenames sorted by serial number SerialNumberList serialNumbers(true); @@ -47,7 +47,7 @@ namespace Isis { } // Now we want the ImageOverlapSet to calculate our overlaps - ImageOverlapSet overlaps(true, threadedCalculate); + ImageOverlapSet overlaps(true, useThread); // Use multi-threading to create the overlaps overlaps.FindImageOverlaps(serialNumbers, diff --git a/isis/src/base/apps/findimageoverlaps/findimageoverlaps.h b/isis/src/base/apps/findimageoverlaps/findimageoverlaps.h index 1a6e980eda..201e8886d2 100644 --- a/isis/src/base/apps/findimageoverlaps/findimageoverlaps.h +++ b/isis/src/base/apps/findimageoverlaps/findimageoverlaps.h @@ -6,9 +6,9 @@ #include "UserInterface.h" namespace Isis { - extern void findimageoverlaps(UserInterface &ui, bool threadedCalculate=true, Pvl *log=nullptr); + extern void findimageoverlaps(UserInterface &ui, bool useThread=true, Pvl *log=nullptr); - extern void findimageoverlaps(FileList &images, UserInterface &ui, bool threadedCalculate=true, Pvl *log=nullptr); + extern void findimageoverlaps(FileList &images, UserInterface &ui, bool useThread=true, Pvl *log=nullptr); } #endif diff --git a/isis/src/base/objs/ImageOverlapSet/ImageOverlapSet.cpp b/isis/src/base/objs/ImageOverlapSet/ImageOverlapSet.cpp index 1a7ce6c3c1..3f52ba48b8 100644 --- a/isis/src/base/objs/ImageOverlapSet/ImageOverlapSet.cpp +++ b/isis/src/base/objs/ImageOverlapSet/ImageOverlapSet.cpp @@ -33,12 +33,12 @@ namespace Isis { * addition to logging errors. * @see automaticRegistration.doc */ - ImageOverlapSet::ImageOverlapSet(bool continueOnError, bool threadedCalculate) { + ImageOverlapSet::ImageOverlapSet(bool continueOnError, bool useThread) { p_continueAfterError = continueOnError; p_writtenSoFar = 0; p_calculatedSoFar = -1; - p_threadedCalculate = threadedCalculate; + p_threadedCalculate = useThread; p_snlist = NULL; } diff --git a/isis/src/base/objs/ImageOverlapSet/ImageOverlapSet.h b/isis/src/base/objs/ImageOverlapSet/ImageOverlapSet.h index 7b2efa7236..94a6032fe4 100644 --- a/isis/src/base/objs/ImageOverlapSet/ImageOverlapSet.h +++ b/isis/src/base/objs/ImageOverlapSet/ImageOverlapSet.h @@ -101,7 +101,7 @@ namespace Isis { */ class ImageOverlapSet : private QThread { public: - ImageOverlapSet(bool continueOnError = false, bool threadedCalculate = true); + ImageOverlapSet(bool continueOnError = false, bool useThread = true); virtual ~ImageOverlapSet(); void FindImageOverlaps(SerialNumberList &boundaries);