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

Moved trim_zeroes to libslic3r utils.

Browse Source
This commit is contained in:
Joseph Lenox 2018-07-15 10:10:42 -05:00
parent ee71f8b8f8
commit 49f123ca20
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/GUI/misc_ui.cpp
View File

@ -148,14 +148,7 @@ 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())); } wxString trim_zeroes(wxString in) { return wxString(trim_zeroes(in.ToStdString())); }

1
src/GUI/misc_ui.hpp
View File

@ -155,7 +155,6 @@ 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); wxString trim_zeroes(wxString in);

8
xs/src/libslic3r/utils.cpp
View File

@ -50,3 +50,11 @@ split_at_regex(const std::string& input, const std::string& regex) {
last; last;
return {first, last}; return {first, last};
} }
/// 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;
}

1
xs/src/libslic3r/utils.hpp
View File

@ -9,5 +9,6 @@
/// Separate a string based on some regular expression string. /// Separate a string based on some regular expression string.
std::vector<std::string> std::vector<std::string>
split_at_regex(const std::string& input, const std::string& regex); split_at_regex(const std::string& input, const std::string& regex);
std::string trim_zeroes(std::string in);
#endif // UTILS_HPP #endif // UTILS_HPP