Files
OrcaSlicer/src/slic3r/GUI/calib_dlg.hpp
tome9111991 2af2f0f98b enh: flow rate pattern calibration menu (#11956)
* feat: Add flow rate calibration pattern selector dialog

* feat: Integrate PR #11881 and improve Flow Rate Calibration Wizard

- Integrated PR #11881: Display layer duration in G-code viewer position window.
- Enhanced Flow Rate Calibration:
    - Implemented a Wizard dialog (FlowRateCalibrationDialog) using DPIDialog for Dark Mode support.
    - Restricted pattern selection to 'Archimedean Chords' and 'Monotonic'.
    - Integrated logic to pass the selected pattern to the calibration generation.

* fix(UI): Refactor FlowRateCalibrationDialog to calib_dlg for macOS build fix and UI consistency

Moved FlowRateCalibrationDialog from MainFrame.cpp to calib_dlg.hpp/.cpp to resolve build errors on macOS. Updated UI to match Pressure Advance calibration dialog style (Dark Mode support, RadioGroups). Logic moved to dialog class.

* Update Wiki link for flow rate calibration

* ui: replace RadioGroup with BitmapComboBox for Flow Rate pattern selection

* fix(ui): use custom ComboBox widget for Flow Rate Calibration

Replaces wxBitmapComboBox with OrcaSlicer's custom ComboBox widget to fix rendering issues on Windows (empty selection) and compilation errors on Linux.

* Refactor: Cleanup unused includes and members in FlowRate calibration dialog

* Fix: Complete rename of Flow Rate to Flow ratio in calibration menus after merge

* Fix: Update Flow Rate to Flow Ratio in Calibration Dialog and Wiki Link

---------

Co-authored-by: yw4z <ywsyildiz@gmail.com>
Co-authored-by: SoftFever <softfeverever@gmail.com>
2026-04-24 21:39:32 +08:00

201 lines
4.9 KiB
C++

#ifndef slic3r_calib_dlg_hpp_
#define slic3r_calib_dlg_hpp_
#include "wxExtensions.hpp"
#include "GUI_Utils.hpp"
#include "Widgets/Button.hpp"
#include "Widgets/RoundedRectangle.hpp"
#include "Widgets/Label.hpp"
#include "Widgets/CheckBox.hpp"
#include "Widgets/ComboBox.hpp"
#include "Widgets/TextInput.hpp"
#include "Widgets/LabeledStaticBox.hpp"
#include "Widgets/RadioGroup.hpp"
#include "GUI_App.hpp"
#include "wx/hyperlink.h"
#include <wx/radiobox.h>
#include "libslic3r/calib.hpp"
namespace Slic3r { namespace GUI {
class PA_Calibration_Dlg : public DPIDialog
{
public:
PA_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plater* plater);
~PA_Calibration_Dlg();
void on_dpi_changed(const wxRect& suggested_rect) override;
void on_show(wxShowEvent& event);
protected:
void reset_params();
virtual void on_start(wxCommandEvent& event);
virtual void on_extruder_type_changed(wxCommandEvent& event);
virtual void on_method_changed(wxCommandEvent& event);
protected:
bool m_bDDE;
Calib_Params m_params;
RadioGroup* m_rbExtruderType;
RadioGroup* m_rbMethod;
TextInput* m_tiStartPA;
TextInput* m_tiEndPA;
TextInput* m_tiPAStep;
CheckBox* m_cbPrintNum;
TextInput* m_tiBMAccels;
TextInput* m_tiBMSpeeds;
Plater* m_plater;
};
class Temp_Calibration_Dlg : public DPIDialog
{
public:
Temp_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plater* plater);
~Temp_Calibration_Dlg();
void on_dpi_changed(const wxRect& suggested_rect) override;
protected:
virtual void on_start(wxCommandEvent& event);
virtual void on_filament_type_changed(wxCommandEvent& event);
Calib_Params m_params;
RadioGroup* m_rbFilamentType;
TextInput* m_tiStart;
TextInput* m_tiEnd;
TextInput* m_tiStep;
Plater* m_plater;
};
class MaxVolumetricSpeed_Test_Dlg : public DPIDialog
{
public:
MaxVolumetricSpeed_Test_Dlg(wxWindow* parent, wxWindowID id, Plater* plater);
~MaxVolumetricSpeed_Test_Dlg();
void on_dpi_changed(const wxRect& suggested_rect) override;
protected:
virtual void on_start(wxCommandEvent& event);
Calib_Params m_params;
TextInput* m_tiStart;
TextInput* m_tiEnd;
TextInput* m_tiStep;
Plater* m_plater;
};
class VFA_Test_Dlg : public DPIDialog {
public:
VFA_Test_Dlg(wxWindow* parent, wxWindowID id, Plater* plater);
~VFA_Test_Dlg();
void on_dpi_changed(const wxRect& suggested_rect) override;
protected:
virtual void on_start(wxCommandEvent& event);
Calib_Params m_params;
TextInput* m_tiStart;
TextInput* m_tiEnd;
TextInput* m_tiStep;
Plater* m_plater;
};
class Retraction_Test_Dlg : public DPIDialog
{
public:
Retraction_Test_Dlg (wxWindow* parent, wxWindowID id, Plater* plater);
~Retraction_Test_Dlg ();
void on_dpi_changed(const wxRect& suggested_rect) override;
protected:
virtual void on_start(wxCommandEvent& event);
Calib_Params m_params;
TextInput* m_tiStart;
TextInput* m_tiEnd;
TextInput* m_tiStep;
Plater* m_plater;
};
class Input_Shaping_Freq_Test_Dlg : public DPIDialog
{
public:
Input_Shaping_Freq_Test_Dlg (wxWindow* parent, wxWindowID id, Plater* plater);
~Input_Shaping_Freq_Test_Dlg ();
void on_dpi_changed(const wxRect& suggested_rect) override;
protected:
virtual void on_start(wxCommandEvent& event);
Calib_Params m_params;
RadioGroup* m_rbModel;
RadioGroup* m_rbType;
TextInput* m_tiFreqStartX;
TextInput* m_tiFreqEndX;
TextInput* m_tiFreqStartY;
TextInput* m_tiFreqEndY;
TextInput* m_tiDampingFactor;
Plater* m_plater;
};
class Input_Shaping_Damp_Test_Dlg : public DPIDialog
{
public:
Input_Shaping_Damp_Test_Dlg (wxWindow* parent, wxWindowID id, Plater* plater);
~Input_Shaping_Damp_Test_Dlg ();
void on_dpi_changed(const wxRect& suggested_rect) override;
protected:
virtual void on_start(wxCommandEvent& event);
Calib_Params m_params;
RadioGroup* m_rbModel;
RadioGroup* m_rbType;
TextInput* m_tiFreqX;
TextInput* m_tiFreqY;
TextInput* m_tiDampingFactorStart;
TextInput* m_tiDampingFactorEnd;
Plater* m_plater;
};
class Cornering_Test_Dlg : public DPIDialog
{
public:
Cornering_Test_Dlg(wxWindow* parent, wxWindowID id, Plater* plater);
~Cornering_Test_Dlg();
void on_dpi_changed(const wxRect& suggested_rect) override;
protected:
virtual void on_start(wxCommandEvent& event);
Calib_Params m_params;
RadioGroup* m_rbModel;
TextInput* m_tiJDStart;
TextInput* m_tiJDEnd;
Plater* m_plater;
};
class FlowRateCalibrationDialog : public DPIDialog
{
public:
FlowRateCalibrationDialog(wxWindow* parent, wxWindowID id, Plater* plater);
~FlowRateCalibrationDialog();
void on_dpi_changed(const wxRect& suggested_rect) override;
protected:
virtual void on_start(wxCommandEvent& event);
RadioGroup* m_rbType;
// ORCA: use standard OrcaSlicer ComboBox instead of BitmapComboBox
ComboBox* m_rbPattern;
Plater* m_plater;
};
}} // namespace Slic3r::GUI
#endif