From 9dc4343029f1ff2e56583ca5b130397017221e88 Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lenox.joseph@gmail.com>
Date: Wed, 4 Jul 2018 16:32:39 -0500
Subject: [PATCH] Move trim_zeroes to misc_ui

---
 src/GUI/OptionsGroup/Field.hpp |  8 --------
 src/GUI/misc_ui.cpp            | 12 ++++++++++++
 src/GUI/misc_ui.hpp            |  4 ++++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/GUI/OptionsGroup/Field.hpp b/src/GUI/OptionsGroup/Field.hpp
index 4a220d1e9..c1c7e057f 100644
--- a/src/GUI/OptionsGroup/Field.hpp
+++ b/src/GUI/OptionsGroup/Field.hpp
@@ -342,15 +342,7 @@ private:
     void _set_value(Slic3r::Pointf3 value);
     void _set_value(std::string value);
 
-    /// Remove extra zeroes generated from std::to_string on doubles
-    std::string trim_zeroes(std::string in) {
-        std::string result {""};
-        std::regex strip_zeroes("(0*)$");
-        std::regex_replace (std::back_inserter(result), in.begin(), in.end(), strip_zeroes, "");
-        if (result.back() == '.') result.append("0");
-        return result;
     }
-    wxString trim_zeroes(wxString in) { return wxString(trim_zeroes(in.ToStdString())); }
 
 
 
diff --git a/src/GUI/misc_ui.cpp b/src/GUI/misc_ui.cpp
index ba850fbe4..b05d3698e 100644
--- a/src/GUI/misc_ui.cpp
+++ b/src/GUI/misc_ui.cpp
@@ -5,6 +5,7 @@
 
 #include <exception>
 #include <stdexcept>
+#include <regex>
 
 
 namespace Slic3r { namespace GUI {
@@ -147,5 +148,16 @@ std::vector<wxString> open_model(wxWindow* parent, wxWindow* top) {
     return tmp;
 }
 
+/// Remove extra zeroes generated from std::to_string on doubles
+std::string trim_zeroes(std::string in) {
+    std::string result {""};
+    std::regex strip_zeroes("(0*)$");
+    std::regex_replace (std::back_inserter(result), in.begin(), in.end(), strip_zeroes, "");
+    if (result.back() == '.') result.append("0");
+    return result;
+}
+
+wxString trim_zeroes(wxString in) { return wxString(trim_zeroes(in.ToStdString())); }
+
 }} // namespace Slic3r::GUI
 
diff --git a/src/GUI/misc_ui.hpp b/src/GUI/misc_ui.hpp
index 22033d6a4..7bcc2bd82 100644
--- a/src/GUI/misc_ui.hpp
+++ b/src/GUI/misc_ui.hpp
@@ -155,6 +155,10 @@ inline Slic3r::Point new_scale(const wxPoint& p) { return Slic3r::Point::new_sca
 /// Singleton for UI settings.
 extern std::unique_ptr<Settings> ui_settings; 
 
+std::string trim_zeroes(std::string in);
+wxString trim_zeroes(wxString in);
+
+
 }} // namespace Slic3r::GUI
 
 #endif // MISC_UI_HPP