FIX:fixed the error in the total number of steps when loading
jira:[STUDIO-9169] Change-Id: I62e61f9ca01b4d04b0ef204df1694d8d0fbc06b2
This commit is contained in:
parent
7d44a8bdca
commit
2b1f8887ef
|
@ -2004,9 +2004,8 @@ wxBoxSizer* StatusBasePanel::create_filament_group(wxWindow* parent)
|
|||
m_button_retry->SetBackgroundColor(btn_bg_white);
|
||||
|
||||
m_button_retry->Bind(wxEVT_BUTTON, [this](wxCommandEvent &e) {
|
||||
wxCommandEvent evt(EVT_AMS_RETRY);
|
||||
evt.SetEventObject(this);
|
||||
wxPostEvent(m_parent, evt);
|
||||
BOOST_LOG_TRIVIAL(info) << "on_ams_retry";
|
||||
if (obj) { obj->command_ams_control("resume"); }
|
||||
});
|
||||
|
||||
|
||||
|
@ -3204,7 +3203,6 @@ void StatusPanel::update_ams(MachineObject *obj)
|
|||
bool ams_loading_state = false;
|
||||
auto ams_status_sub = obj->ams_status_sub;
|
||||
|
||||
int vt_tray_id = VIRTUAL_TRAY_DEPUTY_ID;
|
||||
if (obj->is_enable_np) {
|
||||
if (obj->m_extder_data.current_busy_for_loading) {
|
||||
ams_loading_state = true;
|
||||
|
@ -3216,22 +3214,33 @@ void StatusPanel::update_ams(MachineObject *obj)
|
|||
if (ams_loading_state) {
|
||||
update_filament_step();
|
||||
m_filament_step->updateID(std::atoi(obj->m_ams_id.c_str()), std::atoi(obj->m_tray_id.c_str()));
|
||||
if (obj->m_tray_tar == std::to_string(vt_tray_id) && (obj->m_tray_now != std::to_string(vt_tray_id) || obj->m_tray_now != "255")) {
|
||||
|
||||
bool busy_for_vt_loading = false;
|
||||
if (!obj->is_enable_np) {
|
||||
busy_for_vt_loading = (obj->m_tray_tar == "254" && (obj->m_tray_now != "254" || obj->m_tray_now != "255"));
|
||||
} else {
|
||||
if (obj->m_extder_data.current_busy_for_loading && obj->m_extder_data.current_loading_extder_id != -1 ) {
|
||||
auto tar = obj->m_extder_data.extders[obj->m_extder_data.current_loading_extder_id].star;
|
||||
auto now = obj->m_extder_data.extders[obj->m_extder_data.current_loading_extder_id].snow;
|
||||
if ( (tar.ams_id == std::to_string(VIRTUAL_TRAY_MAIN_ID) || tar.ams_id == std::to_string(VIRTUAL_TRAY_DEPUTY_ID)) &&
|
||||
((now.ams_id != std::to_string(VIRTUAL_TRAY_MAIN_ID) || now.ams_id != std::to_string(VIRTUAL_TRAY_DEPUTY_ID)) || (now.ams_id != "255"))
|
||||
) {
|
||||
busy_for_vt_loading = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (busy_for_vt_loading) {
|
||||
// wait to heat hotend
|
||||
if (ams_status_sub == 0x02) {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_HEAT_NOZZLE, FilamentStepType::STEP_TYPE_VT_LOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_HEAT_NOZZLE, FilamentStepType::STEP_TYPE_VT_LOAD);
|
||||
} else if (ams_status_sub == 0x05) {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_PUSH_NEW_FILAMENT, FilamentStepType::STEP_TYPE_VT_LOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_PUSH_NEW_FILAMENT, FilamentStepType::STEP_TYPE_VT_LOAD);
|
||||
} else if (ams_status_sub == 0x06) {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_CONFIRM_EXTRUDED, FilamentStepType::STEP_TYPE_VT_LOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_CONFIRM_EXTRUDED, FilamentStepType::STEP_TYPE_VT_LOAD);
|
||||
} else if (ams_status_sub == 0x07) {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_PURGE_OLD_FILAMENT, FilamentStepType::STEP_TYPE_VT_LOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_PURGE_OLD_FILAMENT, FilamentStepType::STEP_TYPE_VT_LOAD);
|
||||
} else {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_IDLE, FilamentStepType::STEP_TYPE_VT_LOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_IDLE, FilamentStepType::STEP_TYPE_VT_LOAD);
|
||||
ams_loading_state = false;
|
||||
}
|
||||
|
@ -3239,93 +3248,72 @@ void StatusPanel::update_ams(MachineObject *obj)
|
|||
// wait to heat hotend
|
||||
if (ams_status_sub == 0x02) {
|
||||
if (!obj->is_ams_unload()) {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_HEAT_NOZZLE, FilamentStepType::STEP_TYPE_LOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_HEAT_NOZZLE, FilamentStepType::STEP_TYPE_LOAD);
|
||||
} else {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_HEAT_NOZZLE, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_HEAT_NOZZLE, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
}
|
||||
} else if (ams_status_sub == 0x03) {
|
||||
if (!obj->is_ams_unload()) {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_CUT_FILAMENT, FilamentStepType::STEP_TYPE_LOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_CUT_FILAMENT, FilamentStepType::STEP_TYPE_LOAD);
|
||||
} else {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_CUT_FILAMENT, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_CUT_FILAMENT, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
}
|
||||
} else if (ams_status_sub == 0x04) {
|
||||
if (!obj->is_ams_unload()) {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_PULL_CURR_FILAMENT, FilamentStepType::STEP_TYPE_LOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_PULL_CURR_FILAMENT, FilamentStepType::STEP_TYPE_LOAD);
|
||||
} else {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_PULL_CURR_FILAMENT, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_PULL_CURR_FILAMENT, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
}
|
||||
} else if (ams_status_sub == 0x05) {
|
||||
if (!obj->is_ams_unload()) {
|
||||
if (m_is_load_with_temp) {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_CUT_FILAMENT, FilamentStepType::STEP_TYPE_LOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_CUT_FILAMENT, FilamentStepType::STEP_TYPE_LOAD);
|
||||
} else {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_PUSH_NEW_FILAMENT, FilamentStepType::STEP_TYPE_LOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_PUSH_NEW_FILAMENT, FilamentStepType::STEP_TYPE_LOAD);
|
||||
}
|
||||
|
||||
} else {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_PUSH_NEW_FILAMENT, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_PUSH_NEW_FILAMENT, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
}
|
||||
} else if (ams_status_sub == 0x06) {
|
||||
if (!obj->is_ams_unload()) {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_PUSH_NEW_FILAMENT, FilamentStepType::STEP_TYPE_LOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_PUSH_NEW_FILAMENT, FilamentStepType::STEP_TYPE_LOAD);
|
||||
} else {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_PUSH_NEW_FILAMENT, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_PUSH_NEW_FILAMENT, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
}
|
||||
} else if (ams_status_sub == 0x07) {
|
||||
if (!obj->is_ams_unload()) {
|
||||
if (m_is_load_with_temp) {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_PULL_CURR_FILAMENT, FilamentStepType::STEP_TYPE_LOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_PULL_CURR_FILAMENT, FilamentStepType::STEP_TYPE_LOAD);
|
||||
} else {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_PURGE_OLD_FILAMENT, FilamentStepType::STEP_TYPE_LOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_PURGE_OLD_FILAMENT, FilamentStepType::STEP_TYPE_LOAD);
|
||||
}
|
||||
} else {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_PURGE_OLD_FILAMENT, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_PURGE_OLD_FILAMENT, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
}
|
||||
} else if (ams_status_sub == 0x08) {
|
||||
if (!obj->is_ams_unload()) {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_CHECK_POSITION, FilamentStepType::STEP_TYPE_LOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_CHECK_POSITION, FilamentStepType::STEP_TYPE_LOAD);
|
||||
} else {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_CHECK_POSITION, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_CHECK_POSITION, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
}
|
||||
} else if (ams_status_sub == 0x09) {
|
||||
//just wait
|
||||
} else if (ams_status_sub == 0x0B) {
|
||||
if (!obj->is_ams_unload()) {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_CHECK_POSITION, FilamentStepType::STEP_TYPE_LOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_CHECK_POSITION, FilamentStepType::STEP_TYPE_LOAD);
|
||||
} else {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_CHECK_POSITION, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_CHECK_POSITION, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
}
|
||||
} else {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_IDLE, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_IDLE, FilamentStepType::STEP_TYPE_UNLOAD);
|
||||
ams_loading_state = false;
|
||||
}
|
||||
}
|
||||
} else if (obj->ams_status_main == AMS_STATUS_MAIN_ASSIST) {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_IDLE, FilamentStepType::STEP_TYPE_LOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_IDLE, FilamentStepType::STEP_TYPE_LOAD);
|
||||
ams_loading_state = false;
|
||||
} else {
|
||||
m_ams_control->SetFilamentStep(FilamentStep::STEP_IDLE, FilamentStepType::STEP_TYPE_LOAD);
|
||||
m_filament_step->SetFilamentStep(FilamentStep::STEP_IDLE, FilamentStepType::STEP_TYPE_LOAD);
|
||||
ams_loading_state = false;
|
||||
}
|
||||
|
@ -3371,120 +3359,52 @@ void StatusPanel::update_ams_control_state(std::string ams_id, std::string slot_
|
|||
enable[ACTION_BTN_LOAD] = true;
|
||||
enable[ACTION_BTN_UNLOAD] = true;
|
||||
|
||||
if (obj->is_enable_np) {
|
||||
if (obj->is_in_printing() && !obj->can_resume()) {
|
||||
if (!obj->can_resume() || obj->is_in_extrusion_cali()) {
|
||||
enable[ACTION_BTN_LOAD] = false;
|
||||
enable[ACTION_BTN_UNLOAD] = false;
|
||||
}
|
||||
}
|
||||
else {
|
||||
/*switch now*/
|
||||
bool in_switch_filament = false;
|
||||
|
||||
if (obj->is_enable_np) {
|
||||
if (obj->m_extder_data.current_busy_for_loading) {
|
||||
in_switch_filament = true;
|
||||
}
|
||||
} else if (obj->ams_status_main == AMS_STATUS_MAIN_FILAMENT_CHANGE) {
|
||||
in_switch_filament = true;
|
||||
}
|
||||
|
||||
if (in_switch_filament) {
|
||||
enable[ACTION_BTN_LOAD] = false;
|
||||
enable[ACTION_BTN_UNLOAD] = false;
|
||||
}
|
||||
|
||||
if (ams_id.empty() || slot_id.empty()) {
|
||||
enable[ACTION_BTN_LOAD] = false;
|
||||
enable[ACTION_BTN_UNLOAD] = false;
|
||||
}
|
||||
else if (ams_id == std::to_string(VIRTUAL_TRAY_MAIN_ID) || ams_id == std::to_string(VIRTUAL_TRAY_DEPUTY_ID)) {
|
||||
//todo
|
||||
} else {
|
||||
for (auto ext : obj->m_extder_data.extders) {
|
||||
if (ext.snow.ams_id == ams_id && ext.snow.slot_id == slot_id) {
|
||||
enable[ACTION_BTN_LOAD] = false;
|
||||
}
|
||||
}
|
||||
|
||||
/*empty*/
|
||||
std::map<std::string, Ams *>::iterator it = obj->amsList.find(ams_id);
|
||||
if (it == obj->amsList.end()) {
|
||||
enable[ACTION_BTN_LOAD] = false;
|
||||
|
||||
} else {
|
||||
auto tray_it = it->second->trayList.find(slot_id);
|
||||
|
||||
if (tray_it == it->second->trayList.end()) { enable[ACTION_BTN_LOAD] = false; }
|
||||
|
||||
if (!tray_it->second->is_exists) { enable[ACTION_BTN_LOAD] = false; }
|
||||
}
|
||||
}
|
||||
|
||||
if (obj->is_in_printing() && !obj->can_resume()) {
|
||||
if (!obj->can_resume() || obj->is_in_extrusion_cali()) {
|
||||
enable[ACTION_BTN_LOAD] = false;
|
||||
enable[ACTION_BTN_UNLOAD] = false;
|
||||
}
|
||||
} else {
|
||||
}
|
||||
/*switch now*/
|
||||
bool in_switch_filament = false;
|
||||
|
||||
//if (!obj->is_filament_at_extruder()) {
|
||||
// enable[ACTION_BTN_UNLOAD] = false;
|
||||
//}
|
||||
|
||||
/*if (obj->ams_exist_bits == 0) {
|
||||
if (obj->is_in_printing()) {
|
||||
if (!obj->can_resume()) {
|
||||
enable[ACTION_BTN_LOAD] = false;
|
||||
enable[ACTION_BTN_UNLOAD] = false;
|
||||
}
|
||||
else{
|
||||
if (obj->m_tray_now == "255") {
|
||||
enable[ACTION_BTN_LOAD] = true;
|
||||
enable[ACTION_BTN_UNLOAD] = false;
|
||||
}
|
||||
else if (obj->m_tray_now == std::to_string(VIRTUAL_TRAY_MAIN_ID)) {
|
||||
enable[ACTION_BTN_LOAD] = false;
|
||||
enable[ACTION_BTN_UNLOAD] = true;
|
||||
}
|
||||
}
|
||||
if (obj->is_enable_np) {
|
||||
if (obj->m_extder_data.current_busy_for_loading) { in_switch_filament = true; }
|
||||
} else if (obj->ams_status_main == AMS_STATUS_MAIN_FILAMENT_CHANGE) {
|
||||
in_switch_filament = true;
|
||||
}
|
||||
|
||||
}
|
||||
else {
|
||||
if (obj->is_in_printing()) {
|
||||
if (in_switch_filament) {
|
||||
enable[ACTION_BTN_LOAD] = false;
|
||||
enable[ACTION_BTN_UNLOAD] = false;
|
||||
}
|
||||
|
||||
if (!obj->can_resume()) {
|
||||
enable[ACTION_BTN_LOAD] = false;
|
||||
enable[ACTION_BTN_UNLOAD] = false;
|
||||
if (ams_id.empty() || slot_id.empty()) {
|
||||
enable[ACTION_BTN_LOAD] = false;
|
||||
enable[ACTION_BTN_UNLOAD] = false;
|
||||
} else if (ams_id == std::to_string(VIRTUAL_TRAY_MAIN_ID) || ams_id == std::to_string(VIRTUAL_TRAY_DEPUTY_ID)) {
|
||||
for (auto ext : obj->m_extder_data.extders) {
|
||||
if (ext.snow.ams_id == ams_id && ext.snow.slot_id == slot_id) { enable[ACTION_BTN_LOAD] = false; }
|
||||
}
|
||||
} else {
|
||||
for (auto ext : obj->m_extder_data.extders) {
|
||||
if (ext.snow.ams_id == ams_id && ext.snow.slot_id == slot_id) { enable[ACTION_BTN_LOAD] = false; }
|
||||
}
|
||||
else {
|
||||
if (obj->m_tray_now == "255") {
|
||||
|
||||
if ( m_ams_control->GetCurentAms() == std::to_string(VIRTUAL_TRAY_MAIN_ID) ) {
|
||||
enable[ACTION_BTN_LOAD] = true;
|
||||
enable[ACTION_BTN_UNLOAD] = false;
|
||||
}
|
||||
else if (!m_ams_control->GetCurrentCan(m_ams_control->GetCurentAms()).empty()) {
|
||||
enable[ACTION_BTN_LOAD] = false;
|
||||
enable[ACTION_BTN_UNLOAD] = false;
|
||||
}
|
||||
}
|
||||
else if (obj->m_tray_now == std::to_string(VIRTUAL_TRAY_MAIN_ID)) {
|
||||
if (m_ams_control->GetCurentAms() == std::to_string(VIRTUAL_TRAY_MAIN_ID)) {
|
||||
enable[ACTION_BTN_LOAD] = false;
|
||||
enable[ACTION_BTN_UNLOAD] = true;
|
||||
}
|
||||
else if (!m_ams_control->GetCurrentCan(m_ams_control->GetCurentAms()).empty()) {
|
||||
enable[ACTION_BTN_LOAD] = false;
|
||||
enable[ACTION_BTN_UNLOAD] = false;
|
||||
}
|
||||
}
|
||||
else {
|
||||
enable[ACTION_BTN_LOAD] = false;
|
||||
enable[ACTION_BTN_UNLOAD] = false;
|
||||
}
|
||||
/*empty*/
|
||||
std::map<std::string, Ams *>::iterator it = obj->amsList.find(ams_id);
|
||||
if (it == obj->amsList.end()) {
|
||||
enable[ACTION_BTN_LOAD] = false;
|
||||
|
||||
} else {
|
||||
auto tray_it = it->second->trayList.find(slot_id);
|
||||
|
||||
if (tray_it == it->second->trayList.end()) { enable[ACTION_BTN_LOAD] = false; }
|
||||
|
||||
if (!tray_it->second->is_exists) { enable[ACTION_BTN_LOAD] = false; }
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
m_ams_control->SetActionState(enable);
|
||||
}
|
||||
|
@ -4130,7 +4050,7 @@ void StatusPanel::on_ams_load_curr()
|
|||
}
|
||||
} catch (...) {}
|
||||
} else {
|
||||
obj->command_ams_switch(VIRTUAL_TRAY_MAIN_ID, old_temp, new_temp);
|
||||
obj->command_ams_switch(254, old_temp, new_temp);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -3905,78 +3905,6 @@ void AMSControl::SwitchAms(std::string ams_id)
|
|||
post_event(SimpleEvent(EVT_AMS_SWITCH));
|
||||
}
|
||||
|
||||
void AMSControl::SetFilamentStep(int item_idx, FilamentStepType f_type)
|
||||
{/*
|
||||
wxString FILAMENT_CHANGE_STEP_STRING[FilamentStep::STEP_COUNT] = {
|
||||
_L("Idling..."),
|
||||
_L("Heat the nozzle"),
|
||||
_L("Cut filament"),
|
||||
_L("Pull back current filament"),
|
||||
_L("Push new filament into extruder"),
|
||||
_L("Purge old filament"),
|
||||
_L("Feed Filament"),
|
||||
_L("Confirm extruded"),
|
||||
_L("Check filament location")
|
||||
};
|
||||
|
||||
|
||||
if (item_idx == FilamentStep::STEP_IDLE) {
|
||||
m_simplebook_right->SetSelection(0);
|
||||
m_filament_load_step->Idle();
|
||||
m_filament_unload_step->Idle();
|
||||
m_filament_vt_load_step->Idle();
|
||||
return;
|
||||
}
|
||||
|
||||
wxString step_str = wxEmptyString;
|
||||
if (item_idx < FilamentStep::STEP_COUNT) {
|
||||
step_str = FILAMENT_CHANGE_STEP_STRING[item_idx];
|
||||
}
|
||||
|
||||
if (f_type == FilamentStepType::STEP_TYPE_LOAD) {
|
||||
if (item_idx > 0 && item_idx < FilamentStep::STEP_COUNT) {
|
||||
if (m_simplebook_right->GetSelection() != 1) {
|
||||
m_simplebook_right->SetSelection(1);
|
||||
}
|
||||
|
||||
m_filament_load_step->SelectItem( m_filament_load_step->GetItemUseText(step_str) );
|
||||
} else {
|
||||
m_filament_load_step->Idle();
|
||||
}
|
||||
} else if (f_type == FilamentStepType::STEP_TYPE_UNLOAD) {
|
||||
if (item_idx > 0 && item_idx < FilamentStep::STEP_COUNT) {
|
||||
if (m_simplebook_right->GetSelection() != 2) {
|
||||
m_simplebook_right->SetSelection(2);
|
||||
}
|
||||
m_filament_unload_step->SelectItem( m_filament_unload_step->GetItemUseText(step_str) );
|
||||
}
|
||||
else {
|
||||
m_filament_unload_step->Idle();
|
||||
}
|
||||
} else if (f_type == FilamentStepType::STEP_TYPE_VT_LOAD) {
|
||||
m_simplebook_right->SetSelection(3);
|
||||
if (item_idx > 0 && item_idx < FilamentStep::STEP_COUNT) {
|
||||
if (item_idx == STEP_CONFIRM_EXTRUDED) {
|
||||
m_filament_vt_load_step->SelectItem(2);
|
||||
}
|
||||
else {
|
||||
m_filament_vt_load_step->SelectItem( m_filament_vt_load_step->GetItemUseText(step_str) );
|
||||
}
|
||||
}
|
||||
else {
|
||||
m_filament_vt_load_step->Idle();
|
||||
}
|
||||
} else {
|
||||
if (item_idx > 0 && item_idx < FilamentStep::STEP_COUNT) {
|
||||
m_simplebook_right->SetSelection(1);
|
||||
m_filament_load_step->SelectItem( m_filament_load_step->GetItemUseText(step_str) );
|
||||
}
|
||||
else {
|
||||
m_filament_load_step->Idle();
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
void AMSControl::ShowFilamentTip(bool hasams)
|
||||
{
|
||||
//m_simplebook_right->SetSelection(0);
|
||||
|
@ -4020,48 +3948,14 @@ void AMSControl::SetExtruder(bool on_off, std::string ams_id, std::string slot_i
|
|||
AmsItem *item = nullptr;
|
||||
if (m_ams_item_list.find(ams_id) != m_ams_item_list.end()) { item = m_ams_item_list[ams_id]; }
|
||||
|
||||
//if (m_ams_model == AMSModel::GENERIC_AMS || m_ext_model == AMSModel::GENERIC_AMS || is_vams ) {
|
||||
// if (!on_off) {
|
||||
// m_extruder->TurnOff();
|
||||
// m_extruder->OnVamsLoading(false);
|
||||
// m_vams_road->OnVamsLoading(false);
|
||||
// }
|
||||
// else {
|
||||
// m_extruder->TurnOn(col);
|
||||
// }
|
||||
//}
|
||||
//else if (m_ams_model == AMSModel::AMS_LITE || m_ext_model == AMSModel::AMS_LITE) {
|
||||
// if (!on_off) {
|
||||
// m_extruder->TurnOff();
|
||||
// m_extruder->OnAmsLoading(false);
|
||||
// }
|
||||
// else {
|
||||
// if (item) {
|
||||
// m_extruder->TurnOn(col);
|
||||
// m_extruder->OnAmsLoading(true, item->m_info.nozzle_id, col);
|
||||
// }
|
||||
// }
|
||||
//} else if (m_ams_model == AMSModel::N3F_AMS || m_ams_model == AMSModel::N3S_AMS) {
|
||||
// if (!on_off) {
|
||||
// m_extruder->TurnOff();
|
||||
// m_extruder->OnAmsLoading(false);
|
||||
// } else {
|
||||
// if (item) {
|
||||
// m_extruder->TurnOn(col);
|
||||
// m_extruder->OnAmsLoading(true, item->m_info.nozzle_id, col);
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
|
||||
if (!item) {
|
||||
return;
|
||||
}
|
||||
if (!on_off) {
|
||||
//m_extruder->TurnOff();
|
||||
m_extruder->OnAmsLoading(false);
|
||||
m_extruder->OnAmsLoading(false, item->m_info.nozzle_id);
|
||||
} else {
|
||||
if (item) {
|
||||
auto col = item->GetTagColr(slot_id);
|
||||
//m_extruder->TurnOn(col);
|
||||
m_extruder->OnAmsLoading(true, item->m_info.nozzle_id, col);
|
||||
}
|
||||
auto col = item->GetTagColr(slot_id);
|
||||
m_extruder->OnAmsLoading(true, item->m_info.nozzle_id, col);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -143,8 +143,6 @@ public:
|
|||
|
||||
void PlayRridLoading(wxString amsid, wxString canid);
|
||||
void StopRridLoading(wxString amsid, wxString canid);
|
||||
|
||||
void SetFilamentStep(int item_idx, FilamentStepType f_type);
|
||||
void ShowFilamentTip(bool hasams = true);
|
||||
|
||||
void UpdatePassRoad(string ams_id, AMSPassRoadType type, AMSPassRoadSTEP step);
|
||||
|
|
|
@ -640,7 +640,7 @@ AMSextruder::AMSextruder(wxWindow *parent, wxWindowID id, int nozzle_num, const
|
|||
|
||||
void AMSextruder::TurnOn(wxColour col)
|
||||
{
|
||||
//m_left_extruder->TurnOn(col);
|
||||
//m_left_extruder->TurnOn(col);
|
||||
}
|
||||
|
||||
void AMSextruder::TurnOff()
|
||||
|
@ -650,12 +650,8 @@ void AMSextruder::TurnOff()
|
|||
|
||||
void AMSextruder::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size)
|
||||
{
|
||||
//wxWindow::Create(parent, id, pos, AMS_EXTRUDER_SIZE, wxBORDER_NONE);
|
||||
wxWindow::Create(parent, id, pos, wxSize(-1, FromDIP(36)), wxBORDER_NONE);
|
||||
//SetBackgroundColour(AMS_CONTROL_WHITE_COLOUR);
|
||||
SetBackgroundColour(*wxWHITE);
|
||||
/*SetSize(wxSize(FromDIP(29), FromDIP(37)));
|
||||
SetMinSize(wxSize(FromDIP(29), FromDIP(37)));*/
|
||||
|
||||
wxBoxSizer *m_sizer_body = new wxBoxSizer(wxVERTICAL);
|
||||
|
||||
|
@ -671,9 +667,6 @@ void AMSextruder::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, co
|
|||
m_left_extruder = new AMSextruderImage(this, wxID_ANY, "single_nozzle", AMS_EXTRUDER_SINGLE_NOZZLE_BITMAP_SIZE);
|
||||
}
|
||||
m_left_extruder->setShowState(true);
|
||||
|
||||
/*m_bitmap_sizer->Add(m_left_extruder, 0, wxLEFT, 0);
|
||||
m_bitmap_sizer->Add(m_right_extruder, 0, wxLEFT, 2);*/
|
||||
m_bitmap_sizer->Add(m_left_extruder, 0, wxLEFT | wxALIGN_TOP, 0);
|
||||
m_bitmap_sizer->Add(m_right_extruder, 0, wxLEFT | wxALIGN_TOP, FromDIP(2));
|
||||
SetSizer(m_bitmap_sizer);
|
||||
|
@ -723,13 +716,9 @@ void AMSextruder::updateNozzleNum(int nozzle_num)
|
|||
m_right_extruder->setShowState(false);
|
||||
if (m_nozzle_num >= 2) {
|
||||
m_left_extruder = new AMSextruderImage(this, wxID_ANY, "left_nozzle", AMS_EXTRUDER_DOUBLE_NOZZLE_BITMAP_SIZE);
|
||||
/*SetSize(wxSize(FromDIP(29), FromDIP(37)));
|
||||
SetMinSize(wxSize(FromDIP(29), FromDIP(37)));*/
|
||||
}
|
||||
else {
|
||||
m_left_extruder = new AMSextruderImage(this, wxID_ANY, "single_nozzle", AMS_EXTRUDER_SINGLE_NOZZLE_BITMAP_SIZE);
|
||||
/*SetSize(wxSize(FromDIP(48), FromDIP(37)));
|
||||
SetMinSize(wxSize(FromDIP(48), FromDIP(37)));*/
|
||||
}
|
||||
wxBoxSizer *m_bitmap_sizer = new wxBoxSizer(wxHORIZONTAL);
|
||||
|
||||
|
|
Loading…
Reference in New Issue