mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-10-30 04:02:52 -06:00
41fcf8eb1e
1. flush_multiplier will be apply the the flush volume during slicing rather than only in auto-calc 2. mark too small flush volume as red instead of a warning dialog 3. do not forbidden flush volume lower than the nozzle volume 4. fix incorrect focus status of text input box in WipeTowerDialog 5. check the minimum flush volume based on flush_multiplier 6. limit the decimal digit to two places Signed-off-by: yifan.wu <yifan.wu@bambulab.com> Change-Id: Icdcc50c88ecd9463fb9ce73f996d57c2d9f0187f (cherry picked from commit 60e01edc511f117b05a8a9b92aaf6fd55325e485)
83 lines
No EOL
2.6 KiB
C++
83 lines
No EOL
2.6 KiB
C++
#ifndef _WIPE_TOWER_DIALOG_H_
|
|
#define _WIPE_TOWER_DIALOG_H_
|
|
|
|
#include <wx/spinctrl.h>
|
|
#include <wx/stattext.h>
|
|
#include <wx/textctrl.h>
|
|
#include <wx/checkbox.h>
|
|
#include <wx/msgdlg.h>
|
|
|
|
class WipingPanel : public wxPanel {
|
|
public:
|
|
WipingPanel(wxWindow* parent, const std::vector<float>& matrix, const std::vector<float>& extruders, const std::vector<std::string>& extruder_colours, wxButton* widget_button,
|
|
int extra_flush_volume, float flush_multiplier);
|
|
std::vector<float> read_matrix_values();
|
|
std::vector<float> read_extruders_values();
|
|
void toggle_advanced(bool user_action = false);
|
|
void create_panels(wxWindow* parent, const int num);
|
|
void calc_flushing_volumes();
|
|
|
|
float get_flush_multiplier()
|
|
{
|
|
if (m_flush_multiplier_ebox == nullptr)
|
|
return 1.f;
|
|
|
|
return std::atof(m_flush_multiplier_ebox->GetValue().c_str());
|
|
}
|
|
|
|
private:
|
|
void fill_in_matrix();
|
|
bool advanced_matches_simple();
|
|
int calc_flushing_volume(const wxColour& from, const wxColour& to);
|
|
void update_warning_texts();
|
|
|
|
std::vector<wxSpinCtrl*> m_old;
|
|
std::vector<wxSpinCtrl*> m_new;
|
|
std::vector<std::vector<wxTextCtrl*>> edit_boxes;
|
|
std::vector<wxColour> m_colours;
|
|
unsigned int m_number_of_extruders = 0;
|
|
bool m_advanced = false;
|
|
wxPanel* m_page_simple = nullptr;
|
|
wxPanel* m_page_advanced = nullptr;
|
|
wxPanel* header_line_panel = nullptr;
|
|
wxBoxSizer* m_sizer = nullptr;
|
|
wxBoxSizer* m_sizer_simple = nullptr;
|
|
wxBoxSizer* m_sizer_advanced = nullptr;
|
|
wxGridSizer* m_gridsizer_advanced = nullptr;
|
|
wxButton* m_widget_button = nullptr;
|
|
|
|
const int m_min_flush_volume;
|
|
const int m_max_flush_volume;
|
|
|
|
wxTextCtrl* m_flush_multiplier_ebox = nullptr;
|
|
wxStaticText* m_min_flush_label = nullptr;
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
class WipingDialog : public wxDialog {
|
|
public:
|
|
WipingDialog(wxWindow* parent, const std::vector<float>& matrix, const std::vector<float>& extruders, const std::vector<std::string>& extruder_colours,
|
|
int extra_flush_volume, float flush_multiplier);
|
|
std::vector<float> get_matrix() const { return m_output_matrix; }
|
|
std::vector<float> get_extruders() const { return m_output_extruders; }
|
|
|
|
wxBoxSizer* create_btn_sizer(long flags);
|
|
|
|
float get_flush_multiplier()
|
|
{
|
|
if (m_panel_wiping == nullptr)
|
|
return 1.f;
|
|
|
|
return m_panel_wiping->get_flush_multiplier();
|
|
}
|
|
|
|
private:
|
|
WipingPanel* m_panel_wiping = nullptr;
|
|
std::vector<float> m_output_matrix;
|
|
std::vector<float> m_output_extruders;
|
|
};
|
|
|
|
#endif // _WIPE_TOWER_DIALOG_H_
|