3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-18 10:32:31 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

FIX: add ui_op_lock for cali history operation

Browse source 
Jira: [STUDIO-14419]
Change-Id: I5242a0a56c9fd2459bd681fc32e3d1edd3b19d66
(cherry picked from commit ea7a39ecf0955efe7781f44ec7d3ea3900a43711)
This commit is contained in:
hemai 2025-09-23 20:39:41 +08:00 • committed by Noisyfox
parent a2a9f95b6b
commit 34a6100fe6
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/slic3r/GUI/CaliHistoryDialog.cpp
View file

@ -383,9 +383,14 @@ void HistoryWindow::sync_history_data() {
delete_button->SetMinSize(wxSize(-1, FromDIP(24)));
delete_button->SetCornerRadius(FromDIP(12));
delete_button->Bind(wxEVT_BUTTON, [this, gbSizer, i, &result](auto& e) {
if (m_ui_op_lock) {
return;
} else {
m_ui_op_lock = true;
}
for (int j = 0; j < HISTORY_WINDOW_ITEMS_COUNT; j++) {
auto item = gbSizer->FindItemAtPosition({ i, j });
if (item)
if (item && item->GetWindow())
item->GetWindow()->Hide();
}
gbSizer->SetEmptyCellSize({ 0,0 });
@ -410,6 +415,8 @@ void HistoryWindow::sync_history_data() {
edit_button->SetMinSize(wxSize(-1, FromDIP(24)));
edit_button->SetCornerRadius(FromDIP(12));
edit_button->Bind(wxEVT_BUTTON, [this, result, k_value, name_value, edit_button](auto& e) {
if (m_ui_op_lock) return;
PACalibResult result_buffer = result;
result_buffer.k_value = stof(k_value->GetLabel().ToStdString());
result_buffer.name = name_value->GetLabel().ToUTF8().data();
@ -440,6 +447,7 @@ void HistoryWindow::sync_history_data() {
gbSizer->Add(delete_button, {i, get_colume_idx(CaliColumnType::Cali_Delete, curr_obj)}, {1, 1}, wxBOTTOM, FromDIP(15));
gbSizer->Add(edit_button, {i, get_colume_idx(CaliColumnType::Cali_Edit, curr_obj)}, {1, 1}, wxBOTTOM, FromDIP(15));
i++;
m_ui_op_lock = false;
}
wxGetApp().UpdateDlgDarkUI(this);

2
src/slic3r/GUI/CaliHistoryDialog.hpp
View file

@ -40,6 +40,8 @@ protected:
bool& m_show_history_dialog;
std::vector<PACalibResult> m_calib_results_history;
MachineObject* curr_obj { nullptr };
bool m_ui_op_lock{ false };
};
class EditCalibrationHistoryDialog : public DPIDialog