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

FIX:fix some new ui issues 

jira:[new ui]

Change-Id: I1283de641d4f2e4acfd5bef91716f9029665c465
This commit is contained in:
tao wang 2024-10-16 11:58:25 +08:00 committed by lane.wei
parent c4cdc2e8f3
commit 65e8b4ee7e
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/slic3r/GUI/SelectMachine.cpp
View File

@ -3710,19 +3710,20 @@ void SelectMachineDialog::update_flow_cali_check(MachineObject* obj)
set_flow_calibration_state(true, show_cali_tips);
}
void SelectMachineDialog::update_ams_check(MachineObject* obj)
void SelectMachineDialog::update_ams_check(MachineObject *obj)
{
if (obj && obj->ams_support_use_ams && obj->has_ams()) {
if (obj && obj->ams_support_use_ams && obj->has_ams() && !obj->is_enable_np) {
select_use_ams->Show();
if (obj->get_printer_ams_type() == "generic") {
img_use_ams_tip->Show();
}
else {
} else {
img_use_ams_tip->Hide();
}
} else {
select_use_ams->Hide();
}
} /* else {
select_use_ams->Hide();
}*/
if (obj->is_enable_np) { m_checkbox_list["use_ams"]->SetValue(true); }
}
void SelectMachineDialog::update_show_status()

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

@ -3832,6 +3832,8 @@ void StatusPanel::on_start_unload(wxCommandEvent &event)
void StatusPanel::on_set_bed_temp()
{
if (!obj) {return;}
wxString str = m_tempCtrl_bed->GetTextCtrl()->GetValue();
try {
long bed_temp;
@ -3853,6 +3855,8 @@ void StatusPanel::on_set_bed_temp()
void StatusPanel::on_set_nozzle_temp()
{
if (!obj) {return;}
wxString str = m_tempCtrl_nozzle->GetTextCtrl()->GetValue();
wxString str_deputy;
int nozzle_num = obj->m_extder_data.total_extder_count;
@ -3884,6 +3888,8 @@ void StatusPanel::on_set_nozzle_temp()
void StatusPanel::on_set_chamber_temp()
{
if (!obj) {return;}
wxString str = m_tempCtrl_chamber->GetTextCtrl()->GetValue();
try {
long chamber_temp;

2
src/slic3r/GUI/Widgets/Button.cpp
View File

@ -79,7 +79,7 @@ void Button::SetIcon(const wxString& icon)
auto tmpBitmap = ScalableBitmap(this, icon.ToStdString(), this->active_icon.px_cnt());
if (!icon.IsEmpty()) {
//BBS set button icon default size to 20
if (!tmpBitmap.bmp().IsSameAs(this->active_icon.bmp())) {
if (!tmpBitmap.bmp().IsSameAs(this->active_icon.bmp())) {
this->active_icon = tmpBitmap;
Refresh();
}