From ddc9e26f195dd7c79665cad0b0600941e5085098 Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Sat, 21 Nov 2020 11:02:07 +0100 Subject: [PATCH] Follow-up to 80e8b5e985b84a6a50215d383bad96657bae0b12 Removed the legacy PreviewData.cpp,hpp --- src/slic3r/GUI/DoubleSlider.cpp | 5 ----- xs/src/perlglue.cpp | 3 --- xs/xsp/GCode.xsp | 32 -------------------------------- 3 files changed, 40 deletions(-) diff --git a/src/slic3r/GUI/DoubleSlider.cpp b/src/slic3r/GUI/DoubleSlider.cpp index 4df91fb78..4759ec64d 100644 --- a/src/slic3r/GUI/DoubleSlider.cpp +++ b/src/slic3r/GUI/DoubleSlider.cpp @@ -1,11 +1,6 @@ #include "libslic3r/libslic3r.h" -#if ENABLE_GCODE_VIEWER #include "DoubleSlider.hpp" #include "libslic3r/GCode.hpp" -#else -#include "wxExtensions.hpp" -#include "libslic3r/GCode/PreviewData.hpp" -#endif // ENABLE_GCODE_VIEWER #include "GUI.hpp" #include "GUI_App.hpp" #include "Plater.hpp" diff --git a/xs/src/perlglue.cpp b/xs/src/perlglue.cpp index 47961c623..be539e108 100644 --- a/xs/src/perlglue.cpp +++ b/xs/src/perlglue.cpp @@ -8,15 +8,12 @@ REGISTER_CLASS(ExPolygonCollection, "ExPolygon::Collection"); REGISTER_CLASS(ExtrusionMultiPath, "ExtrusionMultiPath"); REGISTER_CLASS(ExtrusionPath, "ExtrusionPath"); REGISTER_CLASS(ExtrusionLoop, "ExtrusionLoop"); -// there is no ExtrusionLoop::Collection or ExtrusionEntity::Collection REGISTER_CLASS(ExtrusionEntityCollection, "ExtrusionPath::Collection"); REGISTER_CLASS(ExtrusionSimulator, "ExtrusionSimulator"); REGISTER_CLASS(Filler, "Filler"); REGISTER_CLASS(Flow, "Flow"); REGISTER_CLASS(CoolingBuffer, "GCode::CoolingBuffer"); REGISTER_CLASS(GCode, "GCode"); -//REGISTER_CLASS(GCodePreviewData, "GCode::PreviewData"); -// REGISTER_CLASS(GCodeSender, "GCode::Sender"); REGISTER_CLASS(Layer, "Layer"); REGISTER_CLASS(SupportLayer, "Layer::Support"); REGISTER_CLASS(LayerRegion, "Layer::Region"); diff --git a/xs/xsp/GCode.xsp b/xs/xsp/GCode.xsp index d1f53f6e8..4545984bb 100644 --- a/xs/xsp/GCode.xsp +++ b/xs/xsp/GCode.xsp @@ -25,14 +25,6 @@ croak("%s\n", e.what()); } %}; -// void do_export_w_preview(Print *print, const char *path, GCodePreviewData *preview_data) -// %code%{ -// try { -// THIS->do_export(print, path, preview_data); -// } catch (std::exception& e) { -// croak("%s\n", e.what()); -// } -// %}; Ref origin() %code{% RETVAL = &(THIS->origin()); %}; @@ -58,27 +50,3 @@ Ref config() %code{% RETVAL = const_cast(static_cast(static_cast(&THIS->config()))); %}; }; - -//%name{Slic3r::GCode::PreviewData} class GCodePreviewData { -// GCodePreviewData(); -// ~GCodePreviewData(); -// void reset(); -// bool empty() const; -// void set_type(int type) -// %code%{ -// if ((0 <= type) && (type < GCodePreviewData::Extrusion::Num_View_Types)) -// THIS->extrusion.view_type = (GCodePreviewData::Extrusion::EViewType)type; -// %}; -// int type() %code%{ RETVAL = (int)THIS->extrusion.view_type; %}; -// void set_extrusion_flags(int flags) -// %code%{ THIS->extrusion.role_flags = (unsigned int)flags; %}; -// void set_travel_visible(bool visible) -// %code%{ THIS->travel.is_visible = visible; %}; -// void set_retractions_visible(bool visible) -// %code%{ THIS->retraction.is_visible = visible; %}; -// void set_unretractions_visible(bool visible) -// %code%{ THIS->unretraction.is_visible = visible; %}; -// void set_shells_visible(bool visible) -// %code%{ THIS->shell.is_visible = visible; %}; -// void set_extrusion_paths_colors(std::vector colors); -//};