juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-28 05:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

make belt printer specific temp tower only accessible to belt printers

Browse Source
This commit is contained in:
harrierpigeon
2026-06-12 04:41:29 -05:00
parent 85fd613cf7
commit 0bca3fd2e5
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/slic3r/GUI/calib_dlg.cpp
View File

@@ -397,12 +397,14 @@ Temp_Calibration_Dlg::Temp_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plat
// Belt temperature-tower model: Standard (sectioned tower) vs Overhang (engraved // Belt temperature-tower model: Standard (sectioned tower) vs Overhang (engraved
// inverted-L provini that stress overhang quality per temperature). Only affects // inverted-L provini that stress overhang quality per temperature). Only affects
// belt printers; the upright tower ignores it. // belt printers; the upright tower ignores it, so the picker is only shown on
// belts. The dialog is cached across printer switches, so visibility is toggled
// per-show in on_show() rather than gated here at construction time.
auto labeled_box_model = new LabeledStaticBox(this, _L("Test model")); auto labeled_box_model = new LabeledStaticBox(this, _L("Test model"));
auto model_box = new wxStaticBoxSizer(labeled_box_model, wxHORIZONTAL); m_model_box = new wxStaticBoxSizer(labeled_box_model, wxHORIZONTAL);
m_rbModel = new RadioGroup(this, { _L("Standard"), _L("Overhang") }, wxVERTICAL); m_rbModel = new RadioGroup(this, { _L("Standard"), _L("Overhang") }, wxVERTICAL);
model_box->Add(m_rbModel, 0, wxALL | wxEXPAND, FromDIP(4)); m_model_box->Add(m_rbModel, 0, wxALL | wxEXPAND, FromDIP(4));
v_sizer->Add(model_box, 0, wxTOP | wxRIGHT | wxLEFT | wxEXPAND, FromDIP(10)); v_sizer->Add(m_model_box, 0, wxTOP | wxRIGHT | wxLEFT | wxEXPAND, FromDIP(10));
// Settings // Settings
wxString start_temp_str = _L("Start temp: "); wxString start_temp_str = _L("Start temp: ");
@@ -464,6 +466,11 @@ Temp_Calibration_Dlg::Temp_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plat
m_rbFilamentType->Connect(wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler(Temp_Calibration_Dlg::on_filament_type_changed), NULL, this); m_rbFilamentType->Connect(wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler(Temp_Calibration_Dlg::on_filament_type_changed), NULL, this);
// Refresh the belt-only model picker on every show — the dialog is cached and
// reused across printer switches.
this->Connect(wxEVT_SHOW, wxShowEventHandler(Temp_Calibration_Dlg::on_show));
m_model_box->ShowItems(is_belt_printer_selected());
wxGetApp().UpdateDlgDarkUI(this); wxGetApp().UpdateDlgDarkUI(this);
Layout(); Layout();
@@ -520,12 +527,27 @@ void Temp_Calibration_Dlg::on_start(wxCommandEvent& event) {
m_params.start = start; m_params.start = start;
m_params.end = end; m_params.end = end;
m_params.mode = CalibMode::Calib_Temp_Tower; m_params.mode = CalibMode::Calib_Temp_Tower;
m_params.test_model = m_rbModel->GetSelection(); // Picker only exists on belt printers; default non-belt to the Standard model.
m_params.test_model = m_rbModel ? m_rbModel->GetSelection() : 0;
m_plater->calib_temp(m_params); m_plater->calib_temp(m_params);
EndModal(wxID_OK); EndModal(wxID_OK);
} }
void Temp_Calibration_Dlg::on_show(wxShowEvent& event) {
// ORCA-Belt: the dialog is cached across printer switches, so refresh the
// belt-only "Test model" picker on every show. The Overhang model only
// applies to belt printers; hide it (and resize the dialog) otherwise.
const bool belt = is_belt_printer_selected();
if (m_model_box->AreAnyItemsShown() != belt) {
m_model_box->ShowItems(belt);
Layout();
Fit();
GetSizer()->SetSizeHints(this);
}
event.Skip();
}
void Temp_Calibration_Dlg::on_filament_type_changed(wxCommandEvent& event) { void Temp_Calibration_Dlg::on_filament_type_changed(wxCommandEvent& event) {
int selection = event.GetSelection(); int selection = event.GetSelection();
unsigned long start = 0, end = 0; unsigned long start = 0, end = 0;

4
src/slic3r/GUI/calib_dlg.hpp
View File

@@ -59,10 +59,12 @@ protected:
virtual void on_start(wxCommandEvent& event); virtual void on_start(wxCommandEvent& event);
virtual void on_filament_type_changed(wxCommandEvent& event); virtual void on_filament_type_changed(wxCommandEvent& event);
void on_show(wxShowEvent& event);
Calib_Params m_params; Calib_Params m_params;
RadioGroup* m_rbFilamentType; RadioGroup* m_rbFilamentType;
RadioGroup* m_rbModel; RadioGroup* m_rbModel = nullptr;
wxStaticBoxSizer* m_model_box = nullptr;
TextInput* m_tiStart; TextInput* m_tiStart;
TextInput* m_tiEnd; TextInput* m_tiEnd;
TextInput* m_tiStep; TextInput* m_tiStep;