Merge branch 'lm_tm_hollowing' into lm_hollow_gizmo

src/libslic3r/SLA/RasterWriter.cpp

@@ -34,29 +34,40 @@ void RasterWriter::save(const std::string &fpath, const std::string &prjname)
 {
     try {
         Zipper zipper(fpath); // zipper with no compression
-        
-        std::string project = prjname.empty()?
-                    boost::filesystem::path(fpath).stem().string() : prjname;
-        
+        save(zipper, prjname);
+        zipper.finalize();
+    } catch(std::exception& e) {
+        BOOST_LOG_TRIVIAL(error) << e.what();
+        // Rethrow the exception
+        throw;
+    }
+}
+
+void RasterWriter::save(Zipper &zipper, const std::string &prjname)
+{
+    try {
+        std::string project =
+            prjname.empty() ?
+                boost::filesystem::path(zipper.get_filename()).stem().string() :
+                prjname;
+
         zipper.add_entry("config.ini");
-        
+
         zipper << createIniContent(project);
-        
+
         for(unsigned i = 0; i < m_layers_rst.size(); i++)
         {
             if(m_layers_rst[i].rawbytes.size() > 0) {
                 char lyrnum[6];
                 std::sprintf(lyrnum, "%.5d", i);
                 auto zfilename = project + lyrnum + ".png";
-                
+
                 // Add binary entry to the zipper
                 zipper.add_entry(zfilename,
                                  m_layers_rst[i].rawbytes.data(),
                                  m_layers_rst[i].rawbytes.size());
             }
         }
-        
-        zipper.finalize();
     } catch(std::exception& e) {
         BOOST_LOG_TRIVIAL(error) << e.what();
         // Rethrow the exception

src/libslic3r/SLA/RasterWriter.hpp

@@ -10,6 +10,7 @@
 #include <array>
 
 #include <libslic3r/SLA/Raster.hpp>
+#include <libslic3r/Zipper.hpp>
 
 namespace Slic3r {
 
@@ -114,6 +115,7 @@ public:
     }
 
     void save(const std::string &fpath, const std::string &prjname = "");
+    void save(Zipper &zipper, const std::string &prjname = "");
 
     void set_statistics(const PrintStatistics &statistics);