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

FIX: the json val could be long long or string

Browse source 
jira: [none]
Change-Id: Ic06276adf5e7663d57ba1c4b6f9a57e897a9075d
(cherry picked from commit edaaa0b70523951aaa0d415ab178a438a7d7b377)
This commit is contained in:
xin.zhang 2025-02-08 19:51:49 +08:00 • committed by Noisyfox
parent 19a6a20b23
commit 9e024d1d4d
4 changed files with 47 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3637,7 +3637,7 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
}
if (jj.contains("job_id")) {
is_support_wait_sending_finish = true;
this->job_id_ = jj["job_id"].get<std::string>();
this->job_id_ = JsonValParser::get_longlong_val(jj["job_id"]);
}
else {
is_support_wait_sending_finish = false;
@ -4682,7 +4682,7 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
BOOST_LOG_TRIVIAL(info) << "parse_json, ack of project_prepare = " << j.dump(4);
if (m_agent) {
if (jj.contains("job_id")) {
this->job_id_ = jj["job_id"].get<std::string>();
this->job_id_ = JsonValParser::get_longlong_val(jj["job_id"]);
}
}
@ -7485,4 +7485,28 @@ void change_the_opacity(wxColour& colour)
colour = wxColour(colour.Red(), colour.Green(), colour.Blue(), 254);
}
}
//************************************
// Method: get_longlong_val
// FullName: Slic3r::JsonValParser::get_longlong_val
// Access: public static
// Returns: std::string
// Qualifier:
// Parameter: const json & j
//************************************
std::string JsonValParser::get_longlong_val(const json& j)
{
if (j.is_number())
{
return std::to_string(j.get<long long>());
}
else if (j.is_string())
{
return j.get<std::string>();
}
return string();
}
} // namespace Slic3r