mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: Hidden Model Mall Entrance 

Change-Id: If5a5d0d0b8925da3b1637f98c767c1c5df0ef6ed
This commit is contained in:
maosheng.wei 2023-06-30 11:37:15 +08:00 committed by Lane.Wei
parent 570d374cbb
commit 3e03344c23
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/slic3r/GUI/StatusPanel.cpp
View File

@ -1456,7 +1456,7 @@ void StatusPanel::update_tasklist_info()
} }
void StatusPanel::on_market_scoring(wxCommandEvent &event) { void StatusPanel::on_market_scoring(wxCommandEvent &event) {
if (obj->get_modeltask() && obj->get_modeltask()->design_id > 0) { if (obj && obj->get_modeltask() && obj->get_modeltask()->design_id > 0) {
market_model_scoring_page(obj->get_modeltask()->design_id); market_model_scoring_page(obj->get_modeltask()->design_id);
} }
} }
@ -2477,28 +2477,30 @@ void StatusPanel::update_subtask(MachineObject *obj)
m_button_abort->SetBitmap_("print_control_stop_disable"); m_button_abort->SetBitmap_("print_control_stop_disable");
m_button_pause_resume->Enable(false); m_button_pause_resume->Enable(false);
m_button_pause_resume->SetBitmap_("print_control_resume_disable"); m_button_pause_resume->SetBitmap_("print_control_resume_disable");
bool is_market_task = obj->get_modeltask() && obj->get_modeltask()->design_id > 0; if (wxGetApp().has_model_mall()) {
if (is_market_task) { bool is_market_task = obj->get_modeltask() && obj->get_modeltask()->design_id > 0;
m_button_market_scoring->Show(); if (is_market_task) {
BOOST_LOG_TRIVIAL(info) << "SHOW_SCORE_BTU: design_id [" << obj->get_modeltask()->design_id << "] print_finish [" << m_print_finish << "]"; m_button_market_scoring->Show();
if (!m_print_finish && IsShownOnScreen()) { BOOST_LOG_TRIVIAL(info) << "SHOW_SCORE_BTU: design_id [" << obj->get_modeltask()->design_id << "] print_finish [" << m_print_finish << "]";
m_print_finish = true; if (!m_print_finish && IsShownOnScreen()) {
int job_id = obj->get_modeltask()->job_id; m_print_finish = true;
if (wxGetApp().app_config->get("not_show_score_dialog") != "1" && rated_model_id.find(job_id) == rated_model_id.end()) { int job_id = obj->get_modeltask()->job_id;
MessageDialog dlg(this, _L("Please give a score for your favorite Bambu Market model."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Score"), if (wxGetApp().app_config->get("not_show_score_dialog") != "1" && rated_model_id.find(job_id) == rated_model_id.end()) {
wxYES_NO | wxYES_DEFAULT | wxCENTRE); MessageDialog dlg(this, _L("Please give a score for your favorite Bambu Market model."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Score"),
dlg.show_dsa_button(); wxYES_NO | wxYES_DEFAULT | wxCENTRE);
int old_design_id = obj->get_modeltask()->design_id; dlg.show_dsa_button();
auto res = dlg.ShowModal(); int old_design_id = obj->get_modeltask()->design_id;
if (dlg.get_checkbox_state()) { wxGetApp().app_config->set("not_show_score_dialog", "1"); } auto res = dlg.ShowModal();
if (res == wxID_YES) { market_model_scoring_page(old_design_id); } if (dlg.get_checkbox_state()) { wxGetApp().app_config->set("not_show_score_dialog", "1"); }
rated_model_id.insert(job_id); if (res == wxID_YES) { market_model_scoring_page(old_design_id); }
BOOST_LOG_TRIVIAL(info) << "SHOW_SCORE_DLG: design_id [" << old_design_id << "] print_finish [" << m_print_finish << "] not_show [" rated_model_id.insert(job_id);
<< wxGetApp().app_config->get("not_show_score_dialog") << "] job_id [" << job_id << "]"; BOOST_LOG_TRIVIAL(info) << "SHOW_SCORE_DLG: design_id [" << old_design_id << "] print_finish [" << m_print_finish << "] not_show ["
<< wxGetApp().app_config->get("not_show_score_dialog") << "] job_id [" << job_id << "]";
}
} }
} else {
m_button_market_scoring->Hide();
} }
} else {
m_button_market_scoring->Hide();
} }
} else { } else {
m_button_abort->Enable(true); m_button_abort->Enable(true);