juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-28 05:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

NEW:Display AMS mapping relationship in override mode

Browse Source 
jira: none
Change-Id: Iac0b3563df2f76710a5bc461adab6dd8335ee62d
(cherry picked from commit 69f28a711f7680a938a46209da61289787f1d8fa)
This commit is contained in:
zhou.xu
2025-01-23 15:15:59 +08:00
committed by Noisyfox
parent cda6860bcf
commit 552c674483
6 changed files with 286 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,6 +152,13 @@ protected:
StaticBox *m_filament_left_panel{nullptr};
StaticBox *m_filament_right_panel{nullptr};
StaticBox * m_fix_filament_panel{nullptr};
wxFlexGridSizer *m_fix_sizer_ams_mapping{nullptr};
MaterialHash m_fix_materialList;
wxBoxSizer * m_fix_filament_panel_sizer{nullptr};
std::vector<FilamentInfo> m_fix_filaments;
bool m_generate_fix_sizer_ams_mapping = false;
wxBoxSizer *m_filament_panel_sizer;
wxBoxSizer *m_filament_panel_left_sizer;
wxBoxSizer *m_filament_panel_right_sizer;
@@ -194,6 +201,7 @@ public:
void on_set_finish_mapping(wxCommandEvent &evt);
void on_print_job_cancel(wxCommandEvent &evt);
void reset_and_sync_ams_list();
void generate_override_fix_ams_list();
void clone_thumbnail_data(bool allow_clone_ams_color);
void record_edge_pixels_data();
wxColour adjust_color_for_render(const wxColour &color);
@@ -286,6 +294,7 @@ private:
void update_when_change_plate(int);
void update_when_change_map_mode(int);
void update_map_when_change_map_mode();
wxColour decode_ams_color(const std::string &color);
void update_when_change_map_mode(wxCommandEvent &e);
void update_panel_status(PageType page);
void show_color_panel(bool,bool update_layout = true);
@@ -303,9 +312,12 @@ private:
Button * m_button_ok = nullptr;
Button * m_button_cancel = nullptr;
AMSComboInfo m_ams_combo_info;
Label *m_after_map_text{nullptr};
wxStaticText *m_attention_text{nullptr};
wxStaticText* m_tip_text{nullptr};
wxString m_tip_attention_color_map;
wxString m_tip_attention_override;
Label* m_tip_text{nullptr};
//wxStaticText *m_specify_color_cluster_title = nullptr;
//wxStaticText* m_used_colors_tip_text{nullptr};
wxStaticText* m_warning_text{nullptr};