juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 19:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: nozzle AMS rescale

Browse Source 
Change-Id: I8006c72947463d23984fa62ce3a9a2e2d40e990f
Jira: STUDIO-10045
(cherry picked from commit 2d4cdc82181d8fa8b5c16f7baeb2a46e12b3fc07)
This commit is contained in:
chunmao.guo
2025-01-20 11:45:34 +08:00
committed by Noisyfox
parent 484279a7e9
commit 9a7ee39837
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/Plater.cpp
View File

@@ -387,6 +387,8 @@ struct ExtruderGroup : StaticGroup
btn_up->msw_rescale(); btn_up->msw_rescale();
btn_down->msw_rescale(); btn_down->msw_rescale();
combo_flow->Rescale(); combo_flow->Rescale();
for (int i = 0; i < 4; ++i)
ams[i]->msw_rescale();
} }
}; };
@@ -1702,7 +1704,7 @@ Sidebar::Sidebar(Plater *parent)
} }
})); }));
bSizer39->Add(p->m_flushing_volume_btn, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(5)); bSizer39->Add(p->m_flushing_volume_btn, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(4));
bSizer39->Hide(p->m_flushing_volume_btn); bSizer39->Hide(p->m_flushing_volume_btn);
ScalableButton* add_btn = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "add_filament"); ScalableButton* add_btn = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "add_filament");
@@ -2161,6 +2163,14 @@ void Sidebar::update_presets(Preset::Type preset_type)
bool is_dual_extruder = nozzle_diameter->size() == 2; bool is_dual_extruder = nozzle_diameter->size() == 2;
p->layout_printer(isBBL, is_dual_extruder); p->layout_printer(isBBL, is_dual_extruder);
if (is_dual_extruder) {
AMSCountPopupWindow::UpdateAMSCount(0, p->left_extruder);
AMSCountPopupWindow::UpdateAMSCount(1, p->right_extruder);
p->image_printer_bed->SetBitmap(create_scaled_bitmap(bed_type_thumbnails[BedType(p->combo_printer_bed->GetSelection() + 1)], this, 48));
} else {
AMSCountPopupWindow::UpdateAMSCount(0, p->single_extruder);
p->image_printer_bed->SetBitmap(create_scaled_bitmap(bed_type_thumbnails[BedType(p->combo_printer_bed->GetSelection() + 1)], this, 32));
}
if (GUI::wxGetApp().plater()) if (GUI::wxGetApp().plater())
GUI::wxGetApp().plater()->update_machine_sync_status(); GUI::wxGetApp().plater()->update_machine_sync_status();
@@ -2229,6 +2239,7 @@ void Sidebar::msw_rescale()
->SetMinSize(-1, 3 * wxGetApp().em_unit()); ->SetMinSize(-1, 3 * wxGetApp().em_unit());
p->m_printer_icon->msw_rescale(); p->m_printer_icon->msw_rescale();
p->m_printer_setting->msw_rescale(); p->m_printer_setting->msw_rescale();
p->btn_edit_printer->msw_rescale();
p->image_printer->SetSize(PRINTER_THUMBNAIL_SIZE); p->image_printer->SetSize(PRINTER_THUMBNAIL_SIZE);
bool isDual = static_cast<wxBoxSizer *>(p->panel_printer_preset->GetSizer())->GetOrientation() == wxVERTICAL; bool isDual = static_cast<wxBoxSizer *>(p->panel_printer_preset->GetSizer())->GetOrientation() == wxVERTICAL;
p->image_printer_bed->SetBitmap(create_scaled_bitmap(bed_type_thumbnails[BedType(p->combo_printer_bed->GetSelection() + 1)], this, 48)); p->image_printer_bed->SetBitmap(create_scaled_bitmap(bed_type_thumbnails[BedType(p->combo_printer_bed->GetSelection() + 1)], this, 48));

2
src/slic3r/GUI/PresetComboBoxes.cpp
View File

@@ -194,7 +194,7 @@ void PresetComboBox::update_selection()
*/ */
//validate_selection(); //validate_selection();
if (m_last_selected == INT_MAX) if (m_last_selected == INT_MAX)
m_last_selected == 1; m_last_selected = 1;
SetSelection(m_last_selected); SetSelection(m_last_selected);
#ifdef __WXMSW__ #ifdef __WXMSW__