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

FIX:The 'close' button did not call 'cancelw_coin_comor'

Browse Source 
jira: STUDIO-10926
Change-Id: I4ded2cd930575eccfab27d62bf451eb788c90310
(cherry picked from commit 427f27ce9bccef8f1ff18924e7a7ab4f23f898c0)
This commit is contained in:
zhou.xu
2025-03-18 11:44:38 +08:00
committed by Noisyfox
parent dd4781e47b
commit 484d3db930
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/slic3r/GUI/ObjColorDialog.cpp
View File

@@ -232,12 +232,18 @@ ObjColorDialog::ObjColorDialog(wxWindow *parent, Slic3r::ObjDialogInOut &in_out,
if (this->FindWindowById(wxID_CANCEL, this)) {
update_ui(static_cast<wxButton*>(this->FindWindowById(wxID_CANCEL, this)));
this->FindWindowById(wxID_CANCEL, this)->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) {
if (!m_panel_ObjColor) { return; }
m_panel_ObjColor->cancel_paint_color();
EndModal(wxCANCEL);
if (m_panel_ObjColor) {
m_panel_ObjColor->cancel_paint_color();
}
EndModal(wxCANCEL);
});
}
this->Bind(wxEVT_CLOSE_WINDOW, [this](wxCloseEvent& e) { EndModal(wxCANCEL); });
this->Bind(wxEVT_CLOSE_WINDOW, [this](wxCloseEvent &e) {
if (m_panel_ObjColor) {
m_panel_ObjColor->cancel_paint_color();
}
EndModal(wxCANCEL);
});
wxGetApp().UpdateDlgDarkUI(this);
CenterOnParent();
@@ -488,6 +494,7 @@ void ObjColorPanel::cancel_paint_color() {
auto mv = mo->volumes[0];
mv->mmu_segmentation_facets.reset();
mv->config.set("extruder", 1);
m_first_extruder_id = 1;
}
void ObjColorPanel::update_filament_ids()

14
src/slic3r/GUI/PartPlate.cpp
View File

@@ -1776,11 +1776,15 @@ bool PartPlate::check_mixture_of_pla_and_petg(const DynamicPrintConfig &config)
if (!used_filaments.empty()) {
for (auto filament_idx : used_filaments) {
int filament_id = filament_idx - 1;
std::string filament_type = config.option<ConfigOptionStrings>("filament_type")->values.at(filament_id);
if (filament_type == "PLA")
has_pla = true;
if (filament_type == "PETG")
has_petg = true;
if (filament_id < config.option<ConfigOptionStrings>("filament_type")->values.size()) {
std::string filament_type = config.option<ConfigOptionStrings>("filament_type")->values.at(filament_id);
if (filament_type == "PLA")
has_pla = true;
if (filament_type == "PETG")
has_petg = true;
} else {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " check error:array bound";
}
}
}