Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering

src/libslic3r/Fill/FillBase.hpp

@@ -6,6 +6,8 @@
 #include <float.h>
 #include <stdint.h>
 
+#include <type_traits>
+
 #include "../libslic3r.h"
 #include "../BoundingBox.hpp"
 #include "../PrintConfig.hpp"

src/libslic3r/Model.hpp

@@ -319,6 +319,9 @@ public:
     // Extruder ID is only valid for FFF. Returns -1 for SLA or if the extruder ID is not applicable (support volumes).
     int                 extruder_id() const;
 
+    void                set_splittable(const int val) { m_is_splittable = val; }
+    int                 is_splittable() const { return m_is_splittable; }
+
     // Split this volume, append the result to the object owning this volume.
     // Return the number of volumes created from this one.
     // This is useful to assign different materials to different volumes of an object.
@@ -391,6 +394,12 @@ private:
     TriangleMesh             m_convex_hull;
     Geometry::Transformation m_transformation;
 
+    // flag to optimize the checking if the volume is splittable
+    //     -1   ->   is unknown value (before first cheking)
+    //      0   ->   is not splittable
+    //      1   ->   is splittable
+    int                     m_is_splittable {-1};
+
     ModelVolume(ModelObject *object, const TriangleMesh &mesh) : mesh(mesh), m_type(MODEL_PART), object(object)
     {
         if (mesh.stl.stats.number_of_facets > 1)

src/libslic3r/Slicing.hpp

@@ -3,10 +3,11 @@
 #ifndef slic3r_Slicing_hpp_
 #define slic3r_Slicing_hpp_
 
-#include <set>
-#include <vector>
-#include <map>
 #include <cstring>
+#include <map>
+#include <set>
+#include <type_traits>
+#include <vector>
 
 #include "libslic3r.h"
 namespace Slic3r

src/slic3r/GUI/AboutDialog.cpp

@@ -115,7 +115,7 @@ AboutDialog::AboutDialog()
     vsizer->Add(buttons, 0, wxEXPAND | wxRIGHT | wxBOTTOM, 3);
     
 //     this->Bind(wxEVT_LEFT_DOWN, &AboutDialog::onCloseDialog, this);
-    logo->Bind(wxEVT_LEFT_DOWN, &AboutDialog::onCloseDialog, this);
+//     logo->Bind(wxEVT_LEFT_DOWN, &AboutDialog::onCloseDialog, this);
 
 	SetSizer(main_sizer);
 	main_sizer->SetSizeHints(this);

src/slic3r/GUI/GLCanvas3D.cpp

@@ -818,7 +818,7 @@ GLCanvas3D::LayersEditing::LayersEditing()
     , m_z_texture_id(0)
     , m_model_object(nullptr)
     , m_object_max_z(0.f)
-    , m_slicing_parameters(new SlicingParameters)
+    , m_slicing_parameters(nullptr)
     , m_layer_height_profile_modified(false)
     , state(Unknown)
     , band_width(2.0f)
@@ -858,13 +858,16 @@ bool GLCanvas3D::LayersEditing::init(const std::string& vertex_shader_filename,
 
 void GLCanvas3D::LayersEditing::select_object(const Model &model, int object_id)
 {
-    m_model_object   = (object_id >= 0) ? model.objects[object_id] : nullptr;
-    m_object_max_z   = (m_model_object == nullptr) ? 0.f : m_model_object->bounding_box().max.z();
-    if (m_model_object == nullptr || this->last_object_id != object_id) {
+    const ModelObject *model_object_new = (object_id >= 0) ? model.objects[object_id] : nullptr;
+    if (model_object_new == nullptr || this->last_object_id != object_id || m_model_object != model_object_new || m_model_object->id() != model_object_new->id()) {
         m_layer_height_profile.clear();
         m_layer_height_profile_modified = false;
+        delete m_slicing_parameters;
+        m_slicing_parameters = nullptr;
     }
     this->last_object_id = object_id;
+    m_model_object       = model_object_new;
+    m_object_max_z       = (m_model_object == nullptr) ? 0.f : m_model_object->bounding_box().max.z();
 }
 
 bool GLCanvas3D::LayersEditing::is_allowed() const
@@ -1066,49 +1069,24 @@ void GLCanvas3D::LayersEditing::_render_profile(const Rect& bar_rect) const
 {
     //FIXME show some kind of legend.
 
-    // Get a maximum layer height value.
-    //FIXME This is a duplicate code of Slicing.cpp.
-    double layer_height_max = DBL_MAX;
-    const std::vector<double>& nozzle_diameters  = dynamic_cast<const ConfigOptionFloats*>(m_config->option("nozzle_diameter"))->values;
-    const std::vector<double>& layer_heights_min = dynamic_cast<const ConfigOptionFloats*>(m_config->option("min_layer_height"))->values;
-    const std::vector<double>& layer_heights_max = dynamic_cast<const ConfigOptionFloats*>(m_config->option("max_layer_height"))->values;
-    for (unsigned int i = 0; i < (unsigned int)nozzle_diameters.size(); ++i)
-    {
-        double lh_min = (layer_heights_min[i] == 0.0) ? 0.07 : std::max(0.01, layer_heights_min[i]);
-        double lh_max = (layer_heights_max[i] == 0.0) ? (0.75 * nozzle_diameters[i]) : layer_heights_max[i];
-        layer_height_max = std::min(layer_height_max, std::max(lh_min, lh_max));
-    }
-
     // Make the vertical bar a bit wider so the layer height curve does not touch the edge of the bar region.
-    layer_height_max *= 1.12;
-
-    // Get global layer height.
-    double layer_height = dynamic_cast<const ConfigOptionFloat*>(m_config->option("layer_height"))->value;
-    // Override the global layer height with object's layer height if set.
-    const ConfigOption *opt_object_layer_height = m_model_object->config.option("layer_height");
-    if (opt_object_layer_height != nullptr)
-        layer_height = dynamic_cast<const ConfigOptionFloat*>(opt_object_layer_height)->value;
-    float l = bar_rect.get_left();
-    float w = bar_rect.get_right() - l;
-    float b = bar_rect.get_bottom();
-    float t = bar_rect.get_top();
-    float h = t - b;
-    float scale_x = w / (float)layer_height_max;
-    float scale_y = h / m_object_max_z;
-    float x = l + (float)layer_height * scale_x;
+	assert(m_slicing_parameters != nullptr);
+    float scale_x = bar_rect.get_width() / (float)(1.12 * m_slicing_parameters->max_layer_height);
+    float scale_y = bar_rect.get_height() / m_object_max_z;
+    float x = bar_rect.get_left() + (float)m_slicing_parameters->layer_height * scale_x;
 
     // Baseline
     ::glColor3f(0.0f, 0.0f, 0.0f);
     ::glBegin(GL_LINE_STRIP);
-    ::glVertex2f(x, b);
-    ::glVertex2f(x, t);
+    ::glVertex2f(x, bar_rect.get_bottom());
+    ::glVertex2f(x, bar_rect.get_top());
     ::glEnd();
 
     // Curve
     ::glColor3f(0.0f, 0.0f, 1.0f);
     ::glBegin(GL_LINE_STRIP);
     for (unsigned int i = 0; i < m_layer_height_profile.size(); i += 2)
-        ::glVertex2f(l + (float)m_layer_height_profile[i + 1] * scale_x, b + (float)m_layer_height_profile[i] * scale_y);
+        ::glVertex2f(bar_rect.get_left() + (float)m_layer_height_profile[i + 1] * scale_x, bar_rect.get_bottom() + (float)m_layer_height_profile[i] * scale_y);
     ::glEnd();
 }
 
@@ -1182,7 +1160,7 @@ void GLCanvas3D::LayersEditing::render_volumes(const GLCanvas3D& canvas, const G
 
 void GLCanvas3D::LayersEditing::adjust_layer_height_profile()
 {
-    *m_slicing_parameters = PrintObject::slicing_parameters(*m_config, *m_model_object);
+	this->update_slicing_parameters();
 	PrintObject::update_layer_height_profile(*m_model_object, *m_slicing_parameters, m_layer_height_profile);
 	Slic3r::adjust_layer_height_profile(*m_slicing_parameters, m_layer_height_profile, this->last_z, this->strength, this->band_width, this->last_action);
 	m_layer_height_profile_modified = true;
@@ -1191,9 +1169,9 @@ void GLCanvas3D::LayersEditing::adjust_layer_height_profile()
 
 void GLCanvas3D::LayersEditing::generate_layer_height_texture()
 {
+	this->update_slicing_parameters();
 	// Always try to update the layer height profile.
     bool update = ! m_layers_texture.valid;
-    *m_slicing_parameters = PrintObject::slicing_parameters(*m_config, *m_model_object);
     if (PrintObject::update_layer_height_profile(*m_model_object, *m_slicing_parameters, m_layer_height_profile)) {
         // Initialized to the default value.
         m_layer_height_profile_modified = false;
@@ -1230,6 +1208,14 @@ void GLCanvas3D::LayersEditing::accept_changes(GLCanvas3D& canvas)
     m_layer_height_profile_modified = false;
 }
 
+void GLCanvas3D::LayersEditing::update_slicing_parameters()
+{
+	if (m_slicing_parameters == nullptr) {
+		m_slicing_parameters = new SlicingParameters();
+    	*m_slicing_parameters = PrintObject::slicing_parameters(*m_config, *m_model_object);
+    }
+}
+
 const Point GLCanvas3D::Mouse::Drag::Invalid_2D_Point(INT_MAX, INT_MAX);
 const Vec3d GLCanvas3D::Mouse::Drag::Invalid_3D_Point(DBL_MAX, DBL_MAX, DBL_MAX);
 #if ENABLE_MOVE_MIN_THRESHOLD

src/slic3r/GUI/GLCanvas3D.hpp

@@ -89,6 +89,9 @@ public:
 
     float get_bottom() const;
     void set_bottom(float bottom);
+
+    float get_width() const { return m_right - m_left; }
+    float get_height() const { return m_top - m_bottom; }
 };
 
 wxDECLARE_EVENT(EVT_GLCANVAS_OBJECT_SELECT, SimpleEvent);
@@ -343,7 +346,7 @@ class GLCanvas3D
         ~LayersEditing();
 
         bool init(const std::string& vertex_shader_filename, const std::string& fragment_shader_filename);
-        void set_config(const DynamicPrintConfig* config) { m_config = config; }
+		void set_config(const DynamicPrintConfig* config) { m_config = config; delete m_slicing_parameters; m_slicing_parameters = nullptr; }
         void select_object(const Model &model, int object_id);
 
         bool is_allowed() const;
@@ -375,6 +378,7 @@ class GLCanvas3D
         void _render_reset_texture(const Rect& reset_rect) const;
         void _render_active_object_annotations(const GLCanvas3D& canvas, const Rect& bar_rect) const;
         void _render_profile(const Rect& bar_rect) const;
+        void update_slicing_parameters();
     };
 
     struct Mouse

src/slic3r/GUI/GUI_ObjectList.cpp

@@ -1109,10 +1109,14 @@ bool ObjectList::is_splittable()
     if (!get_volume_by_item(item, volume) || !volume)
         return false;
 
+    if (volume->is_splittable() != -1) // if is_splittable value is already known
+        return volume->is_splittable() == 0 ? false : true;
+
     TriangleMeshPtrs meshptrs = volume->mesh.split();
     bool splittable = meshptrs.size() > 1;
     for (TriangleMesh* m : meshptrs) { delete m; }
 
+    volume->set_splittable(splittable ? 1 : 0);
     return splittable;
 }
 

src/slic3r/GUI/MainFrame.cpp

@@ -70,8 +70,14 @@ wxFrame(NULL, wxID_ANY, SLIC3R_BUILD, wxDefaultPosition, wxDefaultSize, wxDEFAUL
     sizer->SetSizeHints(this);
     SetSizer(sizer);
     Fit();
+#ifdef __APPLE__
+    // Using SetMinSize() on Mac messes up the window position in some cases
+    // cf. https://groups.google.com/forum/#!topic/wx-users/yUKPBBfXWO0
+    SetSize(wxSize(760, 490));
+#else
     SetMinSize(wxSize(760, 490));
     SetSize(GetMinSize());
+#endif
     Layout();
 
     // declare events

src/slic3r/GUI/Plater.cpp

@@ -1095,9 +1095,10 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
         "printhost_apikey", "printhost_cafile", "nozzle_diameter", "single_extruder_multi_material",
         "wipe_tower", "wipe_tower_x", "wipe_tower_y", "wipe_tower_width", "wipe_tower_rotation_angle",
         "extruder_colour", "filament_colour", "max_print_height", "printer_model", "printer_technology",
-        // The following three layer height config values are passed here for View3D::m_canvas to receive
-        // layer height updates for the layer height.
-        "min_layer_height", "max_layer_height", "layer_height", "first_layer_height"
+        // These values are necessary to construct SlicingParameters by the Canvas3D variable layer height editor.
+        "layer_height", "first_layer_height", "min_layer_height", "max_layer_height",
+        "brim_width", "perimeters", "perimeter_extruder", "fill_density", "infill_extruder", "top_solid_layers", "bottom_solid_layers", "solid_infill_extruder",
+        "support_material", "support_material_extruder", "support_material_interface_extruder", "support_material_contact_distance", "raft_layers"
         }))
     , sidebar(new Sidebar(q))
     , delayed_scene_refresh(false)
@@ -1875,6 +1876,8 @@ void Plater::priv::schedule_background_process()
 {
     // Trigger the timer event after 0.5s
     this->background_process_timer.Start(500, wxTIMER_ONE_SHOT);
+    // Notify the Canvas3D that something has changed, so it may invalidate some of the layer editing stuff.
+    this->view3D->get_canvas3d()->set_config(this->config);
 }
 
 void Plater::priv::update_print_volume_state()

src/slic3r/GUI/SysInfoDialog.cpp

@@ -121,7 +121,7 @@ SysInfoDialog::SysInfoDialog()
     main_sizer->Add(buttons, 0, wxEXPAND | wxRIGHT | wxBOTTOM, 3);
     
 //     this->Bind(wxEVT_LEFT_DOWN, &SysInfoDialog::onCloseDialog, this);
-    logo->Bind(wxEVT_LEFT_DOWN, &SysInfoDialog::onCloseDialog, this);
+//     logo->Bind(wxEVT_LEFT_DOWN, &SysInfoDialog::onCloseDialog, this);
 
 	SetSizer(main_sizer);
 	main_sizer->SetSizeHints(this);