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

FIX: enhance filament_map auto manual behavior

Browse Source 
1. auto mode dragdrop is not allowed
2. not display filament_map when there is no result in auto mode

jira:none

Change-Id: I0800e0d832e27fe459a17bb1aa829b5e72d0ee8f
(cherry picked from commit 9ee85bef34aaabe7a4cef251f07e77f9af693a2f)
This commit is contained in:
zhimin.zeng
2024-08-09 17:46:11 +08:00
committed by Noisyfox
parent 00388756ed
commit 1ada437979
10 changed files with 147 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/slic3r/GUI/FilamentMapDialog.hpp
View File

@@ -19,24 +19,32 @@ public:
const DynamicPrintConfig *config,
const std::vector<int> &filament_map,
const std::vector<int> &extruders,
bool is_auto);
bool is_auto,
bool has_auto_result
);
bool is_auto() const;
const std::vector<int>& get_filament_maps() { return m_filament_map; }
const std::vector<int>& get_filament_maps() const { return m_filament_map; }
private:
void on_ok(wxCommandEvent &event);
void on_cancle(wxCommandEvent &event);
void on_auto_radio(wxCommandEvent &event);
void on_manual_radio(wxCommandEvent &event);
private:
wxRadioButton* m_auto_radio;
wxRadioButton* m_manual_radio;
DragDropPanel* m_left_panel;
DragDropPanel* m_right_panel;
wxBoxSizer * m_extruder_panel_sizer;
DragDropPanel* m_manual_left_panel;
DragDropPanel* m_manual_right_panel;
DragDropPanel* m_auto_left_panel;
DragDropPanel* m_auto_right_panel;
private:
const DynamicPrintConfig* m_config;
std::vector<int> m_filament_map;
bool m_has_auto_result;
};
}} // namespace Slic3r::GUI