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

ENH:FilamentMapDialog add filament type

Browse Source 
jira: nojira
Change-Id: I08a3c037ffa6227602e71b97697a1bc61e3d5050
(cherry picked from commit 6621fd0e20bce4c32788a86a6fde018f3a7f41ef)
This commit is contained in:
Mack
2025-02-18 22:03:25 +08:00
committed by Noisyfox
parent fc76b50234
commit 3dd369ad4e
8 changed files with 79 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/DragDropPanel.hpp
View File

@@ -20,9 +20,9 @@ class DragDropPanel : public wxPanel
public:
DragDropPanel(wxWindow *parent, const wxString &label, bool is_auto);
void AddColorBlock(const wxColour &color, int filament_id, bool update_ui = true);
void AddColorBlock(const wxColour &color, const std::string &type, int filament_id, bool update_ui = true);
void RemoveColorBlock(ColorPanel *panel, bool update_ui = true);
void DoDragDrop(ColorPanel *panel, const wxColour &color, int filament_id);
void DoDragDrop(ColorPanel *panel, const wxColour &color, const std::string &type, int filament_id);
std::vector<int> GetAllFilaments() const;
@@ -46,10 +46,11 @@ private:
class ColorPanel : public wxPanel
{
public:
ColorPanel(DragDropPanel *parent, const wxColour &color, int filament_id);
ColorPanel(DragDropPanel *parent, const wxColour &color, int filament_id, const std::string& type);
wxColour GetColor() const { return m_color; }
int GetFilamentId() const { return m_filament_id; }
std::string GetType() const { return m_type; }
private:
void OnLeftDown(wxMouseEvent &event);
@@ -58,7 +59,9 @@ private:
DragDropPanel *m_parent;
wxColor m_color;
std::string m_type;
int m_filament_id;
};
}} // namespace Slic3r::GUI