From 778dc2baa43d30e0eb0eb06c948556cdce9bda9c Mon Sep 17 00:00:00 2001
From: Matthias Puchner <github@mpuchner.de>
Date: Mon, 29 Nov 2021 12:47:39 +0100
Subject: [PATCH] mv method to the one single place where used
---
GUI/Model/Material/MaterialItemUtils.cpp | 9 ---------
GUI/Model/Material/MaterialItemUtils.h | 2 --
GUI/Model/Material/MaterialModel.cpp | 9 ++++++++-
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/GUI/Model/Material/MaterialItemUtils.cpp b/GUI/Model/Material/MaterialItemUtils.cpp
index 6ec7d35c209..fb42c1f1a77 100644
--- a/GUI/Model/Material/MaterialItemUtils.cpp
+++ b/GUI/Model/Material/MaterialItemUtils.cpp
@@ -16,12 +16,3 @@
#include <deque>
#include <random>
-
-QColor GUI::MaterialUtil::randomMaterialColor()
-{
- static std::random_device r;
- std::default_random_engine re(r());
- std::uniform_int_distribution<int> ru(0, 255);
-
- return QColor(ru(re), ru(re), ru(re));
-}
diff --git a/GUI/Model/Material/MaterialItemUtils.h b/GUI/Model/Material/MaterialItemUtils.h
index 7b14a023beb..d3c419f37b0 100644
--- a/GUI/Model/Material/MaterialItemUtils.h
+++ b/GUI/Model/Material/MaterialItemUtils.h
@@ -19,8 +19,6 @@
namespace GUI::MaterialUtil {
-QColor randomMaterialColor();
-
} // namespace GUI::MaterialUtil
#endif // BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALITEMUTILS_H
diff --git a/GUI/Model/Material/MaterialModel.cpp b/GUI/Model/Material/MaterialModel.cpp
index c5ea2c5ffb1..6d502353f1a 100644
--- a/GUI/Model/Material/MaterialModel.cpp
+++ b/GUI/Model/Material/MaterialModel.cpp
@@ -17,6 +17,7 @@
#include "GUI/Model/Material/MaterialItemUtils.h"
#include "GUI/Model/Material/MaterialModelStore.h"
#include <QUuid>
+#include <random>
namespace {
@@ -30,7 +31,13 @@ QColor suggestMaterialColor(const QString& name)
return QColor(Qt::green);
if (name.contains("Particle"))
return QColor(146, 198, 255);
- return GUI::MaterialUtil::randomMaterialColor();
+
+ // return a random color
+ static std::random_device r;
+ std::default_random_engine re(r());
+ std::uniform_int_distribution<int> ru(0, 255);
+
+ return QColor(ru(re), ru(re), ru(re));
}
} // namespace
--
GitLab