3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 01:37:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIX:fixed incorrect disabled state of filaments material

Browse source 
Change-Id: I168131d90f4b7e987d026808366a08895e1b1524
This commit is contained in:
tao wang 2023-05-31 11:04:38 +08:00 • committed by Lane.Wei
parent e1199884d8
commit 81cb240dcc
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/slic3r/GUI/SelectMachine.cpp
View file

@ -1735,8 +1735,11 @@ void SelectMachineDialog::prepare_mode()
Fit(); Fit();
} }
for (auto it = m_materialList.begin(); it != m_materialList.end(); it++) { if (m_print_page_mode != PrintPageModePrepare) {
it->second->item->enable(); m_print_page_mode = PrintPageModePrepare;
for (auto it = m_materialList.begin(); it != m_materialList.end(); it++) {
it->second->item->enable();
}
} }
} }
@ -1752,13 +1755,18 @@ void SelectMachineDialog::sending_mode()
Fit(); Fit();
} }
for (auto it = m_materialList.begin(); it != m_materialList.end(); it++) {
it->second->item->disable(); if (m_print_page_mode != PrintPageModeSending) {
m_print_page_mode = PrintPageModeSending;
for (auto it = m_materialList.begin(); it != m_materialList.end(); it++) {
it->second->item->disable();
}
} }
} }
void SelectMachineDialog::finish_mode() void SelectMachineDialog::finish_mode()
{ {
m_print_page_mode = PrintPageModeFinish;
m_is_in_sending_mode = false; m_is_in_sending_mode = false;
m_simplebook->SetSelection(2); m_simplebook->SetSelection(2);
Layout(); Layout();

7
src/slic3r/GUI/SelectMachine.hpp
View file

@ -238,6 +238,12 @@ private:
#define SELECT_MACHINE_DIALOG_SIMBOOK_SIZE wxSize(FromDIP(370), FromDIP(64)) #define SELECT_MACHINE_DIALOG_SIMBOOK_SIZE wxSize(FromDIP(370), FromDIP(64))
enum PrintPageMode {
PrintPageModePrepare = 0,
PrintPageModeSending,
PrintPageModeFinish
};
enum PrintDialogStatus { enum PrintDialogStatus {
PrintStatusInit = 0, PrintStatusInit = 0,
PrintStatusNoUserLogin, PrintStatusNoUserLogin,
@ -287,6 +293,7 @@ private:
bool m_export_3mf_cancel{ false }; bool m_export_3mf_cancel{ false };
bool m_is_canceled{ false }; bool m_is_canceled{ false };
bool m_is_rename_mode{ false }; bool m_is_rename_mode{ false };
PrintPageMode m_print_page_mode{PrintPageMode::PrintPageModePrepare};
std::string m_print_error_msg; std::string m_print_error_msg;
std::string m_print_error_extra; std::string m_print_error_extra;
std::string m_printer_last_select; std::string m_printer_last_select;