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

GUI: Fix calls to PrintingTaskPanel::show_profile_info (#2219)

Browse source 
These will not compile on STL builds of wxWidgets. I assume that on
the non-STL variants, the first argument is cast to a boolean,
which might be a bug…
This commit is contained in:
mia 2023-09-25 17:37:25 +02:00 • committed by GitHub
parent ca534b5b96
commit 3b864e562a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/CalibrationWizardCaliPage.cpp
View file

@ -349,7 +349,7 @@ void CalibrationCaliPage::update_subtask(MachineObject* obj)
m_printing_panel->update_subtask_name(wxString::Format("%s", GUI::from_u8(obj->subtask_name))); m_printing_panel->update_subtask_name(wxString::Format("%s", GUI::from_u8(obj->subtask_name)));
if (obj->get_modeltask() && obj->get_modeltask()->design_id > 0) { if (obj->get_modeltask() && obj->get_modeltask()->design_id > 0) {
m_printing_panel->show_profile_info(wxString::FromUTF8(obj->get_modeltask()->profile_name)); m_printing_panel->show_profile_info(true, wxString::FromUTF8(obj->get_modeltask()->profile_name));
} }
else { else {
m_printing_panel->show_profile_info(false); m_printing_panel->show_profile_info(false);
@ -453,4 +453,4 @@ float CalibrationCaliPage::get_selected_calibration_nozzle_dia(MachineObject* ob
return 0.4; return 0.4;
} }
}} }}

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

@ -2626,7 +2626,7 @@ void StatusPanel::update_subtask(MachineObject *obj)
m_project_task_panel->update_subtask_name(wxString::Format("%s", GUI::from_u8(obj->subtask_name))); m_project_task_panel->update_subtask_name(wxString::Format("%s", GUI::from_u8(obj->subtask_name)));
if (obj->get_modeltask() && obj->get_modeltask()->design_id > 0) { if (obj->get_modeltask() && obj->get_modeltask()->design_id > 0) {
m_project_task_panel->show_profile_info(wxString::FromUTF8(obj->get_modeltask()->profile_name)); m_project_task_panel->show_profile_info(true, wxString::FromUTF8(obj->get_modeltask()->profile_name));
} }
else { else {
m_project_task_panel->show_profile_info(false); m_project_task_panel->show_profile_info(false);