FIX: N3S should only show one slot
and fix crash on calipresetpage jira: STUDIO-10669 Change-Id: I93aecdcc360d47baa72ef08af711f3d06206d5e2
This commit is contained in:
parent
7345b0034f
commit
926cfb14d2
|
@ -1492,6 +1492,9 @@ bool CalibrationPresetPage::is_filaments_compatiable(const std::map<int, Preset*
|
||||||
|
|
||||||
bool CalibrationPresetPage::is_filament_in_blacklist(int tray_id, Preset* preset, std::string& error_tips)
|
bool CalibrationPresetPage::is_filament_in_blacklist(int tray_id, Preset* preset, std::string& error_tips)
|
||||||
{
|
{
|
||||||
|
if (!curr_obj)
|
||||||
|
return true;
|
||||||
|
|
||||||
int ams_id;
|
int ams_id;
|
||||||
int slot_id;
|
int slot_id;
|
||||||
int out_tray_id;
|
int out_tray_id;
|
||||||
|
@ -2605,6 +2608,10 @@ void CalibrationPresetPage::update_multi_extruder_filament_combobox(const std::s
|
||||||
item_size = 1;
|
item_size = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ams_id_int >= 128 && ams_id_int < 153) { // N3S
|
||||||
|
item_size = 1;
|
||||||
|
}
|
||||||
|
|
||||||
for (int i = 0; i < 4; i++) {
|
for (int i = 0; i < 4; i++) {
|
||||||
if (i < item_size) {
|
if (i < item_size) {
|
||||||
if (nozzle_id == 0)
|
if (nozzle_id == 0)
|
||||||
|
|
Loading…
Reference in New Issue