mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: obj->cache_flow_ratio 

Change-Id: Ibfc955a1034f9999a82e29469f3b2d007683e2e7
(cherry picked from commit b7e73f44822cfbf0a7b2d00b9170fae51087850c)
This commit is contained in:
liz.li 2023-07-04 14:59:13 +08:00 committed by Lane.Wei
parent d43a60fd8f
commit cc2536e719
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/CalibrationWizardPresetPage.cpp
View File

@ -119,9 +119,10 @@ void CaliPresetCaliStagePanel::get_cali_stage(CaliPresetStage& stage, float& val
value = (m_stage == CALI_MANUAL_STAGE_2) ? m_flow_ratio_value : value; value = (m_stage == CALI_MANUAL_STAGE_2) ? m_flow_ratio_value : value;
} }
void CaliPresetCaliStagePanel::set_flow_ratio_value(wxString flow_ratio) void CaliPresetCaliStagePanel::set_flow_ratio_value(float flow_ratio)
{ {
flow_ratio_input->GetTextCtrl()->SetValue(flow_ratio); flow_ratio_input->GetTextCtrl()->SetValue(wxString::Format("%.2f", flow_ratio));
m_flow_ratio_value = flow_ratio;
} }
CaliPresetWarningPanel::CaliPresetWarningPanel( CaliPresetWarningPanel::CaliPresetWarningPanel(
@ -874,7 +875,7 @@ void CalibrationPresetPage::on_recommend_input_value()
Preset *selected_filament_preset = selected_filaments.begin()->second; Preset *selected_filament_preset = selected_filaments.begin()->second;
if (selected_filament_preset) { if (selected_filament_preset) {
float flow_ratio = selected_filament_preset->config.option<ConfigOptionFloats>("filament_flow_ratio")->get_at(0); float flow_ratio = selected_filament_preset->config.option<ConfigOptionFloats>("filament_flow_ratio")->get_at(0);
m_cali_stage_panel->set_flow_ratio_value(wxString::Format("%.2f", flow_ratio)); m_cali_stage_panel->set_flow_ratio_value(flow_ratio);
} }
} }
else if (m_cali_mode == CalibMode::Calib_Vol_speed_Tower) { else if (m_cali_mode == CalibMode::Calib_Vol_speed_Tower) {
@ -1580,6 +1581,12 @@ void CalibrationPresetPage::get_preset_info(float& nozzle_dia, BedType& plate_ty
void CalibrationPresetPage::get_cali_stage(CaliPresetStage& stage, float& value) void CalibrationPresetPage::get_cali_stage(CaliPresetStage& stage, float& value)
{ {
m_cali_stage_panel->get_cali_stage(stage, value); m_cali_stage_panel->get_cali_stage(stage, value);
if (stage != CaliPresetStage::CALI_MANUAL_STAGE_2) {
std::map<int, Preset*> selected_filaments = get_selected_filaments();
Preset* preset = selected_filaments.begin()->second;
value = preset->config.option<ConfigOptionFloats>("filament_flow_ratio")->get_at(0);
}
} }
void CalibrationPresetPage::update_filament_combobox(std::string ams_id) void CalibrationPresetPage::update_filament_combobox(std::string ams_id)

2
src/slic3r/GUI/CalibrationWizardPresetPage.hpp
View File

@ -24,7 +24,7 @@ public:
void set_cali_stage(CaliPresetStage stage, float value); void set_cali_stage(CaliPresetStage stage, float value);
void get_cali_stage(CaliPresetStage& stage, float& value); void get_cali_stage(CaliPresetStage& stage, float& value);
void set_flow_ratio_value(wxString flow_ratio); void set_flow_ratio_value(float flow_ratio);
protected: protected:
CaliPresetStage m_stage; CaliPresetStage m_stage;