Updated to 1.9.5, and optimize calibration and device

src/libslic3r/Print.hpp

@@ -39,6 +39,12 @@ class TreeSupport;
 
 #define MARGIN_HEIGHT   1.5
 #define MAX_OUTER_NOZZLE_RADIUS   4
+//1.9.5
+#define TIME_USING_CACHE "time_using_cache"
+#define TIME_MAKE_PERIMETERS "make_perimeters_time"
+#define TIME_INFILL "infill_time"
+#define TIME_GENERATE_SUPPORT "generate_support_material_time"
+
 // QDS: move from PrintObjectSlice.cpp
 struct VolumeSlices
 {
@@ -441,6 +447,8 @@ public:
 
     // QDS: returns 1-based indices of extruders used to print the first layer wall of objects
     std::vector<int>            object_first_layer_wall_extruders;
+    //1.9.5
+    bool             has_variable_layer_heights = false;
 
     // OrcaSlicer
     size_t get_klipper_object_id() const { return m_klipper_object_id; }
@@ -717,7 +725,8 @@ public:
 
     ApplyStatus         apply(const Model &model, DynamicPrintConfig config) override;
 
-    void                process(long long *time_cost_with_cache = nullptr, bool use_cache = false) override;
+    //1.9.5
+    void                process(std::unordered_map<std::string, long long>* slice_time = nullptr, bool use_cache = false) override;
     // Exports G-code into a file name based on the path_template, returns the file path of the generated G-code file.
     // If preview_data is not null, the preview_data is filled in for the G-code visualization (not used by the command line Slic3r).
     std::string         export_gcode(const std::string& path_template, GCodeProcessorResult* result, ThumbnailsGeneratorCallback thumbnail_cb = nullptr);