mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-10 08:17:51 -06:00
Improve gcode preview navigation (#5326)
* preview: home/end to move to start/end step of the layer Add HOME and END key action to preview tab which moves horizontal slider position to a first and last position respectively * preview: cross-layer gcode inspection Automatically advance gcode preview to the next layer when pressing right at the last step of the layer. Same for the first step of the layer: pressing 'left' will switch preview to the previous layer
This commit is contained in:
parent
7a335590e2
commit
6369772510
3 changed files with 32 additions and 36 deletions
|
@ -1732,12 +1732,14 @@ void GCodeViewer::update_moves_slider(bool set_to_max)
|
||||||
++count;
|
++count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool keep_min = m_moves_slider->GetActiveValue() == m_moves_slider->GetMinValue();
|
||||||
|
|
||||||
m_moves_slider->SetSliderValues(values);
|
m_moves_slider->SetSliderValues(values);
|
||||||
m_moves_slider->SetSliderAlternateValues(alternate_values);
|
m_moves_slider->SetSliderAlternateValues(alternate_values);
|
||||||
m_moves_slider->SetMaxValue(view.endpoints.last - view.endpoints.first);
|
m_moves_slider->SetMaxValue(view.endpoints.last - view.endpoints.first);
|
||||||
m_moves_slider->SetSelectionSpan(view.current.first - view.endpoints.first, view.current.last - view.endpoints.first);
|
m_moves_slider->SetSelectionSpan(view.current.first - view.endpoints.first, view.current.last - view.endpoints.first);
|
||||||
if (set_to_max)
|
if (set_to_max)
|
||||||
m_moves_slider->SetHigherValue(m_moves_slider->GetMaxValue());
|
m_moves_slider->SetHigherValue(keep_min ? m_moves_slider->GetMinValue() : m_moves_slider->GetMaxValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
void GCodeViewer::update_layers_slider_mode()
|
void GCodeViewer::update_layers_slider_mode()
|
||||||
|
|
|
@ -2852,6 +2852,7 @@ void GLCanvas3D::load_gcode_preview(const GCodeProcessorResult& gcode_result, co
|
||||||
m_gcode_viewer.init(wxGetApp().get_mode(), wxGetApp().preset_bundle);
|
m_gcode_viewer.init(wxGetApp().get_mode(), wxGetApp().preset_bundle);
|
||||||
m_gcode_viewer.load(gcode_result, *this->fff_print(), wxGetApp().plater()->build_volume(), exclude_bounding_box,
|
m_gcode_viewer.load(gcode_result, *this->fff_print(), wxGetApp().plater()->build_volume(), exclude_bounding_box,
|
||||||
wxGetApp().get_mode(), only_gcode);
|
wxGetApp().get_mode(), only_gcode);
|
||||||
|
m_gcode_viewer.get_moves_slider()->SetHigherValue(m_gcode_viewer.get_moves_slider()->GetMaxValue());
|
||||||
|
|
||||||
if (wxGetApp().is_editor()) {
|
if (wxGetApp().is_editor()) {
|
||||||
//BBS: always load shell at preview, do this in load_shells
|
//BBS: always load shell at preview, do this in load_shells
|
||||||
|
@ -3609,51 +3610,44 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
|
||||||
if (m_canvas_type == CanvasPreview) {
|
if (m_canvas_type == CanvasPreview) {
|
||||||
IMSlider *m_layers_slider = get_gcode_viewer().get_layers_slider();
|
IMSlider *m_layers_slider = get_gcode_viewer().get_layers_slider();
|
||||||
IMSlider *m_moves_slider = get_gcode_viewer().get_moves_slider();
|
IMSlider *m_moves_slider = get_gcode_viewer().get_moves_slider();
|
||||||
if (evt.CmdDown() || evt.ShiftDown()) {
|
int increment = (evt.CmdDown() || evt.ShiftDown()) ? 5 : 1;
|
||||||
if (evt.GetKeyCode() == 'G') {
|
if ((evt.CmdDown() || evt.ShiftDown()) && evt.GetKeyCode() == 'G') {
|
||||||
m_layers_slider->show_go_to_layer(true);
|
m_layers_slider->show_go_to_layer(true);
|
||||||
}
|
|
||||||
IMSlider *m_layers_slider = get_gcode_viewer().get_layers_slider();
|
|
||||||
IMSlider *m_moves_slider = get_gcode_viewer().get_moves_slider();
|
|
||||||
if (keyCode == WXK_UP || keyCode == WXK_DOWN) {
|
|
||||||
int new_pos;
|
|
||||||
if (m_layers_slider->GetSelection() == ssHigher) {
|
|
||||||
new_pos = keyCode == WXK_UP ? m_layers_slider->GetHigherValue() + 5 : m_layers_slider->GetHigherValue() - 5;
|
|
||||||
m_layers_slider->SetHigherValue(new_pos);
|
|
||||||
}
|
|
||||||
else if (m_layers_slider->GetSelection() == ssLower) {
|
|
||||||
new_pos = keyCode == WXK_UP ? m_layers_slider->GetLowerValue() + 5 : m_layers_slider->GetLowerValue() - 5;
|
|
||||||
m_layers_slider->SetLowerValue(new_pos);
|
|
||||||
}
|
|
||||||
if (m_layers_slider->is_one_layer()) m_layers_slider->SetLowerValue(m_layers_slider->GetHigherValue());
|
|
||||||
// BBS set as dirty, update in render_gcode()
|
|
||||||
m_layers_slider->set_as_dirty();
|
|
||||||
} else if (keyCode == WXK_LEFT || keyCode == WXK_RIGHT) {
|
|
||||||
const int new_pos = keyCode == WXK_RIGHT ? m_moves_slider->GetHigherValue() + 5 : m_moves_slider->GetHigherValue() - 5;
|
|
||||||
m_moves_slider->SetHigherValue(new_pos);
|
|
||||||
// BBS set as dirty, update in render_gcode()
|
|
||||||
m_moves_slider->set_as_dirty();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if (keyCode == WXK_UP || keyCode == WXK_DOWN) {
|
else if (keyCode == WXK_UP || keyCode == WXK_DOWN) {
|
||||||
int new_pos;
|
int new_pos;
|
||||||
if (m_layers_slider->GetSelection() == ssHigher) {
|
if (m_layers_slider->GetSelection() == ssHigher) {
|
||||||
new_pos = keyCode == WXK_UP ? m_layers_slider->GetHigherValue() + 1 : m_layers_slider->GetHigherValue() - 1;
|
new_pos = keyCode == WXK_UP ? m_layers_slider->GetHigherValue() + increment : m_layers_slider->GetHigherValue() - increment;
|
||||||
m_layers_slider->SetHigherValue(new_pos);
|
m_layers_slider->SetHigherValue(new_pos);
|
||||||
|
m_moves_slider->SetHigherValue(m_moves_slider->GetMaxValue());
|
||||||
}
|
}
|
||||||
else if (m_layers_slider->GetSelection() == ssLower) {
|
else if (m_layers_slider->GetSelection() == ssLower) {
|
||||||
new_pos = keyCode == WXK_UP ? m_layers_slider->GetLowerValue() + 1 : m_layers_slider->GetLowerValue() - 1;
|
new_pos = keyCode == WXK_UP ? m_layers_slider->GetLowerValue() + increment : m_layers_slider->GetLowerValue() - increment;
|
||||||
m_layers_slider->SetLowerValue(new_pos);
|
m_layers_slider->SetLowerValue(new_pos);
|
||||||
}
|
}
|
||||||
if (m_layers_slider->is_one_layer()) m_layers_slider->SetLowerValue(m_layers_slider->GetHigherValue());
|
} else if (keyCode == WXK_LEFT) {
|
||||||
// BBS set as dirty, update in render_gcode()
|
if (m_moves_slider->GetHigherValue() == m_moves_slider->GetMinValue() && (m_layers_slider->GetHigherValue() > m_layers_slider->GetMinValue())) {
|
||||||
m_layers_slider->set_as_dirty();
|
m_layers_slider->SetHigherValue(m_layers_slider->GetHigherValue() - 1);
|
||||||
} else if (keyCode == WXK_LEFT || keyCode == WXK_RIGHT) {
|
m_moves_slider->SetHigherValue(m_moves_slider->GetMaxValue());
|
||||||
const int new_pos = keyCode == WXK_RIGHT ? m_moves_slider->GetHigherValue() + 1 : m_moves_slider->GetHigherValue() - 1;
|
} else {
|
||||||
|
m_moves_slider->SetHigherValue(m_moves_slider->GetHigherValue() - increment);
|
||||||
|
}
|
||||||
|
} else if (keyCode == WXK_RIGHT) {
|
||||||
|
if (m_moves_slider->GetHigherValue() == m_moves_slider->GetMaxValue() && (m_layers_slider->GetHigherValue() < m_layers_slider->GetMaxValue())) {
|
||||||
|
m_layers_slider->SetHigherValue(m_layers_slider->GetHigherValue() + 1);
|
||||||
|
m_moves_slider->SetHigherValue(m_moves_slider->GetMinValue());
|
||||||
|
} else {
|
||||||
|
m_moves_slider->SetHigherValue(m_moves_slider->GetHigherValue() + increment);
|
||||||
|
}
|
||||||
|
} else if (keyCode == WXK_HOME || keyCode == WXK_END) {
|
||||||
|
const int new_pos = keyCode == WXK_HOME ? m_moves_slider->GetMinValue() : m_moves_slider->GetMaxValue();
|
||||||
m_moves_slider->SetHigherValue(new_pos);
|
m_moves_slider->SetHigherValue(new_pos);
|
||||||
// BBS set as dirty, update in render_gcode()
|
|
||||||
m_moves_slider->set_as_dirty();
|
m_moves_slider->set_as_dirty();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (m_layers_slider->is_dirty() && m_layers_slider->is_one_layer())
|
||||||
|
m_layers_slider->SetLowerValue(m_layers_slider->GetHigherValue());
|
||||||
|
|
||||||
m_dirty = true;
|
m_dirty = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -313,8 +313,8 @@ void KBShortcutsDialog::fill_shortcuts()
|
||||||
{L("Ctrl+Any arrow"), L("Move slider 5x faster")},
|
{L("Ctrl+Any arrow"), L("Move slider 5x faster")},
|
||||||
{L("Ctrl+Mouse wheel"), L("Move slider 5x faster")},
|
{L("Ctrl+Mouse wheel"), L("Move slider 5x faster")},
|
||||||
#endif
|
#endif
|
||||||
|
{ L("Home"), L("Horizontal slider - Move to start position")},
|
||||||
|
{ L("End"), L("Horizontal slider - Move to last position")},
|
||||||
};
|
};
|
||||||
m_full_shortcuts.push_back({ { _L("Preview"), "" }, preview_shortcuts });
|
m_full_shortcuts.push_back({ { _L("Preview"), "" }, preview_shortcuts });
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue