3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-22 06:04:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Partial revert of cc919c68b8

Browse source
This commit is contained in:
Enrico Turri 2019-12-19 11:38:48 +01:00
parent 3b8d42a64f
commit feaccc557d
2 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/3DBed.cpp
View file

@ -204,7 +204,6 @@ bool Bed3D::set_shape(const Pointfs& shape, const std::string& custom_texture, c
std::string cst_texture(custom_texture); std::string cst_texture(custom_texture);
if (!cst_texture.empty()) if (!cst_texture.empty())
{ {
std::replace(cst_texture.begin(), cst_texture.end(), '\\', '/');
if ((!boost::algorithm::iends_with(custom_texture, ".png") && !boost::algorithm::iends_with(custom_texture, ".svg")) || !boost::filesystem::exists(custom_texture)) if ((!boost::algorithm::iends_with(custom_texture, ".png") && !boost::algorithm::iends_with(custom_texture, ".svg")) || !boost::filesystem::exists(custom_texture))
cst_texture = ""; cst_texture = "";
} }
@ -213,7 +212,6 @@ bool Bed3D::set_shape(const Pointfs& shape, const std::string& custom_texture, c
std::string cst_model(custom_model); std::string cst_model(custom_model);
if (!cst_model.empty()) if (!cst_model.empty())
{ {
std::replace(cst_model.begin(), cst_model.end(), '\\', '/');
if (!boost::algorithm::iends_with(custom_model, ".stl") || !boost::filesystem::exists(custom_model)) if (!boost::algorithm::iends_with(custom_model, ".stl") || !boost::filesystem::exists(custom_model))
cst_model = ""; cst_model = "";
} }

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

@ -61,9 +61,7 @@ void BedShapePanel::build_panel(const ConfigOptionPoints& default_pt, const Conf
{ {
m_shape = default_pt.values; m_shape = default_pt.values;
m_custom_texture = custom_texture.value.empty() ? NONE : custom_texture.value; m_custom_texture = custom_texture.value.empty() ? NONE : custom_texture.value;
std::replace(m_custom_texture.begin(), m_custom_texture.end(), '\\', '/');
m_custom_model = custom_model.value.empty() ? NONE : custom_model.value; m_custom_model = custom_model.value.empty() ? NONE : custom_model.value;
std::replace(m_custom_model.begin(), m_custom_model.end(), '\\', '/');
auto sbsizer = new wxStaticBoxSizer(wxVERTICAL, this, _(L("Shape"))); auto sbsizer = new wxStaticBoxSizer(wxVERTICAL, this, _(L("Shape")));
sbsizer->GetStaticBox()->SetFont(wxGetApp().bold_font()); sbsizer->GetStaticBox()->SetFont(wxGetApp().bold_font());
@ -546,8 +544,6 @@ void BedShapePanel::load_texture()
return; return;
} }
std::replace(file_name.begin(), file_name.end(), '\\', '/');
wxBusyCursor wait; wxBusyCursor wait;
m_custom_texture = file_name; m_custom_texture = file_name;
@ -571,8 +567,6 @@ void BedShapePanel::load_model()
return; return;
} }
std::replace(file_name.begin(), file_name.end(), '\\', '/');
wxBusyCursor wait; wxBusyCursor wait;
m_custom_model = file_name; m_custom_model = file_name;