3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 23:46:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

FIX: ext spool name display

Browse source 
Change-Id: I4b5af5814f1f5cb46262725cb63d7d7597e0f8b7
This commit is contained in:
liz.li 2023-07-07 17:20:15 +08:00 • committed by Lane.Wei
parent 35f0a550ad
commit 85a43216d6
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/slic3r/GUI/CalibrationWizardSavePage.cpp
View file

@ -198,9 +198,15 @@ void CaliPASaveAutoPanel::sync_cali_result(const std::vector<PACalibResult>& cal
wxBoxSizer* column_data_sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer* column_data_sizer = new wxBoxSizer(wxVERTICAL);
auto tray_title = new wxStaticText(m_grid_panel, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, 0); auto tray_title = new wxStaticText(m_grid_panel, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, 0);
tray_title->SetFont(Label::Head_14); tray_title->SetFont(Label::Head_14);
char prefix = 'A' + (item.tray_id / 4); wxString tray_name;
char suffix = '0' + 1 + item.tray_id % 4; if (item.tray_id == VIRTUAL_TRAY_ID) {
wxString tray_name = std::string(1, prefix) + std::string(1, suffix); tray_name = "Ext";
}
else {
char prefix = 'A' + (item.tray_id / 4);
char suffix = '0' + 1 + item.tray_id % 4;
tray_name = std::string(1, prefix) + std::string(1, suffix);
}
tray_title->SetLabel(tray_name); tray_title->SetLabel(tray_name);
auto k_value = new GridTextInput(m_grid_panel, "", "", CALIBRATION_FROM_TO_INPUT_SIZE, item.tray_id, GridTextInputType::K); auto k_value = new GridTextInput(m_grid_panel, "", "", CALIBRATION_FROM_TO_INPUT_SIZE, item.tray_id, GridTextInputType::K);
@ -888,9 +894,15 @@ void CalibrationFlowX1SavePage::sync_cali_result(const std::vector<FlowRatioCali
wxBoxSizer* column_data_sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer* column_data_sizer = new wxBoxSizer(wxVERTICAL);
auto tray_title = new wxStaticText(m_grid_panel, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, 0); auto tray_title = new wxStaticText(m_grid_panel, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, 0);
tray_title->SetFont(Label::Head_14); tray_title->SetFont(Label::Head_14);
char prefix = 'A' + (item.tray_id / 4); wxString tray_name;
char suffix = '0' + 1 + item.tray_id % 4; if (item.tray_id == VIRTUAL_TRAY_ID) {
wxString tray_name = std::string(1, prefix) + std::string(1, suffix); tray_name = "Ext";
}
else {
char prefix = 'A' + (item.tray_id / 4);
char suffix = '0' + 1 + item.tray_id % 4;
tray_name = std::string(1, prefix) + std::string(1, suffix);
}
tray_title->SetLabel(tray_name); tray_title->SetLabel(tray_name);
auto flow_ratio_value = new GridTextInput(m_grid_panel, "", "", CALIBRATION_FROM_TO_INPUT_SIZE, item.tray_id, GridTextInputType::FlowRatio); auto flow_ratio_value = new GridTextInput(m_grid_panel, "", "", CALIBRATION_FROM_TO_INPUT_SIZE, item.tray_id, GridTextInputType::FlowRatio);