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

Build fixes, conversion of wxString into utf-8 std::string

Browse source
This commit is contained in:
Vojtech Kral 2018-09-19 10:34:21 +02:00
parent e695164451
commit 51d504c720
5 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xs/src/libslic3r/PrintExport.hpp
View file

@ -81,8 +81,8 @@ template<class Backend> class Zipper {
public: public:
Zipper(const std::string& /*zipfile_path*/) { Zipper(const std::string& /*zipfile_path*/) {
static_assert(Backend>::value, // static_assert(Backend>::value,
"No zipper implementation provided!"); // "No zipper implementation provided!");
} }
void next_entry(const std::string& /*fname*/) {} void next_entry(const std::string& /*fname*/) {}

5
xs/src/libslic3r/SupportMaterial.cpp
View file

@ -2618,7 +2618,10 @@ void modulate_extrusion_by_overlapping_layers(
(fragment_end.is_start ? &polyline.points.front() : &polyline.points.back()); (fragment_end.is_start ? &polyline.points.front() : &polyline.points.back());
} }
private: private:
ExtrusionPathFragmentEndPointAccessor& operator=(const ExtrusionPathFragmentEndPointAccessor&) {} ExtrusionPathFragmentEndPointAccessor& operator=(const ExtrusionPathFragmentEndPointAccessor&) {
return *this;
}
const std::vector<ExtrusionPathFragment> &m_path_fragments; const std::vector<ExtrusionPathFragment> &m_path_fragments;
}; };
const coord_t search_radius = 7; const coord_t search_radius = 7;

6
xs/src/slic3r/GUI/GUI.cpp
View file

@ -991,6 +991,12 @@ wxString from_u8(const std::string &str)
return wxString::FromUTF8(str.c_str()); return wxString::FromUTF8(str.c_str());
} }
std::string into_u8(const wxString &str)
{
auto buffer_utf8 = str.utf8_str();
return std::string(buffer_utf8.data());
}
void set_model_events_from_perl(Model &model, void set_model_events_from_perl(Model &model,
int event_object_selection_changed, int event_object_selection_changed,
int event_object_settings_changed, int event_object_settings_changed,

2
xs/src/slic3r/GUI/GUI.hpp
View file

@ -217,6 +217,8 @@ int combochecklist_get_flags(wxComboCtrl* comboCtrl);
wxString L_str(const std::string &str); wxString L_str(const std::string &str);
// Return wxString from std::string in UTF8 // Return wxString from std::string in UTF8
wxString from_u8(const std::string &str); wxString from_u8(const std::string &str);
// Return std::string in UTF8 from wxString
std::string into_u8(const wxString &str);
void set_model_events_from_perl(Model &model, void set_model_events_from_perl(Model &model,
int event_object_selection_changed, int event_object_selection_changed,

8
xs/src/slic3r/GUI/GUI_Preview.cpp
View file

@ -99,8 +99,9 @@ bool Preview::init(wxNotebook* notebook, DynamicPrintConfig* config, Print* prin
m_combochecklist_features = new wxComboCtrl(); m_combochecklist_features = new wxComboCtrl();
m_combochecklist_features->Create(this, wxID_ANY, _(L("Feature types")), wxDefaultPosition, wxSize(200, -1), wxCB_READONLY); m_combochecklist_features->Create(this, wxID_ANY, _(L("Feature types")), wxDefaultPosition, wxSize(200, -1), wxCB_READONLY);
std::string feature_text = _(L("Feature types")); std::string feature_text = GUI::into_u8(_(L("Feature types")));
std::string feature_items = _(L("Perimeter")) + "|" + std::string feature_items = GUI::into_u8(
_(L("Perimeter")) + "|" +
_(L("External perimeter")) + "|" + _(L("External perimeter")) + "|" +
_(L("Overhang perimeter")) + "|" + _(L("Overhang perimeter")) + "|" +
_(L("Internal infill")) + "|" + _(L("Internal infill")) + "|" +
@ -112,7 +113,8 @@ bool Preview::init(wxNotebook* notebook, DynamicPrintConfig* config, Print* prin
_(L("Support material")) + "|" + _(L("Support material")) + "|" +
_(L("Support material interface")) + "|" + _(L("Support material interface")) + "|" +
_(L("Wipe tower")) + "|" + _(L("Wipe tower")) + "|" +
_(L("Custom")); _(L("Custom"))
);
Slic3r::GUI::create_combochecklist(m_combochecklist_features, feature_text, feature_items, true); Slic3r::GUI::create_combochecklist(m_combochecklist_features, feature_text, feature_items, true);
m_checkbox_travel = new wxCheckBox(this, wxID_ANY, _(L("Travel"))); m_checkbox_travel = new wxCheckBox(this, wxID_ANY, _(L("Travel")));