Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed

src/libslic3r/Config.hpp

@@ -93,7 +93,7 @@ enum ConfigOptionMode {
     comExpert
 };
 
-enum PrinterTechnology
+enum PrinterTechnology : unsigned char
 {
     // Fused Filament Fabrication
     ptFFF,

src/libslic3r/Model.cpp

@@ -1877,6 +1877,31 @@ bool model_volume_list_changed(const ModelObject &model_object_old, const ModelO
     return false;
 }
 
+extern bool model_has_multi_part_objects(const Model &model)
+{
+    for (const ModelObject *model_object : model.objects)
+    	if (model_object->volumes.size() != 1 || ! model_object->volumes.front()->is_model_part())
+    		return true;
+    return false;
+}
+
+extern bool model_has_advanced_features(const Model &model)
+{
+	auto config_is_advanced = [](const DynamicPrintConfig &config) {
+        return ! (config.empty() || (config.size() == 1 && config.cbegin()->first == "extruder"));
+	};
+    for (const ModelObject *model_object : model.objects) {
+        // Is there more than one instance or advanced config data?
+        if (model_object->instances.size() > 1 || config_is_advanced(model_object->config))
+        	return true;
+        // Is there any modifier or advanced config data?
+        for (const ModelVolume* model_volume : model_object->volumes)
+            if (! model_volume->is_model_part() || config_is_advanced(model_volume->config))
+            	return true;
+    }
+    return false;
+}
+
 #ifndef NDEBUG
 // Verify whether the IDs of Model / ModelObject / ModelVolume / ModelInstance / ModelMaterial are valid and unique.
 void check_model_ids_validity(const Model &model)

src/libslic3r/Model.hpp

@@ -17,6 +17,13 @@
 #include <utility>
 #include <vector>
 
+namespace cereal {
+	class BinaryInputArchive;
+	class BinaryOutputArchive;
+	template <class T> void load_optional(BinaryInputArchive &ar, std::shared_ptr<const T> &ptr);
+	template <class T> void save_optional(BinaryOutputArchive &ar, const std::shared_ptr<const T> &ptr);
+}
+
 namespace Slic3r {
 
 class Model;
@@ -526,8 +533,23 @@ private:
 	ModelVolume() : ObjectBase(-1), config(-1), object(nullptr) {
 		assert(this->id().invalid()); assert(this->config.id().invalid());
 	}
-	template<class Archive> void serialize(Archive &ar) {
-		ar(name, config, m_mesh, m_type, m_material_id, m_convex_hull, m_transformation, m_is_splittable);
+	template<class Archive> void load(Archive &ar) {
+		bool has_convex_hull;
+		ar(name, config, m_mesh, m_type, m_material_id, m_transformation, m_is_splittable, has_convex_hull);
+		assert(m_mesh);
+		if (has_convex_hull) {
+			cereal::load_optional(ar, m_convex_hull);
+			if (! m_convex_hull && ! m_mesh->empty())
+				// The convex hull was released from the Undo / Redo stack to conserve memory. Recalculate it.
+				this->calculate_convex_hull();
+		} else
+			m_convex_hull.reset();
+	}
+	template<class Archive> void save(Archive &ar) const {
+		bool has_convex_hull = m_convex_hull.get() != nullptr;
+		ar(name, config, m_mesh, m_type, m_material_id, m_transformation, m_is_splittable, has_convex_hull);
+		if (has_convex_hull)
+			cereal::save_optional(ar, m_convex_hull);
 	}
 };
 
@@ -739,6 +761,12 @@ extern bool model_object_list_extended(const Model &model_old, const Model &mode
 // than the old ModelObject.
 extern bool model_volume_list_changed(const ModelObject &model_object_old, const ModelObject &model_object_new, const ModelVolumeType type);
 
+// If the model has multi-part objects, then it is currently not supported by the SLA mode.
+// Either the model cannot be loaded, or a SLA printer has to be activated.
+extern bool model_has_multi_part_objects(const Model &model);
+// If the model has advanced features, then it cannot be processed in simple mode.
+extern bool model_has_advanced_features(const Model &model);
+
 #ifndef NDEBUG
 // Verify whether the IDs of Model / ModelObject / ModelVolume / ModelInstance / ModelMaterial are valid and unique.
 void check_model_ids_validity(const Model &model);
@@ -747,4 +775,9 @@ void check_model_ids_equal(const Model &model1, const Model &model2);
 
 } // namespace Slic3r
 
+namespace cereal
+{
+	template <class Archive> struct specialize<Archive, Slic3r::ModelVolume, cereal::specialization::member_load_save> {};
+}
+
 #endif /* slic3r_Model_hpp_ */

src/libslic3r/SLA/SLAAutoSupports.cpp

@@ -386,7 +386,7 @@ static inline std::vector<Vec2f> poisson_disk_from_samples(const std::vector<Vec
             } else {
                 // This is a new cell.
                 PoissonDiskGridEntry data;
-                data.first_sample_idx = i;
+                data.first_sample_idx = int(i);
                 data.sample_cnt       = 1;
                 auto result     = cells.insert({sample.cell_id, data});
                 last_cell_id    = sample.cell_id;

src/libslic3r/SLA/SLASupportTreeIGL.cpp

@@ -12,10 +12,18 @@
 #include "SLABoostAdapter.hpp"
 #include "boost/geometry/index/rtree.hpp"
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4244)
+#pragma warning(disable: 4267)
+#endif
 #include <igl/ray_mesh_intersect.h>
 #include <igl/point_mesh_squared_distance.h>
 #include <igl/remove_duplicate_vertices.h>
 #include <igl/signed_distance.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 #include <tbb/parallel_for.h>
 

src/libslic3r/TriangleMesh.cpp

@@ -607,6 +607,40 @@ void TriangleMesh::require_shared_vertices()
     BOOST_LOG_TRIVIAL(trace) << "TriangleMeshSlicer::require_shared_vertices - end";
 }
 
+size_t TriangleMesh::memsize() const
+{
+	size_t memsize = 8 + this->stl.memsize() + this->its.memsize();
+	return memsize;
+}
+
+// Release optional data from the mesh if the object is on the Undo / Redo stack only. Returns the amount of memory released.
+size_t TriangleMesh::release_optional()
+{
+	size_t memsize_released = sizeof(stl_neighbors) * this->stl.neighbors_start.size() + this->its.memsize();
+	// The indexed triangle set may be recalculated using the stl_generate_shared_vertices() function.
+	this->its.clear();
+	// The neighbors structure may be recalculated using the stl_check_facets_exact() function.
+	this->stl.neighbors_start.clear();
+	return memsize_released;
+}
+
+// Restore optional data possibly released by release_optional().
+void TriangleMesh::restore_optional()
+{
+	if (! this->stl.facet_start.empty()) {
+		// Save the old stats before calling stl_check_faces_exact, as it may modify the statistics.
+		stl_stats stats = this->stl.stats;
+		if (this->stl.neighbors_start.empty()) {
+			stl_reallocate(&this->stl);
+			stl_check_facets_exact(&this->stl);
+		}
+		if (this->its.vertices.empty())
+			stl_generate_shared_vertices(&this->stl, this->its);
+		// Restore the old statistics.
+		this->stl.stats = stats;
+	}
+}
+
 void TriangleMeshSlicer::init(const TriangleMesh *_mesh, throw_on_cancel_callback_type throw_on_cancel)
 {
     mesh = _mesh;

src/libslic3r/TriangleMesh.hpp

@@ -67,6 +67,12 @@ public:
     size_t facets_count() const { return this->stl.stats.number_of_facets; }
     bool   empty() const { return this->facets_count() == 0; }
     bool is_splittable() const;
+    // Estimate of the memory occupied by this structure, important for keeping an eye on the Undo / Redo stack allocation.
+    size_t memsize() const;
+    // Release optional data from the mesh if the object is on the Undo / Redo stack only. Returns the amount of memory released.
+    size_t release_optional();
+	// Restore optional data possibly released by release_optional().
+	void restore_optional();
 
     stl_file stl;
     indexed_triangle_set its;

src/libslic3r/Utils.hpp

@@ -21,6 +21,8 @@ extern std::string format_memsize_MB(size_t n);
 // The string is non-empty only if the loglevel >= info (3).
 extern std::string log_memory_info();
 extern void disable_multi_threading();
+// Returns the size of physical memory (RAM) in bytes.
+extern size_t total_physical_memory();
 
 // Set a path with GUI resource files.
 void set_var_dir(const std::string &path);

src/libslic3r/utils.cpp

@@ -7,10 +7,15 @@
 #include <stdio.h>
 
 #ifdef WIN32
-#include <windows.h>
-#include <psapi.h>
+	#include <windows.h>
+	#include <psapi.h>
 #else
-#include <unistd.h>
+	#include <unistd.h>
+	#include <sys/types.h>
+	#include <sys/param.h>
+	#ifdef BSD
+		#include <sys/sysctl.h>
+	#endif
 #endif
 
 #include <boost/log/core.hpp>
@@ -467,4 +472,75 @@ std::string log_memory_info()
 }
 #endif
 
+// Returns the size of physical memory (RAM) in bytes.
+// http://nadeausoftware.com/articles/2012/09/c_c_tip_how_get_physical_memory_size_system
+size_t total_physical_memory()
+{
+#if defined(_WIN32) && (defined(__CYGWIN__) || defined(__CYGWIN32__))
+	// Cygwin under Windows. ------------------------------------
+	// New 64-bit MEMORYSTATUSEX isn't available.  Use old 32.bit
+	MEMORYSTATUS status;
+	status.dwLength = sizeof(status);
+	GlobalMemoryStatus( &status );
+	return (size_t)status.dwTotalPhys;
+#elif defined(_WIN32)
+	// Windows. -------------------------------------------------
+	// Use new 64-bit MEMORYSTATUSEX, not old 32-bit MEMORYSTATUS
+	MEMORYSTATUSEX status;
+	status.dwLength = sizeof(status);
+	GlobalMemoryStatusEx( &status );
+	return (size_t)status.ullTotalPhys;
+#elif defined(__unix__) || defined(__unix) || defined(unix) || (defined(__APPLE__) && defined(__MACH__))
+	// UNIX variants. -------------------------------------------
+	// Prefer sysctl() over sysconf() except sysctl() HW_REALMEM and HW_PHYSMEM
+
+#if defined(CTL_HW) && (defined(HW_MEMSIZE) || defined(HW_PHYSMEM64))
+	int mib[2];
+	mib[0] = CTL_HW;
+#if defined(HW_MEMSIZE)
+	mib[1] = HW_MEMSIZE;            // OSX. ---------------------
+#elif defined(HW_PHYSMEM64)
+	mib[1] = HW_PHYSMEM64;          // NetBSD, OpenBSD. ---------
+#endif
+	int64_t size = 0;               // 64-bit
+	size_t len = sizeof( size );
+	if ( sysctl( mib, 2, &size, &len, NULL, 0 ) == 0 )
+		return (size_t)size;
+	return 0L;			// Failed?
+
+#elif defined(_SC_AIX_REALMEM)
+	// AIX. -----------------------------------------------------
+	return (size_t)sysconf( _SC_AIX_REALMEM ) * (size_t)1024L;
+
+#elif defined(_SC_PHYS_PAGES) && defined(_SC_PAGESIZE)
+	// FreeBSD, Linux, OpenBSD, and Solaris. --------------------
+	return (size_t)sysconf( _SC_PHYS_PAGES ) *
+		(size_t)sysconf( _SC_PAGESIZE );
+
+#elif defined(_SC_PHYS_PAGES) && defined(_SC_PAGE_SIZE)
+	// Legacy. --------------------------------------------------
+	return (size_t)sysconf( _SC_PHYS_PAGES ) *
+		(size_t)sysconf( _SC_PAGE_SIZE );
+
+#elif defined(CTL_HW) && (defined(HW_PHYSMEM) || defined(HW_REALMEM))
+	// DragonFly BSD, FreeBSD, NetBSD, OpenBSD, and OSX. --------
+	int mib[2];
+	mib[0] = CTL_HW;
+#if defined(HW_REALMEM)
+	mib[1] = HW_REALMEM;		// FreeBSD. -----------------
+#elif defined(HW_PYSMEM)
+	mib[1] = HW_PHYSMEM;		// Others. ------------------
+#endif
+	unsigned int size = 0;		// 32-bit
+	size_t len = sizeof( size );
+	if ( sysctl( mib, 2, &size, &len, NULL, 0 ) == 0 )
+		return (size_t)size;
+	return 0L;			// Failed?
+#endif // sysctl and sysconf variants
+
+#else
+	return 0L;			// Unknown OS.
+#endif
+}
+
 }; // namespace Slic3r