reuse path names

Author: tuxbotix

tools/twix/src/panels/automatic_camera_calibration_export.rs

@@ -11,8 +11,9 @@ use parameters::directory::Scope;
 
 use crate::{log_error::LogError, nao::Nao, panel::Panel, value_buffer::BufferHandle};
 
-const TOP_CAMERA_EXTRINSICS_PATH: &str = "camera_matrix_parameters.vision_top.extrinsic_rotations";
-const BOTTOM_CAMERA_EXTRINSICS_PATH: &str =
+pub const TOP_CAMERA_EXTRINSICS_PATH: &str =
+    "camera_matrix_parameters.vision_top.extrinsic_rotations";
+pub const BOTTOM_CAMERA_EXTRINSICS_PATH: &str =
     "camera_matrix_parameters.vision_bottom.extrinsic_rotations";
 pub struct AutomaticCameraCalibrationExportPanel {
     nao: Arc<Nao>,

tools/twix/src/panels/manual_camera_calibration.rs

@@ -7,7 +7,13 @@ use nalgebra::Vector3;
 use parameters::directory::Scope;
 use serde_json::Value;
 
-use crate::{log_error::LogError, nao::Nao, panel::Panel, value_buffer::BufferHandle};
+use crate::{
+    log_error::LogError,
+    nao::Nao,
+    panel::Panel,
+    panels::{BOTTOM_CAMERA_EXTRINSICS_PATH, TOP_CAMERA_EXTRINSICS_PATH},
+    value_buffer::BufferHandle,
+};
 
 pub struct ManualCalibrationPanel {
     nao: Arc<Nao>,
@@ -19,12 +25,9 @@ impl Panel for ManualCalibrationPanel {
     const NAME: &'static str = "Manual Calibration";
 
     fn new(nao: Arc<Nao>, _value: Option<&Value>) -> Self {
-        let top_camera = nao.subscribe_value(
-            "parameters.camera_matrix_parameters.vision_top.extrinsic_rotations".to_string(),
-        );
-        let bottom_camera = nao.subscribe_value(
-            "parameters.camera_matrix_parameters.vision_bottom.extrinsic_rotations".to_string(),
-        );
+        let top_camera = nao.subscribe_value(format!("parameters.{TOP_CAMERA_EXTRINSICS_PATH}"));
+        let bottom_camera =
+            nao.subscribe_value(format!("parameters.{BOTTOM_CAMERA_EXTRINSICS_PATH}"));
 
         Self {
             nao,
@@ -44,7 +47,7 @@ impl Widget for &mut ManualCalibrationPanel {
                     "Top Camera",
                     value,
                     &self.nao,
-                    "camera_matrix_parameters.vision_top.extrinsic_rotations",
+                    TOP_CAMERA_EXTRINSICS_PATH,
                 );
             }
             ui.separator();
@@ -54,7 +57,7 @@ impl Widget for &mut ManualCalibrationPanel {
                     "Bottom Camera",
                     value,
                     &self.nao,
-                    "camera_matrix_parameters.vision_bottom.extrinsic_rotations",
+                    BOTTOM_CAMERA_EXTRINSICS_PATH,
                 );
             }
         })

tools/twix/src/panels/mod.rs

@@ -14,7 +14,10 @@ mod remote;
 mod text;
 mod vision_tuner;
 
-pub use automatic_camera_calibration_export::AutomaticCameraCalibrationExportPanel;
+pub use automatic_camera_calibration_export::{
+    AutomaticCameraCalibrationExportPanel, BOTTOM_CAMERA_EXTRINSICS_PATH,
+    TOP_CAMERA_EXTRINSICS_PATH,
+};
 pub use ball_candidates::BallCandidatePanel;
 pub use behavior_simulator::BehaviorSimulatorPanel;
 pub use enum_plot::EnumPlotPanel;