diff options
| author | YuSanka <yusanka@gmail.com> | 2022-01-29 13:16:28 +0300 |
|---|---|---|
| committer | YuSanka <yusanka@gmail.com> | 2022-01-29 13:16:28 +0300 |
| commit | ea84a46cdc9894be4481d3c7eb111522ce20277a (patch) | |
| tree | e2e65a51a1f3192ffc6591d7073894d60ffeaf93 | |
| parent | ddb14fa7f965591630a65461fc91d6136628329e (diff) | |
G=code substitutions: Debugger: Fixed wxWidgets assert when new substitution is added
+ Fixed representation of the gcode_substitution in DiffDialog and UnsavedChangesDialog
| -rw-r--r-- | src/slic3r/GUI/Tab.cpp | 4 | ||||
| -rw-r--r-- | src/slic3r/GUI/UnsavedChangesDialog.cpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index b08eed47b..bdebb5833 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -4000,7 +4000,7 @@ void SubstitutionManager::add_substitution( int substitution_id, editor->SetFont(wxGetApp().normal_font()); wxGetApp().UpdateDarkUI(editor); - top_sizer->Add(editor, proportion, wxALIGN_CENTER_VERTICAL | wxEXPAND| wxRIGHT, m_em); + top_sizer->Add(editor, proportion, wxALIGN_CENTER_VERTICAL | wxRIGHT, m_em); editor->Bind(wxEVT_TEXT_ENTER, [this, editor, substitution_id, opt_pos](wxEvent& e) { #if !defined(__WXGTK__) @@ -4065,7 +4065,7 @@ void SubstitutionManager::add_substitution( int substitution_id, auto v_sizer = new wxBoxSizer(wxVERTICAL); v_sizer->Add(top_sizer, 1, wxEXPAND); v_sizer->Add(params_sizer, 1, wxEXPAND|wxTOP|wxBOTTOM, int(0.5* m_em)); - m_grid_sizer->Add(v_sizer, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND); + m_grid_sizer->Add(v_sizer, 1, wxEXPAND); if (call_after_layout) { m_parent->GetParent()->Layout(); diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp index 608721203..002287ded 100644 --- a/src/slic3r/GUI/UnsavedChangesDialog.cpp +++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp @@ -1158,10 +1158,11 @@ static wxString get_string_value(std::string opt_key, const DynamicPrintConfig& } if (opt_key == "gcode_substitutions") { if (!strings->empty()) - for (size_t id = 0; id < strings->size(); id += 3) + for (size_t id = 0; id < strings->size(); id += 4) out += from_u8(strings->get_at(id)) + ";\t" + from_u8(strings->get_at(id + 1)) + ";\t" + - from_u8(strings->get_at(id + 2)) + ";\n"; + from_u8(strings->get_at(id + 2)) + ";\t" + + from_u8(strings->get_at(id + 3)) + ";\n"; return out; } if (!strings->empty() && opt_idx < strings->values.size()) |