juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-31 14:52:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: flush_volume use correct extra_flush_volume

Browse Source 
and fix extruder_offset bug

jira: none
Change-Id: I84644ad5b54994ae65269531311386cacd972bf3
(cherry picked from commit 71987627efe4fcdcc7940a48d043a7cecc485c02)
This commit is contained in:
zhimin.zeng
2024-09-11 11:32:16 +08:00
committed by Noisyfox
parent 1a03d33795
commit 42f8070fc9
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@ public:
// BBS
WipingPanel(wxWindow* parent, const std::vector<float>& matrix, const std::vector<float>& extruders, size_t cur_extruder_id,
const std::vector<std::string>& extruder_colours, Button* calc_button,
const std::vector<int>& extra_flush_volume, const std::vector<float>& flush_multiplier, size_t nozzle_nums);
const std::vector<std::vector<int>>& extra_flush_volume, const std::vector<float>& flush_multiplier, size_t nozzle_nums);
std::vector<float> read_matrix_values();
std::vector<float> read_extruders_values();
void toggle_advanced(bool user_action = false);
@@ -78,7 +78,7 @@ private:
bool advanced_matches_simple();
int calc_flushing_volume(const wxColour& from, const wxColour& to,int min_flush_volume);
void update_warning_texts();
std::vector<wxSpinCtrl*> m_old;
std::vector<wxSpinCtrl*> m_new;
std::vector<std::vector<wxTextCtrl*>> edit_boxes;
@@ -98,7 +98,7 @@ private:
std::vector<wxButton *> icon_list1;
std::vector<wxButton *> icon_list2;
const std::vector<int> m_min_flush_volume;
const std::vector<std::vector<int>> m_min_flush_volume;
const int m_max_flush_volume;
wxTextCtrl* m_flush_multiplier_ebox = nullptr;
@@ -119,7 +119,7 @@ class WipingDialog : public Slic3r::GUI::DPIDialog
{
public:
WipingDialog(wxWindow* parent, const std::vector<float>& matrix, const std::vector<float>& extruders, const std::vector<std::string>& extruder_colours,
const std::vector<int>&extra_flush_volume, const std::vector<float>& flush_multiplier, size_t nozzle_nums);
const std::vector<std::vector<int>>&extra_flush_volume, const std::vector<float>& flush_multiplier, size_t nozzle_nums);
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);