From 18c23383afcae1636d505ea0c7596ff442580481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C5=A0ach?= Date: Fri, 5 Jan 2024 14:13:51 +0100 Subject: [PATCH] Remove various perl specific code --- src/libslic3r/Print.hpp | 4 ---- src/libslic3r/Utils.hpp | 4 ---- src/libslic3r/utils.cpp | 9 --------- src/slic3r/GUI/GUI.hpp | 1 - src/slic3r/GUI/ProgressStatusBar.cpp | 10 ---------- src/slic3r/GUI/ProgressStatusBar.hpp | 4 ---- 6 files changed, 32 deletions(-) diff --git a/src/libslic3r/Print.hpp b/src/libslic3r/Print.hpp index a43ea4dfb6..1e710272e1 100644 --- a/src/libslic3r/Print.hpp +++ b/src/libslic3r/Print.hpp @@ -639,10 +639,6 @@ public: // If zero, then the print is empty and the print shall not be executed. unsigned int num_object_instances() const; - // For Perl bindings. - PrintObjectPtrs& objects_mutable() { return m_objects; } - PrintRegionPtrs& print_regions_mutable() { return m_print_regions; } - const ExtrusionEntityCollection& skirt() const { return m_skirt; } const ExtrusionEntityCollection& brim() const { return m_brim; } // Convex hull of the 1st layer extrusions, for bed leveling and placing the initial purge line. diff --git a/src/libslic3r/Utils.hpp b/src/libslic3r/Utils.hpp index e02126d9ba..4b4be4c3ee 100644 --- a/src/libslic3r/Utils.hpp +++ b/src/libslic3r/Utils.hpp @@ -73,10 +73,6 @@ const std::string& data_dir(); // so the user knows where to search for the debugging output. std::string debug_out_path(const char *name, ...); -// A special type for strings encoded in the local Windows 8-bit code page. -// This type is only needed for Perl bindings to relay to Perl that the string is raw, not UTF-8 encoded. -typedef std::string local_encoded_string; - // Returns next utf8 sequence length. =number of bytes in string, that creates together one utf-8 character. // Starting at pos. ASCII characters returns 1. Works also if pos is in the middle of the sequence. extern size_t get_utf8_sequence_length(const std::string& text, size_t pos = 0); diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp index f4d7c51da1..7062c2b89d 100644 --- a/src/libslic3r/utils.cpp +++ b/src/libslic3r/utils.cpp @@ -123,15 +123,6 @@ unsigned get_logging_level() } } -// Force set_logging_level(<=error) after loading of the DLL. -// This is currently only needed if libslic3r is loaded as a shared library into Perl interpreter -// to perform unit and integration tests. -static struct RunOnInit { - RunOnInit() { - set_logging_level(1); - } -} g_RunOnInit; - void disable_multi_threading() { // Disable parallelization to simplify debugging. diff --git a/src/slic3r/GUI/GUI.hpp b/src/slic3r/GUI/GUI.hpp index 0239c62bcd..50492928a7 100644 --- a/src/slic3r/GUI/GUI.hpp +++ b/src/slic3r/GUI/GUI.hpp @@ -50,7 +50,6 @@ void change_opt_value(DynamicPrintConfig& config, const t_config_option_key& opt void show_error(wxWindow* parent, const wxString& message, bool monospaced_font = false); void show_error(wxWindow* parent, const char* message, bool monospaced_font = false); inline void show_error(wxWindow* parent, const std::string& message, bool monospaced_font = false) { show_error(parent, message.c_str(), monospaced_font); } -void show_error_id(int id, const std::string& message); // For Perl void show_info(wxWindow* parent, const wxString& message, const wxString& title = wxString()); void show_info(wxWindow* parent, const char* message, const char* title = nullptr); inline void show_info(wxWindow* parent, const std::string& message,const std::string& title = std::string()) { show_info(parent, message.c_str(), title.c_str()); } diff --git a/src/slic3r/GUI/ProgressStatusBar.cpp b/src/slic3r/GUI/ProgressStatusBar.cpp index 0857cb9275..17d38e33df 100644 --- a/src/slic3r/GUI/ProgressStatusBar.cpp +++ b/src/slic3r/GUI/ProgressStatusBar.cpp @@ -191,15 +191,5 @@ void ProgressStatusBar::set_font(const wxFont &font) self->SetFont(font); } -void ProgressStatusBar::show_cancel_button() -{ - if(m_cancelbutton) m_cancelbutton->Show(); -} - -void ProgressStatusBar::hide_cancel_button() -{ - if(m_cancelbutton) m_cancelbutton->Hide(); -} - } diff --git a/src/slic3r/GUI/ProgressStatusBar.hpp b/src/slic3r/GUI/ProgressStatusBar.hpp index 40b9aeb08b..8b159ec8be 100644 --- a/src/slic3r/GUI/ProgressStatusBar.hpp +++ b/src/slic3r/GUI/ProgressStatusBar.hpp @@ -66,10 +66,6 @@ public: wxString get_status_text() const; void set_font(const wxFont &font); - // Temporary methods to satisfy Perl side - void show_cancel_button(); - void hide_cancel_button(); - void update_dark_ui(); private: