juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 10:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH:optimize the logic of setting profiles for filaments

Browse Source 
Change-Id: Iab4838647dc72c63690f5d465813f82a80df6464
This commit is contained in:
tao wang
2023-06-28 16:07:49 +08:00
committed by Lane.Wei
parent 5060f1b123
commit 40e1f8d7dd
2 changed files with 76 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/slic3r/GUI/StatusPanel.cpp
View File

@@ -2983,12 +2983,11 @@ void StatusPanel::on_filament_edit(wxCommandEvent &event)
tray_id_int = VIRTUAL_TRAY_ID;
m_filament_setting_dlg->ams_id = ams_id_int;
m_filament_setting_dlg->tray_id = tray_id_int;
m_filament_setting_dlg->SetPosition(m_ams_control->GetScreenPosition());
wxString k_val;
wxString n_val;
k_val = wxString::Format("%.3f", obj->vt_tray.k);
n_val = wxString::Format("%.3f", obj->vt_tray.n);
m_filament_setting_dlg->SetPosition(m_ams_control->GetScreenPosition());
m_filament_setting_dlg->Move(wxPoint(m_ams_control->GetScreenPosition().x, m_ams_control->GetScreenPosition().y - FromDIP(40)));
m_filament_setting_dlg->Popup(wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, k_val, n_val);
} else {
std::string tray_id = event.GetString().ToStdString(); // m_ams_control->GetCurrentCan(ams_id);
@@ -3036,7 +3035,7 @@ void StatusPanel::on_filament_edit(wxCommandEvent &event)
}
}
}
m_filament_setting_dlg->SetPosition(m_ams_control->GetScreenPosition());
m_filament_setting_dlg->Move(wxPoint(m_ams_control->GetScreenPosition().x, m_ams_control->GetScreenPosition().y - FromDIP(40)));
m_filament_setting_dlg->Popup(filament, sn_number, temp_min, temp_max, k_val, n_val);
}
catch (...) {
@@ -3081,7 +3080,7 @@ void StatusPanel::on_ext_spool_edit(wxCommandEvent &event)
temp_min = obj->vt_tray.nozzle_temp_min;
}
m_filament_setting_dlg->SetPosition(m_ams_control->GetScreenPosition());
m_filament_setting_dlg->Move(wxPoint(m_ams_control->GetScreenPosition().x, m_ams_control->GetScreenPosition().y - FromDIP(40)));
m_filament_setting_dlg->Popup(filament, sn_number, temp_min, temp_max, k_val, n_val);
}
catch (...) {