mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-14 19:31:14 +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.
135 lines
3.9 KiB
C++
135 lines
3.9 KiB
C++
#pragma once
|
|
#include "libslic3r/CommonDefs.hpp"
|
|
#include "libslic3r/MultiNozzleUtils.hpp"
|
|
#include <nlohmann/json.hpp>
|
|
|
|
#include "DevNozzleSystem.h"
|
|
#include "DevFirmware.h"
|
|
|
|
#include <map>
|
|
|
|
// wx
|
|
#include <string>
|
|
#include <wx/string.h>
|
|
#include <wx/event.h>
|
|
|
|
wxDECLARE_EVENT(DEV_RACK_EVENT_READING_FINISHED, wxCommandEvent);
|
|
|
|
namespace Slic3r
|
|
{
|
|
// Previous definitions
|
|
class DevNozzleSystem;
|
|
|
|
class DevNozzleRack: public wxEvtHandler
|
|
{
|
|
public:
|
|
enum RackStatus : int
|
|
{
|
|
RACK_STATUS_UNKNOWN = -1,
|
|
RACK_STATUS_IDLE = 0,
|
|
RACK_STATUS_HOTEND_CENTRE = 1,
|
|
RACK_STATUS_TOOLHEAD_CENTRE = 2,
|
|
RACK_STATUS_CALIBRATE_HOTEND_RACK = 3,
|
|
RACK_STATUS_CUT_MATERIAL = 4,
|
|
RACK_STATUS_UNLOCK_HOTEND = 5,
|
|
RACK_STATUS_LIFT_HOTEND_RACK = 6,
|
|
RACK_STATUS_PLACE_HOTEND = 7,
|
|
RACK_STATUS_PICK_HOTEND = 8,
|
|
RACK_STATUS_LOCK_HOTEND = 9,
|
|
RACK_STATUS_END,
|
|
};
|
|
|
|
enum RackPos : int
|
|
{
|
|
RACK_POS_UNKNOWN = 0,
|
|
RACK_POS_A_TOP = 1,
|
|
RACK_POS_B_TOP = 2,
|
|
RACK_POS_CENTRE = 3,
|
|
RACK_POS_END,
|
|
};
|
|
|
|
enum RackCaliStatus
|
|
{
|
|
Rack_CALI_UNKNOWN = -1,
|
|
Rack_CALI_NOT = 0,
|
|
Rack_CALI_OK = 1,
|
|
};
|
|
|
|
public:
|
|
DevNozzleRack(DevNozzleSystem* nozzle_system);
|
|
~DevNozzleRack() = default;
|
|
|
|
public:
|
|
// Is supported by the printer
|
|
bool IsSupported() const { return m_is_supported; };
|
|
void SetSupported(bool supported) { m_is_supported = supported; }
|
|
|
|
// getters
|
|
DevNozzleSystem* GetNozzleSystem() const { return m_nozzle_system; }
|
|
|
|
RackPos GetPosition() const { return m_position; }
|
|
RackStatus GetStatus() const { return m_status; }
|
|
RackCaliStatus GetCaliStatus() const { return m_cali_status;}
|
|
|
|
DevNozzle GetNozzle(int idx) const;
|
|
const std::map<int, DevNozzle>& GetRackNozzles() const { return m_rack_nozzles; }
|
|
|
|
// status
|
|
bool HasUnreliableNozzles() const;
|
|
bool HasUnknownNozzles() const;
|
|
int GetKnownNozzleCount() const;
|
|
|
|
// refreshing
|
|
int GetReadingIdx() const { return m_nozzle_system->GetReadingIdx(); }
|
|
int GetReadingCount() const { return m_nozzle_system->GetReadingCount(); }
|
|
void SendReadingFinished();
|
|
|
|
// firmware
|
|
void AddNozzleFirmwareInfo(int nozzle_id, const DevFirmwareVersionInfo& info) { m_rack_nozzles_firmware[nozzle_id] = info; }
|
|
void ClearNozzleFirmwareInfo() { m_rack_nozzles_firmware.clear(); }
|
|
DevFirmwareVersionInfo GetNozzleFirmwareInfo(int nozzle_id) const;
|
|
|
|
// setters
|
|
void Reset();
|
|
void AddRackNozzle(DevNozzle& nozzle) { nozzle.SetOnRack(true); m_rack_nozzles[nozzle.m_nozzle_id] = nozzle; };
|
|
void ClearRackNozzles() { m_rack_nozzles.clear(); }
|
|
|
|
public:
|
|
void ParseRackInfo(const nlohmann::json& rack_info);
|
|
|
|
void CtrlRackPosMove(RackPos new_pos) const;
|
|
void CtrlRackPosGoHome() const;
|
|
|
|
void CtrlRackConfirmNozzle(int rack_nozzle_id) const;
|
|
void CtrlRackConfirmAll() const;
|
|
|
|
void CrtlRackReadNozzle(int rack_nozzle_id) const;
|
|
void CtrlRackReadAll(bool gui_check = false) const;
|
|
bool CtrlCanReadAll() const;
|
|
|
|
// the upgrade is not supported
|
|
// the GUI interface is removed
|
|
int CtrlRackUpgradeExtruderNozzle() const;
|
|
int CtrlRackUpgradeRackNozzle(int rack_nozzle_id) const;;
|
|
int CtrlRackUpgradeAll() const;;
|
|
bool CtrlCanUpdateAll() const;
|
|
|
|
private:
|
|
void ParseRackInfoV1_0(const nlohmann::json& rack_info);
|
|
|
|
int CtrlRackUpgrade(const std::string& module_str) const;
|
|
|
|
bool CheckRackMoveWarningDlg() const;
|
|
|
|
private:
|
|
DevNozzleSystem* m_nozzle_system = nullptr;
|
|
|
|
bool m_is_supported = false; // Indicates if the nozzle rack is supported by the printer
|
|
RackPos m_position = RACK_POS_UNKNOWN;
|
|
RackStatus m_status = RACK_STATUS_UNKNOWN;
|
|
RackCaliStatus m_cali_status = Rack_CALI_UNKNOWN;
|
|
|
|
std::map<int, DevNozzle> m_rack_nozzles; // Map of nozzle ID to DevNozzle objects
|
|
std::map<int, DevFirmwareVersionInfo> m_rack_nozzles_firmware;
|
|
};
|
|
}; |