GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 07:06:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move trim_zeroes to misc_ui

Browse Source
This commit is contained in:
Joseph Lenox 2018-07-04 16:32:39 -05:00 committed by Joseph Lenox
parent e66cda51bf
commit 9dc4343029
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/GUI/OptionsGroup/Field.hpp
View File

@ -342,15 +342,7 @@ private:
void _set_value(Slic3r::Pointf3 value); void _set_value(Slic3r::Pointf3 value);
void _set_value(std::string 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())); }

12
src/GUI/misc_ui.cpp
View File

@ -5,6 +5,7 @@
#include <exception> #include <exception>
#include <stdexcept> #include <stdexcept>
#include <regex>
namespace Slic3r { namespace GUI { namespace Slic3r { namespace GUI {
@ -147,5 +148,16 @@ std::vector<wxString> open_model(wxWindow* parent, wxWindow* top) {
return tmp; 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 }} // namespace Slic3r::GUI

4
src/GUI/misc_ui.hpp
View File

@ -155,6 +155,10 @@ inline Slic3r::Point new_scale(const wxPoint& p) { return Slic3r::Point::new_sca
/// Singleton for UI settings. /// Singleton for UI settings.
extern std::unique_ptr<Settings> ui_settings; extern std::unique_ptr<Settings> ui_settings;
std::string trim_zeroes(std::string in);
wxString trim_zeroes(wxString in);
}} // namespace Slic3r::GUI }} // namespace Slic3r::GUI
#endif // MISC_UI_HPP #endif // MISC_UI_HPP