3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Tech ENABLE_GCODE_VIEWER -> Refactoring and code cleanup

Browse source
This commit is contained in:
enricoturri1966 2020-05-15 12:25:38 +02:00
parent e57bc8afc1
commit a68eefbe4a
11 changed files with 152 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libslic3r/Technologies.hpp
View file

@ -55,7 +55,6 @@
// Enable G-Code viewer // Enable G-Code viewer
#define ENABLE_GCODE_VIEWER (1 && ENABLE_2_3_0_ALPHA1) #define ENABLE_GCODE_VIEWER (1 && ENABLE_2_3_0_ALPHA1)
#define ENABLE_GCODE_USE_WXWIDGETS_SLIDER (1 && ENABLE_GCODE_VIEWER)
#define ENABLE_GCODE_VIEWER_STATISTICS (0 && ENABLE_GCODE_VIEWER) #define ENABLE_GCODE_VIEWER_STATISTICS (0 && ENABLE_GCODE_VIEWER)
#endif // _prusaslicer_technologies_h_ #endif // _prusaslicer_technologies_h_

32
src/slic3r/GUI/DoubleSlider.cpp
View file

@ -20,9 +20,9 @@
#include <wx/bmpcbox.h> #include <wx/bmpcbox.h>
#include <wx/statline.h> #include <wx/statline.h>
#include <wx/dcclient.h> #include <wx/dcclient.h>
#if !ENABLE_GCODE_USE_WXWIDGETS_SLIDER #if !ENABLE_GCODE_VIEWER
#include <wx/numformatter.h> #include <wx/numformatter.h>
#endif // !ENABLE_GCODE_USE_WXWIDGETS_SLIDER #endif // !ENABLE_GCODE_VIEWER
#include <wx/colordlg.h> #include <wx/colordlg.h>
#include <cmath> #include <cmath>
@ -537,7 +537,7 @@ wxString Control::get_label(int tick) const
if (value >= m_values.size()) if (value >= m_values.size())
return "ErrVal"; return "ErrVal";
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER #if ENABLE_GCODE_VIEWER
if (m_draw_mode == dmSequentialGCodeView) if (m_draw_mode == dmSequentialGCodeView)
return wxString::Format("%d", static_cast<unsigned int>(m_values[value])); return wxString::Format("%d", static_cast<unsigned int>(m_values[value]));
else { else {
@ -551,7 +551,7 @@ wxString Control::get_label(int tick) const
wxNumberFormatter::ToString(m_label_koef * value, 2, wxNumberFormatter::Style_None) : wxNumberFormatter::ToString(m_label_koef * value, 2, wxNumberFormatter::Style_None) :
wxNumberFormatter::ToString(m_values[value], 2, wxNumberFormatter::Style_None); wxNumberFormatter::ToString(m_values[value], 2, wxNumberFormatter::Style_None);
return format_wxstr("%1%\n(%2%)", str, m_values.empty() ? value : value + 1); return format_wxstr("%1%\n(%2%)", str, m_values.empty() ? value : value + 1);
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER #endif // ENABLE_GCODE_VIEWER
} }
void Control::draw_tick_text(wxDC& dc, const wxPoint& pos, int tick, bool right_side/*=true*/) const void Control::draw_tick_text(wxDC& dc, const wxPoint& pos, int tick, bool right_side/*=true*/) const
@ -792,10 +792,10 @@ void Control::draw_colored_band(wxDC& dc)
void Control::draw_one_layer_icon(wxDC& dc) void Control::draw_one_layer_icon(wxDC& dc)
{ {
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER #if ENABLE_GCODE_VIEWER
if (m_draw_mode == dmSequentialGCodeView) if (m_draw_mode == dmSequentialGCodeView)
return; return;
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER #endif // ENABLE_GCODE_VIEWER
const wxBitmap& icon = m_is_one_layer ? const wxBitmap& icon = m_is_one_layer ?
m_focus == fiOneLayerIcon ? m_bmp_one_layer_lock_off.bmp() : m_bmp_one_layer_lock_on.bmp() : m_focus == fiOneLayerIcon ? m_bmp_one_layer_lock_off.bmp() : m_bmp_one_layer_lock_on.bmp() :
@ -1302,11 +1302,11 @@ void Control::OnWheel(wxMouseEvent& event)
ssLower : ssHigher; ssLower : ssHigher;
} }
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER #if ENABLE_GCODE_VIEWER
move_current_thumb((m_draw_mode == dmSequentialGCodeView) ? event.GetWheelRotation() < 0 : event.GetWheelRotation() > 0); move_current_thumb((m_draw_mode == dmSequentialGCodeView) ? event.GetWheelRotation() < 0 : event.GetWheelRotation() > 0);
#else #else
move_current_thumb(event.GetWheelRotation() > 0); move_current_thumb(event.GetWheelRotation() > 0);
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER #endif // ENABLE_GCODE_VIEWER
} }
void Control::OnKeyDown(wxKeyEvent &event) void Control::OnKeyDown(wxKeyEvent &event)
@ -1328,34 +1328,34 @@ void Control::OnKeyDown(wxKeyEvent &event)
UseDefaultColors(false); UseDefaultColors(false);
else if (is_horizontal()) else if (is_horizontal())
{ {
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER #if ENABLE_GCODE_VIEWER
if (m_is_focused) if (m_is_focused)
{ {
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER #endif // ENABLE_GCODE_VIEWER
if (key == WXK_LEFT || key == WXK_RIGHT) if (key == WXK_LEFT || key == WXK_RIGHT)
move_current_thumb(key == WXK_LEFT); move_current_thumb(key == WXK_LEFT);
else if (key == WXK_UP || key == WXK_DOWN) { else if (key == WXK_UP || key == WXK_DOWN) {
m_selection = key == WXK_UP ? ssHigher : ssLower; m_selection = key == WXK_UP ? ssHigher : ssLower;
Refresh(); Refresh();
} }
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER #if ENABLE_GCODE_VIEWER
} }
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER #endif // ENABLE_GCODE_VIEWER
} }
else { else {
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER #if ENABLE_GCODE_VIEWER
if (m_is_focused) if (m_is_focused)
{ {
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER #endif // ENABLE_GCODE_VIEWER
if (key == WXK_LEFT || key == WXK_RIGHT) { if (key == WXK_LEFT || key == WXK_RIGHT) {
m_selection = key == WXK_LEFT ? ssHigher : ssLower; m_selection = key == WXK_LEFT ? ssHigher : ssLower;
Refresh(); Refresh();
} }
else if (key == WXK_UP || key == WXK_DOWN) else if (key == WXK_UP || key == WXK_DOWN)
move_current_thumb(key == WXK_UP); move_current_thumb(key == WXK_UP);
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER #if ENABLE_GCODE_VIEWER
} }
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER #endif // ENABLE_GCODE_VIEWER
} }
event.Skip(); // !Needed to have EVT_CHAR generated as well event.Skip(); // !Needed to have EVT_CHAR generated as well

8
src/slic3r/GUI/DoubleSlider.hpp
View file

@ -73,9 +73,9 @@ enum DrawMode
dmRegular, dmRegular,
dmSlaPrint, dmSlaPrint,
dmSequentialFffPrint, dmSequentialFffPrint,
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER #if ENABLE_GCODE_VIEWER
dmSequentialGCodeView, dmSequentialGCodeView,
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER #endif // ENABLE_GCODE_VIEWER
}; };
using t_mode = CustomGCode::Mode; using t_mode = CustomGCode::Mode;
@ -214,9 +214,9 @@ public:
void SetTicksValues(const Slic3r::CustomGCode::Info &custom_gcode_per_print_z); void SetTicksValues(const Slic3r::CustomGCode::Info &custom_gcode_per_print_z);
void SetDrawMode(bool is_sla_print, bool is_sequential_print); void SetDrawMode(bool is_sla_print, bool is_sequential_print);
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER #if ENABLE_GCODE_VIEWER
void SetDrawMode(DrawMode mode) { m_draw_mode = mode; } void SetDrawMode(DrawMode mode) { m_draw_mode = mode; }
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER #endif // ENABLE_GCODE_VIEWER
void SetManipulationMode(t_mode mode) { m_mode = mode; } void SetManipulationMode(t_mode mode) { m_mode = mode; }
t_mode GetManipulationMode() const { return m_mode; } t_mode GetManipulationMode() const { return m_mode; }

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

@ -324,9 +324,6 @@ void GCodeViewer::render() const
m_sequential_view.marker.render(); m_sequential_view.marker.render();
render_shells(); render_shells();
render_legend(); render_legend();
#if !ENABLE_GCODE_USE_WXWIDGETS_SLIDER
render_sequential_bar();
#endif // !ENABLE_GCODE_USE_WXWIDGETS_SLIDER
#if ENABLE_GCODE_VIEWER_STATISTICS #if ENABLE_GCODE_VIEWER_STATISTICS
render_statistics(); render_statistics();
#endif // ENABLE_GCODE_VIEWER_STATISTICS #endif // ENABLE_GCODE_VIEWER_STATISTICS
@ -383,15 +380,13 @@ void GCodeViewer::set_options_visibility_from_flags(unsigned int flags)
enable_legend(is_flag_set(9)); enable_legend(is_flag_set(9));
} }
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER
void GCodeViewer::set_layers_z_range(const std::array<double, 2>& layers_z_range) void GCodeViewer::set_layers_z_range(const std::array<double, 2>& layers_z_range)
{ {
bool keep_sequential_current = layers_z_range[1] <= m_layers_z_range[1]; bool keep_sequential_current = layers_z_range[1] <= m_layers_z_range[1];
m_layers_z_range = layers_z_range; m_layers_z_range = layers_z_range;
refresh_render_paths(keep_sequential_current); refresh_render_paths(keep_sequential_current);
wxGetApp().plater()->update_preview_horz_slider(); wxGetApp().plater()->update_preview_moves_slider();
} }
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER
bool GCodeViewer::init_shaders() bool GCodeViewer::init_shaders()
{ {
@ -1159,93 +1154,6 @@ void GCodeViewer::render_legend() const
ImGui::PopStyleVar(); ImGui::PopStyleVar();
} }
#if !ENABLE_GCODE_USE_WXWIDGETS_SLIDER
void GCodeViewer::render_sequential_bar() const
{
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_sequential_view.last <= m_sequential_view.first)
return;
ImGuiWrapper& imgui = *wxGetApp().imgui();
const ImGuiStyle& style = ImGui::GetStyle();
Size cnv_size = wxGetApp().plater()->get_current_canvas3D()->get_canvas_size();
float left = wxGetApp().plater()->get_view_toolbar().get_width();
float width = static_cast<float>(cnv_size.get_width()) - left;
ImGui::SetNextWindowBgAlpha(0.5f);
imgui.set_next_window_pos(left, static_cast<float>(cnv_size.get_height()), ImGuiCond_Always, 0.0f, 1.0f);
ImGui::SetNextWindowSize({ width, -1.0f }, ImGuiCond_Always);
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
imgui.begin(std::string("Sequential"), ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove);
ImGui::SetCursorPosX(MARGIN);
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.text(low_str);
ImGui::SameLine(MARGIN);
ImGui::PushItemWidth(-MARGIN);
if (ImGui::SliderInt("##slider int", &index, i_min, i_max)) {
m_sequential_view.current = static_cast<unsigned int>(index - 1);
refresh_render_paths(true);
}
ImGui::PopItemWidth();
ImGui::SameLine();
imgui.text(std::to_string(i_max));
imgui.end();
ImGui::PopStyleVar();
}
#endif // !ENABLE_GCODE_USE_WXWIDGETS_SLIDER
#if ENABLE_GCODE_VIEWER_STATISTICS #if ENABLE_GCODE_VIEWER_STATISTICS
void GCodeViewer::render_statistics() const void GCodeViewer::render_statistics() const
{ {

52
src/slic3r/GUI/GCodeViewer.hpp
View file

@ -149,42 +149,6 @@ class GCodeViewer
void reset_ranges() { ranges.reset(); } void reset_ranges() { ranges.reset(); }
}; };
#if !ENABLE_GCODE_USE_WXWIDGETS_SLIDER
struct SequentialView
{
class Marker
{
GL_Model m_model;
Transform3f m_world_transform;
std::array<float, 4> m_color{ 1.0f, 1.0f, 1.0f, 1.0f };
bool m_visible{ false };
Shader m_shader;
public:
void init();
const BoundingBoxf3& get_bounding_box() const { return m_model.get_bounding_box(); }
void set_world_transform(const Transform3f& transform) { m_world_transform = transform; }
void set_color(const std::array<float, 4>& color) { m_color = color; }
bool is_visible() const { return m_visible; }
void set_visible(bool visible) { m_visible = visible; }
void render() const;
private:
void init_shader();
};
unsigned int first{ 0 };
unsigned int last{ 0 };
unsigned int current{ 0 };
Vec3f current_position{ Vec3f::Zero() };
Marker marker;
};
#endif // !ENABLE_GCODE_USE_WXWIDGETS_SLIDER
#if ENABLE_GCODE_VIEWER_STATISTICS #if ENABLE_GCODE_VIEWER_STATISTICS
struct Statistics struct Statistics
{ {
@ -231,7 +195,6 @@ class GCodeViewer
#endif // ENABLE_GCODE_VIEWER_STATISTICS #endif // ENABLE_GCODE_VIEWER_STATISTICS
public: public:
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER
struct SequentialView struct SequentialView
{ {
class Marker class Marker
@ -265,7 +228,6 @@ public:
Vec3f current_position{ Vec3f::Zero() }; Vec3f current_position{ Vec3f::Zero() };
Marker marker; Marker marker;
}; };
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER
enum class EViewType : unsigned char enum class EViewType : unsigned char
{ {
@ -322,10 +284,8 @@ public:
const BoundingBoxf3& get_bounding_box() const { return m_bounding_box; } const BoundingBoxf3& get_bounding_box() const { return m_bounding_box; }
const std::vector<double>& get_layers_zs() const { return m_layers_zs; }; const std::vector<double>& get_layers_zs() const { return m_layers_zs; };
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER
const SequentialView& get_sequential_view() const { return m_sequential_view; } const SequentialView& get_sequential_view() const { return m_sequential_view; }
void update_sequential_view_current(unsigned int low, unsigned int high) { m_sequential_view.current = high; refresh_render_paths(true); } void update_sequential_view_current(unsigned int low, unsigned int high) { m_sequential_view.current = high; refresh_render_paths(true); }
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER
EViewType get_view_type() const { return m_view_type; } EViewType get_view_type() const { return m_view_type; }
void set_view_type(EViewType type) { void set_view_type(EViewType type) {
@ -341,16 +301,7 @@ public:
void set_toolpath_role_visibility_flags(unsigned int flags) { m_extrusions.role_visibility_flags = flags; } void set_toolpath_role_visibility_flags(unsigned int flags) { m_extrusions.role_visibility_flags = flags; }
unsigned int get_options_visibility_flags() const; unsigned int get_options_visibility_flags() const;
void set_options_visibility_from_flags(unsigned int flags); void set_options_visibility_from_flags(unsigned int flags);
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER
void set_layers_z_range(const std::array<double, 2>& layers_z_range); void set_layers_z_range(const std::array<double, 2>& layers_z_range);
#else
void set_layers_z_range(const std::array<double, 2>& layers_z_range)
{
bool keep_sequential_current = layers_z_range[1] <= m_layers_z_range[1];
m_layers_z_range = layers_z_range;
refresh_render_paths(keep_sequential_current);
}
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER
bool is_legend_enabled() const { return m_legend_enabled; } bool is_legend_enabled() const { return m_legend_enabled; }
void enable_legend(bool enable) { m_legend_enabled = enable; } void enable_legend(bool enable) { m_legend_enabled = enable; }
@ -363,9 +314,6 @@ private:
void render_toolpaths() const; void render_toolpaths() const;
void render_shells() const; void render_shells() const;
void render_legend() const; void render_legend() const;
#if !ENABLE_GCODE_USE_WXWIDGETS_SLIDER
void render_sequential_bar() const;
#endif // !ENABLE_GCODE_USE_WXWIDGETS_SLIDER
#if ENABLE_GCODE_VIEWER_STATISTICS #if ENABLE_GCODE_VIEWER_STATISTICS
void render_statistics() const; void render_statistics() const;
#endif // ENABLE_GCODE_VIEWER_STATISTICS #endif // ENABLE_GCODE_VIEWER_STATISTICS

8
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -1523,7 +1523,11 @@ wxDEFINE_EVENT(EVT_GLCANVAS_MOUSE_DRAGGING_FINISHED, SimpleEvent);
wxDEFINE_EVENT(EVT_GLCANVAS_UPDATE_BED_SHAPE, SimpleEvent); wxDEFINE_EVENT(EVT_GLCANVAS_UPDATE_BED_SHAPE, SimpleEvent);
wxDEFINE_EVENT(EVT_GLCANVAS_TAB, SimpleEvent); wxDEFINE_EVENT(EVT_GLCANVAS_TAB, SimpleEvent);
wxDEFINE_EVENT(EVT_GLCANVAS_RESETGIZMOS, SimpleEvent); wxDEFINE_EVENT(EVT_GLCANVAS_RESETGIZMOS, SimpleEvent);
#if ENABLE_GCODE_VIEWER
wxDEFINE_EVENT(EVT_GLCANVAS_MOVE_LAYERS_SLIDER, wxKeyEvent);
#else
wxDEFINE_EVENT(EVT_GLCANVAS_MOVE_DOUBLE_SLIDER, wxKeyEvent); wxDEFINE_EVENT(EVT_GLCANVAS_MOVE_DOUBLE_SLIDER, wxKeyEvent);
#endif // ENABLE_GCODE_VIEWER
wxDEFINE_EVENT(EVT_GLCANVAS_EDIT_COLOR_CHANGE, wxKeyEvent); wxDEFINE_EVENT(EVT_GLCANVAS_EDIT_COLOR_CHANGE, wxKeyEvent);
wxDEFINE_EVENT(EVT_GLCANVAS_UNDO, SimpleEvent); wxDEFINE_EVENT(EVT_GLCANVAS_UNDO, SimpleEvent);
wxDEFINE_EVENT(EVT_GLCANVAS_REDO, SimpleEvent); wxDEFINE_EVENT(EVT_GLCANVAS_REDO, SimpleEvent);
@ -3405,7 +3409,11 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
keyCode == WXK_DOWN) keyCode == WXK_DOWN)
{ {
if (dynamic_cast<Preview*>(m_canvas->GetParent()) != nullptr) if (dynamic_cast<Preview*>(m_canvas->GetParent()) != nullptr)
#if ENABLE_GCODE_VIEWER
post_event(wxKeyEvent(EVT_GLCANVAS_MOVE_LAYERS_SLIDER, evt));
#else
post_event(wxKeyEvent(EVT_GLCANVAS_MOVE_DOUBLE_SLIDER, evt)); post_event(wxKeyEvent(EVT_GLCANVAS_MOVE_DOUBLE_SLIDER, evt));
#endif // ENABLE_GCODE_VIEWER
} }
} }
} }

6
src/slic3r/GUI/GLCanvas3D.hpp
View file

@ -107,7 +107,11 @@ wxDECLARE_EVENT(EVT_GLCANVAS_MOUSE_DRAGGING_FINISHED, SimpleEvent);
wxDECLARE_EVENT(EVT_GLCANVAS_UPDATE_BED_SHAPE, SimpleEvent); wxDECLARE_EVENT(EVT_GLCANVAS_UPDATE_BED_SHAPE, SimpleEvent);
wxDECLARE_EVENT(EVT_GLCANVAS_TAB, SimpleEvent); wxDECLARE_EVENT(EVT_GLCANVAS_TAB, SimpleEvent);
wxDECLARE_EVENT(EVT_GLCANVAS_RESETGIZMOS, SimpleEvent); wxDECLARE_EVENT(EVT_GLCANVAS_RESETGIZMOS, SimpleEvent);
#if ENABLE_GCODE_VIEWER
wxDECLARE_EVENT(EVT_GLCANVAS_MOVE_LAYERS_SLIDER, wxKeyEvent);
#else
wxDECLARE_EVENT(EVT_GLCANVAS_MOVE_DOUBLE_SLIDER, wxKeyEvent); wxDECLARE_EVENT(EVT_GLCANVAS_MOVE_DOUBLE_SLIDER, wxKeyEvent);
#endif // ENABLE_GCODE_VIEWER
wxDECLARE_EVENT(EVT_GLCANVAS_EDIT_COLOR_CHANGE, wxKeyEvent); wxDECLARE_EVENT(EVT_GLCANVAS_EDIT_COLOR_CHANGE, wxKeyEvent);
wxDECLARE_EVENT(EVT_GLCANVAS_UNDO, SimpleEvent); wxDECLARE_EVENT(EVT_GLCANVAS_UNDO, SimpleEvent);
wxDECLARE_EVENT(EVT_GLCANVAS_REDO, SimpleEvent); wxDECLARE_EVENT(EVT_GLCANVAS_REDO, SimpleEvent);
@ -553,10 +557,8 @@ public:
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
void reset_gcode_toolpaths() { m_gcode_viewer.reset(); } void reset_gcode_toolpaths() { m_gcode_viewer.reset(); }
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER
const GCodeViewer::SequentialView& get_gcode_sequential_view() const { return m_gcode_viewer.get_sequential_view(); } const GCodeViewer::SequentialView& get_gcode_sequential_view() const { return m_gcode_viewer.get_sequential_view(); }
void update_gcode_sequential_view_current(unsigned int low, unsigned int high) { m_gcode_viewer.update_sequential_view_current(low, high); } void update_gcode_sequential_view_current(unsigned int low, unsigned int high) { m_gcode_viewer.update_sequential_view_current(low, high); }
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
void toggle_sla_auxiliaries_visibility(bool visible, const ModelObject* mo = nullptr, int instance_idx = -1); void toggle_sla_auxiliaries_visibility(bool visible, const ModelObject* mo = nullptr, int instance_idx = -1);

175
src/slic3r/GUI/GUI_Preview.cpp
View file

@ -183,9 +183,11 @@ Preview::Preview(
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
: m_canvas_widget(nullptr) : m_canvas_widget(nullptr)
, m_canvas(nullptr) , m_canvas(nullptr)
, m_double_slider_sizer(nullptr)
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
, m_bottom_toolbar_sizer(nullptr) , m_bottom_toolbar_sizer(nullptr)
, m_layers_slider_sizer(nullptr)
#else
, m_double_slider_sizer(nullptr)
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
, m_label_view_type(nullptr) , m_label_view_type(nullptr)
, m_choice_view_type(nullptr) , m_choice_view_type(nullptr)
@ -248,7 +250,7 @@ bool Preview::init(wxWindow* parent, Model* model)
m_canvas->enable_collapse_toolbar(true); m_canvas->enable_collapse_toolbar(true);
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
m_double_slider_sizer = create_vert_slider_sizer(); m_layers_slider_sizer = create_layers_slider_sizer();
#else #else
m_double_slider_sizer = new wxBoxSizer(wxHORIZONTAL); m_double_slider_sizer = new wxBoxSizer(wxHORIZONTAL);
create_double_slider(); create_double_slider();
@ -319,15 +321,17 @@ bool Preview::init(wxWindow* parent, Model* model)
wxBoxSizer* top_sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* top_sizer = new wxBoxSizer(wxHORIZONTAL);
top_sizer->Add(m_canvas_widget, 1, wxALL | wxEXPAND, 0); top_sizer->Add(m_canvas_widget, 1, wxALL | wxEXPAND, 0);
#if ENABLE_GCODE_VIEWER
top_sizer->Add(m_layers_slider_sizer, 0, wxEXPAND, 0);
#else
top_sizer->Add(m_double_slider_sizer, 0, wxEXPAND, 0); top_sizer->Add(m_double_slider_sizer, 0, wxEXPAND, 0);
#endif // ENABLE_GCODE_VIEWER
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER
m_horz_slider = new DoubleSlider::Control(this, wxID_ANY, 0, 0, 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL);
m_horz_slider->SetDrawMode(DoubleSlider::dmSequentialGCodeView);
m_horz_slider->Bind(wxEVT_SCROLL_CHANGED, &Preview::on_horz_slider_scroll_changed, this);
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
m_moves_slider = new DoubleSlider::Control(this, wxID_ANY, 0, 0, 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL);
m_moves_slider->SetDrawMode(DoubleSlider::dmSequentialGCodeView);
m_moves_slider->Bind(wxEVT_SCROLL_CHANGED, &Preview::on_moves_slider_scroll_changed, this);
m_bottom_toolbar_sizer = new wxBoxSizer(wxHORIZONTAL); m_bottom_toolbar_sizer = new wxBoxSizer(wxHORIZONTAL);
m_bottom_toolbar_sizer->AddSpacer(10); m_bottom_toolbar_sizer->AddSpacer(10);
m_bottom_toolbar_sizer->Add(m_label_view_type, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5); m_bottom_toolbar_sizer->Add(m_label_view_type, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5);
@ -336,10 +340,8 @@ bool Preview::init(wxWindow* parent, Model* model)
m_bottom_toolbar_sizer->Add(m_label_show, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5); m_bottom_toolbar_sizer->Add(m_label_show, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
m_bottom_toolbar_sizer->Add(m_combochecklist_options, 0, wxALIGN_CENTER_VERTICAL, 5); m_bottom_toolbar_sizer->Add(m_combochecklist_options, 0, wxALIGN_CENTER_VERTICAL, 5);
m_bottom_toolbar_sizer->Add(m_combochecklist_features, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 5); m_bottom_toolbar_sizer->Add(m_combochecklist_features, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 5);
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER
m_bottom_toolbar_sizer->AddSpacer(10); m_bottom_toolbar_sizer->AddSpacer(10);
m_bottom_toolbar_sizer->Add(m_horz_slider, 1, wxALL | wxEXPAND, 5); m_bottom_toolbar_sizer->Add(m_moves_slider, 1, wxALL | wxEXPAND, 5);
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER
#else #else
wxBoxSizer* bottom_sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* bottom_sizer = new wxBoxSizer(wxHORIZONTAL);
bottom_sizer->Add(m_label_view_type, 0, wxALIGN_CENTER_VERTICAL, 5); bottom_sizer->Add(m_label_view_type, 0, wxALIGN_CENTER_VERTICAL, 5);
@ -517,10 +519,8 @@ void Preview::msw_rescale()
{ {
// rescale slider // rescale slider
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
if (m_vert_slider != nullptr) m_vert_slider->msw_rescale(); if (m_layers_slider != nullptr) m_layers_slider->msw_rescale();
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER if (m_moves_slider != nullptr) m_moves_slider->msw_rescale();
if (m_horz_slider != nullptr) m_horz_slider->msw_rescale();
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER
#else #else
if (m_slider) m_slider->msw_rescale(); if (m_slider) m_slider->msw_rescale();
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
@ -532,25 +532,31 @@ void Preview::msw_rescale()
refresh_print(); refresh_print();
} }
#if ENABLE_GCODE_VIEWER
void Preview::move_layers_slider(wxKeyEvent& evt)
{
if (m_layers_slider != nullptr) m_layers_slider->OnKeyDown(evt);
}
#else
void Preview::move_double_slider(wxKeyEvent& evt) void Preview::move_double_slider(wxKeyEvent& evt)
{ {
#if ENABLE_GCODE_VIEWER
if (m_vert_slider != nullptr) m_vert_slider->OnKeyDown(evt);
#else
if (m_slider) if (m_slider)
m_slider->OnKeyDown(evt); m_slider->OnKeyDown(evt);
#endif // ENABLE_GCODE_VIEWER
} }
#endif // ENABLE_GCODE_VIEWER
#if ENABLE_GCODE_VIEWER
void Preview::edit_layers_slider(wxKeyEvent& evt)
{
if (m_layers_slider != nullptr) m_layers_slider->OnChar(evt);
}
#else
void Preview::edit_double_slider(wxKeyEvent& evt) void Preview::edit_double_slider(wxKeyEvent& evt)
{ {
#if ENABLE_GCODE_VIEWER
if (m_vert_slider != nullptr) m_vert_slider->OnChar(evt);
#else
if (m_slider) if (m_slider)
m_slider->OnChar(evt); m_slider->OnChar(evt);
#endif // ENABLE_GCODE_VIEWER
} }
#endif // ENABLE_GCODE_VIEWER
void Preview::bind_event_handlers() void Preview::bind_event_handlers()
{ {
@ -614,9 +620,9 @@ void Preview::show_hide_ui_elements(const std::string& what)
#endif // !ENABLE_GCODE_VIEWER #endif // !ENABLE_GCODE_VIEWER
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
void Preview::hide_vert_slider() void Preview::hide_layers_slider()
{ {
m_double_slider_sizer->Hide((size_t)0); m_layers_slider_sizer->Hide((size_t)0);
Layout(); Layout();
} }
#else #else
@ -756,29 +762,29 @@ void Preview::update_bottom_toolbar()
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
wxBoxSizer* Preview::create_vert_slider_sizer() wxBoxSizer* Preview::create_layers_slider_sizer()
{ {
wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
m_vert_slider = new DoubleSlider::Control(this, wxID_ANY, 0, 0, 0, 100); m_layers_slider = new DoubleSlider::Control(this, wxID_ANY, 0, 0, 0, 100);
m_vert_slider->SetDrawMode(wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() == ptSLA, m_layers_slider->SetDrawMode(wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() == ptSLA,
wxGetApp().preset_bundle->prints.get_edited_preset().config.opt_bool("complete_objects")); wxGetApp().preset_bundle->prints.get_edited_preset().config.opt_bool("complete_objects"));
sizer->Add(m_vert_slider, 0, wxEXPAND, 0); sizer->Add(m_layers_slider, 0, wxEXPAND, 0);
// sizer, m_canvas_widget // sizer, m_canvas_widget
m_canvas_widget->Bind(wxEVT_KEY_DOWN, &Preview::update_vert_slider_from_canvas, this); m_canvas_widget->Bind(wxEVT_KEY_DOWN, &Preview::update_layers_slider_from_canvas, this);
m_canvas_widget->Bind(wxEVT_KEY_UP, [this](wxKeyEvent& event) { m_canvas_widget->Bind(wxEVT_KEY_UP, [this](wxKeyEvent& event) {
if (event.GetKeyCode() == WXK_SHIFT) if (event.GetKeyCode() == WXK_SHIFT)
m_vert_slider->UseDefaultColors(true); m_layers_slider->UseDefaultColors(true);
event.Skip(); event.Skip();
}); });
m_vert_slider->Bind(wxEVT_SCROLL_CHANGED, &Preview::on_vert_slider_scroll_changed, this); m_layers_slider->Bind(wxEVT_SCROLL_CHANGED, &Preview::on_layers_slider_scroll_changed, this);
Bind(DoubleSlider::wxCUSTOMEVT_TICKSCHANGED, [this](wxEvent&) { Bind(DoubleSlider::wxCUSTOMEVT_TICKSCHANGED, [this](wxEvent&) {
Model& model = wxGetApp().plater()->model(); Model& model = wxGetApp().plater()->model();
model.custom_gcode_per_print_z = m_vert_slider->GetTicksValues(); model.custom_gcode_per_print_z = m_layers_slider->GetTicksValues();
m_schedule_background_process(); m_schedule_background_process();
update_view_type(false); update_view_type(false);
@ -850,8 +856,7 @@ static int find_close_layer_idx(const std::vector<double>& zs, double &z, double
} }
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
void Preview::check_vert_slider_values(std::vector<CustomGCode::Item>& ticks_from_model, void Preview::check_layers_slider_values(std::vector<CustomGCode::Item>& ticks_from_model, const std::vector<double>& layers_z)
const std::vector<double>& layers_z)
#else #else
void Preview::check_slider_values(std::vector<CustomGCode::Item>& ticks_from_model, void Preview::check_slider_values(std::vector<CustomGCode::Item>& ticks_from_model,
const std::vector<double>& layers_z) const std::vector<double>& layers_z)
@ -873,34 +878,34 @@ void Preview::check_slider_values(std::vector<CustomGCode::Item>& ticks_from_mod
} }
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
void Preview::update_vert_slider(const std::vector<double>& layers_z, bool keep_z_range) void Preview::update_layers_slider(const std::vector<double>& layers_z, bool keep_z_range)
{ {
// Save the initial slider span. // Save the initial slider span.
double z_low = m_vert_slider->GetLowerValueD(); double z_low = m_layers_slider->GetLowerValueD();
double z_high = m_vert_slider->GetHigherValueD(); double z_high = m_layers_slider->GetHigherValueD();
bool was_empty = m_vert_slider->GetMaxValue() == 0; bool was_empty = m_layers_slider->GetMaxValue() == 0;
bool force_sliders_full_range = was_empty; bool force_sliders_full_range = was_empty;
if (!keep_z_range) if (!keep_z_range)
{ {
bool span_changed = layers_z.empty() || std::abs(layers_z.back() - m_vert_slider->GetMaxValueD()) > DoubleSlider::epsilon()/*1e-6*/; bool span_changed = layers_z.empty() || std::abs(layers_z.back() - m_layers_slider->GetMaxValueD()) > DoubleSlider::epsilon()/*1e-6*/;
force_sliders_full_range |= span_changed; force_sliders_full_range |= span_changed;
} }
bool snap_to_min = force_sliders_full_range || m_vert_slider->is_lower_at_min(); bool snap_to_min = force_sliders_full_range || m_layers_slider->is_lower_at_min();
bool snap_to_max = force_sliders_full_range || m_vert_slider->is_higher_at_max(); bool snap_to_max = force_sliders_full_range || m_layers_slider->is_higher_at_max();
// Detect and set manipulation mode for double slider // Detect and set manipulation mode for double slider
update_vert_slider_mode(); update_layers_slider_mode();
CustomGCode::Info& ticks_info_from_model = wxGetApp().plater()->model().custom_gcode_per_print_z; CustomGCode::Info& ticks_info_from_model = wxGetApp().plater()->model().custom_gcode_per_print_z;
check_vert_slider_values(ticks_info_from_model.gcodes, layers_z); check_layers_slider_values(ticks_info_from_model.gcodes, layers_z);
m_vert_slider->SetSliderValues(layers_z); m_layers_slider->SetSliderValues(layers_z);
assert(m_vert_slider->GetMinValue() == 0); assert(m_layers_slider->GetMinValue() == 0);
m_vert_slider->SetMaxValue(layers_z.empty() ? 0 : layers_z.size() - 1); m_layers_slider->SetMaxValue(layers_z.empty() ? 0 : layers_z.size() - 1);
int idx_low = 0; int idx_low = 0;
int idx_high = m_vert_slider->GetMaxValue(); int idx_high = m_layers_slider->GetMaxValue();
if (!layers_z.empty()) { if (!layers_z.empty()) {
if (!snap_to_min) { if (!snap_to_min) {
int idx_new = find_close_layer_idx(layers_z, z_low, DoubleSlider::epsilon()/*1e-6*/); int idx_new = find_close_layer_idx(layers_z, z_low, DoubleSlider::epsilon()/*1e-6*/);
@ -913,17 +918,15 @@ void Preview::update_vert_slider(const std::vector<double>& layers_z, bool keep_
idx_high = idx_new; idx_high = idx_new;
} }
} }
m_vert_slider->SetSelectionSpan(idx_low, idx_high); m_layers_slider->SetSelectionSpan(idx_low, idx_high);
m_layers_slider->SetTicksValues(ticks_info_from_model);
m_vert_slider->SetTicksValues(ticks_info_from_model);
bool sla_print_technology = wxGetApp().plater()->printer_technology() == ptSLA; bool sla_print_technology = wxGetApp().plater()->printer_technology() == ptSLA;
bool sequential_print = wxGetApp().preset_bundle->prints.get_edited_preset().config.opt_bool("complete_objects"); bool sequential_print = wxGetApp().preset_bundle->prints.get_edited_preset().config.opt_bool("complete_objects");
m_vert_slider->SetDrawMode(sla_print_technology, sequential_print); m_layers_slider->SetDrawMode(sla_print_technology, sequential_print);
m_layers_slider->SetExtruderColors(wxGetApp().plater()->get_extruder_colors_from_plater_config());
m_vert_slider->SetExtruderColors(wxGetApp().plater()->get_extruder_colors_from_plater_config()); m_layers_slider_sizer->Show((size_t)0);
m_double_slider_sizer->Show((size_t)0);
Layout(); Layout();
} }
#else #else
@ -980,7 +983,7 @@ void Preview::update_double_slider(const std::vector<double> & layers_z, bool ke
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
void Preview::update_vert_slider_mode() void Preview::update_layers_slider_mode()
#else #else
void Preview::update_double_slider_mode() void Preview::update_double_slider_mode()
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
@ -1033,17 +1036,17 @@ void Preview::update_double_slider_mode()
} }
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
m_vert_slider->SetModeAndOnlyExtruder(one_extruder_printed_model, only_extruder); m_layers_slider->SetModeAndOnlyExtruder(one_extruder_printed_model, only_extruder);
#else #else
m_slider->SetModeAndOnlyExtruder(one_extruder_printed_model, only_extruder); m_slider->SetModeAndOnlyExtruder(one_extruder_printed_model, only_extruder);
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
} }
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
void Preview::reset_vert_slider() void Preview::reset_layers_slider()
{ {
m_vert_slider->SetHigherValue(0); m_layers_slider->SetHigherValue(0);
m_vert_slider->SetLowerValue(0); m_layers_slider->SetLowerValue(0);
} }
#else #else
void Preview::reset_double_slider() void Preview::reset_double_slider()
@ -1054,7 +1057,7 @@ void Preview::reset_double_slider()
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
void Preview::update_vert_slider_from_canvas(wxKeyEvent& event) void Preview::update_layers_slider_from_canvas(wxKeyEvent& event)
{ {
if (event.HasModifiers()) { if (event.HasModifiers()) {
event.Skip(); event.Skip();
@ -1064,20 +1067,19 @@ void Preview::update_vert_slider_from_canvas(wxKeyEvent& event)
const auto key = event.GetKeyCode(); const auto key = event.GetKeyCode();
if (key == 'U' || key == 'D') { if (key == 'U' || key == 'D') {
const int new_pos = key == 'U' ? m_vert_slider->GetHigherValue() + 1 : m_vert_slider->GetHigherValue() - 1; const int new_pos = key == 'U' ? m_layers_slider->GetHigherValue() + 1 : m_layers_slider->GetHigherValue() - 1;
m_vert_slider->SetHigherValue(new_pos); m_layers_slider->SetHigherValue(new_pos);
if (event.ShiftDown() || m_vert_slider->is_one_layer()) m_vert_slider->SetLowerValue(m_vert_slider->GetHigherValue()); if (event.ShiftDown() || m_layers_slider->is_one_layer()) m_layers_slider->SetLowerValue(m_layers_slider->GetHigherValue());
} }
else if (key == 'S') else if (key == 'S')
m_vert_slider->ChangeOneLayerLock(); m_layers_slider->ChangeOneLayerLock();
else if (key == WXK_SHIFT) else if (key == WXK_SHIFT)
m_vert_slider->UseDefaultColors(false); m_layers_slider->UseDefaultColors(false);
else else
event.Skip(); event.Skip();
} }
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER void Preview::update_moves_slider()
void Preview::update_horz_slider()
{ {
const GCodeViewer::SequentialView& view = m_canvas->get_gcode_sequential_view(); const GCodeViewer::SequentialView& view = m_canvas->get_gcode_sequential_view();
std::vector<double> values(view.last - view.first + 1); std::vector<double> values(view.last - view.first + 1);
@ -1087,11 +1089,10 @@ void Preview::update_horz_slider()
values[count++] = static_cast<double>(i + 1); values[count++] = static_cast<double>(i + 1);
} }
m_horz_slider->SetSliderValues(values); m_moves_slider->SetSliderValues(values);
m_horz_slider->SetMaxValue(view.last - view.first); m_moves_slider->SetMaxValue(view.last - view.first);
m_horz_slider->SetSelectionSpan(0, view.current); m_moves_slider->SetSelectionSpan(0, view.current);
} }
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER
#else #else
void Preview::update_double_slider_from_canvas(wxKeyEvent & event) void Preview::update_double_slider_from_canvas(wxKeyEvent & event)
{ {
@ -1149,7 +1150,7 @@ void Preview::load_print_as_fff(bool keep_z_range)
if (! has_layers) if (! has_layers)
{ {
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
hide_vert_slider(); hide_layers_slider();
#else #else
reset_sliders(true); reset_sliders(true);
m_canvas->reset_legend_texture(); m_canvas->reset_legend_texture();
@ -1246,14 +1247,14 @@ void Preview::load_print_as_fff(bool keep_z_range)
if (zs.empty()) { if (zs.empty()) {
// all layers filtered out // all layers filtered out
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
hide_vert_slider(); hide_layers_slider();
#else #else
reset_sliders(true); reset_sliders(true);
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
m_canvas_widget->Refresh(); m_canvas_widget->Refresh();
} else } else
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
update_vert_slider(zs, keep_z_range); update_layers_slider(zs, keep_z_range);
#else #else
update_sliders(zs, keep_z_range); update_sliders(zs, keep_z_range);
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
@ -1285,7 +1286,7 @@ void Preview::load_print_as_sla()
if (n_layers == 0) if (n_layers == 0)
{ {
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
hide_vert_slider(); hide_layers_slider();
#else #else
reset_sliders(true); reset_sliders(true);
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
@ -1304,7 +1305,7 @@ void Preview::load_print_as_sla()
if (n_layers > 0) if (n_layers > 0)
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
update_vert_slider(zs); update_layers_slider(zs);
#else #else
update_sliders(zs); update_sliders(zs);
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
@ -1314,7 +1315,7 @@ void Preview::load_print_as_sla()
} }
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
void Preview::on_vert_slider_scroll_changed(wxCommandEvent& event) void Preview::on_layers_slider_scroll_changed(wxCommandEvent& event)
#else #else
void Preview::on_sliders_scroll_changed(wxCommandEvent& event) void Preview::on_sliders_scroll_changed(wxCommandEvent& event)
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
@ -1325,7 +1326,7 @@ void Preview::on_sliders_scroll_changed(wxCommandEvent& event)
if (tech == ptFFF) if (tech == ptFFF)
{ {
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
m_canvas->set_toolpaths_z_range({ m_vert_slider->GetLowerValueD(), m_vert_slider->GetHigherValueD() }); m_canvas->set_toolpaths_z_range({ m_layers_slider->GetLowerValueD(), m_layers_slider->GetHigherValueD() });
m_canvas->set_as_dirty(); m_canvas->set_as_dirty();
#else #else
m_canvas->set_toolpaths_range(m_slider->GetLowerValueD() - 1e-6, m_slider->GetHigherValueD() + 1e-6); m_canvas->set_toolpaths_range(m_slider->GetLowerValueD() - 1e-6, m_slider->GetHigherValueD() + 1e-6);
@ -1336,9 +1337,9 @@ void Preview::on_sliders_scroll_changed(wxCommandEvent& event)
else if (tech == ptSLA) else if (tech == ptSLA)
{ {
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
m_canvas->set_clipping_plane(0, ClippingPlane(Vec3d::UnitZ(), -m_vert_slider->GetLowerValueD())); m_canvas->set_clipping_plane(0, ClippingPlane(Vec3d::UnitZ(), -m_layers_slider->GetLowerValueD()));
m_canvas->set_clipping_plane(1, ClippingPlane(-Vec3d::UnitZ(), m_vert_slider->GetHigherValueD())); m_canvas->set_clipping_plane(1, ClippingPlane(-Vec3d::UnitZ(), m_layers_slider->GetHigherValueD()));
m_canvas->set_use_clipping_planes(m_vert_slider->GetHigherValue() != 0); m_canvas->set_use_clipping_planes(m_layers_slider->GetHigherValue() != 0);
#else #else
m_canvas->set_clipping_plane(0, ClippingPlane(Vec3d::UnitZ(), -m_slider->GetLowerValueD())); m_canvas->set_clipping_plane(0, ClippingPlane(Vec3d::UnitZ(), -m_slider->GetLowerValueD()));
m_canvas->set_clipping_plane(1, ClippingPlane(-Vec3d::UnitZ(), m_slider->GetHigherValueD())); m_canvas->set_clipping_plane(1, ClippingPlane(-Vec3d::UnitZ(), m_slider->GetHigherValueD()));
@ -1349,13 +1350,13 @@ void Preview::on_sliders_scroll_changed(wxCommandEvent& event)
} }
} }
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER #if ENABLE_GCODE_VIEWER
void Preview::on_horz_slider_scroll_changed(wxCommandEvent& event) void Preview::on_moves_slider_scroll_changed(wxCommandEvent& event)
{ {
m_canvas->update_gcode_sequential_view_current(static_cast<unsigned int>(m_horz_slider->GetLowerValueD()), static_cast<unsigned int>(m_horz_slider->GetHigherValueD())); m_canvas->update_gcode_sequential_view_current(static_cast<unsigned int>(m_moves_slider->GetLowerValueD()), static_cast<unsigned int>(m_moves_slider->GetHigherValueD()));
m_canvas->render(); m_canvas->render();
} }
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER #endif // ENABLE_GCODE_VIEWER
} // namespace GUI } // namespace GUI
} // namespace Slic3r } // namespace Slic3r

39
src/slic3r/GUI/GUI_Preview.hpp
View file

@ -82,9 +82,11 @@ class Preview : public wxPanel
{ {
wxGLCanvas* m_canvas_widget; wxGLCanvas* m_canvas_widget;
GLCanvas3D* m_canvas; GLCanvas3D* m_canvas;
wxBoxSizer* m_double_slider_sizer;
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
wxBoxSizer* m_layers_slider_sizer;
wxBoxSizer* m_bottom_toolbar_sizer; wxBoxSizer* m_bottom_toolbar_sizer;
#else
wxBoxSizer* m_double_slider_sizer;
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
wxStaticText* m_label_view_type; wxStaticText* m_label_view_type;
wxChoice* m_choice_view_type; wxChoice* m_choice_view_type;
@ -126,10 +128,8 @@ class Preview : public wxPanel
#endif // !ENABLE_GCODE_VIEWER #endif // !ENABLE_GCODE_VIEWER
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
DoubleSlider::Control* m_vert_slider{ nullptr }; DoubleSlider::Control* m_layers_slider{ nullptr };
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER DoubleSlider::Control* m_moves_slider{ nullptr };
DoubleSlider::Control* m_horz_slider{ nullptr };
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER
#else #else
DoubleSlider::Control* m_slider {nullptr}; DoubleSlider::Control* m_slider {nullptr};
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
@ -162,8 +162,13 @@ Preview(wxWindow* parent, Model* model, DynamicPrintConfig* config,
void refresh_print(); void refresh_print();
void msw_rescale(); void msw_rescale();
#if ENABLE_GCODE_VIEWER
void move_layers_slider(wxKeyEvent& evt);
void edit_layers_slider(wxKeyEvent& evt);
#else
void move_double_slider(wxKeyEvent& evt); void move_double_slider(wxKeyEvent& evt);
void edit_double_slider(wxKeyEvent& evt); void edit_double_slider(wxKeyEvent& evt);
#endif // ENABLE_GCODE_VIEWER
void update_view_type(bool slice_completed); void update_view_type(bool slice_completed);
@ -171,9 +176,7 @@ Preview(wxWindow* parent, Model* model, DynamicPrintConfig* config,
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
void update_bottom_toolbar(); void update_bottom_toolbar();
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER void update_moves_slider();
void update_horz_slider();
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
private: private:
@ -183,7 +186,7 @@ private:
void unbind_event_handlers(); void unbind_event_handlers();
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
void hide_vert_slider(); void hide_layers_slider();
#else #else
void show_hide_ui_elements(const std::string& what); void show_hide_ui_elements(const std::string& what);
@ -206,14 +209,14 @@ private:
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
// Create/Update/Reset double slider on 3dPreview // Create/Update/Reset double slider on 3dPreview
wxBoxSizer* create_vert_slider_sizer(); wxBoxSizer* create_layers_slider_sizer();
void check_vert_slider_values(std::vector<CustomGCode::Item>& ticks_from_model, void check_layers_slider_values(std::vector<CustomGCode::Item>& ticks_from_model,
const std::vector<double>& layers_z); const std::vector<double>& layers_z);
void reset_vert_slider(); void reset_layers_slider();
void update_vert_slider(const std::vector<double>& layers_z, bool keep_z_range = false); void update_layers_slider(const std::vector<double>& layers_z, bool keep_z_range = false);
void update_vert_slider_mode(); void update_layers_slider_mode();
// update vertical DoubleSlider after keyDown in canvas // update vertical DoubleSlider after keyDown in canvas
void update_vert_slider_from_canvas(wxKeyEvent& event); void update_layers_slider_from_canvas(wxKeyEvent& event);
#else #else
// Create/Update/Reset double slider on 3dPreview // Create/Update/Reset double slider on 3dPreview
void create_double_slider(); void create_double_slider();
@ -230,10 +233,8 @@ private:
void load_print_as_sla(); void load_print_as_sla();
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
void on_vert_slider_scroll_changed(wxCommandEvent& event); void on_layers_slider_scroll_changed(wxCommandEvent& event);
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER void on_moves_slider_scroll_changed(wxCommandEvent& event);
void on_horz_slider_scroll_changed(wxCommandEvent& event);
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER
#else #else
void on_sliders_scroll_changed(wxCommandEvent& event); void on_sliders_scroll_changed(wxCommandEvent& event);
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER

21
src/slic3r/GUI/Plater.cpp
View file

@ -1642,9 +1642,7 @@ struct Plater::priv
bool init_view_toolbar(); bool init_view_toolbar();
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
void update_preview_bottom_toolbar(); void update_preview_bottom_toolbar();
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER void update_preview_moves_slider();
void update_preview_horz_slider();
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
void reset_all_gizmos(); void reset_all_gizmos();
@ -1975,8 +1973,13 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
config->option<ConfigOptionString>("bed_custom_model")->value); config->option<ConfigOptionString>("bed_custom_model")->value);
}); });
preview->get_wxglcanvas()->Bind(EVT_GLCANVAS_TAB, [this](SimpleEvent&) { select_next_view_3D(); }); preview->get_wxglcanvas()->Bind(EVT_GLCANVAS_TAB, [this](SimpleEvent&) { select_next_view_3D(); });
#if ENABLE_GCODE_VIEWER
preview->get_wxglcanvas()->Bind(EVT_GLCANVAS_MOVE_LAYERS_SLIDER, [this](wxKeyEvent& evt) { preview->move_layers_slider(evt); });
preview->get_wxglcanvas()->Bind(EVT_GLCANVAS_EDIT_COLOR_CHANGE, [this](wxKeyEvent& evt) { preview->edit_layers_slider(evt); });
#else
preview->get_wxglcanvas()->Bind(EVT_GLCANVAS_MOVE_DOUBLE_SLIDER, [this](wxKeyEvent& evt) { preview->move_double_slider(evt); }); preview->get_wxglcanvas()->Bind(EVT_GLCANVAS_MOVE_DOUBLE_SLIDER, [this](wxKeyEvent& evt) { preview->move_double_slider(evt); });
preview->get_wxglcanvas()->Bind(EVT_GLCANVAS_EDIT_COLOR_CHANGE, [this](wxKeyEvent& evt) { preview->edit_double_slider(evt); }); preview->get_wxglcanvas()->Bind(EVT_GLCANVAS_EDIT_COLOR_CHANGE, [this](wxKeyEvent& evt) { preview->edit_double_slider(evt); });
#endif // ENABLE_GCODE_VIEWER
q->Bind(EVT_SLICING_COMPLETED, &priv::on_slicing_completed, this); q->Bind(EVT_SLICING_COMPLETED, &priv::on_slicing_completed, this);
q->Bind(EVT_PROCESS_COMPLETED, &priv::on_process_completed, this); q->Bind(EVT_PROCESS_COMPLETED, &priv::on_process_completed, this);
@ -3879,12 +3882,10 @@ void Plater::priv::update_preview_bottom_toolbar()
preview->update_bottom_toolbar(); preview->update_bottom_toolbar();
} }
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER void Plater::priv::update_preview_moves_slider()
void Plater::priv::update_preview_horz_slider()
{ {
preview->update_horz_slider(); preview->update_moves_slider();
} }
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
bool Plater::priv::can_set_instance_to_object() const bool Plater::priv::can_set_instance_to_object() const
@ -5482,12 +5483,10 @@ void Plater::update_preview_bottom_toolbar()
p->update_preview_bottom_toolbar(); p->update_preview_bottom_toolbar();
} }
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER void Plater::update_preview_moves_slider()
void Plater::update_preview_horz_slider()
{ {
p->update_preview_horz_slider(); p->update_preview_moves_slider();
} }
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
const Mouse3DController& Plater::get_mouse3d_controller() const const Mouse3DController& Plater::get_mouse3d_controller() const

4
src/slic3r/GUI/Plater.hpp
View file

@ -320,9 +320,7 @@ public:
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
void update_preview_bottom_toolbar(); void update_preview_bottom_toolbar();
#if ENABLE_GCODE_USE_WXWIDGETS_SLIDER void update_preview_moves_slider();
void update_preview_horz_slider();
#endif // ENABLE_GCODE_USE_WXWIDGETS_SLIDER
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
const Mouse3DController& get_mouse3d_controller() const; const Mouse3DController& get_mouse3d_controller() const;