fix mutil color upload and print crash bug.

This commit is contained in:
alves
2026-02-28 11:37:02 +08:00
parent 838c14405c
commit 5098401480

View File

@@ -3058,25 +3058,15 @@ void SSWCP_MachineOption_Instance::sw_GetFileFilamentMapping()
return -1; return -1;
} }
if (oriclr.size() == 7) { auto colorSize = oriclr.size();//7 or 9
for (int i = 1; i <= 6; ++i) { for (auto i = 1; i < colorSize; i++)
if (oriclr[7 - i] - '0' >= 0 && oriclr[7 - i] - '0' <= 9) { {
res += std::pow(16, i - 1) * (oriclr[7 - i] - '0'); if (oriclr[colorSize - i] - '0' >= 0 && oriclr[colorSize - i] - '0' <= 9) {
res += std::pow(16, i - 1) * (oriclr[colorSize - i] - '0');
} else { } else {
res += std::pow(16, i - 1) * (oriclr[7 - i] - 'A' + 10); res += std::pow(16, i - 1) * (oriclr[colorSize - i] - 'A' + 10);
} }
} }
} else {
for (int i = 1; i <= 8; ++i) {
if (oriclr[7 - i] - '0' >= 0 && oriclr[7 - i] - '0' <= 9) {
res += std::pow(16, i - 1) * (oriclr[7 - i] - '0');
} else {
res += std::pow(16, i - 1) * (oriclr[7 - i] - 'A' + 10);
}
}
}
return res; return res;
}; };