GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-05 19:46:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

DoubleSliderForLayers: Suppress to edit and show ticks in SLA mode

Browse Source
This commit is contained in:
YuSanka 2024-04-24 14:04:45 +02:00 committed by Lukas Matena
parent 2b93bd97c6
commit 44d5862667
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/slic3r/GUI/DoubleSliderForLayers.cpp
View File

@ -172,7 +172,7 @@ void DSForLayers::draw_ticks(const ImRect& slideable_region)
// return; // return;
//if (m_ticks.empty() || m_mode == MultiExtruder) //if (m_ticks.empty() || m_mode == MultiExtruder)
// return; // return;
if (m_ticks.empty()) if (m_ticks.empty() || m_draw_mode == dmSlaPrint)
return; return;
const ImVec2 tick_border = ImVec2(23.0f, 2.0f) * m_scale; const ImVec2 tick_border = ImVec2(23.0f, 2.0f) * m_scale;
@ -359,7 +359,7 @@ void DSForLayers::render_menu()
else if (m_show_cog_menu) else if (m_show_cog_menu)
ImGui::OpenPopup("cog_menu_popup"); ImGui::OpenPopup("cog_menu_popup");
if (m_allow_editing) if (can_edit())
render_add_tick_menu(); render_add_tick_menu();
render_cog_menu(); render_cog_menu();
@ -501,7 +501,7 @@ void DSForLayers::render_cog_menu()
if (m_ticks.edit_extruder_sequence(m_ctrl.GetMaxPos(), m_mode)) if (m_ticks.edit_extruder_sequence(m_ctrl.GetMaxPos(), m_mode))
process_ticks_changed(); process_ticks_changed();
} }
if (m_allow_editing) { if (can_edit()) {
if (ImGuiPureWrap::menu_item_with_icon(_u8L("Use default colors").c_str(), "", icon_sz, 0, m_ticks.used_default_colors())) { if (ImGuiPureWrap::menu_item_with_icon(_u8L("Use default colors").c_str(), "", icon_sz, 0, m_ticks.used_default_colors())) {
UseDefaultColors(!m_ticks.used_default_colors()); UseDefaultColors(!m_ticks.used_default_colors());
} }
@ -650,7 +650,7 @@ void DSForLayers::Render(const int canvas_width, const int canvas_height, float
ImVec2 btn_pos = ImVec2(groove_center_x - 0.5f * action_btn_sz, pos.y - 0.75f * action_btn_sz); ImVec2 btn_pos = ImVec2(groove_center_x - 0.5f * action_btn_sz, pos.y - 0.75f * action_btn_sz);
if (!m_ticks.empty() && m_allow_editing && if (!m_ticks.empty() && can_edit() &&
render_button(ImGui::DSRevert, ImGui::DSRevertHovered, "revert", btn_pos, fiRevertIcon)) render_button(ImGui::DSRevert, ImGui::DSRevertHovered, "revert", btn_pos, fiRevertIcon))
discard_all_thicks(); discard_all_thicks();
@ -676,7 +676,7 @@ void DSForLayers::Render(const int canvas_width, const int canvas_height, float
m_values[m_ctrl.GetMinPos()], m_values[m_ctrl.GetMaxPos()])) m_values[m_ctrl.GetMinPos()], m_values[m_ctrl.GetMaxPos()]))
process_jump_to_value(); process_jump_to_value();
if (m_allow_editing) if (can_edit())
render_color_picker(); render_color_picker();
} }
@ -966,7 +966,7 @@ void DSForLayers::add_code_as_tick(Type type, int selected_extruder/* = -1*/)
void DSForLayers::add_current_tick() void DSForLayers::add_current_tick()
{ {
if (!m_allow_editing) if (!can_edit())
return; return;
const int tick = m_ctrl.GetActivePos(); const int tick = m_ctrl.GetActivePos();
@ -1041,6 +1041,11 @@ void DSForLayers::process_jump_to_value()
} }
} }
bool DSForLayers::can_edit() const
{
return m_allow_editing && m_draw_mode != dmSlaPrint;
}
} // DoubleSlider } // DoubleSlider

1
src/slic3r/GUI/DoubleSliderForLayers.hpp
View File

@ -169,6 +169,7 @@ private:
void edit_tick(int tick = -1); void edit_tick(int tick = -1);
void discard_all_thicks(); void discard_all_thicks();
void process_jump_to_value(); void process_jump_to_value();
bool can_edit() const;
std::string get_label(int pos) const override { return get_label(pos, ltHeightWithLayer); } std::string get_label(int pos) const override { return get_label(pos, ltHeightWithLayer); }