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

FIX: [STUDIO-2899] Model mall entrance issue

Browse source 
The device window switches from a printer that has printed the mall
model to a printer that does not download the model from the mall. The
printing progress area also displays a rating button

Change-Id: I240cc4d2045cab043f9f6d20e8d40632c4f5b862
This commit is contained in:
maosheng.wei 2023-05-12 18:10:17 +08:00 • committed by Lane.Wei
parent f3fdfee569
commit 187718890f
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/slic3r/GUI/StatusPanel.cpp
View file

@ -2364,6 +2364,7 @@ void StatusPanel::update_subtask(MachineObject *obj)
reset_printing_values(); reset_printing_values();
} else if (obj->is_in_printing() || obj->print_status == "FINISH") { } else if (obj->is_in_printing() || obj->print_status == "FINISH") {
if (obj->is_in_prepare() || obj->print_status == "SLICING") { if (obj->is_in_prepare() || obj->print_status == "SLICING") {
m_button_market_scoring->Hide();
m_button_abort->Enable(false); m_button_abort->Enable(false);
m_button_abort->SetBitmap_("print_control_stop_disable"); m_button_abort->SetBitmap_("print_control_stop_disable");
@ -2419,10 +2420,9 @@ void StatusPanel::update_subtask(MachineObject *obj)
if (!m_print_finish && obj->get_modeltask() && obj->get_modeltask()->design_id > 0) { if (!m_print_finish && obj->get_modeltask() && obj->get_modeltask()->design_id > 0) {
m_print_finish = true; m_print_finish = true;
m_button_market_scoring->Show(); m_button_market_scoring->Show();
if (wxGetApp().app_config->get("not_show_score_dialog") != "1") { int job_id = obj->get_modeltask()->job_id;
MessageDialog dlg(this, if (wxGetApp().app_config->get("not_show_score_dialog") != "1" && rated_model_id.find(job_id) == rated_model_id.end()) {
_L("The currently printed model belongs to the Bambu Market model,click the Yes button to rate the model.\nYou can also click on the " MessageDialog dlg(this, _L("Please give a score for your favorite Bambu Market model."),
"\"Immediately score\" button to rate the model."),
wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Score"), wxYES_NO | wxYES_DEFAULT | wxCENTRE); wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Score"), wxYES_NO | wxYES_DEFAULT | wxCENTRE);
dlg.show_dsa_button(); dlg.show_dsa_button();
int old_design_id = obj->get_modeltask()->design_id; int old_design_id = obj->get_modeltask()->design_id;
@ -2431,7 +2431,10 @@ void StatusPanel::update_subtask(MachineObject *obj)
if (res == wxID_YES) { if (res == wxID_YES) {
market_model_scoring_page(old_design_id); market_model_scoring_page(old_design_id);
} }
rated_model_id.insert(job_id);
} }
} else if (obj->get_modeltask() && obj->get_modeltask()->design_id <= 0) {
m_button_market_scoring->Hide();
} }
} else { } else {
m_button_abort->Enable(true); m_button_abort->Enable(true);
@ -2547,6 +2550,7 @@ void StatusPanel::reset_printing_values()
m_staticText_subtask_value->SetLabelText(NA_STR); m_staticText_subtask_value->SetLabelText(NA_STR);
m_staticText_profile_value->SetLabelText(wxEmptyString); m_staticText_profile_value->SetLabelText(wxEmptyString);
m_staticText_profile_value->Hide(); m_staticText_profile_value->Hide();
m_button_market_scoring->Hide();
update_basic_print_data(false); update_basic_print_data(false);
m_printing_stage_value->SetLabelText(""); m_printing_stage_value->SetLabelText("");
m_staticText_progress_left->SetLabelText(NA_STR); m_staticText_progress_left->SetLabelText(NA_STR);

1
src/slic3r/GUI/StatusPanel.hpp
View file

@ -269,6 +269,7 @@ protected:
std::shared_ptr<ImageTransientPopup> m_image_popup; std::shared_ptr<ImageTransientPopup> m_image_popup;
std::shared_ptr<CameraPopup> m_camera_popup; std::shared_ptr<CameraPopup> m_camera_popup;
std::vector<SliceInfoPanel *> slice_info_list; std::vector<SliceInfoPanel *> slice_info_list;
std::set<int> rated_model_id;
AMSSetting *m_ams_setting_dlg{nullptr}; AMSSetting *m_ams_setting_dlg{nullptr};
PrintOptionsDialog* print_options_dlg { nullptr }; PrintOptionsDialog* print_options_dlg { nullptr };
CalibrationDialog* calibration_dlg {nullptr}; CalibrationDialog* calibration_dlg {nullptr};