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

Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer

Browse source
This commit is contained in:
bubnikv 2019-05-15 10:59:38 +02:00
commit 84f09df03e
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -608,7 +608,11 @@ void Choice::BUILD() {
if (m_is_editable) {
temp->Bind(wxEVT_KILL_FOCUS, ([this](wxEvent& e) {
e.Skip();
if (m_opt.type == coStrings) return;
if (m_opt.type == coStrings) {
on_change_field();
return;
}
double old_val = !m_value.empty() ? boost::any_cast<double>(m_value) : -99999;
if (is_defined_input_value<wxBitmapComboBox>(window, m_opt.type)) {
if (fabs(old_val - boost::any_cast<double>(get_value())) <= 0.0001)

7
src/slic3r/GUI/Plater.cpp
View file

@ -2948,14 +2948,15 @@ const wxString& Plater::priv::get_project_filename() const
void Plater::priv::set_project_filename(const wxString& filename)
{
wxString copy = filename;
std::string copy = into_u8(filename);
if (boost::algorithm::iends_with(copy, ".zip.amf"))
// we remove the .zip part of the extension
copy = boost::ireplace_last_copy(copy, ".zip.", ".");
// we force 3mf extension
boost::filesystem::path full_path = into_path(copy);
full_path.replace_extension("3mf");
boost::filesystem::path full_path(copy);
if (!full_path.empty())
full_path.replace_extension("3mf");
m_project_filename = from_path(full_path);
wxGetApp().mainframe->update_title();