Tech ENABLE_GCODE_WINDOW_USE_MAPPED_FILE merged into ENABLE_GCODE_WINDOW

This commit is contained in:
enricoturri1966
2021-03-08 10:20:07 +01:00
parent 5998ee8f2e
commit 14aca210cb
6 changed files with 3 additions and 110 deletions

View File

@@ -3368,17 +3368,8 @@ void Plater::priv::set_current_panel(wxPanel* panel)
panel_sizer->Layout();
if (current_panel == view3D) {
#if ENABLE_GCODE_WINDOW
if (old_panel == preview) {
#if !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE
preview->get_canvas3d()->stop_mapping_gcode_file();
#endif // !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE
preview->get_canvas3d()->unbind_event_handlers();
}
#else
if (old_panel == preview)
preview->get_canvas3d()->unbind_event_handlers();
#endif // ENABLE_GCODE_WINDOW
view3D->get_canvas3d()->bind_event_handlers();
@@ -3403,11 +3394,6 @@ void Plater::priv::set_current_panel(wxPanel* panel)
view3D->get_canvas3d()->unbind_event_handlers();
preview->get_canvas3d()->bind_event_handlers();
#if ENABLE_GCODE_WINDOW
#if !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE
preview->get_canvas3d()->start_mapping_gcode_file();
#endif // !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE
#endif // ENABLE_GCODE_WINDOW
// see: Plater::priv::object_list_changed()
// FIXME: it may be better to have a single function making this check and let it be called wherever needed