mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-08 00:01:09 +00:00
Preview: reuse a belt print's toolpaths until the view is toggled
load_as_gcode() skips the conversion and GPU upload when it is handed the result it already shows, but belt printers were exempt from that cache, because the designed/raw view changes the toolpath geometry for the same result. So every preview reload of a belt print, switching back to the Preview tab for one, converted and uploaded every toolpath again. Remember the view the result was converted for and reuse it while both match. Toggling the view (B, the legend checkbox, the toolbar menu) still converts again. The print config the back-transform reads cannot change without a new G-code result, so the result id covers it as it does on any other printer. Suggested by raistlin7447 on #14394.
This commit is contained in:
@@ -1390,11 +1390,11 @@ void GCodeViewer::load_as_gcode(const GCodeProcessorResult& gcode_result, const
|
||||
m_viewer.set_dim_previous_layers_brightness(0.01f * std::stoi(get_app_config()->get("preview_dim_previous_layers_brightness")));
|
||||
|
||||
// avoid processing if called with the same gcode_result.
|
||||
// Belt printers are exempt: the toolpath geometry fed to libvgcode depends on
|
||||
// the current designed/raw view state (back-transform applied in convert), so
|
||||
// re-running the conversion is required for the upright view and for toggling
|
||||
// it (hotkey B) to take effect even when the G-code itself is unchanged.
|
||||
if (m_last_result_id == gcode_result.id && wxGetApp().is_editor() && !print.config().belt_printer.value) {
|
||||
// On a belt printer the toolpath geometry fed to libvgcode also depends on the
|
||||
// designed/raw view state (the back-transform is applied in convert), so the
|
||||
// same result is converted again only when that view has been toggled.
|
||||
const bool same_belt_view = !print.config().belt_printer.value || m_last_belt_show_designed == m_belt_show_designed;
|
||||
if (m_last_result_id == gcode_result.id && wxGetApp().is_editor() && same_belt_view) {
|
||||
//BBS: add logs
|
||||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": the same id %1%, return directly, result %2% ") % m_last_result_id % (&gcode_result);
|
||||
|
||||
@@ -1688,6 +1688,7 @@ void GCodeViewer::load_as_gcode(const GCodeProcessorResult& gcode_result, const
|
||||
|
||||
//BBS: move the id to the end of reset
|
||||
m_last_result_id = gcode_result.id;
|
||||
m_last_belt_show_designed = m_belt_show_designed;
|
||||
m_gcode_result = &gcode_result;
|
||||
m_move_type_counts.fill(0);
|
||||
for (auto& move_type_times : m_move_type_times)
|
||||
|
||||
Reference in New Issue
Block a user