Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuSanka <yusanka@gmail.com>2019-10-14 11:05:27 +0300
committerYuSanka <yusanka@gmail.com>2019-10-14 13:59:10 +0300
commit5c2b5a167b1ea93c4073420cc05f7ccd18403d35 (patch)
tree7cd182244f5d4c2b02d7702f0eb4c3d9359345f6 /src/slic3r/GUI/wxExtensions.hpp
parent8e6bb7c20dd91f22d8e6f6643edc911352bc9e29 (diff)
Context menu is extended for multiple material printing
Diffstat (limited to 'src/slic3r/GUI/wxExtensions.hpp')
-rw-r--r--src/slic3r/GUI/wxExtensions.hpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/slic3r/GUI/wxExtensions.hpp b/src/slic3r/GUI/wxExtensions.hpp
index 0ee451f44..e874dbf38 100644
--- a/src/slic3r/GUI/wxExtensions.hpp
+++ b/src/slic3r/GUI/wxExtensions.hpp
@@ -806,6 +806,16 @@ public:
EnableTickManipulation(false);
}
+ static enum ManipulationState {
+ msSingleExtruder, // single extruder printer preset is selected
+ msMultiExtruder, // multiple extruder printer preset is selected
+ msMultiExtruderSimple // multiple extruder printer preset is selected, but one-extruder print is detected
+ };
+ void SetManipulationState(ManipulationState state) {
+ m_state = state;
+ }
+ ManipulationState GetManipulationState() const { return m_state; }
+
bool is_horizontal() const { return m_style == wxSL_HORIZONTAL; }
bool is_one_layer() const { return m_is_one_layer; }
bool is_lower_at_min() const { return m_lower_value == m_min_value; }
@@ -823,8 +833,10 @@ public:
void OnKeyUp(wxKeyEvent &event);
void OnChar(wxKeyEvent &event);
void OnRightDown(wxMouseEvent& event);
+ int get_extruder_for_tick(int tick);
void OnRightUp(wxMouseEvent& event);
void add_code(std::string code);
+ void change_extruder(int extruder);
protected:
@@ -846,6 +858,7 @@ protected:
void detect_selected_slider(const wxPoint& pt);
void correct_lower_value();
void correct_higher_value();
+ wxString get_tooltip(bool is_revert_icon_focused);
void move_current_thumb(const bool condition);
void action_tick(const TicksAction action);
void enter_window(wxMouseEvent& event, const bool enter);
@@ -889,6 +902,7 @@ private:
bool m_is_one_layer_icon_focesed = false;
bool m_is_enabled_tick_manipulation = true;
bool m_show_context_menu = false;
+ ManipulationState m_state = msSingleExtruder;
wxRect m_rect_lower_thumb;
wxRect m_rect_higher_thumb;
@@ -929,6 +943,7 @@ private:
tick(tick), gcode(code), extruder(extruder) {}
bool operator<(const TICK_CODE& other) const { return other.tick > this->tick; }
+ bool operator>(const TICK_CODE& other) const { return other.tick < this->tick; }
int tick;
std::string gcode;