3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow-up ba22eb600e - Fix for string formatting

Browse Source 
(by @bubnikv)
This commit is contained in:
YuSanka 2022-11-02 16:27:49 +01:00
parent 0468250298
commit a59f8aea6e
1 changed files with 28 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/slic3r/GUI/format.hpp
View File

@ -7,12 +7,35 @@
// though C++20 format uses a different template pattern for position independent parameters. // though C++20 format uses a different template pattern for position independent parameters.
// This wrapper also manages implicit conversion from wxString to UTF8 and format_wxstr() variants are provided to format into wxString. // This wrapper also manages implicit conversion from wxString to UTF8 and format_wxstr() variants are provided to format into wxString.
#include <libslic3r/format.hpp>
#include <wx/string.h> #include <wx/string.h>
namespace Slic3r { namespace Slic3r::internal::format {
namespace GUI { // Wrapper around wxScopedCharBuffer to indicate that the content is UTF8 formatted.
struct utf8_buffer {
// wxScopedCharBuffer is reference counted, therefore copying by value is cheap.
wxScopedCharBuffer data;
};
inline std::ostream& operator<<(std::ostream& os, const utf8_buffer &v) {
os << v.data.data();
return os;
}
// Accept wxString and convert it to UTF8 to be processed by Slic3r::format().
inline const utf8_buffer cook(const wxString& arg) {
return utf8_buffer{ arg.ToUTF8() };
}
// Vojtech seemingly does not understand perfect forwarding:
// Why Slic3r::internal::format::cook(T&& arg) is taken for non-const wxString reference?
inline const utf8_buffer cook(wxString& arg) {
return utf8_buffer{ arg.ToUTF8() };
}
inline const utf8_buffer cook(wxString&& arg) {
return utf8_buffer{ arg.ToUTF8() };
}
}
#include <libslic3r/format.hpp>
namespace Slic3r::GUI {
// Format input mixing UTF8 encoded strings (const char*, std::string) and wxStrings, return a wxString. // Format input mixing UTF8 encoded strings (const char*, std::string) and wxStrings, return a wxString.
template<typename... TArgs> template<typename... TArgs>
@ -42,42 +65,6 @@ inline std::string format(const wxString& fmt, TArgs&&... args) {
return Slic3r::format(fmt.ToUTF8().data(), std::forward<TArgs>(args)...); return Slic3r::format(fmt.ToUTF8().data(), std::forward<TArgs>(args)...);
} }
} // namespace GUI } // namespace Slic3r::GUI
namespace internal {
namespace format {
// Wrapper around wxScopedCharBuffer to indicate that the content is UTF8 formatted.
struct utf8_buffer {
// wxScopedCharBuffer is reference counted, therefore copying by value is cheap.
wxScopedCharBuffer data;
};
// Accept wxString and convert it to UTF8 to be processed by Slic3r::format().
inline const utf8_buffer cook(const wxString &arg) {
return utf8_buffer { arg.ToUTF8() };
}
// Vojtech seemingly does not understand perfect forwarding:
// Why Slic3r::internal::format::cook(T&& arg) is taken for non-const wxString reference?
inline const utf8_buffer cook(wxString &arg) {
return utf8_buffer { arg.ToUTF8() };
}
inline const utf8_buffer cook(wxString &&arg) {
return utf8_buffer{ arg.ToUTF8() };
}
}
}
} // namespace Slic3r
namespace boost {
namespace io {
namespace detail {
// Adaptor for boost::format to accept wxString converted to UTF8.
inline std::ostream& operator<<(std::ostream& os, const Slic3r::internal::format::utf8_buffer& str) {
os << str.data.data();
return os;
}
}
}
}
#endif /* slic3r_GUI_format_hpp_ */ #endif /* slic3r_GUI_format_hpp_ */