diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index b94063ad1b..e9a05e05ee 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -5,8 +5,8 @@ #include "libslic3r/Print.hpp" namespace Slic3r { namespace GUI { -static wxString PA_LINE = _L("Line"); -static wxString PA_PATTERN = _L("Pattern"); +static int PA_LINE = 0; +static int PA_PATTERN = 1; CaliPresetCaliStagePanel::CaliPresetCaliStagePanel( wxWindow* parent, @@ -166,6 +166,14 @@ CaliComboBox::CaliComboBox(wxWindow* parent, m_combo_box->Bind(wxEVT_COMBOBOX, m_on_value_change_call_back); } +int CaliComboBox::get_selection() const +{ + if (m_combo_box) + return m_combo_box->GetSelection(); + + return 0; +} + wxString CaliComboBox::get_value() const { if (m_combo_box) @@ -1964,7 +1972,7 @@ wxArrayString CalibrationPresetPage::get_custom_range_values() CalibMode CalibrationPresetPage::get_pa_cali_method() { if (m_pa_cali_method_combox) { - wxString selected_mode = m_pa_cali_method_combox->get_value(); + int selected_mode = m_pa_cali_method_combox->get_selection(); if (selected_mode == PA_LINE) { return CalibMode::Calib_PA_Line; } diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.hpp b/src/slic3r/GUI/CalibrationWizardPresetPage.hpp index 76bf2c1d92..9327527587 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.hpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.hpp @@ -53,6 +53,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL); + int get_selection() const; wxString get_value() const; void set_values(const wxArrayString& values);