mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-07 15:51:08 +00:00
HanifKoh
73d32d4791
* Stop Leaking json Through Headers and Drop Includes Kept Only for the Name AppConfig.hpp, DeviceManager.hpp and UserManager.hpp carried a global "using namespace nlohmann;", json_diff.hpp a global "using json = nlohmann::json;" and PrinterFileSystem.h a global "using nlohmann::json;". Every file that included one of them, directly or not, could write a bare json, and 63 did without declaring it. The last two also made the include checker treat json_diff.hpp and PrinterFileSystem.h as the headers that provide json, so they were included from files that use nothing else from them: 57 of the 59 includers of json_diff.hpp never name json_diff. The five statements are removed. Headers that use the type now spell nlohmann::json, source files declare their own "using json = nlohmann::json;", and the includes that only supplied the name are dropped or replaced by <nlohmann/json.hpp>. Eight files reached json_diff.hpp only through an include that is now gone and with it lost that header's "using namespace std;". The std names they used unqualified are qualified. * Declare json in OrcaSlicer.cpp on Every Platform OrcaSlicer.cpp had its "using namespace nlohmann;" and the json include inside the Linux-only include block, so on Windows and macOS it took json from AppConfig.hpp's global directive, which is gone. The include and a "using json = nlohmann::json;" now sit outside the block.
28 lines
978 B
C++
28 lines
978 B
C++
#include "DevBed.h"
|
|
#include <nlohmann/json.hpp>
|
|
#include "slic3r/GUI/DeviceManager.hpp"
|
|
|
|
using json = nlohmann::json;
|
|
|
|
namespace Slic3r {
|
|
|
|
void DevBed::ParseV1_0(const json &print_json, DevBed *system)
|
|
{
|
|
if (print_json.contains("bed_temper")) {
|
|
if (print_json["bed_temper"].is_number()) { system->bed_temp = print_json["bed_temper"].get<float>(); }
|
|
}
|
|
if (print_json.contains("bed_target_temper")) {
|
|
if (print_json["bed_target_temper"].is_number()) { system->bed_temp_target = print_json["bed_target_temper"].get<float>(); }
|
|
}
|
|
}
|
|
|
|
void DevBed::ParseV2_0(const json &print_json, DevBed *system)
|
|
{
|
|
if (print_json.contains("bed_temp") && print_json["bed_temp"].is_number()) {
|
|
int bed_temp_bits = print_json["bed_temp"].get<int>();
|
|
system->bed_temp = system->m_owner->get_flag_bits(bed_temp_bits, 0, 16);
|
|
system->bed_temp_target = system->m_owner->get_flag_bits(bed_temp_bits, 16, 16);
|
|
}
|
|
}
|
|
|
|
} // namespace Slic3r
|