3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-15 02:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Wiping volumes options temporarily added to Print Settings

Browse source
This commit is contained in:
Lukas Matena 2018-03-19 15:30:54 +01:00
parent 3d6f6530c0
commit e41eff9186
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xs/src/libslic3r/PrintConfig.hpp
View file

@ -630,6 +630,8 @@ public:
ConfigOptionFloat wipe_tower_rotation_angle; ConfigOptionFloat wipe_tower_rotation_angle;
ConfigOptionFloat wipe_tower_bridging; ConfigOptionFloat wipe_tower_bridging;
ConfigOptionBool wipe_tower_adhesion; ConfigOptionBool wipe_tower_adhesion;
ConfigOptionFloats wiping_volumes_matrix;
ConfigOptionFloats wiping_volumes_extruders;
ConfigOptionFloat z_offset; ConfigOptionFloat z_offset;
protected: protected:
@ -698,6 +700,8 @@ protected:
OPT_PTR(wipe_tower_rotation_angle); OPT_PTR(wipe_tower_rotation_angle);
OPT_PTR(wipe_tower_bridging); OPT_PTR(wipe_tower_bridging);
OPT_PTR(wipe_tower_adhesion); OPT_PTR(wipe_tower_adhesion);
OPT_PTR(wiping_volumes_matrix);
OPT_PTR(wiping_volumes_extruders);
OPT_PTR(z_offset); OPT_PTR(z_offset);
} }
}; };

2
xs/src/slic3r/GUI/Preset.cpp
View file

@ -200,7 +200,7 @@ const std::vector<std::string>& Preset::print_options()
"top_infill_extrusion_width", "support_material_extrusion_width", "infill_overlap", "bridge_flow_ratio", "clip_multipart_objects", "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", "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", "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; return s_opts;

2
xs/src/slic3r/GUI/PresetBundle.cpp
View file

@ -32,7 +32,7 @@
namespace Slic3r { namespace Slic3r {
static std::vector<std::string> s_project_options { static std::vector<std::string> s_project_options {
}; };
PresetBundle::PresetBundle() : PresetBundle::PresetBundle() :

7
xs/src/slic3r/GUI/Tab.cpp
View file

@ -528,11 +528,12 @@ void TabPrint::build()
sizer->Add(m_wipe_tower_btn); sizer->Add(m_wipe_tower_btn);
m_wipe_tower_btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent& e) m_wipe_tower_btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent& e)
{ {
//auto init_data = (m_config->option<ConfigOptionFloats>("wiping_volumes_matrix"))->values; std::vector<double> init_data = (m_config->option<ConfigOptionFloats>("wiping_volumes_matrix"))->values;
//WipingDialog dlg(this,std::vector<float>(init_data.begin(), init_data.end())); // dlg lives on stack, no need to call Destroy load_key_value("wiping_volumes_matrix", a);
WipingDialog dlg(this,std::vector<float>(init_data.begin(), init_data.end())); // dlg lives on stack, no need to call Destroy
if (dlg.ShowModal() == wxID_OK) { 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; //std::cout << std::endl << "dialog returned: " << dlg.GetValue() << std::endl;
} }
})); }));