juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

GCodeAnalyzer and GCodePreviewData removed from tech ENABLE_GCODE_VIEWER

Browse Source
This commit is contained in:
enricoturri1966
2020-05-07 10:49:12 +02:00
parent c29f0a4849
commit 5c6a56ca29
22 changed files with 311 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/DoubleSlider.cpp
View File

@@ -1,5 +1,9 @@
#include "wxExtensions.hpp"
#if ENABLE_GCODE_VIEWER
#include "libslic3r/GCode.hpp"
#else
#include "libslic3r/GCode/PreviewData.hpp"
#endif // ENABLE_GCODE_VIEWER
#include "GUI.hpp"
#include "GUI_App.hpp"
#include "I18N.hpp"
@@ -1945,7 +1949,11 @@ std::string TickCodeInfo::get_color_for_tick(TickCode tick, const std::string& c
{
if (mode == t_mode::SingleExtruder && code == ColorChangeCode && m_use_default_colors)
{
#if ENABLE_GCODE_VIEWER
const std::vector<std::string>& colors = ColorPrintColors::get();
#else
const std::vector<std::string>& colors = GCodePreviewData::ColorPrintColors();
#endif // ENABLE_GCODE_VIEWER
if (ticks.empty())
return colors[0];
m_default_color_idx++;