3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-03 23:00:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

ENH:show n3f/n3s version info

Browse source 
jira:[for n3s]

Change-Id: Ia0056dfdf7157036008cc63a37c9fd8076063a6a
(cherry picked from commit a44ff5a95a6774b4eed1238bde12d0a750c24a10)
This commit is contained in:
tao wang 2024-09-10 13:56:52 +08:00 • committed by Noisyfox
parent eba2e0af78
commit 21c69a99e6
3 changed files with 37 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/slic3r/GUI/DeviceManager.cpp
View file

@ -1325,12 +1325,18 @@ wxString MachineObject::get_upgrade_result_str(int err_code)
std::map<int, MachineObject::ModuleVersionInfo> MachineObject::get_ams_version()
{
std::vector<std::string> ams_type = {"ams", "n3f", "n3s"};
std::map<int, ModuleVersionInfo> result;
for (int i = 0; i < 4; i++) {
std::string ams_id = "ams/" + std::to_string(i);
auto it = module_vers.find(ams_id);
if (it != module_vers.end()) {
result.emplace(std::pair(i, it->second));
for (int i = 0; i < 8; i++) {
std::string ams_id;
for (auto type : ams_type )
{
ams_id = type + "/" + std::to_string(i);
auto it = module_vers.find(ams_id);
if (it != module_vers.end()) {
result.emplace(std::pair(i, it->second));
}
}
}
return result;

16
src/slic3r/GUI/GUI_App.cpp
View file

@ -3676,11 +3676,17 @@ void GUI_App::load_gcode(wxWindow* parent, wxString& input_file) const
wxString GUI_App::transition_tridid(int trid_id)
{
//wxString maping_dict = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
wxString maping_dict[] = { "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"};
int id_index = ceil(trid_id / 4);
int id_suffix = (trid_id + 1) % 4 == 0 ? 4 : (trid_id + 1) % 4;
return wxString::Format("%s%d", maping_dict[id_index], id_suffix);
wxString maping_dict[] = { "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" };
if (trid_id >= 128 * 4) {
int id_index = 4 + trid_id % 128;
return wxString::Format("%s", maping_dict[id_index]);
}
else {
int id_index = ceil(trid_id / 4);
int id_suffix = id_suffix = (trid_id + 1) % 4 == 0 ? 4 : (trid_id + 1) % 4;
return wxString::Format("%s%d", maping_dict[id_index], id_suffix);
}
}
//BBS

16
src/slic3r/GUI/UpgradePanel.cpp
View file

@ -688,9 +688,23 @@ void MachineInfoPanel::update_ams_ext(MachineObject *obj)
amspanel->Show();
auto it = ver_list.find(atoi(iter->first.c_str()));
if (it == ver_list.end()) {
continue;
}
auto ams_id = std::stoi(iter->second->id);
wxString ams_text = wxString::Format("AMS%s", std::to_string(ams_id + 1));
size_t pos = it->second.name.find('/');
wxString ams_device_name = "AMS-%s";
if (pos != std::string::npos) {
wxString result = it->second.name.substr(0, pos);
result.MakeUpper();
ams_device_name = result + "-%s";
}
wxString ams_text = wxString::Format(ams_device_name, std::to_string(ams_id + 1));
ams_name = ams_text;
if (it == ver_list.end()) {