FIX: Hidden Model Mall Entrance
Change-Id: If5a5d0d0b8925da3b1637f98c767c1c5df0ef6ed
This commit is contained in:
parent
570d374cbb
commit
3e03344c23
|
@ -1456,7 +1456,7 @@ void StatusPanel::update_tasklist_info()
|
|||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
@ -2477,28 +2477,30 @@ void StatusPanel::update_subtask(MachineObject *obj)
|
|||
m_button_abort->SetBitmap_("print_control_stop_disable");
|
||||
m_button_pause_resume->Enable(false);
|
||||
m_button_pause_resume->SetBitmap_("print_control_resume_disable");
|
||||
bool is_market_task = obj->get_modeltask() && obj->get_modeltask()->design_id > 0;
|
||||
if (is_market_task) {
|
||||
m_button_market_scoring->Show();
|
||||
BOOST_LOG_TRIVIAL(info) << "SHOW_SCORE_BTU: design_id [" << obj->get_modeltask()->design_id << "] print_finish [" << m_print_finish << "]";
|
||||
if (!m_print_finish && IsShownOnScreen()) {
|
||||
m_print_finish = true;
|
||||
int job_id = obj->get_modeltask()->job_id;
|
||||
if (wxGetApp().app_config->get("not_show_score_dialog") != "1" && rated_model_id.find(job_id) == rated_model_id.end()) {
|
||||
MessageDialog dlg(this, _L("Please give a score for your favorite Bambu Market model."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Score"),
|
||||
wxYES_NO | wxYES_DEFAULT | wxCENTRE);
|
||||
dlg.show_dsa_button();
|
||||
int old_design_id = obj->get_modeltask()->design_id;
|
||||
auto res = dlg.ShowModal();
|
||||
if (dlg.get_checkbox_state()) { wxGetApp().app_config->set("not_show_score_dialog", "1"); }
|
||||
if (res == wxID_YES) { market_model_scoring_page(old_design_id); }
|
||||
rated_model_id.insert(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 << "]";
|
||||
if (wxGetApp().has_model_mall()) {
|
||||
bool is_market_task = obj->get_modeltask() && obj->get_modeltask()->design_id > 0;
|
||||
if (is_market_task) {
|
||||
m_button_market_scoring->Show();
|
||||
BOOST_LOG_TRIVIAL(info) << "SHOW_SCORE_BTU: design_id [" << obj->get_modeltask()->design_id << "] print_finish [" << m_print_finish << "]";
|
||||
if (!m_print_finish && IsShownOnScreen()) {
|
||||
m_print_finish = true;
|
||||
int job_id = obj->get_modeltask()->job_id;
|
||||
if (wxGetApp().app_config->get("not_show_score_dialog") != "1" && rated_model_id.find(job_id) == rated_model_id.end()) {
|
||||
MessageDialog dlg(this, _L("Please give a score for your favorite Bambu Market model."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Score"),
|
||||
wxYES_NO | wxYES_DEFAULT | wxCENTRE);
|
||||
dlg.show_dsa_button();
|
||||
int old_design_id = obj->get_modeltask()->design_id;
|
||||
auto res = dlg.ShowModal();
|
||||
if (dlg.get_checkbox_state()) { wxGetApp().app_config->set("not_show_score_dialog", "1"); }
|
||||
if (res == wxID_YES) { market_model_scoring_page(old_design_id); }
|
||||
rated_model_id.insert(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 {
|
||||
m_button_abort->Enable(true);
|
||||
|
|
Loading…
Reference in New Issue