mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-07-19 00:42:18 +00:00
75c8d0775a
- FilamentMapDialog's manual page understands volume types: a mixed (Hybrid) extruder shows separate Standard / High Flow drop zones with live sub-nozzle counts, a validation timer with an inline error + "set nozzle count" suggestion, and composes a per-filament volume map on OK (persisted to the plate or globally) - switching an extruder's Flow type rewrites the affected plate map entries; plate maps stay sized across filament add/delete/count changes (values keep their filament, no index shift) - CLI: manual mapping on multi-nozzle printers synthesizes the volume map from extruder flow types when absent; nozzle-manual mode requires explicit maps; computed maps land on the plate so exported projects carry filament_volume_maps - filament_nozzle_map joins the project options (selection seeding + filament-count resizing) - pot entries for the new dialog strings All 19 reference fixtures byte-identical; slicing an exported Hybrid project reproduces its g-code byte-for-byte with the volume map round-tripped through model_settings.config.
127 lines
3.9 KiB
C++
127 lines
3.9 KiB
C++
|
|
#ifndef FILAMENT_MAP_PANEL_HPP
|
|
#define FILAMENT_MAP_PANEL_HPP
|
|
|
|
#include "GUI.hpp"
|
|
#include "DragDropPanel.hpp"
|
|
#include "wxExtensions.hpp"
|
|
#include "Widgets/Label.hpp"
|
|
|
|
namespace Slic3r { namespace GUI {
|
|
|
|
// Fired by the manual panel's validation timer: the event int is 1 when the current manual
|
|
// grouping is printable with the installed nozzles, 0 when some zone has no matching nozzle.
|
|
wxDECLARE_EVENT(wxEVT_INVALID_MANUAL_MAP, wxCommandEvent);
|
|
|
|
class FilamentMapManualPanel : public wxPanel
|
|
{
|
|
public:
|
|
FilamentMapManualPanel(wxWindow *parent,
|
|
const std::vector<std::string> &color,
|
|
const std::vector<std::string> &type,
|
|
const std::vector<int> &filament_list,
|
|
const std::vector<int> &filament_map,
|
|
const std::vector<int> &filament_volume_map);
|
|
~FilamentMapManualPanel();
|
|
|
|
std::vector<int> GetFilamentMaps() const;
|
|
std::vector<int> GetFilamentVolumeMaps() const;
|
|
std::vector<int> GetLeftFilaments() const { return m_left_panel->GetAllFilaments(); }
|
|
std::vector<int> GetRightFilaments() const { return m_right_panel->GetAllFilaments(); }
|
|
|
|
std::vector<int> GetRightHighFlowFilaments() const { return m_right_panel->GetHighFlowFilaments(); }
|
|
std::vector<int> GetRightStandardFilaments() const { return m_right_panel->GetStandardFilaments(); }
|
|
std::vector<int> GetRightTPUHighFlowFilaments() const { return m_right_panel->GetTPUHighFlowFilaments(); }
|
|
void UpdateNozzleVolumeType();
|
|
void UpdateNozzleCountDisplay();
|
|
|
|
bool Show(bool show = true) override;
|
|
|
|
private:
|
|
void OnTimer(wxTimerEvent &evt);
|
|
void OnSwitchFilament(wxCommandEvent &);
|
|
void SyncPanelHeights();
|
|
void OnDragDropCompleted(wxCommandEvent &evt);
|
|
void OnSuggestionClicked(wxCommandEvent &event);
|
|
|
|
DragDropPanel *m_left_panel;
|
|
SeparatedDragDropPanel *m_right_panel;
|
|
|
|
Label *m_description;
|
|
Label *m_tips;
|
|
Label *m_errors;
|
|
wxPanel *m_suggestion_panel;
|
|
|
|
ScalableButton *m_switch_btn;
|
|
|
|
std::vector<int> m_filament_map;
|
|
std::vector<int> m_filament_volume_map;
|
|
std::vector<int> m_filament_list;
|
|
std::vector<std::string> m_filament_color;
|
|
std::vector<std::string> m_filament_type;
|
|
|
|
wxTimer *m_timer;
|
|
int m_invalid_id{-1};
|
|
bool m_force_validation{false};
|
|
};
|
|
|
|
class FilamentMapBtnPanel : public wxPanel
|
|
{
|
|
public:
|
|
FilamentMapBtnPanel(wxWindow *parent, const wxString &label, const wxString &detail, const std::string &icon_path);
|
|
void Hide();
|
|
void Show();
|
|
void Select(bool selected);
|
|
bool Enable(bool enable);
|
|
bool IsEnabled() const { return m_enabled; }
|
|
protected:
|
|
void OnPaint(wxPaintEvent &event);
|
|
private:
|
|
void OnEnterWindow(wxMouseEvent &event);
|
|
void OnLeaveWindow(wxMouseEvent &evnet);
|
|
|
|
void UpdateStatus();
|
|
|
|
wxBitmap icon_enabled;
|
|
wxBitmap icon_disabled;
|
|
|
|
wxBitmapButton *m_btn;
|
|
wxStaticText *m_label;
|
|
Label *m_disable_tip;
|
|
Label *m_detail;
|
|
std::string m_icon_path;
|
|
bool m_enabled{ true };
|
|
bool m_hover{false};
|
|
bool m_selected{false};
|
|
};
|
|
|
|
class FilamentMapAutoPanel : public wxPanel
|
|
{
|
|
public:
|
|
FilamentMapAutoPanel(wxWindow *parent, FilamentMapMode mode, bool machine_synced);
|
|
void Hide();
|
|
void Show();
|
|
FilamentMapMode GetMode() const { return m_mode; }
|
|
|
|
private:
|
|
void OnModeSwitch(FilamentMapMode mode);
|
|
void UpdateStatus();
|
|
|
|
FilamentMapBtnPanel *m_flush_panel;
|
|
FilamentMapBtnPanel *m_match_panel;
|
|
FilamentMapMode m_mode;
|
|
};
|
|
|
|
class FilamentMapDefaultPanel : public wxPanel
|
|
{
|
|
public:
|
|
FilamentMapDefaultPanel(wxWindow *parent);
|
|
void Hide();
|
|
void Show();
|
|
|
|
private:
|
|
Label *m_label;
|
|
};
|
|
}} // namespace Slic3r::GUI
|
|
|
|
#endif |