mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-11 19:17:33 +00:00
Class for RadioGroup & LabeledStaticBox and improvements for Calibration Dialogs, Windows with wxStaticBoxSizer (#9797)
* update * Update calib_dlg.cpp * Update LabeledStaticBox.hpp * Update calib_dlg.cpp * update * update * RadioGroup fix * update * update * update * update * RadioGroup * Fix render issue when position is set to default (-1) * Fix macOS render issue by removing default NSBox border * Fix compile --------- Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
This commit is contained in:
@@ -3,13 +3,14 @@
|
||||
|
||||
#include "wxExtensions.hpp"
|
||||
#include "GUI_Utils.hpp"
|
||||
#include "Widgets/RadioBox.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>
|
||||
@@ -35,8 +36,8 @@ protected:
|
||||
Calib_Params m_params;
|
||||
|
||||
|
||||
wxRadioBox* m_rbExtruderType;
|
||||
wxRadioBox* m_rbMethod;
|
||||
RadioGroup* m_rbExtruderType;
|
||||
RadioGroup* m_rbMethod;
|
||||
TextInput* m_tiStartPA;
|
||||
TextInput* m_tiEndPA;
|
||||
TextInput* m_tiPAStep;
|
||||
@@ -60,7 +61,7 @@ protected:
|
||||
virtual void on_filament_type_changed(wxCommandEvent& event);
|
||||
Calib_Params m_params;
|
||||
|
||||
wxRadioBox* m_rbFilamentType;
|
||||
RadioGroup* m_rbFilamentType;
|
||||
TextInput* m_tiStart;
|
||||
TextInput* m_tiEnd;
|
||||
TextInput* m_tiStep;
|
||||
@@ -132,7 +133,7 @@ protected:
|
||||
virtual void on_start(wxCommandEvent& event);
|
||||
Calib_Params m_params;
|
||||
|
||||
wxRadioBox* m_rbModel;
|
||||
RadioGroup* m_rbModel;
|
||||
TextInput* m_tiFreqStartX;
|
||||
TextInput* m_tiFreqEndX;
|
||||
TextInput* m_tiFreqStartY;
|
||||
@@ -153,7 +154,7 @@ protected:
|
||||
virtual void on_start(wxCommandEvent& event);
|
||||
Calib_Params m_params;
|
||||
|
||||
wxRadioBox* m_rbModel;
|
||||
RadioGroup* m_rbModel;
|
||||
TextInput* m_tiFreqX;
|
||||
TextInput* m_tiFreqY;
|
||||
TextInput* m_tiDampingFactorStart;
|
||||
@@ -172,7 +173,7 @@ protected:
|
||||
virtual void on_start(wxCommandEvent& event);
|
||||
Calib_Params m_params;
|
||||
|
||||
wxRadioBox* m_rbModel;
|
||||
RadioGroup* m_rbModel;
|
||||
TextInput* m_tiJDStart;
|
||||
TextInput* m_tiJDEnd;
|
||||
Plater* m_plater;
|
||||
|
||||
Reference in New Issue
Block a user