diff --git a/xs/src/libslic3r/PrintConfig.hpp b/xs/src/libslic3r/PrintConfig.hpp index 3488b5c4f0..b35cf9cf1c 100644 --- a/xs/src/libslic3r/PrintConfig.hpp +++ b/xs/src/libslic3r/PrintConfig.hpp @@ -630,6 +630,8 @@ public: ConfigOptionFloat wipe_tower_rotation_angle; ConfigOptionFloat wipe_tower_bridging; ConfigOptionBool wipe_tower_adhesion; + ConfigOptionFloats wiping_volumes_matrix; + ConfigOptionFloats wiping_volumes_extruders; ConfigOptionFloat z_offset; protected: @@ -698,6 +700,8 @@ protected: OPT_PTR(wipe_tower_rotation_angle); OPT_PTR(wipe_tower_bridging); OPT_PTR(wipe_tower_adhesion); + OPT_PTR(wiping_volumes_matrix); + OPT_PTR(wiping_volumes_extruders); OPT_PTR(z_offset); } }; diff --git a/xs/src/slic3r/GUI/Preset.cpp b/xs/src/slic3r/GUI/Preset.cpp index 57fa977749..847c7e523b 100644 --- a/xs/src/slic3r/GUI/Preset.cpp +++ b/xs/src/slic3r/GUI/Preset.cpp @@ -200,7 +200,7 @@ const std::vector& Preset::print_options() "top_infill_extrusion_width", "support_material_extrusion_width", "infill_overlap", "bridge_flow_ratio", "clip_multipart_objects", "elefant_foot_compensation", "xy_size_compensation", "threads", "resolution", "wipe_tower", "wipe_tower_x", "wipe_tower_y", "wipe_tower_width", "wipe_tower_per_color_wipe", "wipe_tower_rotation_angle", "wipe_tower_adhesion", "wipe_tower_bridging", - "compatible_printers", "compatible_printers_condition" + "wiping_volumes_matrix", "wiping_volumes_extruders", "compatible_printers", "compatible_printers_condition" }; return s_opts; diff --git a/xs/src/slic3r/GUI/PresetBundle.cpp b/xs/src/slic3r/GUI/PresetBundle.cpp index 7d2501a655..668b9ee125 100644 --- a/xs/src/slic3r/GUI/PresetBundle.cpp +++ b/xs/src/slic3r/GUI/PresetBundle.cpp @@ -32,7 +32,7 @@ namespace Slic3r { -static std::vector s_project_options { +static std::vector s_project_options { }; PresetBundle::PresetBundle() : diff --git a/xs/src/slic3r/GUI/Tab.cpp b/xs/src/slic3r/GUI/Tab.cpp index 8cec658b32..6e978f0837 100644 --- a/xs/src/slic3r/GUI/Tab.cpp +++ b/xs/src/slic3r/GUI/Tab.cpp @@ -528,11 +528,12 @@ void TabPrint::build() sizer->Add(m_wipe_tower_btn); m_wipe_tower_btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent& e) { - //auto init_data = (m_config->option("wiping_volumes_matrix"))->values; - //WipingDialog dlg(this,std::vector(init_data.begin(), init_data.end())); // dlg lives on stack, no need to call Destroy + std::vector init_data = (m_config->option("wiping_volumes_matrix"))->values; + load_key_value("wiping_volumes_matrix", a); + WipingDialog dlg(this,std::vector(init_data.begin(), init_data.end())); // dlg lives on stack, no need to call Destroy if (dlg.ShowModal() == wxID_OK) { - //load_key_value("wipe_tower_advanced", dlg.GetValue()); + //load_key_value("wiping_volumes_matrix", dlg.GetValue()); //std::cout << std::endl << "dialog returned: " << dlg.GetValue() << std::endl; } }));