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

ENH:add scroll for SyncAmsDialog 

jira: none
Change-Id: Id1a6ea1107b8672182f86e16f2093b661d8f8966
This commit is contained in:
zhou.xu 2025-02-14 17:08:00 +08:00 committed by lane.wei
parent 2fdab78423
commit fceb5ec5aa
4 changed files with 164 additions and 823 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/images/loading.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

1
src/slic3r/GUI/Plater.cpp
View File

@ -3003,7 +3003,6 @@ void Sidebar::sync_ams_list(bool is_from_big_sync_btn)
SyncAmsInfoDialog::SyncInfo temp_info;
temp_info.use_dialog_pos = false;
temp_info.cancel_text_to_later = is_from_big_sync_btn;
temp_info.connected_printer = true;
if (m_sync_dlg == nullptr) {
m_sync_dlg = std::make_shared<SyncAmsInfoDialog>(this, temp_info);
} else {

936
src/slic3r/GUI/SyncAmsInfoDialog.cpp
View File

File diff suppressed because it is too large Load Diff

50
src/slic3r/GUI/SyncAmsInfoDialog.hpp
View File

@ -6,7 +6,7 @@
#include "GUI_App.hpp"
#include "GUI_Utils.hpp"
#include <wx/animate.h>
#include "SelectMachine.hpp"
#include "DeviceManager.hpp"
#include "BaseTransparentDPIFrame.hpp"
@ -40,7 +40,6 @@ class SyncAmsInfoDialog : public DPIDialog
wxColour m_colour_def_color{wxColour(255, 255, 255)};
wxColour m_colour_bold_color{wxColour(38, 46, 48)};
StateColor m_btn_bg_enable;
Label * m_text_bed_type;
std::shared_ptr<int> m_token = std::make_shared<int>(0);
std::map<std::string, PrintOption *> m_checkbox_list;
@ -49,12 +48,9 @@ class SyncAmsInfoDialog : public DPIDialog
std::vector<FilamentInfo> m_filaments;
std::vector<FilamentInfo> m_ams_mapping_result;
std::vector<int> m_filaments_map;
std::shared_ptr<BBLStatusBarSend> m_status_bar;
// SendModeSwitchButton* m_mode_print {nullptr};
// SendModeSwitchButton* m_mode_send {nullptr};
wxStaticBitmap *m_printer_image{nullptr};
wxStaticBitmap *m_bed_image{nullptr};
Slic3r::DynamicPrintConfig m_required_data_config;
Slic3r::Model m_required_data_model;
@ -77,46 +73,29 @@ protected:
wxBoxSizer * m_sizer_options_other{nullptr};
wxBoxSizer * m_sizer_thumbnail{nullptr};
wxScrolledWindow * m_scrolledWindow{nullptr};
wxBoxSizer * m_sizer_main{nullptr};
wxBoxSizer * m_sizer_this{nullptr};
wxBoxSizer * m_basicl_sizer{nullptr};
wxBoxSizer * rename_sizer_v{nullptr};
wxBoxSizer * rename_sizer_h{nullptr};
wxBoxSizer * m_sizer_autorefill{nullptr};
ScalableButton * m_button_refresh{nullptr};
wxStaticBitmap * m_rename_button{nullptr};
ComboBox * m_comboBox_printer{nullptr};
wxStaticBitmap * m_staticbitmap{nullptr};
wxStaticBitmap * img_amsmapping_tip{nullptr};
ThumbnailPanel * m_thumbnailPanel{nullptr};
wxPanel * m_panel_status{nullptr};
wxPanel * m_basic_panel;
wxPanel * m_rename_normal_panel{nullptr};
wxPanel * m_panel_sending{nullptr};
wxPanel * m_panel_prepare{nullptr};
wxPanel * m_panel_finish{nullptr};
wxPanel * m_line_top{nullptr};
Label * m_st_txt_error_code{nullptr};
Label * m_st_txt_error_desc{nullptr};
Label * m_st_txt_extra_info{nullptr};
Label * m_ams_backup_tip{nullptr};
wxHyperlinkCtrl * m_link_network_state{nullptr};
wxSimplebook * m_rename_switch_panel{nullptr};
wxSimplebook * m_simplebook{nullptr};
wxStaticText * m_rename_text{nullptr};
Label * m_stext_printer_title{nullptr};
Label * m_statictext_ams_msg{nullptr};
Label * m_text_printer_msg{nullptr};
wxStaticText * m_staticText_bed_title{nullptr};
wxStaticText * m_stext_sending{nullptr};
wxStaticText * m_statictext_finish{nullptr};
TextInput * m_rename_input{nullptr};
wxTimer * m_refresh_timer{nullptr};
std::shared_ptr<PrintJob> m_print_job;
wxScrolledWindow * m_sw_print_failed_info{nullptr};
wxHyperlinkCtrl * m_hyperlink{nullptr};
ScalableBitmap * rename_editable{nullptr};
ScalableBitmap * rename_editable_light{nullptr};
ScalableBitmap * ams_mapping_help_icon{nullptr};
wxStaticBitmap * img_ams_backup{nullptr};
ThumbnailData m_cur_input_thumbnail_data;
@ -168,11 +147,17 @@ protected:
wxGridSizer *m_sizer_ams_mapping_left{nullptr};
wxGridSizer *m_sizer_ams_mapping_right{nullptr};
wxSimplebook *m_pages{nullptr};
wxPanel * m_loading_page{nullptr};
wxPanel * m_show_page{nullptr};
wxBoxSizer * m_sizer_show_page{nullptr};
bool m_finish_ams_map_flag = false;
wxAnimationCtrl *m_gif_ctrl{nullptr};
public:
void check_empty_project();
void init_bind();
void init_timer();
void check_focus(wxWindow *window);
void show_print_failed_info(bool show, int code = 0, wxString description = wxEmptyString, wxString extra = wxEmptyString);
void check_fcous_state(wxWindow *window);
void popup_filament_backup();
@ -183,20 +168,16 @@ public:
void sync_ams_mapping_result(std::vector<FilamentInfo> &result);
void prepare(int print_plate_idx);
void show_status(PrintDialogStatus status, std::vector<wxString> params = std::vector<wxString>());
void sys_color_changed();
void reset_timeout();
void update_user_printer();
void reset_ams_material();
void update_show_status();
void on_rename_click(wxMouseEvent &event);
void on_rename_enter();
void update_printer_combobox(wxCommandEvent &event);
void on_cancel(wxCloseEvent &event);
void show_errors(wxString &info);
void on_ok_btn(wxCommandEvent &event);
void Enable_Auto_Refill(bool enable);
void connect_printer_mqtt();
void on_send_print();
void clear_ip_address_config(wxCommandEvent &e);
void on_refresh(wxCommandEvent &event);
void on_set_finish_mapping(wxCommandEvent &evt);
@ -209,7 +190,7 @@ public:
void final_deal_edge_pixels_data(ThumbnailData &data);
void updata_thumbnail_data_after_connected_printer();
void show_ams_controls(bool flag);
void show_advanced_settings(bool flag);
void show_advanced_settings(bool flag, bool update_layout = true);
void update_thumbnail_data_accord_plate_index(bool allow_clone_ams_color);
void unify_deal_thumbnail_data(ThumbnailData &input_data, ThumbnailData &no_light_data,bool allow_clone_ams_color);
void change_default_normal(int old_filament_id, wxColour temp_ams_color);
@ -246,7 +227,6 @@ public:
std::string get_print_status_info(PrintDialogStatus status);
PrintFromType get_print_type() { return m_print_type; };
wxString format_bed_name(std::string plate_name);
wxString format_steel_name(NozzleType type);
wxString format_text(wxString &m_msg);
PrintDialogStatus get_status() { return m_print_status; }
@ -259,7 +239,6 @@ public:
{
wxPoint dialog_pos;
bool use_dialog_pos = false;
bool connected_printer = false;
bool first_sync = false;
bool cancel_text_to_later = false;
};
@ -301,7 +280,7 @@ private:
void update_when_change_map_mode(wxCommandEvent &e);
void update_panel_status(PageType page);
void show_color_panel(bool,bool update_layout = true);
void update_more_setting(bool layout = true);
void update_more_setting(bool layout = true,bool from_more_seting_text = false);
void add_two_image_control();
void to_next_plate(wxCommandEvent &event);
void to_previous_plate(wxCommandEvent &event);
@ -330,7 +309,6 @@ private:
wxButton * m_right_image_button = nullptr;
wxBoxSizer * sizer_basic_right_info = nullptr;
wxBoxSizer * sizer_advanced_options_title = nullptr;
wxPanel * m_rename_edit_panel = nullptr;
Label * m_confirm_title = nullptr;
wxString m_undone_str;
wxString m_override_undone_str;