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

FIX: cannot select k value when connect 2 printer 

github: 4085
Change-Id: I660f20032535ad8ab1f218224af68f7cc0dc3395
This commit is contained in:
zhimin.zeng 2024-06-25 18:04:26 +08:00 committed by Lane.Wei
parent 17d3915733
commit dc94ad4fb6
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/AMSMaterialsSetting.cpp
View File

@ -1035,7 +1035,7 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
m_filament_selection = evt.GetSelection(); m_filament_selection = evt.GetSelection();
//reset cali //reset cali
int cali_select_idx; int cali_select_idx = -1;
if ( !this->obj || m_filament_selection < 0) { if ( !this->obj || m_filament_selection < 0) {
m_input_k_val->Enable(false); m_input_k_val->Enable(false);

2
src/slic3r/GUI/Monitor.cpp
View File

@ -317,6 +317,8 @@ void MonitorPanel::on_update_all(wxMouseEvent &event)
set_default(); set_default();
update_all(); update_all();
m_status_info_panel->last_cali_version.reset();
MachineObject *obj_ = dev->get_selected_machine(); MachineObject *obj_ = dev->get_selected_machine();
if (obj_) if (obj_)
GUI::wxGetApp().sidebar().load_ams_list(obj_->dev_id, obj_); GUI::wxGetApp().sidebar().load_ams_list(obj_->dev_id, obj_);

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

@ -2499,7 +2499,7 @@ void StatusPanel::update_ams(MachineObject *obj)
} }
if (m_filament_setting_dlg) { m_filament_setting_dlg->obj = obj; } if (m_filament_setting_dlg) { m_filament_setting_dlg->obj = obj; }
if (obj->cali_version != -1 && last_cali_version != obj->cali_version) { if (obj && (!last_cali_version.has_value() || last_cali_version != obj->cali_version)) {
last_cali_version = obj->cali_version; last_cali_version = obj->cali_version;
CalibUtils::emit_get_PA_calib_info(obj->nozzle_diameter, ""); CalibUtils::emit_get_PA_calib_info(obj->nozzle_diameter, "");
} }

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

@ -637,7 +637,7 @@ public:
long last_read_done_bits{ -1 }; long last_read_done_bits{ -1 };
long last_reading_bits { -1 }; long last_reading_bits { -1 };
long last_ams_version { -1 }; long last_ams_version { -1 };
int last_cali_version{-1}; std::optional<int> last_cali_version;
enum ThumbnailState task_thumbnail_state {ThumbnailState::PLACE_HOLDER}; enum ThumbnailState task_thumbnail_state {ThumbnailState::PLACE_HOLDER};
std::vector<int> last_stage_list_info; std::vector<int> last_stage_list_info;