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

ENH:enable flow calibration when using Textured PEI Plate

Browse source 
Change-Id: I34d5ae8a04f97eb4559b27a87f87a894650f6e39
This commit is contained in:
tao wang 2023-05-30 20:25:07 +08:00 • committed by Lane.Wei
parent 392ddf9047
commit bba4b993f5
2 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1646,7 +1646,7 @@ wxWindow *SelectMachineDialog::create_item_checkbox(wxString title, wxWindow *pa
check->Bind(wxEVT_LEFT_DOWN, [this, check, param](wxMouseEvent &e) { check->Bind(wxEVT_LEFT_DOWN, [this, check, param](wxMouseEvent &e) {
if (!m_checkbox_state_list[param]) {return;} //if (!m_checkbox_state_list[param]) {return;}
AppConfig* config = wxGetApp().app_config; AppConfig* config = wxGetApp().app_config;
if (config) { if (config) {
if (check->GetValue()) if (check->GetValue())
@ -1658,7 +1658,7 @@ wxWindow *SelectMachineDialog::create_item_checkbox(wxString title, wxWindow *pa
}); });
checkbox->Bind(wxEVT_LEFT_DOWN, [this, check, param](wxMouseEvent&) { checkbox->Bind(wxEVT_LEFT_DOWN, [this, check, param](wxMouseEvent&) {
if (!m_checkbox_state_list[param]) {return;} //if (!m_checkbox_state_list[param]) {return;}
check->SetValue(check->GetValue() ? false : true); check->SetValue(check->GetValue() ? false : true);
AppConfig* config = wxGetApp().app_config; AppConfig* config = wxGetApp().app_config;
if (config) { if (config) {
@ -1670,7 +1670,7 @@ wxWindow *SelectMachineDialog::create_item_checkbox(wxString title, wxWindow *pa
}); });
text->Bind(wxEVT_LEFT_DOWN, [this, check, param](wxMouseEvent &) { text->Bind(wxEVT_LEFT_DOWN, [this, check, param](wxMouseEvent &) {
if (!m_checkbox_state_list[param]) {return;} //if (!m_checkbox_state_list[param]) {return;}
check->SetValue(check->GetValue() ? false : true); check->SetValue(check->GetValue() ? false : true);
AppConfig* config = wxGetApp().app_config; AppConfig* config = wxGetApp().app_config;
if (config) { if (config) {
@ -1681,7 +1681,7 @@ wxWindow *SelectMachineDialog::create_item_checkbox(wxString title, wxWindow *pa
} }
}); });
m_checkbox_state_list[param] = true; //m_checkbox_state_list[param] = true;
m_checkbox_list[param] = check; m_checkbox_list[param] = check;
return checkbox; return checkbox;
} }
@ -3302,27 +3302,27 @@ wxImage *SelectMachineDialog::LoadImageFromBlob(const unsigned char *data, int s
return NULL; return NULL;
} }
void SelectMachineDialog::set_flow_calibration_state(bool state) //void SelectMachineDialog::set_flow_calibration_state(bool state)
{ //{
if (!state) { // if (!state) {
m_checkbox_list["flow_cali"]->SetValue(state); // m_checkbox_list["flow_cali"]->SetValue(state);
m_checkbox_list["flow_cali"]->SetToolTip(_L("Extrusion compensation calibration is not supported when using Textured PEI Plate")); // m_checkbox_list["flow_cali"]->SetToolTip(_L("Extrusion compensation calibration is not supported when using Textured PEI Plate"));
m_checkbox_list["flow_cali"]->Disable(); // m_checkbox_list["flow_cali"]->Disable();
m_checkbox_state_list["flow_cali"] = state; // m_checkbox_state_list["flow_cali"] = state;
for (auto win : select_flow->GetWindowChildren()) { // for (auto win : select_flow->GetWindowChildren()) {
win->SetToolTip(_L("Extrusion compensation calibration is not supported when using Textured PEI Plate")); // win->SetToolTip(_L("Extrusion compensation calibration is not supported when using Textured PEI Plate"));
} // }
select_flow->SetToolTip(_L("Extrusion compensation calibration is not supported when using Textured PEI Plate")); // select_flow->SetToolTip(_L("Extrusion compensation calibration is not supported when using Textured PEI Plate"));
} // }
else { // else {
m_checkbox_list["flow_cali"]->SetValue(state); // m_checkbox_list["flow_cali"]->SetValue(state);
m_checkbox_list["flow_cali"]->Enable(); // m_checkbox_list["flow_cali"]->Enable();
m_checkbox_state_list["flow_cali"] = state; // m_checkbox_state_list["flow_cali"] = state;
for (auto win : select_flow->GetWindowChildren()) { // for (auto win : select_flow->GetWindowChildren()) {
win->SetToolTip( _L("Flow Calibration")); // win->SetToolTip( _L("Flow Calibration"));
} // }
} // }
} //}
void SelectMachineDialog::set_default() void SelectMachineDialog::set_default()
{ {
@ -3564,13 +3564,13 @@ void SelectMachineDialog::set_default_normal()
m_scrollable_view->SetMaxSize(m_scrollable_region->GetSize()); m_scrollable_view->SetMaxSize(m_scrollable_region->GetSize());
//disable pei bed //disable pei bed
auto bed_type = m_plater->get_partplate_list().get_curr_plate()->get_bed_type(true); /*auto bed_type = m_plater->get_partplate_list().get_curr_plate()->get_bed_type(true);
if (bed_type == BedType::btPTE) { if (bed_type == BedType::btPTE) {
set_flow_calibration_state(false); set_flow_calibration_state(false);
} }
else { else {
set_flow_calibration_state(true); set_flow_calibration_state(true);
} }*/
wxSize screenSize = wxGetDisplaySize(); wxSize screenSize = wxGetDisplaySize();
auto dialogSize = this->GetSize(); auto dialogSize = this->GetSize();
@ -3720,13 +3720,13 @@ void SelectMachineDialog::set_default_from_sdcard()
m_scrollable_view->SetMaxSize(m_scrollable_region->GetSize()); m_scrollable_view->SetMaxSize(m_scrollable_region->GetSize());
//disable pei bed //disable pei bed
auto bed_type = m_plater->get_partplate_list().get_curr_plate()->get_bed_type(true); /*auto bed_type = m_plater->get_partplate_list().get_curr_plate()->get_bed_type(true);
if (bed_type == BedType::btPTE) { if (bed_type == BedType::btPTE) {
set_flow_calibration_state(false); set_flow_calibration_state(false);
} }
else { else {
set_flow_calibration_state(true); set_flow_calibration_state(true);
} }*/
wxSize screenSize = wxGetDisplaySize(); wxSize screenSize = wxGetDisplaySize();
auto dialogSize = this->GetSize(); auto dialogSize = this->GetSize();

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

@ -305,7 +305,7 @@ private:
StateColor m_btn_bg_enable; StateColor m_btn_bg_enable;
std::map<std::string, CheckBox *> m_checkbox_list; std::map<std::string, CheckBox *> m_checkbox_list;
std::map<std::string, bool> m_checkbox_state_list; //std::map<std::string, bool> m_checkbox_state_list;
std::vector<wxString> m_bedtype_list; std::vector<wxString> m_bedtype_list;
std::vector<MachineObject*> m_list; std::vector<MachineObject*> m_list;
std::vector<FilamentInfo> m_filaments; std::vector<FilamentInfo> m_filaments;
@ -440,7 +440,7 @@ public:
void update_priner_status_msg(wxString msg, bool is_warning = false); void update_priner_status_msg(wxString msg, bool is_warning = false);
void update_print_status_msg(wxString msg, bool is_warning = false, bool is_printer = true); void update_print_status_msg(wxString msg, bool is_warning = false, bool is_printer = true);
void update_print_error_info(int code, std::string msg, std::string extra); void update_print_error_info(int code, std::string msg, std::string extra);
void set_flow_calibration_state(bool state); //void set_flow_calibration_state(bool state);
bool is_show_timelapse(); bool is_show_timelapse();
bool is_same_printer_model(); bool is_same_printer_model();
bool has_tips(MachineObject* obj); bool has_tips(MachineObject* obj);