Skip to content
Snippets Groups Projects

Resolves #343 GUI and Frame Refactor

Merged Nicolas Pope requested to merge feature/gui2 into master
2 files
+ 8
21
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -242,27 +242,17 @@ bool ExtrinsicCalibration::isBusy() {
@@ -242,27 +242,17 @@ bool ExtrinsicCalibration::isBusy() {
void ExtrinsicCalibration::updateCalibration() {
void ExtrinsicCalibration::updateCalibration() {
auto fs = std::atomic_load(&fs_current_);
auto fs = std::atomic_load(&fs_current_);
unsigned int nsources = fs->frames.size();
for (unsigned int i = 0; i < state_.cameras.size(); i++) {
std::vector<CalibrationData> data(nsources);
auto& c = state_.cameras[i];
std::vector<bool> update(nsources, false);
auto& frame = fs->frames[c.id];
auto calib = frame.get<CalibrationData>(Channel::CalibrationData);
for (unsigned int i = 0; i < nsources; i++) {
calib.get(c.id.channel) = state_.calib.calibration(i);
data[i] = (*fs)[i].get<CalibrationData>(Channel::CalibrationData);
setCalibration(frame, calib);
}
for (const auto& camera : state_.cameras) {
auto srcid = camera.id.source();
data[srcid].get(camera.id.channel) = camera.calib;
update[srcid] = true;
}
for (unsigned int i = 0; i < nsources; i++) {
setCalibration((*fs)[i], data[i]);
}
}
}
}
void ExtrinsicCalibration::updateCalibration(int c) {
void ExtrinsicCalibration::updateCalibration(int c) {
throw ftl::exception("Not implemented");
}
}
void ExtrinsicCalibration::stereoRectify(int cl, int cr,
void ExtrinsicCalibration::stereoRectify(int cl, int cr,
@@ -360,8 +350,6 @@ int ExtrinsicCalibration::getFrameCount(int camera) {
@@ -360,8 +350,6 @@ int ExtrinsicCalibration::getFrameCount(int camera) {
// debug method: save state to file (msgpack)
// debug method: save state to file (msgpack)
void ExtrinsicCalibration::saveInput(const std::string& filename) {
void ExtrinsicCalibration::saveInput(const std::string& filename) {
LOG(WARNING) << "DISABLED";
return;
ftl::pool.push([this, filename](int){
ftl::pool.push([this, filename](int){
do {
do {
// calib must not be modified; would be better to have mutex here
// calib must not be modified; would be better to have mutex here
Loading