FIX: fix build error

jira: none
Change-Id: I97df69b728fc3871b7c33e1fd3ba068e741d51c7
(cherry picked from commit 326d7d28b47017bdbd98873a6437ef84116291ba)

src/libslic3r/Config.hpp

@@ -30,7 +30,6 @@ namespace Slic3r {
     {
         double  value;
         bool    percent;
-
     private:
         friend class cereal::access;
         template<class Archive> void serialize(Archive& ar) { ar(this->value); ar(this->percent); }

src/libslic3r/GCode/ToolOrdering.cpp

@@ -216,6 +216,7 @@ ToolOrdering::ToolOrdering(const PrintObject &object, unsigned int first_extrude
     m_is_BBL_printer = object.print()->is_BBL_printer();
     m_print_full_config = &object.print()->full_print_config();
     m_print_object_ptr = &object;
+    m_print = const_cast<Print*>(object.print());
     if (object.layers().empty())
         return;
 
@@ -260,6 +261,7 @@ ToolOrdering::ToolOrdering(const Print &print, unsigned int first_extruder, bool
 {
     m_is_BBL_printer = print.is_BBL_printer();
     m_print_full_config = &print.full_print_config();
+    m_print = const_cast<Print *>(&print);  // for update the context of print
     m_print_config_ptr = &print.config();
 
     // Initialize the print layers for all objects and all layers.

src/libslic3r/GCode/ToolOrdering.hpp

@@ -217,6 +217,7 @@ private:
     const DynamicPrintConfig*  m_print_full_config = nullptr;
     const PrintConfig*         m_print_config_ptr = nullptr;
     const PrintObject*         m_print_object_ptr = nullptr;
+    Print*                     m_print;
     bool                       m_is_BBL_printer = false;
 };
 

src/libslic3r/PlaceholderParser.cpp

@@ -1570,13 +1570,12 @@ namespace client
             expr::random(param1, param2, ctx->context_data->rng);
         }
 
-        static void filament_change(const MyContext* ctx, expr<Iterator>& param)
+        static void filament_change(const MyContext* ctx, expr& param)
         {
             MyContext *context = const_cast<MyContext *>(ctx);
             context->current_extruder_id = param.as_i();
         }
 
-        template <typename Iterator>
         static void throw_exception(const std::string &msg, const IteratorRange &it_range)
         {
             // An asterix is added to the start of the string to differentiate the boost::spirit::info::tag content
@@ -2170,7 +2169,7 @@ namespace client
                                                                     [ px::bind(&expr::max, _val, _2) ]
                 |   (kw["random"] > '(' > conditional_expression(_r1) [_val = _1] > ',' > conditional_expression(_r1) > ')')
                                                                     [ px::bind(&MyContext::random, _r1, _val, _2) ]
-                |   (kw["filament_change"] > '(' > conditional_expression(_r1) > ')') [ px::bind(&MyContext::filament_change<Iterator>, _r1, _1) ]
+                |   (kw["filament_change"] > '(' > conditional_expression(_r1) > ')') [ px::bind(&MyContext::filament_change, _r1, _1) ]
                 |   (kw["digits"] > '(' > conditional_expression(_r1) [_val = _1] > ',' > conditional_expression(_r1) > optional_parameter(_r1))
                                                                     [ px::bind(&expr::digits<false>, _val, _2, _3) ]
                 |   (kw["zdigits"] > '(' > conditional_expression(_r1) [_val = _1] > ',' > conditional_expression(_r1) > optional_parameter(_r1))

src/libslic3r/Preset.cpp

@@ -2738,7 +2738,7 @@ inline t_config_option_keys deep_diff(const ConfigBase &config_this, const Confi
                 case coFloats:  add_correct_opts_to_diff<ConfigOptionFloats     >(opt_key, diff, config_other, config_this, strict);  break;
                 case coStrings: add_correct_opts_to_diff<ConfigOptionStrings    >(opt_key, diff, config_other, config_this, strict);  break;
                 case coPercents:add_correct_opts_to_diff<ConfigOptionPercents   >(opt_key, diff, config_other, config_this, strict);  break;
-                case coFloatsOrPercents: add_correct_opts_to_diff<ConfigOptionFloatsOrPercents>(opt_key, diff, config_other, config_this); break;
+                case coFloatsOrPercents: add_correct_opts_to_diff<ConfigOptionFloatsOrPercents>(opt_key, diff, config_other, config_this, strict); break;
                 case coPoints:  add_correct_opts_to_diff<ConfigOptionPoints     >(opt_key, diff, config_other, config_this, strict);  break;
                 // BBS
                 case coEnums: add_correct_opts_to_diff<ConfigOptionInts>(opt_key, diff, config_other, config_this, strict); break;

src/libslic3r/Print.cpp

@@ -2796,7 +2796,7 @@ void Print::_make_wipe_tower()
                     unsigned int pre_filament_id = nozzle_cur_filament_ids[nozzle_id];
 
                     float volume_to_purge = 0;
-                    if (pre_filament_id != unsigned int(-1) && pre_filament_id != filament_id) {
+                    if (pre_filament_id != (unsigned int)(-1) && pre_filament_id != filament_id) {
                         volume_to_purge = multi_extruder_flush[nozzle_id][pre_filament_id][filament_id];
                         volume_to_purge *= m_config.flush_multiplier.get_at(nozzle_id);
                         volume_to_purge = pre_filament_id == -1 ? 0 :

src/slic3r/GUI/BackgroundSlicingProcess.cpp

@@ -228,9 +228,10 @@ void BackgroundSlicingProcess::process_fff()
 		BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" %1%: gcode_result reseted, will start print::process")%__LINE__;
 		m_print->process();
 		BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" %1%: after print::process, send slicing complete event to gui...")%__LINE__;
-		if (m_current_plate->get_filament_map_mode() == FilamentMapMode::fmmAuto)
-			m_current_plate->set_filament_maps(m_fff_print->get_filament_maps());
-
+        if (m_current_plate->get_filament_map_mode() == FilamentMapMode::fmmAuto) {
+            std::vector<int> f_maps = m_fff_print->get_filament_maps();
+            m_current_plate->set_filament_maps(f_maps);
+		}
 		wxCommandEvent evt(m_event_slicing_completed_id);
 		// Post the Slicing Finished message for the G-code viewer to update.
 		// Passing the timestamp

src/slic3r/GUI/GCodeViewer.cpp

@@ -4377,7 +4377,7 @@ void GCodeViewer::render_legend_color_arr_recommen(float window_padding)
 {
     ImGuiWrapper &imgui = *wxGetApp().imgui();
 
-    auto link_text = [&](std::string &label) {
+    auto link_text = [&](const std::string &label) {
         ImVec2 wiki_part_size = ImGui::CalcTextSize(label.c_str());
 
         ImColor HyperColor = ImColor(48, 221, 114, 255).Value;

src/slic3r/GUI/PartPlate.cpp

@@ -3191,7 +3191,7 @@ std::vector<int> PartPlate::get_filament_maps()
     return filament_maps;
 }
 
-void PartPlate::set_filament_maps(std::vector<int>& f_maps)
+void PartPlate::set_filament_maps(const std::vector<int>& f_maps)
 {
     std::vector<int>& filament_maps = m_config.option<ConfigOptionInts>("filament_map", true)->values;
 

src/slic3r/GUI/PartPlate.hpp

@@ -485,7 +485,7 @@ public:
     void set_filament_map_mode(FilamentMapMode& mode);
 
     std::vector<int> get_filament_maps();
-    void set_filament_maps(std::vector<int>& f_maps);
+    void set_filament_maps(const std::vector<int>& f_maps);
 
     void set_filament_count(int filament_count);
     void on_filament_added();

src/slic3r/GUI/Plater.cpp

@@ -1620,8 +1620,6 @@ void Sidebar::msw_rescale()
     //BBS
     p->m_bed_type_list->Rescale();
     p->m_bed_type_list->SetMinSize({-1, 3 * wxGetApp().em_unit()});
-    p->m_left_extruder_list->Rescale();
-    p->m_right_extruder_list->Rescale();
 #if 0
     if (p->mode_sizer)
         p->mode_sizer->msw_rescale();
@@ -13367,7 +13365,7 @@ void Plater::on_filaments_delete(size_t num_filaments, size_t filament_id)
     sidebar().obj_list()->update_objects_list_filament_column_when_delete_filament(filament_id, num_filaments);
 
     // update customize gcode
-    for (auto& item = p->model.plates_custom_gcodes.begin(); item != p->model.plates_custom_gcodes.end(); ++item) {
+    for (auto item = p->model.plates_custom_gcodes.begin(); item != p->model.plates_custom_gcodes.end(); ++item) {
         auto iter = std::remove_if(item->second.gcodes.begin(), item->second.gcodes.end(), [filament_id](const Item& gcode_item) {
             return (gcode_item.type == CustomGCode::Type::ToolChange && gcode_item.extruder == filament_id + 1);
         });

src/slic3r/GUI/SelectMachine.cpp

@@ -612,6 +612,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
     sizer_print_failed_info->Add(sizer_extra_info, 0, wxLEFT, 5);
 
     
+
     m_sizer_main->Add(m_line_top, 0, wxEXPAND, 0);
     m_sizer_main->Add(0, 0, 0, wxTOP, FromDIP(12));
     m_sizer_main->Add(m_basic_panel, 0, wxEXPAND|wxLEFT|wxRIGHT, FromDIP(15));