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

ENH: refine camera setting logic 

Change-Id: I3d80950e8f6a6391b31a06929645af17cc779cb9
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2022-12-06 14:06:38 +08:00 committed by Lane.Wei
parent e3739a8a0f
commit 1c02449201
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/CameraPopup.cpp
View File

@ -135,6 +135,7 @@ void CameraPopup::on_switch_timelapse(wxCommandEvent& event)
return;
}
bool value = m_switch_timelapse->GetValue();
m_switch_timelapse->SetValue(!value);
m_obj->command_ipcam_timelapse(!value);
}
@ -146,6 +147,7 @@ void CameraPopup::on_switch_recording(wxCommandEvent& event)
return;
}
bool value = m_switch_recording->GetValue();
m_switch_recording->SetValue(!value);
m_obj->command_ipcam_record(!value);
}

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

@ -1635,6 +1635,7 @@ int MachineObject::command_unload_filament()
int MachineObject::command_ipcam_record(bool on_off)
{
BOOST_LOG_TRIVIAL(info) << "command_ipcam_record = " << on_off;
json j;
j["camera"]["command"] = "ipcam_record_set";
j["camera"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
@ -1645,6 +1646,7 @@ int MachineObject::command_ipcam_record(bool on_off)
int MachineObject::command_ipcam_timelapse(bool on_off)
{
BOOST_LOG_TRIVIAL(info) << "command_ipcam_timelapse " << on_off;
json j;
j["camera"]["command"] = "ipcam_timelapse";
j["camera"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
@ -1655,13 +1657,13 @@ int MachineObject::command_ipcam_timelapse(bool on_off)
int MachineObject::command_ipcam_resolution_set(std::string resolution)
{
BOOST_LOG_TRIVIAL(info) << "command:ipcam_resolution_set" << ", resolution:" << resolution;
json j;
j["camera"]["command"] = "ipcam_resolution_set";
j["camera"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
j["camera"]["resolution"] = resolution;
BOOST_LOG_TRIVIAL(info) << "command:ipcam_resolution_set" << ", resolution:" << resolution;
camera_resolution_hold_count = HOLD_COUNT_MAX;
camera_recording_hold_count = HOLD_COUNT_MAX;
camera_resolution_hold_count = HOLD_COUNT_RESOLUTION;
camera_recording_hold_count = HOLD_COUNT_RESOLUTION;
return this->publish_json(j.dump());
}
@ -2930,13 +2932,16 @@ int MachineObject::parse_json(std::string payload)
this->camera_timelapse = true;
if (j["camera"]["control"].get<std::string>() == "disable")
this->camera_timelapse = false;
BOOST_LOG_TRIVIAL(info) << "ack of timelapse = " << camera_timelapse;
} else if (j["camera"]["command"].get<std::string>() == "ipcam_record_set") {
if (j["camera"]["control"].get<std::string>() == "enable")
this->camera_recording_when_printing = true;
if (j["camera"]["control"].get<std::string>() == "disable")
this->camera_recording_when_printing = false;
BOOST_LOG_TRIVIAL(info) << "ack of ipcam_record_set " << camera_recording_when_printing;
} else if (j["camera"]["command"].get<std::string>() == "ipcam_resolution_set") {
this->camera_resolution = j["camera"]["resolution"].get<std::string>();
BOOST_LOG_TRIVIAL(info) << "ack of resolution = " << camera_resolution;
}
}
}

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

@ -25,6 +25,7 @@
#define BED_TEMP_LIMIT 120
#define HOLD_COUNT_MAX 3
#define HOLD_COUNT_RESOLUTION 6
#define GET_VERSION_RETRYS 10
#define RETRY_INTERNAL 2000