commit 3320898c608b96a9b0d08f648ba047db7754208a
author Jim Ostrowski <yimmy13@gmail.com> Sat Mar 02 15:01:45 2024 -0800
committer Jim Ostrowski <yimmy13@gmail.com> Fri Mar 15 23:04:25 2024 -0700
tree 0fce5b95c83f08a8dfe3ef75d193297aa5148ca7
parent 2033f051745831f3c3f03fee8c8d2ce5e9090ebc

Moving calibration file naming to a centralized call, for consistency

Moving to format of:
calibration_NODE_NAME-TEAM#-CAMERA#_cam-24-XX_TIMESTAMP.json

Change-Id: Iece87428a9428cbdd70496f7335f5ec977357200
Signed-off-by: Jim Ostrowski <yimmy13@gmail.com>

y2024/vision/modify_extrinsics.cc

diff --git a/y2024/vision/modify_extrinsics.cc b/y2024/vision/modify_extrinsics.cc
index 9122191..d021744 100644
--- a/y2024/vision/modify_extrinsics.cc
+++ b/y2024/vision/modify_extrinsics.cc
@@ -14,6 +14,7 @@
 #include "aos/time/time.h"
 #include "aos/util/file.h"
 #include "frc971/vision/calibration_generated.h"
+#include "frc971/vision/vision_util_lib.h"
 
 // This is a helper program to build and rename calibration files
 // You can:
@@ -160,11 +161,9 @@
       (FLAGS_calibration_folder == ""
            ? std::filesystem::path(orig_calib_filename).parent_path().string()
            : FLAGS_calibration_folder);
-  const std::string new_calib_filename =
-      dirname + "/" +
-      absl::StrFormat("calibration_%s-%d-%d_cam-%s_%s.json", node_name.c_str(),
-                      team_number, camera_number, camera_id.c_str(),
-                      time_ss.str());
+  const std::string new_calib_filename = frc971::vision::CalibrationFilename(
+      dirname, node_name.c_str(), team_number, camera_number, camera_id.c_str(),
+      time_ss.str());
 
   VLOG(1) << "From: " << orig_calib_filename << " -> "
           << aos::FlatbufferToJson(base_calibration, {.multi_line = true});