mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-05 06:41:10 +00:00
Lam Wei Lun
543ca95059
Resolve the filament list's printer model from the agent-reported model id or the selected printer profile, so the AMS Materials Setting dropdown and its Confirm button work on OrcaSonar. Third-party trays pre-fill and allow editing their temps, and the popup's initial selection no longer overwrites them. Render explicitly-empty trays as "Empty" instead of "?" using a wire-derived DevAmsTray::is_empty, while keeping the slot editable. Hide the flow-dynamics K/N controls for non-Bambu agents — tile, dialog, validation and sends — with Bambu behavior unchanged. Tests cover model resolution, the K/N gate and empty-tray classification.
87 lines
3.0 KiB
C++
87 lines
3.0 KiB
C++
// why: match the GUI include order to avoid rpcndr.h byte/std::byte
|
|
// ambiguity in the Windows COM headers.
|
|
#ifdef WIN32
|
|
#ifndef WIN32_LEAN_AND_MEAN
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#endif
|
|
#ifndef NOMINMAX
|
|
#define NOMINMAX
|
|
#endif
|
|
#include <Windows.h>
|
|
#endif
|
|
|
|
#include <catch2/catch_all.hpp>
|
|
|
|
#include <wx/timer.h>
|
|
|
|
#include <nlohmann/json.hpp>
|
|
|
|
#include "slic3r/GUI/Widgets/AMSItem.hpp"
|
|
#include "slic3r/GUI/DeviceCore/DevFilaSystem.h"
|
|
|
|
using json = nlohmann::json;
|
|
using namespace Slic3r;
|
|
using namespace Slic3r::GUI;
|
|
|
|
// A configured slot the wire reports as having no filament (all material fields
|
|
// present and empty) is "Empty", not the unknown "?" the UI draws for a tray
|
|
// whose info is missing. The distinction must survive into the AMS panel model.
|
|
TEST_CASE("Configured empty AMS trays remain distinct from unknown trays", "[AMSItem]")
|
|
{
|
|
MachineObject machine(nullptr, nullptr, "test", "test-device", "127.0.0.1");
|
|
machine.printer_agent_id = "orca";
|
|
|
|
const json print_json = json::parse(R"({
|
|
"ams": {
|
|
"ams_exist_bits": "1",
|
|
"tray_exist_bits": "3",
|
|
"ams": [ { "id": "0", "info": "0001", "tray": [
|
|
{ "id": "0", "tag_uid": "0000000000000000", "tray_info_idx": "", "tray_type": "", "tray_color": "00000000" },
|
|
{ "id": "1" }
|
|
] } ]
|
|
}
|
|
})");
|
|
DevFilaSystemParser::ParseV1_0(print_json, &machine, machine.GetFilaSystem().get(), false);
|
|
|
|
const auto& ams_list = machine.GetFilaSystem()->GetAmsList();
|
|
const auto ams_it = ams_list.find("0");
|
|
REQUIRE(ams_it != ams_list.end());
|
|
auto* ams = ams_it->second;
|
|
REQUIRE(ams != nullptr);
|
|
REQUIRE(ams->GetTray("0") != nullptr);
|
|
CHECK(ams->GetTray("0")->is_empty);
|
|
|
|
AMSinfo info;
|
|
REQUIRE(info.parse_ams_info(&machine, ams));
|
|
REQUIRE(info.cans.size() == 2);
|
|
|
|
CHECK(info.cans[0].is_empty);
|
|
CHECK(info.cans[0].material_state == AMSCanType::AMS_CAN_TYPE_THIRDBRAND);
|
|
CHECK_FALSE(info.cans[1].is_empty);
|
|
CHECK(info.cans[1].material_state == AMSCanType::AMS_CAN_TYPE_THIRDBRAND);
|
|
}
|
|
|
|
TEST_CASE("Empty external slots remain distinct from unknown slots", "[AMSItem]")
|
|
{
|
|
MachineObject machine(nullptr, nullptr, "test", "test-device", "127.0.0.1");
|
|
machine.printer_agent_id = "orca";
|
|
|
|
DevAmsTray empty_slot = machine.parse_vt_tray(json::parse(R"({
|
|
"id": "255", "tag_uid": "0000000000000000", "tray_info_idx": "", "tray_type": "", "tray_color": "00000000"
|
|
})"));
|
|
CHECK(empty_slot.is_empty);
|
|
|
|
AMSinfo empty_info;
|
|
empty_info.parse_ext_info(&machine, empty_slot);
|
|
CHECK(empty_info.cans[0].is_empty);
|
|
CHECK(empty_info.cans[0].material_state == AMSCanType::AMS_CAN_TYPE_VIRTUAL);
|
|
|
|
DevAmsTray unknown_slot = machine.parse_vt_tray(json::parse(R"({"id": "254"})"));
|
|
CHECK_FALSE(unknown_slot.is_empty);
|
|
|
|
AMSinfo unknown_info;
|
|
unknown_info.parse_ext_info(&machine, unknown_slot);
|
|
CHECK_FALSE(unknown_info.cans[0].is_empty);
|
|
CHECK(unknown_info.cans[0].material_state == AMSCanType::AMS_CAN_TYPE_VIRTUAL);
|
|
}
|