flydra-types: move DataAssocRow here

strawlab · Nov 28, 2023 · 739f6cc · 739f6cc
1 parent 910a78e
commit 739f6cc
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 25 deletions.
diff --git a/braid-offline/src/bin/compute-flydra1-compat.rs b/braid-offline/src/bin/compute-flydra1-compat.rs
@@ -7,10 +7,10 @@ use std::collections::{BTreeMap, HashMap};
 use std::io::{Read, Write};
 use tracing::{error, info, trace};
 
-use flydra2::{DataAssocRow, Result};
+use flydra2::Result;
 use groupby::AscendingGroupIter;
 
-use flydra_types::{KalmanEstimatesRow, SyncFno};
+use flydra_types::{DataAssocRow, KalmanEstimatesRow, SyncFno};
 
 use braid_offline::pick_csvgz_or_csv;
 

diff --git a/flydra-types/src/lib.rs b/flydra-types/src/lib.rs
@@ -114,6 +114,20 @@ impl WithKey<SyncFno> for KalmanEstimatesRow {
     }
 }
 
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct DataAssocRow {
+    // changes to this struct should update BraidMetadataSchemaTag
+    pub obj_id: u32,
+    pub frame: SyncFno,
+    pub cam_num: CamNum,
+    pub pt_idx: u8,
+}
+impl WithKey<SyncFno> for DataAssocRow {
+    fn key(&self) -> SyncFno {
+        self.frame
+    }
+}
+
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
 pub struct FlydraRawUdpPoint {
     pub x0_abs: f64,

diff --git a/flydra2/src/flydra2.rs b/flydra2/src/flydra2.rs
@@ -33,14 +33,12 @@ use mvg::{DistortedPixel, PointWorldFrame, PointWorldFrameWithSumReprojError};
 pub use braidz_types::BraidMetadata;
 
 use flydra_types::{
-    CamInfoRow, CamNum, ConnectedCameraSyncState, FlydraFloatTimestampLocal, HostClock,
-    KalmanEstimatesRow, RosCamName, SyncFno, TextlogRow, TrackingParams, TriggerClockInfoRow,
-    Triggerbox, RECONSTRUCT_LATENCY_HLOG_FNAME, REPROJECTION_DIST_HLOG_FNAME,
+    CamInfoRow, CamNum, ConnectedCameraSyncState, DataAssocRow, FlydraFloatTimestampLocal,
+    HostClock, KalmanEstimatesRow, RosCamName, SyncFno, TextlogRow, TrackingParams,
+    TriggerClockInfoRow, Triggerbox, RECONSTRUCT_LATENCY_HLOG_FNAME, REPROJECTION_DIST_HLOG_FNAME,
 };
 pub use flydra_types::{Data2dDistortedRow, Data2dDistortedRowF32};
 
-use withkey::WithKey;
-
 mod connected_camera_manager;
 pub use connected_camera_manager::{ConnectedCamCallback, ConnectedCamerasManager};
 
@@ -169,20 +167,6 @@ where
     }
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct DataAssocRow {
-    // changes to this struct should update BraidMetadataSchemaTag
-    pub obj_id: u32,
-    pub frame: SyncFno,
-    pub cam_num: CamNum,
-    pub pt_idx: u8,
-}
-impl WithKey<SyncFno> for DataAssocRow {
-    fn key(&self) -> SyncFno {
-        self.frame
-    }
-}
-
 #[derive(Debug, Serialize, Deserialize)]
 pub struct ExperimentInfoRow {
     // changes to this struct should update BraidMetadataSchemaTag

diff --git a/flydra2/src/tracking_core.rs b/flydra2/src/tracking_core.rs
@@ -17,8 +17,8 @@ use adskalman::ObservationModel as ObservationModelTrait;
 use adskalman::{StateAndCovariance, TransitionModelLinearNoControl};
 
 use flydra_types::{
-    CamNum, FlydraFloatTimestampLocal, FlydraRawUdpPoint, KalmanEstimatesRow, RosCamName, SyncFno,
-    TrackingParams, Triggerbox,
+    CamNum, DataAssocRow, FlydraFloatTimestampLocal, FlydraRawUdpPoint, KalmanEstimatesRow,
+    RosCamName, SyncFno, TrackingParams, Triggerbox,
 };
 
 use crate::bundled_data::{MiniArenaPointPerCam, PerMiniArenaAllCamsOneFrameUndistorted};
@@ -27,8 +27,8 @@ use crate::{
     model_server::{SendKalmanEstimatesRow, SendType},
     new_object_test_2d::NewObjectTestFlat3D,
     new_object_test_3d::NewObjectTestFull3D,
-    to_world_point, CameraObservationModel, ConnectedCamerasManager, DataAssocRow,
-    HypothesisTestResult, KalmanEstimateRecord, MyFloat, SaveToDiskMsg, TimeDataPassthrough,
+    to_world_point, CameraObservationModel, ConnectedCamerasManager, HypothesisTestResult,
+    KalmanEstimateRecord, MyFloat, SaveToDiskMsg, TimeDataPassthrough,
 };
 
 // -----------------------------------------------------------------------------