3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-07 06:57:36 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

NEW: parse camera recording and resolution fields

Browse source 
Change-Id: I8aa5af228d6ad50ff495577652c2ba716f6cc3b3
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2022-11-01 16:36:37 +08:00 • committed by Lane.Wei
parent a8ad6e9f69
commit 1eacc5d38f
4 changed files with 36 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1148,7 +1148,12 @@ bool MachineObject::has_timelapse()
return camera_timelapse;
}
bool MachineObject::has_recording()
bool MachineObject::is_recording_enable()
{
return camera_recording_when_printing;
}
bool MachineObject::is_recording()
{
return camera_recording;
}
@ -1621,6 +1626,7 @@ void MachineObject::reset()
last_update_time = std::chrono::system_clock::now();
m_push_count = 0;
camera_recording = false;
camera_recording_when_printing = false;
camera_timelapse = false;
printing_speed_mag = 100;
gcode_file_prepare_percent = 0;
@ -2198,16 +2204,32 @@ int MachineObject::parse_json(std::string payload)
}
#pragma endregion
#pragma region options
try {
if (jj.contains("option")) {
if (jj["option"].is_number()) {
int option = jj["option"].get<int>();
if ((option & (1 << 0)) != 0) {
camera_recording = true;
} else {
camera_recording = false;
}
}
}
}
catch(...) {
}
#pragma endregion
#pragma region camera
// parse camera info
try {
if (jj.contains("ipcam")) {
if (jj["ipcam"].contains("ipcam_record")) {
if (jj["ipcam"]["ipcam_record"].get<std::string>() == "enable") {
camera_recording = true;
camera_recording_when_printing = true;
}
else {
camera_recording = false;
camera_recording_when_printing = false;
}
}
if (jj["ipcam"].contains("timelapse")) {
@ -2597,9 +2619,9 @@ int MachineObject::parse_json(std::string payload)
this->camera_timelapse = false;
} else if (j["camera"]["command"].get<std::string>() == "ipcam_record_set") {
if (j["camera"]["control"].get<std::string>() == "enable")
this->camera_recording = true;
this->camera_recording_when_printing = true;
if (j["camera"]["control"].get<std::string>() == "disable")
this->camera_recording = false;
this->camera_recording_when_printing = false;
}
}
}