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

Ramming parameters reduced to one and connected to the wipe tower generator again

Browse source
This commit is contained in:
Lukas Matena 2018-03-15 14:04:12 +01:00
parent 9f18b639a8
commit 67009d80fd
10 changed files with 139 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -469,7 +469,7 @@ void TabPrint::build()
{
std::string init_data = (m_config->option<ConfigOptionString>("wipe_tower_advanced"))->value;
std::cout << "dialog init: " << init_data << std::endl;
WipeTowerDialog dlg(this,init_data); // dlg lives on stack, no need to call Destroy
WipingDialog dlg(this,init_data); // dlg lives on stack, no need to call Destroy
if (dlg.ShowModal() == wxID_OK) {
load_key_value("wipe_tower_advanced", dlg.GetValue());
@ -891,10 +891,10 @@ void TabFilament::build()
ramming_dialog_btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent& e)
{
//std::string init_data = (m_config->option<ConfigOptionString>("wipe_tower_advanced"))->value;
RammingDialog dlg(this,std::string());
RammingDialog dlg(this,(m_config->option<ConfigOptionStrings>("filament_ramming_parameters"))->get_at(0));
if (dlg.ShowModal() == wxID_OK) {
//load_key_value("wipe_tower_advanced", dlg.GetValue());
wxMessageBox("DIALOG OK:\n"+dlg.get_parameters());
//load_key_value("wipe_tower_advanced", dlg.get_parameters());
}
}));
return sizer;