From 159dc2111278bfa56e2c5fdaaf601e7d955bfdde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Tue, 4 Sep 2018 14:55:35 +0200 Subject: [PATCH] #3274 Create multiple fractures. Fix bug and rename argument --- .../RicCreateMultipleFracturesOptionItemUi.cpp | 6 +++--- .../RicCreateMultipleFracturesOptionItemUi.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesOptionItemUi.cpp b/ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesOptionItemUi.cpp index d4eb824ef5..6450b92d0a 100644 --- a/ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesOptionItemUi.cpp +++ b/ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesOptionItemUi.cpp @@ -88,12 +88,12 @@ double RicCreateMultipleFracturesOptionItemUi::minimumSpacing() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicCreateMultipleFracturesOptionItemUi::isKLayerContained(int k) const +bool RicCreateMultipleFracturesOptionItemUi::isKLayerContained(int oneBasedK) const { auto minMax = std::minmax(m_topKOneBased, m_baseKOneBased); - if (k < minMax.first) return false; - if (k < minMax.second) return true; + if (oneBasedK < minMax.first) return false; + if (oneBasedK <= minMax.second) return true; return false; } diff --git a/ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesOptionItemUi.h b/ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesOptionItemUi.h index 64971c75cd..c0c466a915 100644 --- a/ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesOptionItemUi.h +++ b/ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesOptionItemUi.h @@ -41,7 +41,7 @@ public: RimFractureTemplate* fractureTemplate() const; double minimumSpacing() const; - bool isKLayerContained(int k) const; + bool isKLayerContained(int oneBasedK) const; private: virtual void