GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-16 07:55:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Completed UI for G-code find & replace

Browse Source
This commit is contained in:
YuSanka 2022-01-10 13:27:47 +01:00
parent 8a387fc52d
commit 3a81dd5c5a
4 changed files with 73 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/GUI.cpp
View File

@ -143,7 +143,7 @@ void change_opt_value(DynamicPrintConfig& config, const t_config_option_key& opt
config.set_key_value(opt_key, new ConfigOptionString(boost::any_cast<std::string>(value))); config.set_key_value(opt_key, new ConfigOptionString(boost::any_cast<std::string>(value)));
break; break;
case coStrings:{ case coStrings:{
if (opt_key == "compatible_prints" || opt_key == "compatible_printers") { if (opt_key == "compatible_prints" || opt_key == "compatible_printers" || opt_key == "gcode_substitutions") {
config.option<ConfigOptionStrings>(opt_key)->values = config.option<ConfigOptionStrings>(opt_key)->values =
boost::any_cast<std::vector<std::string>>(value); boost::any_cast<std::vector<std::string>>(value);
} }

4
src/slic3r/GUI/OptionsGroup.cpp
View File

@ -596,7 +596,7 @@ void ConfigOptionsGroup::back_to_config_value(const DynamicPrintConfig& config,
} }
else if (m_opt_map.find(opt_key) == m_opt_map.end() || else if (m_opt_map.find(opt_key) == m_opt_map.end() ||
// This option don't have corresponded field // This option don't have corresponded field
opt_key == "bed_shape" || opt_key == "filament_ramming_parameters" || opt_key == "bed_shape" || opt_key == "filament_ramming_parameters" || opt_key == "gcode_substitutions" ||
opt_key == "compatible_printers" || opt_key == "compatible_prints" ) { opt_key == "compatible_printers" || opt_key == "compatible_prints" ) {
value = get_config_value(config, opt_key); value = get_config_value(config, opt_key);
this->change_opt_value(opt_key, value); this->change_opt_value(opt_key, value);
@ -875,7 +875,7 @@ boost::any ConfigOptionsGroup::get_config_value(const DynamicPrintConfig& config
ret = from_u8(config.opt_string(opt_key)); ret = from_u8(config.opt_string(opt_key));
break; break;
case coStrings: case coStrings:
if (opt_key == "compatible_printers" || opt_key == "compatible_prints") { if (opt_key == "compatible_printers" || opt_key == "compatible_prints" || opt_key == "gcode_substitutions") {
ret = config.option<ConfigOptionStrings>(opt_key)->values; ret = config.option<ConfigOptionStrings>(opt_key)->values;
break; break;
} }

106
src/slic3r/GUI/Tab.cpp
View File

@ -859,6 +859,12 @@ void Tab::on_roll_back_value(const bool to_sys /*= true*/)
if ((m_options_list["filament_ramming_parameters"] & os) == 0) if ((m_options_list["filament_ramming_parameters"] & os) == 0)
to_sys ? group->back_to_sys_value("filament_ramming_parameters") : group->back_to_initial_value("filament_ramming_parameters"); to_sys ? group->back_to_sys_value("filament_ramming_parameters") : group->back_to_initial_value("filament_ramming_parameters");
} }
if (group->title == "G-code Substitutions") {
if ((m_options_list["gcode_substitutions"] & os) == 0) {
to_sys ? group->back_to_sys_value("gcode_substitutions") : group->back_to_initial_value("gcode_substitutions");
load_key_value("gcode_substitutions", true/*some value*/, true);
}
}
if (group->title == "Profile dependencies") { if (group->title == "Profile dependencies") {
// "compatible_printers" option doesn't exists in Printer Settimgs Tab // "compatible_printers" option doesn't exists in Printer Settimgs Tab
if (m_type != Preset::TYPE_PRINTER && (m_options_list["compatible_printers"] & os) == 0) { if (m_type != Preset::TYPE_PRINTER && (m_options_list["compatible_printers"] & os) == 0) {
@ -953,7 +959,7 @@ void Tab::update_visibility()
page->update_visibility(m_mode, page.get() == m_active_page); page->update_visibility(m_mode, page.get() == m_active_page);
rebuild_page_tree(); rebuild_page_tree();
if (m_type == Preset::TYPE_SLA_PRINT) if (m_type == Preset::TYPE_SLA_PRINT || m_type == Preset::TYPE_PRINT)
update_description_lines(); update_description_lines();
Layout(); Layout();
@ -1697,15 +1703,15 @@ void TabPrint::build()
option.opt.height = 5;//50; option.opt.height = 5;//50;
optgroup->append_single_option_line(option); optgroup->append_single_option_line(option);
optgroup = page->new_optgroup(L("G-code Substitutions"), 0); optgroup = page->new_optgroup(L("G-code Substitutions"));
option = optgroup->get_option("gcode_substitutions");
option.opt.full_width = true; create_line_with_widget(optgroup.get(), "gcode_substitutions", "", [this](wxWindow* parent) {
option.opt.height = 0;//50; return create_manage_substitution_widget(parent);
optgroup->append_single_option_line(option); });
line = { "", "" }; line = { "", "" };
line.full_width = 1; line.full_width = 1;
line.widget = [this](wxWindow* parent) { line.widget = [this](wxWindow* parent) {
return create_substitution_widget(parent); return create_substitutions_widget(parent);
}; };
optgroup->append_line(line); optgroup->append_line(line);
@ -1753,13 +1759,21 @@ void TabPrint::update_description_lines()
from_u8(PresetHints::top_bottom_shell_thickness_explanation(*m_preset_bundle))); from_u8(PresetHints::top_bottom_shell_thickness_explanation(*m_preset_bundle)));
} }
if (m_active_page && m_active_page->title() == "Output options" && m_post_process_explanation) { if (m_active_page && m_active_page->title() == "Output options") {
if (m_post_process_explanation) {
m_post_process_explanation->SetText( m_post_process_explanation->SetText(
_L("Post processing scripts shall modify G-code file in place.")); _L("Post processing scripts shall modify G-code file in place."));
#ifndef __linux__ #ifndef __linux__
m_post_process_explanation->SetPathEnd("post-processing-scripts_283913"); m_post_process_explanation->SetPathEnd("post-processing-scripts_283913");
#endif // __linux__ #endif // __linux__
} }
// upadte G-code substitutions from the current configuration
{
m_subst_manager.update_from_config();
if (m_del_all_substitutions_btn)
m_del_all_substitutions_btn->Show(!m_subst_manager.is_empty_substitutions());
}
}
} }
void TabPrint::toggle_options() void TabPrint::toggle_options()
@ -3913,7 +3927,7 @@ void SubstitutionManager::delete_substitution(int substitution_id)
call_ui_update(); call_ui_update();
// update grid_sizer // update grid_sizer
add_all(); update_from_config();
} }
// Add substitution line // Add substitution line
@ -3980,12 +3994,12 @@ void SubstitutionManager::add_substitution(int substitution_id, const std::strin
chb_regexp->SetValue(regexp); chb_regexp->SetValue(regexp);
params_sizer->Add(chb_regexp, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, m_em); params_sizer->Add(chb_regexp, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, m_em);
auto chb_case_insensitive = new wxCheckBox(m_parent, wxID_ANY, wxString("Case sensitive")); auto chb_case_insensitive = new wxCheckBox(m_parent, wxID_ANY, wxString("Case insensitive"));
chb_regexp->SetValue(case_insensitive); chb_case_insensitive->SetValue(case_insensitive);
params_sizer->Add(chb_case_insensitive, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxLEFT, m_em); params_sizer->Add(chb_case_insensitive, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxLEFT, m_em);
auto chb_whole_word = new wxCheckBox(m_parent, wxID_ANY, wxString("Whole word")); auto chb_whole_word = new wxCheckBox(m_parent, wxID_ANY, wxString("Whole word"));
chb_regexp->SetValue(whole_word); chb_whole_word->SetValue(whole_word);
params_sizer->Add(chb_whole_word, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxLEFT, m_em); params_sizer->Add(chb_whole_word, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxLEFT, m_em);
for (wxCheckBox* chb : std::initializer_list<wxCheckBox*>{ chb_regexp, chb_case_insensitive, chb_whole_word }) { for (wxCheckBox* chb : std::initializer_list<wxCheckBox*>{ chb_regexp, chb_case_insensitive, chb_whole_word }) {
@ -4010,7 +4024,7 @@ void SubstitutionManager::add_substitution(int substitution_id, const std::strin
} }
} }
void SubstitutionManager::add_all() void SubstitutionManager::update_from_config()
{ {
if (!m_grid_sizer->IsEmpty()) if (!m_grid_sizer->IsEmpty())
m_grid_sizer->Clear(true); m_grid_sizer->Clear(true);
@ -4058,50 +4072,54 @@ void SubstitutionManager::edit_substitution(int substitution_id, int opt_pos, co
call_ui_update(); call_ui_update();
} }
// Return a callback to create a TabPrint widget to edit G-code substitutions bool SubstitutionManager::is_empty_substitutions()
wxSizer* TabPrint::create_substitution_widget(wxWindow* parent)
{ {
ScalableButton* add_btn = new ScalableButton(parent, wxID_ANY, "add_copies", " " + _L("Add G-code substitution") + " ", return m_config->option<ConfigOptionStrings>("gcode_substitutions")->values.empty();
wxDefaultSize, wxDefaultPosition, wxBU_LEFT | wxBU_EXACTFIT, true); }
add_btn->SetFont(wxGetApp().normal_font());
add_btn->SetSize(add_btn->GetBestSize());
ScalableButton* del_all_btn = new ScalableButton(parent, wxID_ANY, "cross", " " + _L("Delete all G-code substitution") + " ", // Return a callback to create a TabPrint widget to edit G-code substitutions
wxDefaultSize, wxDefaultPosition, wxBU_LEFT | wxBU_EXACTFIT, true); wxSizer* TabPrint::create_manage_substitution_widget(wxWindow* parent)
del_all_btn->SetFont(wxGetApp().normal_font()); {
del_all_btn->SetSize(del_all_btn->GetBestSize()); auto create_btn = [parent](ScalableButton** btn, const wxString& label, const std::string& icon_name) {
del_all_btn->Hide(); *btn = new ScalableButton(parent, wxID_ANY, icon_name, " " + label + " ", wxDefaultSize, wxDefaultPosition, wxBU_LEFT | wxBU_EXACTFIT, true);
(*btn)->SetFont(wxGetApp().normal_font());
(*btn)->SetSize((*btn)->GetBestSize());
};
auto btns_sizer = new wxBoxSizer(wxHORIZONTAL); ScalableButton* add_substitution_btn;
btns_sizer->Add(add_btn, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxLEFT, em_unit(parent)); create_btn(&add_substitution_btn, _L("Add G-code substitution"), "add_copies");
btns_sizer->Add(del_all_btn, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxLEFT, em_unit(parent)); add_substitution_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent e) {
m_subst_manager.add_substitution();
m_del_all_substitutions_btn->Show();
});
auto v_sizer = new wxBoxSizer(wxVERTICAL); create_btn(&m_del_all_substitutions_btn, _L("Delete all G-code substitution"), "cross");
v_sizer->Add(btns_sizer); m_del_all_substitutions_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent e) {
m_subst_manager.delete_all();
m_del_all_substitutions_btn->Hide();
});
wxFlexGridSizer* grid_sizer = new wxFlexGridSizer(4, 5, wxGetApp().em_unit()); // "Old val", "New val", "Params" & buttons sizer auto sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add(add_substitution_btn, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxLEFT, em_unit(parent));
sizer->Add(m_del_all_substitutions_btn, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxLEFT, em_unit(parent));
parent->GetParent()->Layout();
return sizer;
}
// Return a callback to create a TabPrint widget to edit G-code substitutions
wxSizer* TabPrint::create_substitutions_widget(wxWindow* parent)
{
wxFlexGridSizer* grid_sizer = new wxFlexGridSizer(4, 5, wxGetApp().em_unit()); // delete_button, "Old val", "New val", "Params"
grid_sizer->SetFlexibleDirection(wxHORIZONTAL); grid_sizer->SetFlexibleDirection(wxHORIZONTAL);
m_subst_manager.init(m_config, parent, grid_sizer); m_subst_manager.init(m_config, parent, grid_sizer);
m_subst_manager.set_cb_edited_substitution([this]() { m_subst_manager.set_cb_edited_substitution([this]() {
// load_key_value("gcode_substitution", custom_model);
update_changed_ui(); update_changed_ui();
}); });
del_all_btn->Bind(wxEVT_BUTTON, [this, del_all_btn](wxCommandEvent e) {
m_subst_manager.delete_all();
del_all_btn->Hide();
});
add_btn->Bind(wxEVT_BUTTON, [this, del_all_btn](wxCommandEvent e) {
m_subst_manager.add_substitution();
del_all_btn->Show();
});
v_sizer->Add(grid_sizer, 0, wxEXPAND | wxTOP, em_unit(parent));
auto sizer = new wxBoxSizer(wxHORIZONTAL); auto sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add(v_sizer, 0, wxALIGN_CENTER_VERTICAL); sizer->Add(grid_sizer, 0, wxALIGN_CENTER_VERTICAL);
parent->GetParent()->Layout(); parent->GetParent()->Layout();
return sizer; return sizer;

7
src/slic3r/GUI/Tab.hpp
View File

@ -66,7 +66,7 @@ public:
const std::string& plain_pattern = std::string(), const std::string& plain_pattern = std::string(),
const std::string& format = std::string(), const std::string& format = std::string(),
const std::string& params = std::string()); const std::string& params = std::string());
void add_all(); void update_from_config();
void delete_all(); void delete_all();
void edit_substitution(int substitution_id, void edit_substitution(int substitution_id,
int opt_pos, // option position insubstitution [0, 2] int opt_pos, // option position insubstitution [0, 2]
@ -78,6 +78,7 @@ public:
if (m_cb_edited_substitution) if (m_cb_edited_substitution)
m_cb_edited_substitution(); m_cb_edited_substitution();
} }
bool is_empty_substitutions();
}; };
// Single Tab page containing a{ vsizer } of{ optgroups } // Single Tab page containing a{ vsizer } of{ optgroups }
@ -420,12 +421,14 @@ public:
void update() override; void update() override;
void clear_pages() override; void clear_pages() override;
bool supports_printer_technology(const PrinterTechnology tech) const override { return tech == ptFFF; } bool supports_printer_technology(const PrinterTechnology tech) const override { return tech == ptFFF; }
wxSizer* create_substitution_widget(wxWindow* parent); wxSizer* create_manage_substitution_widget(wxWindow* parent);
wxSizer* create_substitutions_widget(wxWindow* parent);
private: private:
ogStaticText* m_recommended_thin_wall_thickness_description_line = nullptr; ogStaticText* m_recommended_thin_wall_thickness_description_line = nullptr;
ogStaticText* m_top_bottom_shell_thickness_explanation = nullptr; ogStaticText* m_top_bottom_shell_thickness_explanation = nullptr;
ogStaticText* m_post_process_explanation = nullptr; ogStaticText* m_post_process_explanation = nullptr;
ScalableButton* m_del_all_substitutions_btn{nullptr};
SubstitutionManager m_subst_manager; SubstitutionManager m_subst_manager;
}; };