mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: parse nozzle_diameter 

Change-Id: I408f93cd0e527e0a78714d2140750076a4cc7a81
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2023-02-15 19:38:21 +08:00 committed by Lane.Wei
parent cd45f984ff
commit b1a310cf74
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/slic3r/GUI/DeviceManager.cpp
View File

@ -2075,6 +2075,7 @@ void MachineObject::reset()
last_mc_print_stage = -1; last_mc_print_stage = -1;
m_new_ver_list_exist = false; m_new_ver_list_exist = false;
extruder_axis_status = LOAD; extruder_axis_status = LOAD;
nozzle_diameter = 0.0f;
vt_tray.reset(); vt_tray.reset();
@ -2661,6 +2662,19 @@ int MachineObject::parse_json(std::string payload)
} }
#pragma endregion #pragma endregion
try {
if (jj.contains("nozzle_diameter")) {
if (jj["nozzle_diameter"].is_number_float()) {
nozzle_diameter = jj["nozzle_diameter"].get<float>();
} else if (jj["nozzle_diameter"].is_string()) {
nozzle_diameter = stof(jj["nozzle_diameter"].get<std::string>().c_str());
}
}
}
catch(...) {
;
}
#pragma region upgrade #pragma region upgrade
try { try {
if (jj.contains("upgrade_state")) { if (jj.contains("upgrade_state")) {

1
src/slic3r/GUI/DeviceManager.hpp
View File

@ -405,6 +405,7 @@ public:
std::string dev_ip; std::string dev_ip;
std::string dev_id; std::string dev_id;
bool local_use_ssl { false }; bool local_use_ssl { false };
float nozzle_diameter { 0.0f };
std::string dev_connection_type; /* lan | cloud */ std::string dev_connection_type; /* lan | cloud */
std::string connection_type() { return dev_connection_type; } std::string connection_type() { return dev_connection_type; }
void set_dev_ip(std::string ip) {dev_ip = ip;}; void set_dev_ip(std::string ip) {dev_ip = ip;};