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

Polishing the dialog, added parameter tooltips, fixed warnings

Browse Source
This commit is contained in:
Lukas Matena 2024-03-20 05:50:04 +01:00
parent 88234446e2
commit 37d6b7ea1b
4 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/GCode/WipeTower.cpp
View File

@ -1558,8 +1558,8 @@ void WipeTower::plan_toolchange(float z_par, float layer_height_par, unsigned in
if (old_tool == new_tool) // new layer without toolchanges - we are done if (old_tool == new_tool) // new layer without toolchanges - we are done
return; return;
// this is an actual toolchange - let's calculate depth to reserve on the wipe tower // this is an actual toolchange - let's calculate depth to reserve on the wipe tower
float width = m_wipe_tower_width - 3*m_perimeter_width; float width = m_wipe_tower_width - 3*m_perimeter_width;
float length_to_extrude = volume_to_length(0.25f * std::accumulate(m_filpar[old_tool].ramming_speed.begin(), m_filpar[old_tool].ramming_speed.end(), 0.f), float length_to_extrude = volume_to_length(0.25f * std::accumulate(m_filpar[old_tool].ramming_speed.begin(), m_filpar[old_tool].ramming_speed.end(), 0.f),
m_perimeter_width * m_filpar[old_tool].ramming_line_width_multiplicator, m_perimeter_width * m_filpar[old_tool].ramming_line_width_multiplicator,
layer_height_par); layer_height_par);

9
src/libslic3r/PrintConfig.cpp
View File

@ -1145,8 +1145,10 @@ void PrintConfigDef::init_fff_params()
def->set_default_value(new ConfigOptionFloats { 3.4 }); def->set_default_value(new ConfigOptionFloats { 3.4 });
def = this->add("filament_purge_multiplier", coPercents); def = this->add("filament_purge_multiplier", coPercents);
def->label = L("Purge multiplier"); def->label = L("Purge volume multiplier");
def->tooltip = L(""); def->tooltip = L("Purging volume on the wipe tower is determined by 'multimaterial_purging' in Printer Settings. "
"This option allows to modify the volume on filament level. "
"Note that the project can override this by setting project-specific values.");
def->sidetext = L("%"); def->sidetext = L("%");
def->min = 0; def->min = 0;
def->mode = comExpert; def->mode = comExpert;
@ -2146,7 +2148,8 @@ void PrintConfigDef::init_fff_params()
def = this->add("multimaterial_purging", coFloat); def = this->add("multimaterial_purging", coFloat);
def->label = L("Purging volume"); def->label = L("Purging volume");
def->tooltip = L(""); def->tooltip = L("Determines purging volume on the wipe tower. This can be modified in Filament Settings "
"('filament_purge_multiplier') or overridden using project-specific settings.");
def->sidetext = L("mm³"); def->sidetext = L("mm³");
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(140.)); def->set_default_value(new ConfigOptionFloat(140.));

43
src/slic3r/GUI/WipeTowerDialog.cpp
View File

@ -195,41 +195,45 @@ WipingDialog::WipingDialog(wxWindow* parent, const std::vector<float>& matrix, c
{ {
SetFont(wxGetApp().normal_font()); SetFont(wxGetApp().normal_font());
update_ui(this); update_ui(this);
m_widget_button = new wxButton(this,wxID_ANY,_L("Set default values"), wxPoint(0, 0), wxDefaultSize); m_widget_button = new wxButton(this,wxID_ANY,_L("Set values from configuration"), wxPoint(0, 0), wxDefaultSize);
update_ui(m_widget_button); update_ui(m_widget_button);
wxGetApp().SetWindowVariantForButton(m_widget_button); wxGetApp().SetWindowVariantForButton(m_widget_button);
m_radio_button1 = new wxRadioButton(this, wxID_ANY, _L("Default from configuration")); m_radio_button1 = new wxRadioButton(this, wxID_ANY, _L("Use values from configuration"));
m_radio_button2 = new wxRadioButton(this, wxID_ANY, _L("Custom project-specific settings")); m_radio_button2 = new wxRadioButton(this, wxID_ANY, _L("Use custom project-specific settings"));
auto stb = new wxStaticBox(this, wxID_ANY, wxEmptyString); auto stb1 = new wxStaticBox(this, wxID_ANY, wxEmptyString);
auto stb2 = new wxStaticBox(this, wxID_ANY, wxEmptyString);
m_panel_wiping = new WipingPanel(this, matrix, extruder_colours, filament_purging_multipliers, printer_purging_volume, m_widget_button); m_panel_wiping = new WipingPanel(this, matrix, extruder_colours, filament_purging_multipliers, printer_purging_volume, m_widget_button);
update_ui(m_radio_button1); update_ui(m_radio_button1);
update_ui(m_radio_button2); update_ui(m_radio_button2);
update_ui(stb); update_ui(stb1);
update_ui(stb2);
auto heading_text = new wxStaticText(this, wxID_ANY, _L("The project uses single-extruder multimaterial printer with the wipe tower.\nThe volume of material used for purging can be configured here.") ,wxDefaultPosition, wxDefaultSize);
m_info_text1 = new wxStaticText(this, wxID_ANY, _L("Options 'multimaterial_purging' and 'filament_purge_multiplier' will be used.") ,wxDefaultPosition, wxDefaultSize);
wxString info = _(L("Here you can adjust required purging volume (mm³) for any given pair of tools."));
wxSize text_size = GetTextExtent(info);
auto info_str = new wxStaticText(this, wxID_ANY, info ,wxDefaultPosition, wxDefaultSize);
// set min sizer width according to extruders count // set min sizer width according to extruders count
const auto sizer_width = (int)((std::sqrt(matrix.size()) + 2.8)*ITEM_WIDTH()); const auto sizer_width = (int)((std::sqrt(matrix.size()) + 2.8)*ITEM_WIDTH());
auto main_sizer = new wxBoxSizer(wxVERTICAL); auto main_sizer = new wxBoxSizer(wxVERTICAL);
main_sizer->SetMinSize(wxSize(sizer_width, -1)); main_sizer->SetMinSize(wxSize(sizer_width, -1));
main_sizer->Add(info_str, 0, wxALL, 10); main_sizer->Add(heading_text, 0, wxALL, 10);
main_sizer->Add(m_radio_button1, 0, wxALL, 10); main_sizer->Add(m_radio_button1, 0, wxALL, 10);
auto stb_sizer1 = new wxStaticBoxSizer(stb1, wxHORIZONTAL);
stb_sizer1->Add(m_info_text1, 0, wxALIGN_CENTER_HORIZONTAL, 0);
main_sizer->Add(stb_sizer1, 0, wxALIGN_CENTER_HORIZONTAL, 0);
auto t = new wxStaticText(this, wxID_ANY, _L("(all values in mm³)"), wxDefaultPosition, wxDefaultSize);
main_sizer->Add(m_radio_button2, 0, wxALL, 10); main_sizer->Add(m_radio_button2, 0, wxALL, 10);
auto stb_sizer2 = new wxStaticBoxSizer(stb2, wxVERTICAL);
auto stb_sizer = new wxStaticBoxSizer(stb, wxVERTICAL); stb_sizer2->Add(m_panel_wiping, 0, wxEXPAND | wxALL, 5);
stb_sizer->Add(m_panel_wiping, 0, wxEXPAND | wxALL, 5); stb_sizer2->Add(t, 0, wxALIGN_CENTER_HORIZONTAL | wxCENTER | wxBOTTOM, 0);
stb_sizer->Add(m_widget_button, 0, wxALIGN_CENTER_HORIZONTAL | wxCENTER | wxBOTTOM, 5); stb_sizer2->Add(m_widget_button, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, 5);
main_sizer->Add(stb_sizer2, 0, wxALIGN_CENTER_HORIZONTAL | wxBOTTOM, 20);
main_sizer->Add(stb_sizer, 0, wxALIGN_CENTER_HORIZONTAL | wxBOTTOM, 20);
auto buttons = CreateStdDialogButtonSizer(wxOK | wxCANCEL); auto buttons = CreateStdDialogButtonSizer(wxOK | wxCANCEL);
wxGetApp().SetWindowVariantForButton(buttons->GetAffirmativeButton()); wxGetApp().SetWindowVariantForButton(buttons->GetAffirmativeButton());
@ -359,7 +363,7 @@ WipingPanel::WipingPanel(wxWindow* parent, const std::vector<float>& matrix, con
m_sizer = new wxBoxSizer(wxVERTICAL); m_sizer = new wxBoxSizer(wxVERTICAL);
m_sizer->Add(m_page_advanced, 0, wxEXPAND | wxALL, 25); m_sizer->Add(m_page_advanced, 0, wxEXPAND | wxALL, 5);
m_sizer->SetSizeHints(this); m_sizer->SetSizeHints(this);
SetSizer(m_sizer); SetSizer(m_sizer);
@ -412,6 +416,7 @@ std::vector<float> WipingPanel::read_matrix_values() {
void WipingDialog::enable_or_disable_panel() void WipingDialog::enable_or_disable_panel()
{ {
bool enable = m_radio_button2->GetValue(); bool enable = m_radio_button2->GetValue();
m_info_text1->Enable(! enable);
m_widget_button->Enable(enable); m_widget_button->Enable(enable);
m_panel_wiping->Enable(enable); m_panel_wiping->Enable(enable);
m_panel_wiping->Refresh(); m_panel_wiping->Refresh();

1
src/slic3r/GUI/WipeTowerDialog.hpp
View File

@ -89,6 +89,7 @@ private:
wxRadioButton* m_radio_button1 = nullptr; wxRadioButton* m_radio_button1 = nullptr;
wxRadioButton* m_radio_button2 = nullptr; wxRadioButton* m_radio_button2 = nullptr;
wxButton* m_widget_button = nullptr; wxButton* m_widget_button = nullptr;
wxStaticText* m_info_text1 = nullptr;
}; };
#endif // _WIPE_TOWER_DIALOG_H_ #endif // _WIPE_TOWER_DIALOG_H_