Merge branch 'master' into master_262

CMakeLists.txt

@@ -1,3 +1,13 @@
+#/|/ Copyright (c) Prusa Research 2017 - 2023 Tomáš Mészáros @tamasmeszaros, Vojtěch Bubník @bubnikv, Lukáš Matěna @lukasmatena, Filip Sykala @Jony01, Oleksandra Iushchenko @YuSanka, Lukáš Hejl @hejllukas, David Kocík @kocikdav, Enrico Turri @enricoturri1966, Vojtěch Král @vojtechkral
+#/|/ Copyright (c) 2023 Ben Greiner
+#/|/ Copyright (c) 2021 D-mo @dimitry-ishenko
+#/|/ Copyright (c) 2020 Pascal de Bruijn @pmjdebruijn
+#/|/ Copyright (c) 2019 Sam Segers
+#/|/ Copyright (c) 2019 Colin Gilgenbach @hexane360
+#/|/ Copyright (c) 2018 Dan Kortschak
+#/|/
+#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
+#/|/
 cmake_minimum_required(VERSION 3.13)
 project(PrusaSlicer)
 
@@ -59,7 +69,6 @@ if (APPLE)
     endif ()
 endif ()
 
-# Proposal for C++ unit tests and sandboxes
 option(SLIC3R_BUILD_SANDBOXES   "Build development sandboxes" OFF)
 option(SLIC3R_BUILD_TESTS       "Build unit tests" ON)
 

resources/localization/cs/PrusaSlicer_cs.po

@@ -1589,7 +1589,7 @@ msgstr "Záchrana při neznámých hodnotách konfigurace"
 #: src/slic3r/GUI/ArrangeSettingsDialogImgui.cpp:100
 #: src/slic3r/GUI/Jobs/SLAImportDialog.hpp:118
 msgid "Balanced"
-msgstr "Vyvážený"
+msgstr "Vyvážené"
 
 #: src/slic3r/GUI/MainFrame.cpp:710
 msgid "based on Slic3r"
@@ -5293,7 +5293,7 @@ msgstr "Ventilátor bude vypnutý."
 #: src/slic3r/GUI/ArrangeSettingsDialogImgui.cpp:98
 #: src/slic3r/GUI/Jobs/SLAImportDialog.hpp:119
 msgid "Fast"
-msgstr "Rychlý"
+msgstr "Rychlé"
 
 #: src/libslic3r/PrintConfig.cpp:3700
 msgid "Fast tilt"

resources/localization/de/PrusaSlicer_de.po

@@ -9125,7 +9125,7 @@ msgstr "mm (Null zum Deaktivieren)"
 
 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:517 src/slic3r/GUI/GUI_App.cpp:2472
 msgid "Mode"
-msgstr "&Modus"
+msgstr "Modus"
 
 #: src/slic3r/GUI/wxExtensions.cpp:714
 msgctxt "Mode"

resources/localization/es/PrusaSlicer_es.po

@@ -9072,7 +9072,7 @@ msgstr "mm (cero para deshabilitar)"
 
 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:517 src/slic3r/GUI/GUI_App.cpp:2472
 msgid "Mode"
-msgstr "&Modo"
+msgstr "Modo"
 
 #: src/slic3r/GUI/wxExtensions.cpp:714
 msgctxt "Mode"

resources/localization/fr/PrusaSlicer_fr.po

@@ -9143,7 +9143,7 @@ msgstr "mm (zéro pour désactiver)"
 
 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:517 src/slic3r/GUI/GUI_App.cpp:2472
 msgid "Mode"
-msgstr "&Mode"
+msgstr "Mode"
 
 #: src/slic3r/GUI/wxExtensions.cpp:714
 msgctxt "Mode"

resources/localization/it/PrusaSlicer_it.po

@@ -9056,7 +9056,7 @@ msgstr "mm (imposta a zero per disabilitare)"
 
 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:517 src/slic3r/GUI/GUI_App.cpp:2472
 msgid "Mode"
-msgstr "&Modalità"
+msgstr "Modalità"
 
 #: src/slic3r/GUI/wxExtensions.cpp:714
 msgctxt "Mode"

resources/localization/ja/PrusaSlicer_ja.po

@@ -8909,7 +8909,7 @@ msgstr "mm (0で無効化)"
 
 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:517 src/slic3r/GUI/GUI_App.cpp:2472
 msgid "Mode"
-msgstr "モード (&M)"
+msgstr "モード "
 
 #: src/slic3r/GUI/wxExtensions.cpp:714
 msgctxt "Mode"

resources/localization/pl/PrusaSlicer_pl.po

@@ -9040,7 +9040,7 @@ msgstr "mm (zero, aby wyłączyć)"
 
 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:517 src/slic3r/GUI/GUI_App.cpp:2472
 msgid "Mode"
-msgstr "&Tryb"
+msgstr "Tryb"
 
 #: src/slic3r/GUI/wxExtensions.cpp:714
 msgctxt "Mode"

src/libslic3r/GCode/GCodeProcessor.cpp

@@ -3958,7 +3958,8 @@ void GCodeProcessor::post_process()
                 while (rev_it != m_lines.rend() && rev_it->time > time_threshold_i && curr_cmd != cmd && curr_cmd != "G28" && curr_cmd != "G29") {
                     rev_it->line = line_replacer(rev_it->line);
                     ++rev_it;
-                    curr_cmd = GCodeReader::GCodeLine::extract_cmd(rev_it->line);
+                    if (rev_it != m_lines.rend())
+                        curr_cmd = GCodeReader::GCodeLine::extract_cmd(rev_it->line);
                 }
 
                 // we met the previous evenience of cmd, or a G28/G29 command. stop inserting lines

src/libslic3r/Support/SupportMaterial.cpp

@@ -2,6 +2,12 @@
 ///|/ Copyright (c) SuperSlicer 2023 Remi Durand @supermerill
 ///|/ Copyright (c) 2016 Sakari Kapanen @Flannelhead
 ///|/
+///|/ ported from lib/Slic3r/Print/SupportMaterial.pm:
+///|/ Copyright (c) Prusa Research 2016 - 2017 Vojtěch Bubník @bubnikv
+///|/ Copyright (c) 2016 Joseph Lenox @lordofhyphens
+///|/ Copyright (c) Slic3r 2013 - 2015 Alessandro Ranellucci @alranel
+///|/ Copyright (c) 2013 Mark Hindess
+///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
 #include "../ClipperUtils.hpp"

src/slic3r/GUI/Gizmos/GLGizmoCut.cpp

@@ -2330,8 +2330,8 @@ void GLGizmoCut3D::render_connectors_input_window(CutConnectors &connectors)
         });
 
     if (m_connector_type == CutConnectorType::Snap) {
-        render_snap_specific_input(_u8L("Bulge"), _u8L("Bulge proportion related to radius"), m_snap_bulge_proportion, 0.15f, 5.f, 100.f * m_snap_space_proportion);
+        render_snap_specific_input(_u8L("Bulge"), _L("Bulge proportion related to radius"), m_snap_bulge_proportion, 0.15f, 5.f, 100.f * m_snap_space_proportion);
-        render_snap_specific_input(_u8L("Space"), _u8L("Space proportion related to radius"), m_snap_space_proportion, 0.3f, 10.f, 50.f);
+        render_snap_specific_input(_u8L("Space"), _L("Space proportion related to radius"), m_snap_space_proportion, 0.3f, 10.f, 50.f);
     }
 
     ImGui::Separator();
@@ -2586,7 +2586,7 @@ void GLGizmoCut3D::render_groove_angle_input(const std::string& label, float& in
     }
 }
 
-void GLGizmoCut3D::render_snap_specific_input(const std::string& label, const std::string& tooltip, float& in_val, const float& init_val, const float min_val, const float max_val)
+void GLGizmoCut3D::render_snap_specific_input(const std::string& label, const wxString& tooltip, float& in_val, const float& init_val, const float min_val, const float max_val)
 {
     ImGuiWrapper::text(label);
 

src/slic3r/GUI/Gizmos/GLGizmoCut.hpp

@@ -306,7 +306,7 @@ protected:
     void render_color_marker(float size, const ImU32& color);
     void render_groove_float_input(const std::string &label, float &in_val, const float &init_val, float &in_tolerance);
     void render_groove_angle_input(const std::string &label, float &in_val, const float &init_val, float min_val, float max_val);
-    void render_snap_specific_input(const std::string& label, const std::string& tooltip, float& in_val, const float& init_val, const float min_val, const float max_val);
+    void render_snap_specific_input(const std::string& label, const wxString& tooltip, float& in_val, const float& init_val, const float min_val, const float max_val);
     void render_cut_plane_input_window(CutConnectors &connectors);
     void init_input_window_data(CutConnectors &connectors);
     void render_input_window_warning() const;

src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp

@@ -141,7 +141,8 @@ void GLGizmoSlaSupports::on_render()
 
     m_selection_rectangle.render(m_parent);
     m_c->object_clipper()->render_cut();
-    m_c->supports_clipper()->render_cut();
+    if (are_sla_supports_shown())
+        m_c->supports_clipper()->render_cut();
 
     glsafe(::glDisable(GL_BLEND));
 }

src/slic3r/GUI/Tab.cpp

@@ -4241,7 +4241,7 @@ void Tab::rename_preset()
     if (dlg.ShowModal() != wxID_OK)
         return;
 
-    const std::string new_name = into_u8(dlg.get_name());
+    const std::string new_name = dlg.get_name();
     if (new_name.empty() || new_name == m_presets->get_selected_preset().name)
         return;