ENABLE_GCODE_VIEWER set as default in libslic3r

src/libslic3r/GCode.hpp

@@ -14,9 +14,7 @@
 #include "GCode/ToolOrdering.hpp"
 #include "GCode/WipeTower.hpp"
 #include "GCode/SeamPlacer.hpp"
-#if ENABLE_GCODE_VIEWER
 #include "GCode/GCodeProcessor.hpp"
-#endif // ENABLE_GCODE_VIEWER
 #include "EdgeGrid.hpp"
 #include "GCode/ThumbnailData.hpp"
 
@@ -31,9 +29,6 @@ namespace Slic3r {
 
 // Forward declarations.
 class GCode;
-#if !ENABLE_GCODE_VIEWER
-class GCodePreviewData;
-#endif // !ENABLE_GCODE_VIEWER
 
 namespace { struct Item; }
 struct PrintInstance;
@@ -143,14 +138,12 @@ private:
     double                                                       m_last_wipe_tower_print_z = 0.f;
 };
 
-#if ENABLE_GCODE_VIEWER
 class ColorPrintColors
 {
     static const std::vector<std::string> Colors;
 public:
     static const std::vector<std::string>& get() { return Colors; }
 };
-#endif // ENABLE_GCODE_VIEWER
 
 class GCode {
 public:        
@@ -158,13 +151,8 @@ public:
     	m_origin(Vec2d::Zero()),
         m_enable_loop_clipping(true), 
         m_enable_cooling_markers(false), 
-        m_enable_extrusion_role_markers(false), 
-#if ENABLE_GCODE_VIEWER
+        m_enable_extrusion_role_markers(false),
         m_last_processor_extrusion_role(erNone),
-#else
-        m_enable_analyzer(false),
-        m_last_analyzer_extrusion_role(erNone),
-#endif // ENABLE_GCODE_VIEWER
         m_layer_count(0),
         m_layer_index(-1), 
         m_layer(nullptr), 
@@ -175,17 +163,8 @@ public:
         m_last_mm3_per_mm(0.0),
         m_last_width(0.0f),
 #endif // ENABLE_GCODE_VIEWER_DATA_CHECKING
-#if !ENABLE_GCODE_VIEWER
-        m_last_mm3_per_mm(GCodeAnalyzer::Default_mm3_per_mm),
-        m_last_width(GCodeAnalyzer::Default_Width),
-        m_last_height(GCodeAnalyzer::Default_Height),
-#endif // !ENABLE_GCODE_VIEWER
         m_brim_done(false),
         m_second_layer_things_done(false),
-#if !ENABLE_GCODE_VIEWER
-        m_normal_time_estimator(GCodeTimeEstimator::Normal),
-        m_silent_time_estimator(GCodeTimeEstimator::Silent),
-#endif // !ENABLE_GCODE_VIEWER
         m_silent_time_estimator_enabled(false),
         m_last_obj_copy(nullptr, Point(std::numeric_limits<coord_t>::max(), std::numeric_limits<coord_t>::max()))
         {}
@@ -193,11 +172,7 @@ public:
 
     // throws std::runtime_exception on error,
     // throws CanceledException through print->throw_if_canceled().
-#if ENABLE_GCODE_VIEWER
     void            do_export(Print* print, const char* path, GCodeProcessor::Result* result = nullptr, ThumbnailsGeneratorCallback thumbnail_cb = nullptr);
-#else
-    void            do_export(Print* print, const char* path, GCodePreviewData* preview_data = nullptr, ThumbnailsGeneratorCallback thumbnail_cb = nullptr);
-#endif // ENABLE_GCODE_VIEWER
 
     // Exported for the helper classes (OozePrevention, Wipe) and for the Perl binding for unit tests.
     const Vec2d&    origin() const { return m_origin; }
@@ -360,16 +335,8 @@ private:
     // Markers for the Pressure Equalizer to recognize the extrusion type.
     // The Pressure Equalizer removes the markers from the final G-code.
     bool                                m_enable_extrusion_role_markers;
-#if ENABLE_GCODE_VIEWER
     // Keeps track of the last extrusion role passed to the processor
     ExtrusionRole                       m_last_processor_extrusion_role;
-#else
-    // Enableds the G-code Analyzer.
-    // Extended markers will be added during G-code generation.
-    // The G-code Analyzer will remove these comments from the final G-code.
-    bool                                m_enable_analyzer;
-    ExtrusionRole                       m_last_analyzer_extrusion_role;
-#endif // ENABLE_GCODE_VIEWER
     // How many times will change_layer() be called?
     // change_layer() will update the progress bar.
     unsigned int                        m_layer_count;
@@ -381,7 +348,6 @@ private:
     double                              m_volumetric_speed;
     // Support for the extrusion role markers. Which marker is active?
     ExtrusionRole                       m_last_extrusion_role;
-#if ENABLE_GCODE_VIEWER
     // Support for G-Code Processor
     float                               m_last_height{ 0.0f };
     float                               m_last_layer_z{ 0.0f };
@@ -389,12 +355,6 @@ private:
     double                              m_last_mm3_per_mm;
     float                               m_last_width{ 0.0f };
 #endif // ENABLE_GCODE_VIEWER_DATA_CHECKING
-#else
-    // Support for G-Code Analyzer
-    double                              m_last_mm3_per_mm;
-    float                               m_last_width;
-    float                               m_last_height;
-#endif // ENABLE_GCODE_VIEWER
 
     Point                               m_last_pos;
     bool                                m_last_pos_defined;
@@ -415,20 +375,10 @@ private:
     // Index of a last object copy extruded.
     std::pair<const PrintObject*, Point> m_last_obj_copy;
 
-#if !ENABLE_GCODE_VIEWER
-    // Time estimators
-    GCodeTimeEstimator m_normal_time_estimator;
-    GCodeTimeEstimator m_silent_time_estimator;
-#endif // !ENABLE_GCODE_VIEWER
     bool m_silent_time_estimator_enabled;
 
-#if ENABLE_GCODE_VIEWER
     // Processor
     GCodeProcessor m_processor;
-#else
-    // Analyzer
-    GCodeAnalyzer m_analyzer;
-#endif // ENABLE_GCODE_VIEWER
 
     // Write a string into a file.
     void _write(FILE* file, const std::string& what) { this->_write(file, what.c_str()); }