mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH:modify wxTextCtrl to SpinInput 

in ObjColorDialog
jira:STUDIO-9057

Change-Id: Iff2c6bcab29d34fdc881439c8cfb4f6c8d6d0838
This commit is contained in:
zhou.xu 2024-12-16 15:12:07 +08:00 committed by lane.wei
parent ea0c542f00
commit 1663a5550d
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/slic3r/GUI/ObjColorDialog.cpp
View File

@ -244,15 +244,14 @@ ObjColorPanel::ObjColorPanel(wxWindow * parent,
specify_color_cluster_title->SetFont(Label::Head_14); specify_color_cluster_title->SetFont(Label::Head_14);
specify_cluster_sizer->Add(specify_color_cluster_title, 0, wxALIGN_CENTER | wxALL, FromDIP(5)); specify_cluster_sizer->Add(specify_color_cluster_title, 0, wxALIGN_CENTER | wxALL, FromDIP(5));
m_color_cluster_num_by_user_ebox = new wxTextCtrl(m_page_simple, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(25), -1), wxTE_PROCESS_ENTER); m_color_cluster_num_by_user_ebox = new SpinInput(m_page_simple, "", wxEmptyString, wxDefaultPosition, wxSize(FromDIP(45), -1), wxTE_PROCESS_ENTER);
m_color_cluster_num_by_user_ebox->SetValue(std::to_string(m_color_cluster_num_by_algo).c_str()); m_color_cluster_num_by_user_ebox->SetValue(std::to_string(m_color_cluster_num_by_algo).c_str());
{//event {//event
auto on_apply_color_cluster_text_modify = [this](wxEvent &e) { auto on_apply_color_cluster_text_modify = [this](wxEvent &e) {
wxString str = m_color_cluster_num_by_user_ebox->GetValue(); int number = m_color_cluster_num_by_user_ebox->GetValue();
int number = wxAtoi(str);
if (number > m_color_num_recommend || number < g_min_cluster_color) { if (number > m_color_num_recommend || number < g_min_cluster_color) {
number = number < g_min_cluster_color ? g_min_cluster_color : m_color_num_recommend; number = number < g_min_cluster_color ? g_min_cluster_color : m_color_num_recommend;
str = wxString::Format(("%d"), number); auto str = wxString::Format(("%d"), number);
m_color_cluster_num_by_user_ebox->SetValue(str); m_color_cluster_num_by_user_ebox->SetValue(str);
MessageDialog dlg(nullptr, wxString::Format(_L("The color count should be in range [%d, %d]."), g_min_cluster_color, m_color_num_recommend), MessageDialog dlg(nullptr, wxString::Format(_L("The color count should be in range [%d, %d]."), g_min_cluster_color, m_color_num_recommend),
_L("Warning"), wxICON_WARNING | wxOK); _L("Warning"), wxICON_WARNING | wxOK);
@ -263,18 +262,16 @@ ObjColorPanel::ObjColorPanel(wxWindow * parent,
m_color_cluster_num_by_user_ebox->Bind(wxEVT_TEXT_ENTER, on_apply_color_cluster_text_modify); m_color_cluster_num_by_user_ebox->Bind(wxEVT_TEXT_ENTER, on_apply_color_cluster_text_modify);
m_color_cluster_num_by_user_ebox->Bind(wxEVT_KILL_FOCUS, on_apply_color_cluster_text_modify); m_color_cluster_num_by_user_ebox->Bind(wxEVT_KILL_FOCUS, on_apply_color_cluster_text_modify);
m_color_cluster_num_by_user_ebox->Bind(wxEVT_COMMAND_TEXT_UPDATED, [this](wxCommandEvent &) { m_color_cluster_num_by_user_ebox->Bind(wxEVT_COMMAND_TEXT_UPDATED, [this](wxCommandEvent &) {
wxString str = m_color_cluster_num_by_user_ebox->GetValue(); int number = m_color_cluster_num_by_user_ebox->GetValue();
int number = wxAtof(str);
if (number > m_color_num_recommend || number < g_min_cluster_color) { if (number > m_color_num_recommend || number < g_min_cluster_color) {
number = number < g_min_cluster_color ? g_min_cluster_color : m_color_num_recommend; number = number < g_min_cluster_color ? g_min_cluster_color : m_color_num_recommend;
str = wxString::Format(("%d"), number); auto str = wxString::Format(("%d"), number);
m_color_cluster_num_by_user_ebox->SetValue(str); m_color_cluster_num_by_user_ebox->SetValue(str);
m_color_cluster_num_by_user_ebox->SetInsertionPointEnd(); // m_color_cluster_num_by_user_ebox->SetInsertionPointEnd();
} }
if (m_last_cluster_num != number) { if (m_last_cluster_num != number) {
deal_algo(number, true); deal_algo(number, true);
Layout(); Layout();
//Fit();
Refresh(); Refresh();
Update(); Update();
m_last_cluster_num = number; m_last_cluster_num = number;

3
src/slic3r/GUI/ObjColorDialog.hpp
View File

@ -9,6 +9,7 @@
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <wx/checkbox.h> #include <wx/checkbox.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include "Widgets/SpinInput.hpp"
class Button; class Button;
class Label; class Label;
class ComboBox; class ComboBox;
@ -55,7 +56,7 @@ private:
wxPanel * m_page_simple = nullptr; wxPanel * m_page_simple = nullptr;
wxBoxSizer * m_sizer = nullptr; wxBoxSizer * m_sizer = nullptr;
wxBoxSizer * m_sizer_simple = nullptr; wxBoxSizer * m_sizer_simple = nullptr;
wxTextCtrl *m_color_cluster_num_by_user_ebox{nullptr}; SpinInput * m_color_cluster_num_by_user_ebox{nullptr};
wxStaticText * m_warning_text{nullptr}; wxStaticText * m_warning_text{nullptr};
Button * m_quick_approximate_match_btn{nullptr}; Button * m_quick_approximate_match_btn{nullptr};
Button * m_quick_add_btn{nullptr}; Button * m_quick_add_btn{nullptr};