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.
44 lines
1.1 KiB
C++
44 lines
1.1 KiB
C++
#pragma once
|
|
#include <memory>
|
|
#include <nlohmann/json.hpp>
|
|
|
|
namespace Slic3r {
|
|
|
|
class MachineObject;
|
|
|
|
class DevChamber
|
|
{
|
|
public:
|
|
static std::shared_ptr<DevChamber> Create(MachineObject *obj) { return std::shared_ptr<DevChamber>( new DevChamber(obj)); }
|
|
|
|
public: // getter
|
|
bool HasChamber() const;
|
|
bool SupportChamberTempDisplay() const;
|
|
bool SupportChamberEdit() const;
|
|
int GetChamberTempEditMin() const;
|
|
int GetChamberTempEditMax() const;
|
|
int GetChamberTempSwitchHeat() const;
|
|
|
|
float GetChamberTemp() const { return m_temp; };
|
|
float GetChamberTempTarget() const { return m_temp_target; };
|
|
|
|
public:
|
|
// setter
|
|
void ParseChamber(const nlohmann::json &print_json);
|
|
|
|
void ParseChamberV1_0(const nlohmann::json& print_json);
|
|
void ParseChamberV2_0(const nlohmann::json& print_json);
|
|
|
|
// control
|
|
int CtrlSetChamberTemp(int temp);
|
|
|
|
protected:
|
|
DevChamber(MachineObject *obj) : m_owner(obj) {}
|
|
|
|
private:
|
|
float m_temp = 0.0f;
|
|
float m_temp_target = 0.0f;
|
|
MachineObject* m_owner = nullptr;
|
|
};
|
|
|
|
} // namespace Slic3r
|