juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-10 03:27:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Fix the bug where switching languages on macOS caused a freeze.

Browse Source 
Jira: STUDIO-14688

Change-Id: Iadbaa91e8ed9259f514428bcd7dd66308cdcc388
(cherry picked from commit 84c7fafcca503c00a8ef92f23ade2c2ce871849e)
This commit is contained in:
weizhen.xie
2025-09-24 20:11:59 +08:00
committed by Noisyfox
parent 91393cddfb
commit 80f4a7a40f
2 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,20 +47,19 @@ class WipingDialog : public wxDialog
public:
using VolumeMatrix = std::vector<std::vector<double>>;
WipingDialog(wxWindow* parent,const std::vector<std::vector<int>>& extra_flush_volume, const int max_flush_volume = Slic3r::g_max_flush_volume);
VolumeMatrix CalcFlushingVolumes(int extruder_id);
WipingDialog(wxWindow* parent, const int max_flush_volume = Slic3r::g_max_flush_volume);
static VolumeMatrix CalcFlushingVolumes(int extruder_id);
std::vector<double> GetFlattenMatrix()const;
std::vector<double> GetMultipliers()const;
bool GetSubmitFlag() const { return m_submit_flag; }
private:
int CalcFlushingVolume(const wxColour& from_, const wxColour& to_, int min_flush_volume, int nozzle_flush_dataset);
static int CalcFlushingVolume(const wxColour& from_, const wxColour& to_, int min_flush_volume, int nozzle_flush_dataset);
wxString BuildTableObjStr();
wxString BuildTextObjStr(bool multi_language = true);
void StoreFlushData(int extruder_num, const std::vector<std::vector<double>>& flush_volume_vecs, const std::vector<double>& flush_multipliers);
wxWebView* m_webview;
std::vector<std::vector<int>> m_extra_flush_volume;
int m_max_flush_volume;
VolumeMatrix m_raw_matrixs;