diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be0d96617..6ec87a34a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,22 +35,20 @@ test_crates: - cd ../.. # Test fmf-cli - - cd fmf/fmf-cli + - cd $CI_PROJECT_DIR/media-utils/fmf/fmf-cli - cargo test --release - - cd ../.. # Test ads-apriltag - - cd ads-apriltag + - cd $CI_PROJECT_DIR/ads-apriltag - cargo test --release - - cd .. # Test apriltag-track-movie - - cd ads-apriltag/apriltag-track-movie + - cd $CI_PROJECT_DIR/ads-apriltag/apriltag-track-movie - cargo test --release - cd ../.. # Test braid-april-cal, which requires opencv - - cd braid-april-cal + - cd $CI_PROJECT_DIR/braid-april-cal # run test in release mode, otherwise slow - PKG_CONFIG_PATH=/opt/opencv-4.9.0-static/lib/pkgconfig OPENCV_STATIC=1 cargo test --release --features solve-pnp - cd .. @@ -83,26 +81,21 @@ test_crates: # Test Pylon stuff - _packaging/install-pylon-linux.sh - - cd ci2-simple-demo + - cd $CI_PROJECT_DIR/camera/ci2-simple-demo - LD_LIBRARY_PATH="/opt/pylon/lib" cargo test --features backend_pyloncxx - - cd .. - - cd ci2-simple-async-demo + - cd $CI_PROJECT_DIR/camera/ci2-simple-async-demo - LD_LIBRARY_PATH="/opt/pylon/lib" cargo test --features backend_pyloncxx - - cd .. - - cd ci2-cli + - cd $CI_PROJECT_DIR/camera/ci2-cli - cargo test --features backend_pyloncxx - - cd .. - DEBIAN_FRONTEND=noninteractive apt-get install -y cmake pkg-config libfontconfig-dev - - cd fly-eye + - cd $CI_PROJECT_DIR/fly-eye - cargo build --release --features backend_pyloncxx - - cd .. - - cd led-box-comms + - cd $CI_PROJECT_DIR/led-box-comms - cargo test - - cd .. test_flydra2: variables: @@ -165,27 +158,24 @@ test_crates_rust_stable: - cd .. # Test mvg - - cd mvg + - cd $CI_PROJECT_DIR/geometry/mvg - cargo test --features rerun-io - - cd .. # Test braid-april-cal-webapp - - cd braid-april-cal/braid-april-cal-webapp + - cd $CI_PROJECT_DIR/braid-april-cal/braid-april-cal-webapp - cargo test - cd ../.. # Test datetime-conversion - cd datetime-conversion - cargo test - - cd .. - # Test simple-obj-parse - - cd simple-obj-parse + # Test geometry/simple-obj-parse + - cd $CI_PROJECT_DIR/geometry/simple-obj-parse - cargo test - - cd .. # basic-frame - - cd basic-frame + - cd $CI_PROJECT_DIR/basic-frame - cargo test - cargo test --features convert-image - cd .. @@ -214,31 +204,27 @@ test_crates_rust_stable: - cd .. # Test ufmf - - cd ufmf + - cd $CI_PROJECT_DIR/media-utils/ufmf - cargo test - - cd .. # Test flydra-types - - cd flydra-types + - cd $CI_PROJECT_DIR/flydra-types - cargo test - - cd .. - - cd mvg/mvg-util + # Test mvg/mvg-util + - cd $CI_PROJECT_DIR/geometry/mvg/mvg-util - cargo test - - cd ../.. # Test flydra-mvg - - cd flydra-mvg + - cd $CI_PROJECT_DIR/geometry/flydra-mvg - cargo test - - cd .. # Test fmf - - cd fmf + - cd $CI_PROJECT_DIR/media-utils/fmf - cargo test - - cd .. # Test media-utils/tiff-decoder - - cd media-utils/tiff-decoder + - cd $CI_PROJECT_DIR/media-utils/tiff-decoder - cargo test - cd ../.. @@ -710,7 +696,7 @@ extra-programs: - mkdir -p $CI_PROJECT_DIR/build - - cd $CI_PROJECT_DIR/mvg/mvg-util + - cd $CI_PROJECT_DIR/geometry/mvg/mvg-util - cargo build --release - cp $CI_PROJECT_DIR/target/release/cal-to-xml $CI_PROJECT_DIR/build - cp $CI_PROJECT_DIR/target/release/align-calibration $CI_PROJECT_DIR/build @@ -752,7 +738,7 @@ fmf-cli: - source $CARGO_HOME/env - export RUSTFLAGS="-D warnings" - - cd $CI_PROJECT_DIR/fmf/fmf-cli + - cd $CI_PROJECT_DIR/media-utils/fmf/fmf-cli - cargo build --release - mkdir -p $CI_PROJECT_DIR/build - ldd -v $CI_PROJECT_DIR/target/release/fmf diff --git a/Cargo.toml b/Cargo.toml index d49412984..b5a30517e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,8 +6,6 @@ members = [ "ads-webasm", "ads-webasm/example", "basic-frame", - "bg-movie-writer", - "bisection-search", "braid", "braid/braid-run", "braid/braid-run/braid_frontend", @@ -30,18 +28,16 @@ members = [ "bui-backend-session", "bui-backend-session/types", "build-util", - "camcal", - "led-box", - "led-box-comms", - "ci2", - "ci2/ci2-types", - "ci2-async", - "ci2-cli", - "ci2-pyloncxx", - "ci2-vimba", - "ci2-remote-control", - "ci2-simple-async-demo", - "ci2-simple-demo", + "camera/ci2", + "camera/ci2-async", + "camera/ci2-cli", + "camera/ci2-pyloncxx", + "camera/ci2-remote-control", + "camera/ci2-simple-async-demo", + "camera/ci2-simple-demo", + "camera/ci2-types", + "camera/ci2-vimba", + "camera/vimba", "csv-eof", "datetime-conversion", "download-verify", @@ -51,12 +47,9 @@ members = [ "event-stream-types", "fastfreeimage", "fly-eye", - "fmf", - "fmf/fmf-cli", "flydra-feature-detector", "flydra-feature-detector/flydra-feature-detector-types", "flydra-feature-detector/flydra-pt-detect-cfg", - "flydra-mvg", "flydra-types", "flydra2", "flytrax-csv-to-braidz", @@ -64,15 +57,31 @@ members = [ "freemovr-calibration/freemovr-calibration-cli", "freemovr-calibration/freemovr-calibration-webapp", "freemovr-calibration/ncollide-geom", + "geometry/camcal", + "geometry/flydra-mvg", + "geometry/mvg", + "geometry/mvg/mvg-util", + "geometry/opencv-calibrate", + "geometry/opencv-calibrate/find-chessboard", + "geometry/parry-geom", + "geometry/refraction", + "geometry/refraction/bisection-search", + "geometry/simple-obj-parse", + "geometry/textured-tri-mesh", "groupby", "http-video-streaming", "http-video-streaming/http-video-streaming-types", "imops", + "led-box", + "led-box-comms", "led-box-standalone", "machine-vision-shaders", + "media-utils/bg-movie-writer", "media-utils/dump-frame", "media-utils/ffmpeg-writer", "media-utils/ffmpeg-rewriter", + "media-utils/fmf", + "media-utils/fmf/fmf-cli", "media-utils/font-drawing", "media-utils/frame-source", "media-utils/less-avc-wrapper", @@ -83,20 +92,14 @@ members = [ "media-utils/srt-writer", "media-utils/strand-convert", "media-utils/tiff-decoder", + "media-utils/ufmf", "media-utils/video2rrd", "media-utils/video2srt", "media-utils/y4m-writer", - "mvg", - "mvg/mvg-util", "nvenc", "nvenc/dynlink-cuda", "nvenc/dynlink-nvidia-encode", "nvenc/dynlink-nvidia-encode/gen-nvenc-bindings", - "opencv-calibrate", - "opencv-calibrate/find-chessboard", - "parry-geom", - "refraction", - "simple-obj-parse", "strand-cam", "strand-cam/flytrax-io", "strand-cam/strand-cam-offline-checkerboards", @@ -107,11 +110,8 @@ members = [ "strand-cam-csv-config-types", "strand-cam-pseudo-cal", "strand-cam-storetype", - "textured-tri-mesh", "timestamped-frame", "tracking", - "ufmf", - "vimba", "withkey", "write-debian-changelog", "zip-or-dir", @@ -200,6 +200,7 @@ ncollide2d = { package = "ncollide2d-updated", version = "0.36.3" } ncollide3d = { package = "ncollide3d-updated", version = "0.36.3" } num-iter = "0.1" num-traits = "0.2" +obj = { version = "0.10", features = ["genmesh"] } opencv-ros-camera = { version = "0.15.1", features = ["serde-serialize"] } openh264 = "0.6.0" ordered-float = { version = "3.4", features = ["serde"] } @@ -263,7 +264,8 @@ zip = { version = "0.6.6", default-features = false, features = [ ads-apriltag = { path = "ads-apriltag" } ads-webasm = { path = "ads-webasm" } basic-frame = { path = "basic-frame" } -bg-movie-writer = { path = "bg-movie-writer" } +bisection-search = { path = "geometry/refraction/bisection-search" } +bg-movie-writer = { path = "media-utils/bg-movie-writer" } braid = { path = "braid" } braid-april-cal = { path = "braid-april-cal" } braid-config-data = { path = "braid-config-data" } @@ -275,13 +277,13 @@ braidz-writer = { path = "braid/braidz-writer" } bui-backend-session = { path = "bui-backend-session" } bui-backend-session-types = { path = "bui-backend-session/types" } build-util = { path = "build-util" } -camcal = { path = "camcal" } -ci2 = { path = "ci2" } -ci2-async = { path = "ci2-async" } -ci2-pyloncxx = { path = "ci2-pyloncxx" } -ci2-remote-control = { path = "ci2-remote-control" } -ci2-types = { path = "ci2/ci2-types" } -ci2-vimba = { path = "ci2-vimba" } +camcal = { path = "geometry/camcal" } +ci2 = { path = "camera/ci2" } +ci2-async = { path = "camera/ci2-async" } +ci2-pyloncxx = { path = "camera/ci2-pyloncxx" } +ci2-remote-control = { path = "camera/ci2-remote-control" } +ci2-types = { path = "camera/ci2-types" } +ci2-vimba = { path = "camera/ci2-vimba" } csv-eof = { path = "csv-eof" } datetime-conversion = { path = "datetime-conversion" } download-verify = { path = "download-verify" } @@ -297,11 +299,11 @@ flydra-feature-detector = { path = "flydra-feature-detector" } flydra-feature-detector-types = { path = "flydra-feature-detector/flydra-feature-detector-types" } flydra-pt-detect-cfg = { path = "flydra-feature-detector/flydra-pt-detect-cfg" } flydra-types = { path = "flydra-types", default-features = false } -flydra-mvg = { path = "flydra-mvg" } +flydra-mvg = { path = "geometry/flydra-mvg" } flydra2 = { path = "flydra2", default-features = false } flytrax-apriltags-calibration = { path = "braid-april-cal/flytrax-apriltags-calibration" } flytrax-io = { path = "strand-cam/flytrax-io" } -fmf = { path = "fmf" } +fmf = { path = "media-utils/fmf" } font-drawing = { path = "media-utils/font-drawing" } frame-source = { path = "media-utils/frame-source" } groupby = { path = "groupby" } @@ -313,22 +315,25 @@ less-avc-wrapper = { path = "media-utils/less-avc-wrapper" } machine-vision-shaders = { path = "machine-vision-shaders" } mkv-strand-reader = { path = "media-utils/mkv-strand-reader" } mp4-writer = { path = "media-utils/mp4-writer" } -mvg = { path = "mvg", features = ["serde-serialize"] } +mvg = { path = "geometry/mvg", features = ["serde-serialize"] } ncollide-geom = { path = "freemovr-calibration/ncollide-geom" } nvenc = { path = "nvenc" } -opencv-calibrate = { path = "opencv-calibrate" } -parry-geom = { path = "parry-geom" } -refraction = { path = "refraction" } +opencv-calibrate = { path = "geometry/opencv-calibrate" } +parry-geom = { path = "geometry/parry-geom" } +refraction = { path = "geometry/refraction" } rust-cam-bui-types = { path = "rust-cam-bui-types" } +simple-obj-parse = { path = "geometry/simple-obj-parse" } srt-writer = { path = "media-utils/srt-writer" } strand-cam = { path = "strand-cam", default-features = false } strand-cam-csv-config-types = { path = "strand-cam-csv-config-types" } strand-cam-pseudo-cal = { path = "strand-cam-pseudo-cal" } strand-cam-storetype = { path = "strand-cam-storetype" } +textured-tri-mesh = { path = "geometry/textured-tri-mesh" } tiff-decoder = { path = "media-utils/tiff-decoder" } timestamped-frame = { path = "timestamped-frame" } tracking = { path = "tracking" } -ufmf = { path = "ufmf" } +ufmf = { path = "media-utils/ufmf" } +vimba = { path = "camera/vimba" } withkey = { path = "withkey" } y4m-writer = { path = "media-utils/y4m-writer" } zip-or-dir = { path = "zip-or-dir" } diff --git a/ads-webasm/Cargo.toml b/ads-webasm/Cargo.toml index 5ea5d3a18..82969e233 100644 --- a/ads-webasm/Cargo.toml +++ b/ads-webasm/Cargo.toml @@ -17,8 +17,8 @@ gloo-file = { workspace = true } yew-tincture.workspace = true -simple-obj-parse = { path = "../simple-obj-parse", optional = true } -textured-tri-mesh = { path = "../textured-tri-mesh", optional = true } +simple-obj-parse = { workspace = true, optional = true } +textured-tri-mesh = { workspace = true, optional = true } enum-iter.workspace = true rust-cam-bui-types.workspace = true diff --git a/adslog/adslog-cli/tools/flydra-hist.py b/adslog/adslog-cli/tools/flydra-hist.py deleted file mode 100644 index a8dd4236e..000000000 --- a/adslog/adslog-cli/tools/flydra-hist.py +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/env python3 -"""print histograms of flydra timing data -""" - -import json -import sys -import collections -import numpy as np -import pandas as pd -import datetime -from pytz import utc, timezone - -fname = sys.argv[1] -count = 0 -data = collections.defaultdict(list) -with open(fname,mode='r') as fd: - for line in fd.readlines(): - row = json.loads(line.strip()) - if row['table_name'] != 'raw_packet': - continue - count += 1 - - stamp = row['stamp'] - dot_idx = stamp.find('.') - stamp2 = stamp[:dot_idx+7] - stamp2 += 'Z' - stamp_dt = datetime.datetime.strptime(stamp2, "%Y-%m-%dT%H:%M:%S.%fZ") - stamp_f64 = stamp_dt.replace(tzinfo=utc).timestamp() - - val = row['val'] - - if val['timestamp'] != 0.0: - x1 = (val['cam_received_time'] - val['timestamp']) * 1000.0 - else: - x1 = np.nan - x2 = (val['preprocess_stamp'] - val['cam_received_time']) * 1000.0 - x3 = (val['done_camnode_processing'] - val['cam_received_time']) * 1000.0 - x4 = (stamp_f64 - val['cam_received_time']) * 1000.0 - - bits = val['image_processing_steps']['bits'] - - data['cam->computer'].append(x1) - data['computer->improc'].append(x2) - data['computer->send'].append(x3) - data['computer->mainbrain'].append(x4) - data['bits'].append(bits) - data['cam'].append(val['cam_name']) - data['frame'].append(val['framenumber']) - -df = pd.DataFrame(data) -for bits, gdf in df.groupby('bits'): - print(gdf.describe()) - print(len(gdf)) diff --git a/basic-frame/Cargo.toml b/basic-frame/Cargo.toml index 613e3c13b..50369679d 100644 --- a/basic-frame/Cargo.toml +++ b/basic-frame/Cargo.toml @@ -9,5 +9,5 @@ rust-version = "1.76" chrono.workspace = true machine-vision-formats = { workspace = true, features = ["std"] } -timestamped-frame = { path = "../timestamped-frame" } +timestamped-frame.workspace = true convert-image = { workspace = true, optional = true } diff --git a/braid-april-cal/Cargo.toml b/braid-april-cal/Cargo.toml index cd94aef27..2f821f0de 100644 --- a/braid-april-cal/Cargo.toml +++ b/braid-april-cal/Cargo.toml @@ -19,9 +19,9 @@ argmin = { version = "0.8.1", features = [ ], default-features = false } argmin-math = "0.3" -mvg = { path = "../mvg", features = ["serde-serialize"] } -flydra-mvg = { path = "../flydra-mvg" } -opencv-calibrate = { path = "../opencv-calibrate", optional = true } +mvg = { workspace = true, features = ["serde-serialize"] } +flydra-mvg.workspace = true +opencv-calibrate = { workspace = true, optional = true } [dev-dependencies] anyhow.workspace = true diff --git a/ci2-async/Cargo.toml b/camera/ci2-async/Cargo.toml similarity index 76% rename from ci2-async/Cargo.toml rename to camera/ci2-async/Cargo.toml index 38d4fb90e..07888f21c 100644 --- a/ci2-async/Cargo.toml +++ b/camera/ci2-async/Cargo.toml @@ -13,5 +13,5 @@ thread-control = "0.1.2" ci2 = { path = "../ci2" } machine-vision-formats.workspace = true -timestamped-frame = { path = "../timestamped-frame" } -basic-frame = { path = "../basic-frame" } +timestamped-frame.workspace = true +basic-frame.workspace = true diff --git a/ci2-async/src/lib.rs b/camera/ci2-async/src/lib.rs similarity index 100% rename from ci2-async/src/lib.rs rename to camera/ci2-async/src/lib.rs diff --git a/ci2-cli/Cargo.toml b/camera/ci2-cli/Cargo.toml similarity index 100% rename from ci2-cli/Cargo.toml rename to camera/ci2-cli/Cargo.toml diff --git a/ci2-cli/src/ci2-cli.rs b/camera/ci2-cli/src/ci2-cli.rs similarity index 100% rename from ci2-cli/src/ci2-cli.rs rename to camera/ci2-cli/src/ci2-cli.rs diff --git a/ci2-pyloncxx/Cargo.toml b/camera/ci2-pyloncxx/Cargo.toml similarity index 85% rename from ci2-pyloncxx/Cargo.toml rename to camera/ci2-pyloncxx/Cargo.toml index 7d41ba974..6054b8926 100644 --- a/ci2-pyloncxx/Cargo.toml +++ b/camera/ci2-pyloncxx/Cargo.toml @@ -18,8 +18,8 @@ lazy_static.workspace = true ci2 = { path = "../ci2" } pylon-cxx = "0.4.0" machine-vision-formats.workspace = true -timestamped-frame = { path = "../timestamped-frame" } -basic-frame = { path = "../basic-frame" } +timestamped-frame.workspace = true +basic-frame.workspace = true [target.'cfg(target_os = "linux")'.dependencies] rlimit = "0.6" diff --git a/ci2-pyloncxx/src/feature_cache.rs b/camera/ci2-pyloncxx/src/feature_cache.rs similarity index 100% rename from ci2-pyloncxx/src/feature_cache.rs rename to camera/ci2-pyloncxx/src/feature_cache.rs diff --git a/ci2-pyloncxx/src/lib.rs b/camera/ci2-pyloncxx/src/lib.rs similarity index 100% rename from ci2-pyloncxx/src/lib.rs rename to camera/ci2-pyloncxx/src/lib.rs diff --git a/ci2-remote-control/Cargo.toml b/camera/ci2-remote-control/Cargo.toml similarity index 86% rename from ci2-remote-control/Cargo.toml rename to camera/ci2-remote-control/Cargo.toml index ab25ae15f..31d468b74 100644 --- a/ci2-remote-control/Cargo.toml +++ b/camera/ci2-remote-control/Cargo.toml @@ -7,7 +7,7 @@ rust-version = "1.76" [dependencies] serde.workspace = true -ci2-types = { path = "../ci2/ci2-types" } +ci2-types.workspace = true rust-cam-bui-types.workspace = true enum-iter.workspace = true chrono.workspace = true diff --git a/ci2-remote-control/src/lib.rs b/camera/ci2-remote-control/src/lib.rs similarity index 100% rename from ci2-remote-control/src/lib.rs rename to camera/ci2-remote-control/src/lib.rs diff --git a/ci2-simple-async-demo/Cargo.toml b/camera/ci2-simple-async-demo/Cargo.toml similarity index 62% rename from ci2-simple-async-demo/Cargo.toml rename to camera/ci2-simple-async-demo/Cargo.toml index dbbeed850..df36c3a1e 100644 --- a/ci2-simple-async-demo/Cargo.toml +++ b/camera/ci2-simple-async-demo/Cargo.toml @@ -10,17 +10,17 @@ tracing.workspace = true env_logger.workspace = true futures = "0.3" anyhow.workspace = true -lazy_static = "1.0" +lazy_static.workspace = true -basic-frame = { path = "../basic-frame" } +basic-frame.workspace = true machine-vision-formats.workspace = true -timestamped-frame = { path = "../timestamped-frame" } -ci2 = { path = "../ci2" } -ci2-async = { path = "../ci2-async" } +timestamped-frame.workspace = true +ci2.workspace = true +ci2-async.workspace = true -ci2-pyloncxx = { path = "../ci2-pyloncxx", optional = true } +ci2-pyloncxx = { workspace = true, optional = true } pylon-cxx = { version = "0.4.0", optional = true } -ci2-vimba = { path = "../ci2-vimba", optional = true } +ci2-vimba = { workspace = true, optional = true } [features] default = ["backend_pyloncxx"] diff --git a/ci2-simple-async-demo/src/main.rs b/camera/ci2-simple-async-demo/src/main.rs similarity index 100% rename from ci2-simple-async-demo/src/main.rs rename to camera/ci2-simple-async-demo/src/main.rs diff --git a/ci2-simple-demo/Cargo.toml b/camera/ci2-simple-demo/Cargo.toml similarity index 64% rename from ci2-simple-demo/Cargo.toml rename to camera/ci2-simple-demo/Cargo.toml index 10d56dc41..400e0c649 100644 --- a/ci2-simple-demo/Cargo.toml +++ b/camera/ci2-simple-demo/Cargo.toml @@ -10,12 +10,12 @@ tracing.workspace = true machine-vision-formats.workspace = true anyhow.workspace = true -timestamped-frame = { path = "../timestamped-frame" } -ci2 = { path = "../ci2" } +timestamped-frame.workspace = true +ci2.workspace = true env_logger.workspace = true -ci2-pyloncxx = { path = "../ci2-pyloncxx", optional = true } -ci2-vimba = { path = "../ci2-vimba", optional = true } -lazy_static = "1.4.0" +ci2-pyloncxx = { workspace = true, optional = true } +ci2-vimba = { workspace = true, optional = true } +lazy_static.workspace = true [features] default = ["backend_pyloncxx"] diff --git a/ci2-simple-demo/src/main.rs b/camera/ci2-simple-demo/src/main.rs similarity index 100% rename from ci2-simple-demo/src/main.rs rename to camera/ci2-simple-demo/src/main.rs diff --git a/ci2/ci2-types/Cargo.toml b/camera/ci2-types/Cargo.toml similarity index 100% rename from ci2/ci2-types/Cargo.toml rename to camera/ci2-types/Cargo.toml diff --git a/ci2/ci2-types/src/lib.rs b/camera/ci2-types/src/lib.rs similarity index 100% rename from ci2/ci2-types/src/lib.rs rename to camera/ci2-types/src/lib.rs diff --git a/ci2-vimba/Cargo.toml b/camera/ci2-vimba/Cargo.toml similarity index 74% rename from ci2-vimba/Cargo.toml rename to camera/ci2-vimba/Cargo.toml index 283f7e162..e3cadfd4b 100644 --- a/ci2-vimba/Cargo.toml +++ b/camera/ci2-vimba/Cargo.toml @@ -7,7 +7,7 @@ rust-version = "1.76" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -vimba = { path = "../vimba" } +vimba.workspace = true tracing.workspace = true thiserror.workspace = true anyhow.workspace = true @@ -20,10 +20,10 @@ tempfile.workspace = true vmbc-sys = "0.1" ci2 = { path = "../ci2" } -basic-frame = { path = "../basic-frame" } -timestamped-frame = { path = "../timestamped-frame" } +basic-frame.workspace = true +timestamped-frame.workspace = true [dev-dependencies] env_logger.workspace = true anyhow.workspace = true -timestamped-frame = { path = "../timestamped-frame" } +timestamped-frame.workspace = true diff --git a/ci2-vimba/src/lib.rs b/camera/ci2-vimba/src/lib.rs similarity index 100% rename from ci2-vimba/src/lib.rs rename to camera/ci2-vimba/src/lib.rs diff --git a/ci2/Cargo.toml b/camera/ci2/Cargo.toml similarity index 66% rename from ci2/Cargo.toml rename to camera/ci2/Cargo.toml index 78d3cc149..47af94421 100644 --- a/ci2/Cargo.toml +++ b/camera/ci2/Cargo.toml @@ -11,6 +11,6 @@ anyhow.workspace = true chrono.workspace = true machine-vision-formats.workspace = true -ci2-types = { path = "ci2-types" } -basic-frame = { path = "../basic-frame" } -timestamped-frame = { path = "../timestamped-frame" } +ci2-types.workspace = true +basic-frame.workspace = true +timestamped-frame.workspace = true diff --git a/ci2/src/lib.rs b/camera/ci2/src/lib.rs similarity index 100% rename from ci2/src/lib.rs rename to camera/ci2/src/lib.rs diff --git a/vimba/Cargo.toml b/camera/vimba/Cargo.toml similarity index 100% rename from vimba/Cargo.toml rename to camera/vimba/Cargo.toml diff --git a/vimba/examples/async-std.rs b/camera/vimba/examples/async-std.rs similarity index 100% rename from vimba/examples/async-std.rs rename to camera/vimba/examples/async-std.rs diff --git a/vimba/examples/async-tokio.rs b/camera/vimba/examples/async-tokio.rs similarity index 100% rename from vimba/examples/async-tokio.rs rename to camera/vimba/examples/async-tokio.rs diff --git a/vimba/examples/asynchronous-grab.rs b/camera/vimba/examples/asynchronous-grab.rs similarity index 100% rename from vimba/examples/asynchronous-grab.rs rename to camera/vimba/examples/asynchronous-grab.rs diff --git a/vimba/examples/features-load.rs b/camera/vimba/examples/features-load.rs similarity index 100% rename from vimba/examples/features-load.rs rename to camera/vimba/examples/features-load.rs diff --git a/vimba/examples/features-save.rs b/camera/vimba/examples/features-save.rs similarity index 100% rename from vimba/examples/features-save.rs rename to camera/vimba/examples/features-save.rs diff --git a/vimba/examples/synchronous-grab.rs b/camera/vimba/examples/synchronous-grab.rs similarity index 100% rename from vimba/examples/synchronous-grab.rs rename to camera/vimba/examples/synchronous-grab.rs diff --git a/vimba/src/lib.rs b/camera/vimba/src/lib.rs similarity index 100% rename from vimba/src/lib.rs rename to camera/vimba/src/lib.rs diff --git a/flydra2/Cargo.toml b/flydra2/Cargo.toml index 45bb80a7a..6ea067ce5 100644 --- a/flydra2/Cargo.toml +++ b/flydra2/Cargo.toml @@ -9,7 +9,7 @@ rust-version = "1.76" path = "src/flydra2.rs" [build-dependencies] -build-util = { path = "../build-util" } +build-util.workspace = true [dependencies] thiserror.workspace = true diff --git a/freemovr-calibration/Cargo.toml b/freemovr-calibration/Cargo.toml index aa03313d0..3e47c9a76 100644 --- a/freemovr-calibration/Cargo.toml +++ b/freemovr-calibration/Cargo.toml @@ -17,8 +17,7 @@ ncollide2d = { workspace = true, features = ["default"] } ncollide3d = { workspace = true, features = ["default", "serde-serialize"] } cam-geom.workspace = true opencv-ros-camera.workspace = true -genmesh = "0.6" -obj = { version = "0.10", features = ["genmesh"] } +obj.workspace = true byteorder.workspace = true image.workspace = true csv.workspace = true @@ -26,11 +25,11 @@ chrono.workspace = true dlt = { workspace = true, features = ["default"] } mvg.workspace = true -camcal = { path = "../camcal", optional = true } +camcal = { workspace = true, optional = true } opencv-calibrate = { workspace = true, optional = true } -simple-obj-parse = { path = "../simple-obj-parse" } -textured-tri-mesh = { path = "../textured-tri-mesh" } -ncollide-geom = { workspace = true } +simple-obj-parse.workspace = true +textured-tri-mesh.workspace = true +ncollide-geom.workspace = true [dev-dependencies] approx.workspace = true diff --git a/freemovr-calibration/freemovr-calibration-cli/Cargo.toml b/freemovr-calibration/freemovr-calibration-cli/Cargo.toml index a693aea5b..6bf19eedd 100644 --- a/freemovr-calibration/freemovr-calibration-cli/Cargo.toml +++ b/freemovr-calibration/freemovr-calibration-cli/Cargo.toml @@ -22,7 +22,7 @@ opencv-ros-camera.workspace = true chrono.workspace = true freemovr-calibration = { path = ".." } -mvg = { path = "../../mvg" } +mvg.workspace = true [features] default = [] diff --git a/camcal/Cargo.toml b/geometry/camcal/Cargo.toml similarity index 87% rename from camcal/Cargo.toml rename to geometry/camcal/Cargo.toml index 1281c39dd..4df8c9dd8 100644 --- a/camcal/Cargo.toml +++ b/geometry/camcal/Cargo.toml @@ -14,4 +14,4 @@ serde_yaml.workspace = true chrono.workspace = true eyre.workspace = true -opencv-calibrate = { path = "../opencv-calibrate" } +opencv-calibrate.workspace = true diff --git a/camcal/LICENSE-APACHE b/geometry/camcal/LICENSE-APACHE similarity index 100% rename from camcal/LICENSE-APACHE rename to geometry/camcal/LICENSE-APACHE diff --git a/camcal/LICENSE-MIT b/geometry/camcal/LICENSE-MIT similarity index 100% rename from camcal/LICENSE-MIT rename to geometry/camcal/LICENSE-MIT diff --git a/camcal/README.md b/geometry/camcal/README.md similarity index 100% rename from camcal/README.md rename to geometry/camcal/README.md diff --git a/camcal/src/lib.rs b/geometry/camcal/src/lib.rs similarity index 100% rename from camcal/src/lib.rs rename to geometry/camcal/src/lib.rs diff --git a/flydra-mvg/Cargo.toml b/geometry/flydra-mvg/Cargo.toml similarity index 100% rename from flydra-mvg/Cargo.toml rename to geometry/flydra-mvg/Cargo.toml diff --git a/flydra-mvg/src/fermats_least_time.rs b/geometry/flydra-mvg/src/fermats_least_time.rs similarity index 100% rename from flydra-mvg/src/fermats_least_time.rs rename to geometry/flydra-mvg/src/fermats_least_time.rs diff --git a/flydra-mvg/src/flydra_xml_support.rs b/geometry/flydra-mvg/src/flydra_xml_support.rs similarity index 100% rename from flydra-mvg/src/flydra_xml_support.rs rename to geometry/flydra-mvg/src/flydra_xml_support.rs diff --git a/flydra-mvg/src/lib.rs b/geometry/flydra-mvg/src/lib.rs similarity index 100% rename from flydra-mvg/src/lib.rs rename to geometry/flydra-mvg/src/lib.rs diff --git a/flydra-mvg/tests/flydra/sample_calibration.xml b/geometry/flydra-mvg/tests/flydra/sample_calibration.xml similarity index 100% rename from flydra-mvg/tests/flydra/sample_calibration.xml rename to geometry/flydra-mvg/tests/flydra/sample_calibration.xml diff --git a/flydra-mvg/tests/flydra/sample_calibration_water.xml b/geometry/flydra-mvg/tests/flydra/sample_calibration_water.xml similarity index 100% rename from flydra-mvg/tests/flydra/sample_calibration_water.xml rename to geometry/flydra-mvg/tests/flydra/sample_calibration_water.xml diff --git a/flydra-mvg/tests/tests.rs b/geometry/flydra-mvg/tests/tests.rs similarity index 100% rename from flydra-mvg/tests/tests.rs rename to geometry/flydra-mvg/tests/tests.rs diff --git a/mvg/Cargo.toml b/geometry/mvg/Cargo.toml similarity index 100% rename from mvg/Cargo.toml rename to geometry/mvg/Cargo.toml diff --git a/mvg/README.md b/geometry/mvg/README.md similarity index 100% rename from mvg/README.md rename to geometry/mvg/README.md diff --git a/mvg/mvg-util/Cargo.toml b/geometry/mvg/mvg-util/Cargo.toml similarity index 100% rename from mvg/mvg-util/Cargo.toml rename to geometry/mvg/mvg-util/Cargo.toml diff --git a/mvg/mvg-util/alignment-test-data/20241017_164418-unaligned.xml b/geometry/mvg/mvg-util/alignment-test-data/20241017_164418-unaligned.xml similarity index 100% rename from mvg/mvg-util/alignment-test-data/20241017_164418-unaligned.xml rename to geometry/mvg/mvg-util/alignment-test-data/20241017_164418-unaligned.xml diff --git a/mvg/mvg-util/alignment-test-data/ground_truth.csv b/geometry/mvg/mvg-util/alignment-test-data/ground_truth.csv similarity index 100% rename from mvg/mvg-util/alignment-test-data/ground_truth.csv rename to geometry/mvg/mvg-util/alignment-test-data/ground_truth.csv diff --git a/mvg/mvg-util/alignment-test-data/unaligned.csv b/geometry/mvg/mvg-util/alignment-test-data/unaligned.csv similarity index 100% rename from mvg/mvg-util/alignment-test-data/unaligned.csv rename to geometry/mvg/mvg-util/alignment-test-data/unaligned.csv diff --git a/mvg/mvg-util/src/bin/align-calibration.rs b/geometry/mvg/mvg-util/src/bin/align-calibration.rs similarity index 100% rename from mvg/mvg-util/src/bin/align-calibration.rs rename to geometry/mvg/mvg-util/src/bin/align-calibration.rs diff --git a/mvg/mvg-util/src/bin/cal-to-xml.rs b/geometry/mvg/mvg-util/src/bin/cal-to-xml.rs similarity index 100% rename from mvg/mvg-util/src/bin/cal-to-xml.rs rename to geometry/mvg/mvg-util/src/bin/cal-to-xml.rs diff --git a/mvg/mvg-util/src/bin/print-cal.rs b/geometry/mvg/mvg-util/src/bin/print-cal.rs similarity index 100% rename from mvg/mvg-util/src/bin/print-cal.rs rename to geometry/mvg/mvg-util/src/bin/print-cal.rs diff --git a/mvg/src/align_points.rs b/geometry/mvg/src/align_points.rs similarity index 100% rename from mvg/src/align_points.rs rename to geometry/mvg/src/align_points.rs diff --git a/mvg/src/camera.rs b/geometry/mvg/src/camera.rs similarity index 100% rename from mvg/src/camera.rs rename to geometry/mvg/src/camera.rs diff --git a/mvg/src/extrinsics.rs b/geometry/mvg/src/extrinsics.rs similarity index 100% rename from mvg/src/extrinsics.rs rename to geometry/mvg/src/extrinsics.rs diff --git a/mvg/src/intrinsics.rs b/geometry/mvg/src/intrinsics.rs similarity index 100% rename from mvg/src/intrinsics.rs rename to geometry/mvg/src/intrinsics.rs diff --git a/mvg/src/lib.rs b/geometry/mvg/src/lib.rs similarity index 100% rename from mvg/src/lib.rs rename to geometry/mvg/src/lib.rs diff --git a/mvg/src/multi_cam_system.rs b/geometry/mvg/src/multi_cam_system.rs similarity index 100% rename from mvg/src/multi_cam_system.rs rename to geometry/mvg/src/multi_cam_system.rs diff --git a/mvg/src/pymvg_support.rs b/geometry/mvg/src/pymvg_support.rs similarity index 100% rename from mvg/src/pymvg_support.rs rename to geometry/mvg/src/pymvg_support.rs diff --git a/mvg/src/rerun_io.rs b/geometry/mvg/src/rerun_io.rs similarity index 100% rename from mvg/src/rerun_io.rs rename to geometry/mvg/src/rerun_io.rs diff --git a/mvg/tests/pmat-regress.rs b/geometry/mvg/tests/pmat-regress.rs similarity index 100% rename from mvg/tests/pmat-regress.rs rename to geometry/mvg/tests/pmat-regress.rs diff --git a/mvg/tests/pymvg-example.json b/geometry/mvg/tests/pymvg-example.json similarity index 100% rename from mvg/tests/pymvg-example.json rename to geometry/mvg/tests/pymvg-example.json diff --git a/mvg/tests/ros/camera.yaml b/geometry/mvg/tests/ros/camera.yaml similarity index 100% rename from mvg/tests/ros/camera.yaml rename to geometry/mvg/tests/ros/camera.yaml diff --git a/mvg/tests/tests.rs b/geometry/mvg/tests/tests.rs similarity index 100% rename from mvg/tests/tests.rs rename to geometry/mvg/tests/tests.rs diff --git a/opencv-calibrate/.gitignore b/geometry/opencv-calibrate/.gitignore similarity index 100% rename from opencv-calibrate/.gitignore rename to geometry/opencv-calibrate/.gitignore diff --git a/opencv-calibrate/Cargo.toml b/geometry/opencv-calibrate/Cargo.toml similarity index 100% rename from opencv-calibrate/Cargo.toml rename to geometry/opencv-calibrate/Cargo.toml diff --git a/opencv-calibrate/LICENSE-APACHE b/geometry/opencv-calibrate/LICENSE-APACHE similarity index 100% rename from opencv-calibrate/LICENSE-APACHE rename to geometry/opencv-calibrate/LICENSE-APACHE diff --git a/opencv-calibrate/LICENSE-MIT b/geometry/opencv-calibrate/LICENSE-MIT similarity index 100% rename from opencv-calibrate/LICENSE-MIT rename to geometry/opencv-calibrate/LICENSE-MIT diff --git a/opencv-calibrate/README.md b/geometry/opencv-calibrate/README.md similarity index 100% rename from opencv-calibrate/README.md rename to geometry/opencv-calibrate/README.md diff --git a/opencv-calibrate/build.rs b/geometry/opencv-calibrate/build.rs similarity index 100% rename from opencv-calibrate/build.rs rename to geometry/opencv-calibrate/build.rs diff --git a/opencv-calibrate/find-chessboard/Cargo.toml b/geometry/opencv-calibrate/find-chessboard/Cargo.toml similarity index 90% rename from opencv-calibrate/find-chessboard/Cargo.toml rename to geometry/opencv-calibrate/find-chessboard/Cargo.toml index fbcd57393..e98f7b92c 100644 --- a/opencv-calibrate/find-chessboard/Cargo.toml +++ b/geometry/opencv-calibrate/find-chessboard/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" rust-version = "1.76" [dependencies] -opencv-calibrate = { path = ".." } +opencv-calibrate.workspace = true image.workspace = true serde_yaml.workspace = true clap.workspace = true diff --git a/opencv-calibrate/find-chessboard/LICENSE-APACHE b/geometry/opencv-calibrate/find-chessboard/LICENSE-APACHE similarity index 100% rename from opencv-calibrate/find-chessboard/LICENSE-APACHE rename to geometry/opencv-calibrate/find-chessboard/LICENSE-APACHE diff --git a/opencv-calibrate/find-chessboard/LICENSE-MIT b/geometry/opencv-calibrate/find-chessboard/LICENSE-MIT similarity index 100% rename from opencv-calibrate/find-chessboard/LICENSE-MIT rename to geometry/opencv-calibrate/find-chessboard/LICENSE-MIT diff --git a/opencv-calibrate/find-chessboard/README.md b/geometry/opencv-calibrate/find-chessboard/README.md similarity index 100% rename from opencv-calibrate/find-chessboard/README.md rename to geometry/opencv-calibrate/find-chessboard/README.md diff --git a/opencv-calibrate/find-chessboard/build.bat b/geometry/opencv-calibrate/find-chessboard/build.bat similarity index 100% rename from opencv-calibrate/find-chessboard/build.bat rename to geometry/opencv-calibrate/find-chessboard/build.bat diff --git a/opencv-calibrate/find-chessboard/src/main.rs b/geometry/opencv-calibrate/find-chessboard/src/main.rs similarity index 100% rename from opencv-calibrate/find-chessboard/src/main.rs rename to geometry/opencv-calibrate/find-chessboard/src/main.rs diff --git a/opencv-calibrate/src/ffi.rs b/geometry/opencv-calibrate/src/ffi.rs similarity index 100% rename from opencv-calibrate/src/ffi.rs rename to geometry/opencv-calibrate/src/ffi.rs diff --git a/opencv-calibrate/src/lib.rs b/geometry/opencv-calibrate/src/lib.rs similarity index 100% rename from opencv-calibrate/src/lib.rs rename to geometry/opencv-calibrate/src/lib.rs diff --git a/opencv-calibrate/src/opencv-calibrate.cpp b/geometry/opencv-calibrate/src/opencv-calibrate.cpp similarity index 100% rename from opencv-calibrate/src/opencv-calibrate.cpp rename to geometry/opencv-calibrate/src/opencv-calibrate.cpp diff --git a/opencv-calibrate/windows-test-static.bat b/geometry/opencv-calibrate/windows-test-static.bat similarity index 100% rename from opencv-calibrate/windows-test-static.bat rename to geometry/opencv-calibrate/windows-test-static.bat diff --git a/opencv-calibrate/windows-test.bat b/geometry/opencv-calibrate/windows-test.bat similarity index 100% rename from opencv-calibrate/windows-test.bat rename to geometry/opencv-calibrate/windows-test.bat diff --git a/parry-geom/Cargo.toml b/geometry/parry-geom/Cargo.toml similarity index 100% rename from parry-geom/Cargo.toml rename to geometry/parry-geom/Cargo.toml diff --git a/parry-geom/src/lib.rs b/geometry/parry-geom/src/lib.rs similarity index 100% rename from parry-geom/src/lib.rs rename to geometry/parry-geom/src/lib.rs diff --git a/refraction/Cargo.toml b/geometry/refraction/Cargo.toml similarity index 59% rename from refraction/Cargo.toml rename to geometry/refraction/Cargo.toml index 3d9f219f7..5830c144f 100644 --- a/refraction/Cargo.toml +++ b/geometry/refraction/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" rust-version = "1.76" [dependencies] -simba = { workspace = true, features = ["libm"] } -bisection-search = { path = "../bisection-search" } +simba.workspace = true +bisection-search.workspace = true diff --git a/bisection-search/Cargo.toml b/geometry/refraction/bisection-search/Cargo.toml similarity index 100% rename from bisection-search/Cargo.toml rename to geometry/refraction/bisection-search/Cargo.toml diff --git a/bisection-search/src/lib.rs b/geometry/refraction/bisection-search/src/lib.rs similarity index 100% rename from bisection-search/src/lib.rs rename to geometry/refraction/bisection-search/src/lib.rs diff --git a/refraction/refraction.ipynb b/geometry/refraction/refraction.ipynb similarity index 100% rename from refraction/refraction.ipynb rename to geometry/refraction/refraction.ipynb diff --git a/refraction/src/lib.rs b/geometry/refraction/src/lib.rs similarity index 100% rename from refraction/src/lib.rs rename to geometry/refraction/src/lib.rs diff --git a/simple-obj-parse/Cargo.toml b/geometry/simple-obj-parse/Cargo.toml similarity index 72% rename from simple-obj-parse/Cargo.toml rename to geometry/simple-obj-parse/Cargo.toml index d620e8230..57893120d 100644 --- a/simple-obj-parse/Cargo.toml +++ b/geometry/simple-obj-parse/Cargo.toml @@ -8,6 +8,6 @@ rust-version = "1.76" [dependencies] nalgebra.workspace = true ncollide3d = { workspace = true, features = ["default", "serde-serialize"] } -textured-tri-mesh = { path = "../textured-tri-mesh" } +textured-tri-mesh.workspace = true genmesh = "0.6" -obj = { version = "0.10", features = ["genmesh"] } +obj.workspace = true diff --git a/simple-obj-parse/src/error.rs b/geometry/simple-obj-parse/src/error.rs similarity index 100% rename from simple-obj-parse/src/error.rs rename to geometry/simple-obj-parse/src/error.rs diff --git a/simple-obj-parse/src/lib.rs b/geometry/simple-obj-parse/src/lib.rs similarity index 100% rename from simple-obj-parse/src/lib.rs rename to geometry/simple-obj-parse/src/lib.rs diff --git a/simple-obj-parse/tests/has-32vert-polygon.obj b/geometry/simple-obj-parse/tests/has-32vert-polygon.obj similarity index 100% rename from simple-obj-parse/tests/has-32vert-polygon.obj rename to geometry/simple-obj-parse/tests/has-32vert-polygon.obj diff --git a/simple-obj-parse/tests/integration.rs b/geometry/simple-obj-parse/tests/integration.rs similarity index 100% rename from simple-obj-parse/tests/integration.rs rename to geometry/simple-obj-parse/tests/integration.rs diff --git a/simple-obj-parse/tests/tetrahedron.obj b/geometry/simple-obj-parse/tests/tetrahedron.obj similarity index 100% rename from simple-obj-parse/tests/tetrahedron.obj rename to geometry/simple-obj-parse/tests/tetrahedron.obj diff --git a/textured-tri-mesh/Cargo.toml b/geometry/textured-tri-mesh/Cargo.toml similarity index 64% rename from textured-tri-mesh/Cargo.toml rename to geometry/textured-tri-mesh/Cargo.toml index b4134ae67..c2bb2d80e 100644 --- a/textured-tri-mesh/Cargo.toml +++ b/geometry/textured-tri-mesh/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -serde = { version = "1.0", features = ["derive"], optional = true } +serde = { workspace = true, features = ["derive"], optional = true } [features] serde-serialize = ["serde"] diff --git a/textured-tri-mesh/src/lib.rs b/geometry/textured-tri-mesh/src/lib.rs similarity index 100% rename from textured-tri-mesh/src/lib.rs rename to geometry/textured-tri-mesh/src/lib.rs diff --git a/bg-movie-writer/Cargo.toml b/media-utils/bg-movie-writer/Cargo.toml similarity index 87% rename from bg-movie-writer/Cargo.toml rename to media-utils/bg-movie-writer/Cargo.toml index aa439e5a3..7e6035113 100644 --- a/bg-movie-writer/Cargo.toml +++ b/media-utils/bg-movie-writer/Cargo.toml @@ -13,8 +13,8 @@ thiserror.workspace = true mp4-writer = { workspace = true, features = ["openh264-encode", "nv-encode"] } machine-vision-formats.workspace = true ci2-remote-control.workspace = true -nvenc = { path = "../nvenc" } -basic-frame = { path = "../basic-frame" } +nvenc.workspace = true +basic-frame.workspace = true ffmpeg-rewriter.workspace = true ffmpeg-writer.workspace = true diff --git a/bg-movie-writer/src/lib.rs b/media-utils/bg-movie-writer/src/lib.rs similarity index 100% rename from bg-movie-writer/src/lib.rs rename to media-utils/bg-movie-writer/src/lib.rs diff --git a/bg-movie-writer/src/movie_writer_thread.rs b/media-utils/bg-movie-writer/src/movie_writer_thread.rs similarity index 100% rename from bg-movie-writer/src/movie_writer_thread.rs rename to media-utils/bg-movie-writer/src/movie_writer_thread.rs diff --git a/bg-movie-writer/windows-test.bat b/media-utils/bg-movie-writer/windows-test.bat similarity index 100% rename from bg-movie-writer/windows-test.bat rename to media-utils/bg-movie-writer/windows-test.bat diff --git a/fmf/Cargo.toml b/media-utils/fmf/Cargo.toml similarity index 100% rename from fmf/Cargo.toml rename to media-utils/fmf/Cargo.toml diff --git a/fmf/fmf-cli/Cargo.toml b/media-utils/fmf/fmf-cli/Cargo.toml similarity index 91% rename from fmf/fmf-cli/Cargo.toml rename to media-utils/fmf/fmf-cli/Cargo.toml index 3be09581c..52dc35058 100644 --- a/fmf/fmf-cli/Cargo.toml +++ b/media-utils/fmf/fmf-cli/Cargo.toml @@ -26,13 +26,13 @@ y4m.workspace = true timestamped-frame.workspace = true fmf.workspace = true convert-image.workspace = true -basic-frame = { path = "../../basic-frame" } +basic-frame.workspace = true mp4-writer = { workspace = true, features = ["openh264-encode", "nv-encode"] } y4m-writer.workspace = true ci2-remote-control.workspace = true -nvenc = { path = "../../nvenc" } +nvenc.workspace = true [dev-dependencies] tempfile.workspace = true diff --git a/fmf/fmf-cli/README.md b/media-utils/fmf/fmf-cli/README.md similarity index 100% rename from fmf/fmf-cli/README.md rename to media-utils/fmf/fmf-cli/README.md diff --git a/fmf/fmf-cli/src/fmf-cli.rs b/media-utils/fmf/fmf-cli/src/fmf-cli.rs similarity index 100% rename from fmf/fmf-cli/src/fmf-cli.rs rename to media-utils/fmf/fmf-cli/src/fmf-cli.rs diff --git a/fmf/replacing-fmf.md b/media-utils/fmf/replacing-fmf.md similarity index 100% rename from fmf/replacing-fmf.md rename to media-utils/fmf/replacing-fmf.md diff --git a/fmf/src/lib.rs b/media-utils/fmf/src/lib.rs similarity index 100% rename from fmf/src/lib.rs rename to media-utils/fmf/src/lib.rs diff --git a/fmf/src/pixel_formats.rs b/media-utils/fmf/src/pixel_formats.rs similarity index 100% rename from fmf/src/pixel_formats.rs rename to media-utils/fmf/src/pixel_formats.rs diff --git a/fmf/src/reader.rs b/media-utils/fmf/src/reader.rs similarity index 100% rename from fmf/src/reader.rs rename to media-utils/fmf/src/reader.rs diff --git a/ufmf/Cargo.toml b/media-utils/ufmf/Cargo.toml similarity index 62% rename from ufmf/Cargo.toml rename to media-utils/ufmf/Cargo.toml index 5f4a77b8a..784576341 100644 --- a/ufmf/Cargo.toml +++ b/media-utils/ufmf/Cargo.toml @@ -12,10 +12,10 @@ thiserror.workspace = true structure = "0.1.2" cast = "0.2.2" -basic-frame = { path = "../basic-frame" } +basic-frame.workspace = true machine-vision-formats.workspace = true -timestamped-frame = { path = "../timestamped-frame" } -datetime-conversion = { path = "../datetime-conversion" } +timestamped-frame.workspace = true +datetime-conversion.workspace = true [dev-dependencies] -basic-frame = { path = "../basic-frame" } +basic-frame.workspace = true diff --git a/ufmf/src/lib.rs b/media-utils/ufmf/src/lib.rs similarity index 100% rename from ufmf/src/lib.rs rename to media-utils/ufmf/src/lib.rs diff --git a/ufmf/src/save_indices.rs b/media-utils/ufmf/src/save_indices.rs similarity index 100% rename from ufmf/src/save_indices.rs rename to media-utils/ufmf/src/save_indices.rs diff --git a/strand-cam-pseudo-cal/Cargo.toml b/strand-cam-pseudo-cal/Cargo.toml index 3f6049c0d..44f9a8cd9 100644 --- a/strand-cam-pseudo-cal/Cargo.toml +++ b/strand-cam-pseudo-cal/Cargo.toml @@ -6,14 +6,14 @@ edition = "2021" rust-version = "1.76" [dependencies] -serde_json = "1.0.29" +serde_json.workspace = true nalgebra.workspace = true opencv-ros-camera.workspace = true cam-geom.workspace = true -mvg = { path = "../mvg" } -flydra-mvg = { path = "../flydra-mvg" } -http-video-streaming-types = { path = "../http-video-streaming/http-video-streaming-types" } +flydra-mvg.workspace = true +mvg.workspace = true +http-video-streaming-types.workspace = true flydra-types.workspace = true [dev-dependencies] diff --git a/strand-cam-storetype/Cargo.toml b/strand-cam-storetype/Cargo.toml index 0801ece46..7a4c73aa4 100644 --- a/strand-cam-storetype/Cargo.toml +++ b/strand-cam-storetype/Cargo.toml @@ -6,18 +6,18 @@ edition = "2021" rust-version = "1.76" [dependencies] -serde = { version = "1.0", default-features = false, features = ["derive"] } -serde_json = "1.0" +serde.workspace = true +serde_json.workspace = true serde_yaml.workspace = true -bui-backend-session-types = { path = "../bui-backend-session/types" } -led-box-comms = { path = "../led-box-comms" } -ci2-types = { path = "../ci2/ci2-types" } +bui-backend-session-types.workspace = true +led-box-comms.workspace = true +ci2-types.workspace = true ci2-remote-control.workspace = true -flydra-feature-detector-types = { path = "../flydra-feature-detector/flydra-feature-detector-types" } -http-video-streaming-types = { path = "../http-video-streaming/http-video-streaming-types" } +flydra-feature-detector-types.workspace = true +http-video-streaming-types.workspace = true rust-cam-bui-types.workspace = true -mvg = { path = "../mvg", features = ["serde-serialize"] } +mvg = { workspace = true, features = ["serde-serialize"] } [features] default = ["std"]