juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-15 23:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: the sorting of AMS list

Browse Source 
JIRA: [STUDIO-14738] [STUDIO-14651]
Change-Id: I6d4b89edc77383be8afacf9823567bc756c8e2ed
(cherry picked from commit 8defa1f50b4b556c6ebaf2ad533ba09ad3f23e38)
This commit is contained in:
xin.zhang
2025-09-24 14:06:36 +08:00
committed by Noisyfox
parent 2234b227c4
commit 8d3da67254
4 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/DeviceCore/DevFilaSystem.h
View File

@@ -4,6 +4,7 @@
#include "DevDefs.h"
#include "DevFilaAmsSetting.h"
#include "DevUtil.h"
#include <map>
#include <memory>
@@ -158,7 +159,7 @@ public:
/* ams */
DevAms* GetAmsById(const std::string& ams_id) const;
std::map<std::string, DevAms*>& GetAmsList() { return amsList; }
std::map<std::string, DevAms*, NumericStrCompare>& GetAmsList() { return amsList; }
int GetAmsCount() const { return amsList.size(); }
/* tray*/
@@ -190,7 +191,7 @@ private:
/* ams properties */
int m_ams_cali_stat = 0;
std::map<std::string, DevAms*> amsList; // key: ams[id], start with 0
std::map<std::string, DevAms*, NumericStrCompare> amsList;// key: ams[id], start with 0
DevAmsSystemSetting m_ams_system_setting{ this };
std::shared_ptr<DevAmsSystemFirmwareSwitch> m_ams_firmware_switch = DevAmsSystemFirmwareSwitch::Create(this);