3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 01:37:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Tech ENABLE_GCODE_WINDOW_USE_MAPPED_FILE merged into ENABLE_GCODE_WINDOW

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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

@ -1195,11 +1195,6 @@ GLCanvas3D::GLCanvas3D(wxGLCanvas* canvas)
GLCanvas3D::~GLCanvas3D()
{
#if ENABLE_GCODE_WINDOW
#if !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE
m_gcode_viewer.stop_mapping_gcode_file();
#endif // !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE
#endif // ENABLE_GCODE_WINDOW
reset_volumes();
}
@ -3900,20 +3895,6 @@ void GLCanvas3D::mouse_up_cleanup()
m_canvas->ReleaseMouse();
}
#if ENABLE_GCODE_WINDOW
#if !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE
void GLCanvas3D::start_mapping_gcode_file()
{
m_gcode_viewer.start_mapping_gcode_file();
}
void GLCanvas3D::stop_mapping_gcode_file()
{
m_gcode_viewer.stop_mapping_gcode_file();
}
#endif // !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE
#endif // ENABLE_GCODE_WINDOW
bool GLCanvas3D::_is_shown_on_screen() const
{
return (m_canvas != nullptr) ? m_canvas->IsShownOnScreen() : false;