timur/RaptorEagleV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix status string, free memory in AcquisitionProcess instance

Browse Source
This commit is contained in:
Timur A. Fatkhullin 2024-12-24 13:38:49 +03:00
parent 0ece075bb8
commit ea9b099d81
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
raptor_eagle_acqproc.cpp
View File

@ -400,6 +400,8 @@ void RaptorEagleCCD::AcquisitionProcess::start(const std::shared_ptr<acq_params_
} else { } else {
_manager->logInfo("FITS file '{}' is saved", _acqParams->filename); _manager->logInfo("FITS file '{}' is saved", _acqParams->filename);
} }
_imageBuffer.release();
}); });
} }

15
raptor_eagle_ccd.cpp
View File

@ -1231,8 +1231,13 @@ void RaptorEagleCCD::initAttrComm()
} else { } else {
auto sptr = it->lock(); auto sptr = it->lock();
auto st = sptr->status(); auto st = sptr->status();
if (st.substr(0, 3) == "ACQ") { // if the camera is acquiring then if (st.substr(0, CAMERA_ATTR_CAMERA_STATUS_ACQ.size()) ==
s_head = st + ","; // return it at the beginning of the status string CAMERA_ATTR_CAMERA_STATUS_ACQ) { // if the camera is acquiring then
s_head = st + ","; // return it at the beginning of the status string
} else if (st.substr(0, CAMERA_ATTR_CAMERA_STATUS_IDLE.size()) == CAMERA_ATTR_CAMERA_STATUS_IDLE) {
// here, cquisition process is already inactive
it = _acqProcesses.erase(it);
continue;
} else { } else {
std::ranges::copy(st, std::back_inserter(s)); std::ranges::copy(st, std::back_inserter(s));
s += ","; s += ",";
@ -1244,9 +1249,9 @@ void RaptorEagleCCD::initAttrComm()
if (!s.empty() || !s_head.empty()) { if (!s.empty() || !s_head.empty()) {
s = s_head + s; s = s_head + s;
if (_acqProcesses.size() == 1) { // if (_acqProcesses.size() == 1) {
s.resize(s.size() - 1); // delete trailing "," s.resize(s.size() - 1); // delete trailing ","
} // }
} else { } else {
s = std::string{CAMERA_ATTR_CAMERA_STATUS_IDLE.begin(), CAMERA_ATTR_CAMERA_STATUS_IDLE.end()}; s = std::string{CAMERA_ATTR_CAMERA_STATUS_IDLE.begin(), CAMERA_ATTR_CAMERA_STATUS_IDLE.end()};
} }