diff --git a/conda/meta.yaml b/conda/meta.yaml index ff2b550e2fd1dcc5260370cc254083f466ceee33..a71db4bfb8fba172720e520adcc96a3d0bf6a1b1 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -4,7 +4,7 @@ package: source: git_url: https://github.com/mooch443/trex.git - git_rev: 6109f35777f89123815e0377fc7dd59c7d606aa9 + git_rev: 6c5a8c0033afc62b0c83a1bd9506f51303c854b8 git_depth: 1 build: diff --git a/docs/formats.rst b/docs/formats.rst index 9ba209f9624799563148cdaa5a0b86a8168e1978..18136c0b71fa67ba48164aac5f12410e4828023d 100644 --- a/docs/formats.rst +++ b/docs/formats.rst @@ -22,11 +22,18 @@ Upon hitting the ``S`` key/clicking the export tracking data button in the menu, SPEED AX (x-component of acceleration in cm/s) AY (y-component *) + time (time in seconds from start of the video, consistent across individuals) + frame (monotonically increasing integer number, consistent across individuals) + num_pixels (number of pixels in the object) ... +Each of these metrics is saved per frame, meaning that each metric mentioned here has the same number of values per individual. However, not all individuals have the same number of frames and do not necessarily start at the same time (even though the time variable is consistent across individuals). If an individual is first detected later in the video (not in the first frame), then that frame is the first one to appear in the exported data. Individuals may also not appear towards the end of the video, in which case there also won't be any data exported for that part. + .. NOTE:: There are a couple hashtags in there -- these simply mean that the data-source for that metric is different. For example, ``wcentroid`` means that this metric is centered on the centroid (weighted by pixel values) of each individual. If no hashtag is provided, the metric centers on the head of each individual. These are usually closely related, but are different from each other e.g. when the individual moves its head independently from other parts of the body. There the head-based metric would show much more wiggling around than the centroid-based metric. +If one metric (such as anything posture-related) is not available in a frame -- either because the individual was not found, or because no valid posture was found -- then all affected metrics (sometimes all) will be set to infinity. + Posture -------