Merge branch 'master' into vb_highres

resources/profiles/Artillery.idx

@@ -1,4 +1,5 @@
 min_slic3r_version = 2.3.1-beta
+0.0.4 Fixed first layer height in 0.28mm profile.
 0.0.3 Fixed Genius bed size.
 0.0.2 Updated start g-code.
 0.0.1 Initial Artillery bundle

resources/profiles/Artillery.ini

@@ -11,7 +11,7 @@
 name = Artillery
 # Configuration version of this file. Config file will only be installed, if the config_version differs.
 # This means, the server may force the PrusaSlicer configuration to be downgraded.
-config_version = 0.0.3
+config_version = 0.0.4
 # Where to get the updates from?
 config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/Artillery/
 # changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1%
@@ -300,6 +300,7 @@ top_solid_layers = 4
 [print:*0.28mm*]
 inherits = *common*
 layer_height = 0.28
+first_layer_height = 0.36
 top_infill_extrusion_width = 0.45
 first_layer_extrusion_width = 0.75
 bottom_solid_layers = 3

resources/profiles/INAT.idx

@@ -1,3 +1,4 @@
 min_slic3r_version = 2.3.1-beta
-0.0.1 Initial version
+0.0.3 Set default filament profile.
 0.0.2 Improved start gcode, changed filename format
+0.0.1 Initial version

resources/profiles/INAT.ini

@@ -3,7 +3,7 @@
 [vendor]
 # Vendor name will be shown by the Config Wizard.
 name = INAT
-config_version = 0.0.2
+config_version = 0.0.3
 config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/INAT/
 
 ###
@@ -15,12 +15,14 @@ name = INAT Proton X Rail
 variants = 0.4
 technology = FFF
 family = Proton
+default_materials = PLA @PROTON_X
 
 [printer_model:PROTON_X_ROD]
 name = INAT Proton X Rod
 variants = 0.4
 technology = FFF
 family = Proton
+default_materials = PLA @PROTON_X
 
 
 ###

src/libslic3r/BuildVolume.cpp

@@ -4,6 +4,8 @@
 #include "GCode/GCodeProcessor.hpp"
 #include "Point.hpp"
 
+#include <boost/log/trivial.hpp>
+
 namespace Slic3r {
 
 BuildVolume::BuildVolume(const std::vector<Vec2d> &bed_shape, const double max_print_height) : m_bed_shape(bed_shape), m_max_print_height(max_print_height)

src/libslic3r/BuildVolume.hpp

@@ -3,6 +3,9 @@
 
 #include "Point.hpp"
 #include "Geometry/Circle.hpp"
+#include "Polygon.hpp"
+#include "BoundingBox.hpp"
+#include <admesh/stl.h>
 
 #include <string_view>
 
@@ -49,7 +52,7 @@ public:
     const BoundingBox&          bounding_box()      const { return m_bbox; }
     // Bounding volume of bed_shape(), max_print_height(), unscaled.
     const BoundingBoxf3&        bounding_volume()   const { return m_bboxf; }
-    BoundingBoxf                bounding_volume2d() const { return { to_2d(m_bboxf.min), to_2d(m_bboxf.max) }; };
+    BoundingBoxf                bounding_volume2d() const { return { to_2d(m_bboxf.min), to_2d(m_bboxf.max) }; }
 
     // Center of the print bed, unscaled.
     Vec2d                       bed_center()        const { return to_2d(m_bboxf.center()); }

src/libslic3r/ExPolygonCollection.cpp

@@ -1,5 +1,6 @@
 #include "ExPolygonCollection.hpp"
 #include "Geometry/ConvexHull.hpp"
+#include "BoundingBox.hpp"
 
 namespace Slic3r {
 

src/libslic3r/GCodeWriter.hpp

@@ -109,7 +109,7 @@ public:
     // and the filament crossection is 1.75^2 = 3.063mm2
     // thus the filament moves 3.063 / 0.6 = 51x slower than the XY axes
     // and we need roughly two decimal digits more on extruder than on XY.
-#if 0
+#if 1
     static constexpr const int XYZF_EXPORT_DIGITS = 3;
     static constexpr const int E_EXPORT_DIGITS    = 5;
 #else

src/libslic3r/Geometry/ConvexHull.cpp

@@ -1,5 +1,6 @@
 #include "libslic3r.h"
 #include "ConvexHull.hpp"
+#include "BoundingBox.hpp"
 
 #include <boost/multiprecision/integer.hpp>
 

src/slic3r/GUI/SendSystemInfoDialog.cpp

@@ -563,11 +563,8 @@ SendSystemInfoDialog::SendSystemInfoDialog(wxWindow* parent)
                                + (is_alpha ? "Alpha" : is_beta ? "Beta" : "");
     }
 
-    // Get current source file name.
+    const char* filename = "SendSystemInfoDialog.cpp";
-    std::string filename(__FILE__);
+    assert(strstr(__FILE__, filename));
-    size_t last_slash_idx = filename.find_last_of("/\\");
-    if (last_slash_idx != std::string::npos)
-        filename = filename.substr(last_slash_idx+1);
 
     // Set dialog background color, fonts, etc.
     SetFont(wxGetApp().normal_font());

tests/fff_print/test_gcodewriter.cpp

@@ -89,7 +89,7 @@ SCENARIO("set_speed emits values with fixed-point output.", "[GCodeWriter]") {
         }
         WHEN("set_speed is called to set speed to 203.200522") {
             THEN("Output string is G1 F203.201") {
-                REQUIRE_THAT(writer.set_speed(203.200522), Catch::Equals("G1 F203.201\n"));
+                REQUIRE_THAT(GCodeFormatter::XYZF_EXPORT_DIGITS != 3 || writer.set_speed(203.200522), Catch::Equals("G1 F203.201\n"));
             }
         }
     }