3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer

Browse source
This commit is contained in:
Enrico Turri 2020-05-05 16:32:13 +02:00
commit c6646ca897
1 changed files with 55 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/slic3r/GUI/GCodeViewer.cpp
View file

@ -1099,7 +1099,13 @@ void GCodeViewer::render_legend() const
void GCodeViewer::render_sequential_dlg() const void GCodeViewer::render_sequential_dlg() const
{ {
static const float margin = 125.0f; static const float MARGIN = 125.0f;
static const float BUTTON_W = 50.0f;
auto apply_button_action = [this](unsigned int value) {
m_sequential_view.current = std::clamp(value, m_sequential_view.first, m_sequential_view.last);
refresh_render_paths(true);
};
if (m_roles.empty()) if (m_roles.empty())
return; return;
@ -1110,10 +1116,9 @@ void GCodeViewer::render_sequential_dlg() const
ImGuiWrapper& imgui = *wxGetApp().imgui(); ImGuiWrapper& imgui = *wxGetApp().imgui();
const ImGuiStyle& style = ImGui::GetStyle(); const ImGuiStyle& style = ImGui::GetStyle();
const GLToolbar& view_toolbar = wxGetApp().plater()->get_view_toolbar();
Size cnv_size = wxGetApp().plater()->get_current_canvas3D()->get_canvas_size(); Size cnv_size = wxGetApp().plater()->get_current_canvas3D()->get_canvas_size();
float left = view_toolbar.get_width(); float left = wxGetApp().plater()->get_view_toolbar().get_width();
float width = static_cast<float>(cnv_size.get_width()) - left; float width = static_cast<float>(cnv_size.get_width()) - left;
ImGui::SetNextWindowBgAlpha(0.5f); ImGui::SetNextWindowBgAlpha(0.5f);
@ -1122,21 +1127,59 @@ void GCodeViewer::render_sequential_dlg() const
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f); ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
imgui.begin(std::string("Sequential"), ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove); imgui.begin(std::string("Sequential"), ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove);
std::string low_str = std::to_string(m_sequential_view.first); ImGui::SetCursorPosX(MARGIN);
ImGui::SetCursorPosX(margin - style.ItemSpacing.x - ImGui::CalcTextSize(low_str.c_str()).x); imgui.disabled_begin(m_sequential_view.first == m_sequential_view.current);
if (ImGui::Button("< 1", { BUTTON_W, 0.0f }))
apply_button_action(m_sequential_view.current - 1);
imgui.disabled_end();
ImGui::SameLine();
imgui.disabled_begin(m_sequential_view.current - m_sequential_view.first < 10);
if (ImGui::Button("< 10", { BUTTON_W, 0.0f }))
apply_button_action(m_sequential_view.current - 10);
imgui.disabled_end();
ImGui::SameLine();
imgui.disabled_begin(m_sequential_view.current - m_sequential_view.first < 100);
if (ImGui::Button("< 100", { BUTTON_W, 0.0f }))
apply_button_action(m_sequential_view.current - 100);
imgui.disabled_end();
ImGui::SameLine(width - MARGIN - 3 * BUTTON_W - 2 * style.ItemSpacing.x - style.WindowPadding.x);
imgui.disabled_begin(m_sequential_view.last - m_sequential_view.current < 100);
if (ImGui::Button("> 100", { BUTTON_W, 0.0f }))
apply_button_action(m_sequential_view.current + 100);
imgui.disabled_end();
ImGui::SameLine();
imgui.disabled_begin(m_sequential_view.last - m_sequential_view.current < 10);
if (ImGui::Button("> 10", { BUTTON_W, 0.0f }))
apply_button_action(m_sequential_view.current + 10);
imgui.disabled_end();
ImGui::SameLine();
imgui.disabled_begin(m_sequential_view.last == m_sequential_view.current);
if (ImGui::Button("> 1", { BUTTON_W, 0.0f }))
apply_button_action(m_sequential_view.current + 1);
imgui.disabled_end();
int index = 1 + static_cast<int>(m_sequential_view.current);
int i_min = 1 + static_cast<int>(m_sequential_view.first);
int i_max = 1 + static_cast<int>(m_sequential_view.last);
std::string low_str = std::to_string(i_min);
ImGui::SetCursorPosX(MARGIN - style.ItemSpacing.x - ImGui::CalcTextSize(low_str.c_str()).x);
ImGui::AlignTextToFramePadding(); ImGui::AlignTextToFramePadding();
imgui.text(low_str); imgui.text(low_str);
ImGui::SameLine(margin); ImGui::SameLine(MARGIN);
ImGui::PushItemWidth(-margin); ImGui::PushItemWidth(-MARGIN);
int index = static_cast<int>(m_sequential_view.current); if (ImGui::SliderInt("##slider int", &index, i_min, i_max)) {
if (ImGui::SliderInt("##slider int", &index, static_cast<int>(m_sequential_view.first), static_cast<int>(m_sequential_view.last))) m_sequential_view.current = static_cast<unsigned int>(index - 1);
{
m_sequential_view.current = static_cast<unsigned int>(index);
refresh_render_paths(true); refresh_render_paths(true);
} }
ImGui::PopItemWidth(); ImGui::PopItemWidth();
ImGui::SameLine(); ImGui::SameLine();
imgui.text(std::to_string(m_sequential_view.last)); imgui.text(std::to_string(i_max));
imgui.end(); imgui.end();
ImGui::PopStyleVar(); ImGui::PopStyleVar();