3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 20:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix of the previous commit: Fix compilation on Linux.

Browse source
This commit is contained in:
bubnikv 2017-09-20 10:03:53 +02:00
parent 473233019c
commit 8089631f10
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xs/src/slic3r/GUI/Preset.cpp
View file

@ -97,7 +97,7 @@ void PresetCollection::update_editor_ui(wxBitmapComboBox *ui)
size_t n_visible = this->num_visible();
size_t n_choice = size_t(ui->GetCount());
std::string name_selected = ui->GetStringSelection().ToUTF8();
std::string name_selected = ui->GetStringSelection().ToUTF8().data();
if (boost::algorithm::iends_with(name_selected, g_suffix_modified))
// Remove the g_suffix_modified.
name_selected.erase(name_selected.end() - g_suffix_modified.size(), name_selected.end());

4
xs/src/slic3r/GUI/Preset.hpp
View file

@ -20,7 +20,7 @@ public:
TYPE_PRINTER,
};
Preset(Type type, const std::string &name, bool is_default = false) : type(type), name(name), is_default(is_default) {}
Preset(Type type, const std::string &name, bool is_default = false) : type(type), is_default(is_default), name(name) {}
Type type = TYPE_INVALID;
@ -54,7 +54,7 @@ public:
DynamicPrintConfig& load(const std::vector<std::string> &keys);
// Set the is_dirty flag if the provided config is different from the active one.
bool set_dirty(const DynamicPrintConfig &config) { this->is_dirty = ! this->config.diff(config).empty(); }
void set_dirty(const DynamicPrintConfig &config) { this->is_dirty = ! this->config.diff(config).empty(); }
void reset_dirty() { this->is_dirty = false; }
bool enable_compatible(const std::string &active_printer);
};