From 590ae25b13d2ff27843a82f821ec6b2d9e2e12f6 Mon Sep 17 00:00:00 2001
From: tamasmeszaros <meszaros.q@gmail.com>
Date: Thu, 4 Apr 2019 12:30:11 +0200
Subject: [PATCH] Altering sla export interface to support explicit project
 name.

---
 src/libslic3r/Print.cpp       |  2 +-
 src/libslic3r/PrintExport.hpp | 19 ++++++++++---------
 src/libslic3r/SLAPrint.hpp    | 20 ++++++++------------
 src/libslic3r/Zipper.cpp      |  5 -----
 src/libslic3r/Zipper.hpp      |  3 ---
 5 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp
index 794390133..c13f0bc2a 100644
--- a/src/libslic3r/Print.cpp
+++ b/src/libslic3r/Print.cpp
@@ -10,7 +10,7 @@
 #include "GCode/WipeTowerPrusaMM.hpp"
 #include "Utils.hpp"
 
-#include "PrintExport.hpp"
+//#include "PrintExport.hpp"
 
 #include <algorithm>
 #include <limits>
diff --git a/src/libslic3r/PrintExport.hpp b/src/libslic3r/PrintExport.hpp
index 04b993a52..ce62f7cb0 100644
--- a/src/libslic3r/PrintExport.hpp
+++ b/src/libslic3r/PrintExport.hpp
@@ -7,6 +7,7 @@
 #include <vector>
 
 #include <boost/log/trivial.hpp>
+#include <boost/filesystem/path.hpp>
 
 #include "Rasterizer/Rasterizer.hpp"
 //#include <tbb/parallel_for.h>
@@ -72,7 +73,8 @@ public:
     void finish_layer();
 
     // Save all the layers into the file (or dir) specified in the path argument
-    void save(const std::string& path);
+    // An optional project name can be added to be used for the layer file names
+    void save(const std::string& path, const std::string& projectname = "");
 
     // Save only the selected layer to the file specified in path argument.
     void save_layer(unsigned lyr, const std::string& path);
@@ -86,7 +88,8 @@ template<class T = void> struct VeryFalse { static const bool value = false; };
 template<class Fmt> class LayerWriter {
 public:
 
-    LayerWriter(const std::string& /*zipfile_path*/) {
+    LayerWriter(const std::string& /*zipfile_path*/)
+    {
         static_assert(VeryFalse<Fmt>::value,
                       "No layer writer implementation provided!");
     }
@@ -99,10 +102,6 @@ public:
     void binary_entry(const std::string& /*fname*/,
                       const std::uint8_t* buf, size_t len);
 
-    // Get the name of the archive but only the name part without the path or
-    // the extension.
-    std::string get_name() { return ""; }
-
     // Test whether the object can still be used for writing.
     bool is_ok() { return false; }
 
@@ -253,12 +252,14 @@ public:
     }
 
     template<class LyrFmt>
-    inline void save(const std::string& path) {
+    inline void save(const std::string& fpath, const std::string& prjname = "")
+    {
         try {
-            LayerWriter<LyrFmt> writer(path);
+            LayerWriter<LyrFmt> writer(fpath);
             if(!writer.is_ok()) return;
 
-            std::string project = writer.get_name();
+            std::string project = prjname.empty()?
+                       boost::filesystem::path(fpath).stem().string() : prjname;
 
             writer.next_entry("config.ini");
             if(!writer.is_ok()) return;
diff --git a/src/libslic3r/SLAPrint.hpp b/src/libslic3r/SLAPrint.hpp
index a1e382acb..d4443d915 100644
--- a/src/libslic3r/SLAPrint.hpp
+++ b/src/libslic3r/SLAPrint.hpp
@@ -320,10 +320,8 @@ struct SLAPrintStatistics
     }
 };
 
-struct SLAminzZipper {};
-
 // The implementation of creating zipped archives with wxWidgets
-template<> class LayerWriter<SLAminzZipper> {
+template<> class LayerWriter<Zipper> {
     Zipper m_zip;
 public:
 
@@ -332,16 +330,12 @@ public:
     void next_entry(const std::string& fname) { m_zip.add_entry(fname); }
 
     void binary_entry(const std::string& fname,
-                             const std::uint8_t* buf,
-                             size_t l)
+                      const std::uint8_t* buf,
+                      size_t l)
     {
         m_zip.add_entry(fname, buf, l);
     }
 
-    std::string get_name() const {
-        return m_zip.get_name();
-    }
-
     template<class T> inline LayerWriter& operator<<(T&& arg) {
         m_zip << std::forward<T>(arg); return *this;
     }
@@ -389,9 +383,11 @@ public:
     // Returns true if the last step was finished with success.
     bool                finished() const override { return this->is_step_done(slaposSliceSupports) && this->Inherited::is_step_done(slapsRasterize); }
 
-    template<class Fmt = SLAminzZipper>
-    void export_raster(const std::string& fname) {
-        if(m_printer) m_printer->save<Fmt>(fname);
+    template<class Fmt = Zipper>
+    inline void export_raster(const std::string& fpath,
+                       const std::string& projectname = "")
+    {
+        if(m_printer) m_printer->save<Fmt>(fpath, projectname);
     }
 
     const PrintObjects& objects() const { return m_objects; }
diff --git a/src/libslic3r/Zipper.cpp b/src/libslic3r/Zipper.cpp
index 6b7faaddc..4466f1b04 100644
--- a/src/libslic3r/Zipper.cpp
+++ b/src/libslic3r/Zipper.cpp
@@ -4,7 +4,6 @@
 
 #include "Zipper.hpp"
 #include "miniz/miniz_zip.h"
-#include <boost/filesystem/path.hpp>
 #include <boost/log/trivial.hpp>
 
 #include "I18N.hpp"
@@ -213,10 +212,6 @@ void Zipper::finish_entry()
     m_entry.clear();
 }
 
-std::string Zipper::get_name() const {
-    return boost::filesystem::path(m_impl->m_zipname).stem().string();
-}
-
 void Zipper::finalize()
 {
     finish_entry();
diff --git a/src/libslic3r/Zipper.hpp b/src/libslic3r/Zipper.hpp
index 6566dad42..7d95ffdac 100644
--- a/src/libslic3r/Zipper.hpp
+++ b/src/libslic3r/Zipper.hpp
@@ -81,9 +81,6 @@ public:
     /// file is up to minz after the erroneous write.
     void finish_entry();
 
-    /// Gets the name of the archive without the path or extension.
-    std::string get_name() const;
-
     void finalize();
 };