Skip to content

Commit

Permalink
v2.0.0
Browse files Browse the repository at this point in the history
refactor: rename package

test: add test_reprojection script
  • Loading branch information
davidliyutong committed Apr 22, 2023
1 parent bb0ba0f commit 8f6e499
Show file tree
Hide file tree
Showing 25 changed files with 50 additions and 29 deletions.
19 changes: 10 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ A set of Python scripts to operate Intel Realsense Cameras. By using multi-threa
### From Source

```shell
git clone https://github.com/mvig-robotflow/rfimu-realsense-recorder
cd rfimu-realsense-recorder
git clone https://github.com/mvig-robotflow/rfimarkit-rs-recorder
cd rfimarkit-rs-recorder
python setup.py
```

### From PyPi

```shell
python -m pip install markit-realsense-recorder
python -m pip install markit-rs-recorder
```

## Usage
Expand All @@ -28,7 +28,7 @@ import io
import cv2
import numpy as np
import yaml
from realsense_recorder.common import new_realsense_camera_system_from_config, RealsenseSystemModel
from markit_rs_recorder.common import new_realsense_camera_system_from_config, RealsenseSystemModel

cfg_str = """
realsense:
Expand Down Expand Up @@ -72,6 +72,7 @@ def main():
cv2.destroyAllWindows()
break


main()
```

Expand All @@ -80,30 +81,30 @@ main()
To Create and persist record configuration:

```shell
python -m realsense_recorder configure
python -m markit_rs_recorder configure
```

To launch a remote record station that supports REST API

```shell
python -m realsense_recorder serve
python -m markit_rs_recorder serve
```

To launch a remote record station that is calibrated
```shell
python -m realsense_recorder serve --calibration=path/to/calibration
python -m markit_rs_recorder serve --calibration=path/to/calibration
```

> Note: The calibration.json file is expected to be in the `path/to/calibration` directory. The calibration file can be generated by running `python -m realsense_recorder calibrate`
To run calibration

```shell
python -m realsense_recorder calibrate
python -m markit_rs_recorder calibrate
```

To run post-processing

```shell
python -m realsense_recorder post_process --base_dir path/to/recording
python -m markit_rs_recorder post_process --base_dir path/to/recording
```
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import argparse
import sys
import realsense_recorder.scripts as scripts
import realsense_recorder.cmd as cmd
import markit_rs_recorder.scripts as scripts
import markit_rs_recorder.cmd as cmd

parser = argparse.ArgumentParser()

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from rich.progress import track
import numpy as np

from realsense_recorder.common import (
from markit_rs_recorder.common import (
RealsenseCameraCfg,
RealsenseSystemCfg,
RealsenseSystemModel,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import numpy as np
from typing import Tuple

from realsense_recorder.io import compress_record, sync_cameras
from markit_rs_recorder.io import compress_record, sync_cameras

# def detect_fiducials(base_dir: str):
# pass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from fastapi.responses import JSONResponse, RedirectResponse
import pyrealsense2 as rs

from realsense_recorder.common import (
from markit_rs_recorder.common import (
CALLBACKS,
new_realsense_camera_system_from_yaml_file,
RealsenseSystemModel,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import pyrealsense2 as rs
import cv2

from realsense_recorder.common import new_camera_config_by_device, new_system_config
from markit_rs_recorder.common import new_camera_config_by_device, new_system_config


def enumerate_connected_devices(ctx: rs.context):
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import cv2
import numpy as np
import tqdm
from realsense_recorder.io import get_directory_reader
from markit_rs_recorder.io import get_directory_reader
from rich.console import Console

console = None
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import yaml
from rich.console import Console

from realsense_recorder.common import configure_realsense_system_from_keyboard
from markit_rs_recorder.common import configure_realsense_system_from_keyboard


def main(args: argparse.Namespace):
Expand Down
18 changes: 9 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@

from setuptools import setup

requires = open("./requirements.txt", "r").readlines() if os.path.exists("./requirements.txt") else open("./markit_realsense_recorder.egg-info/requires.txt", "r").readlines()
requires = open("./requirements.txt", "r").readlines() if os.path.exists("./requirements.txt") else open("./markit_rs_recorder.egg-info/requires.txt", "r").readlines()

setup(
name="markit-realsense-recorder",
version="1.8.2",
name="markit-rs-recorder",
version="2.0.0",
author="davidliyutong",
author_email="davidliyutong@sjtu.edu.cn",
description="Realsense remote recorder",
packages=[
"realsense_recorder",
"realsense_recorder/cmd",
"realsense_recorder/common",
"realsense_recorder/filters",
"realsense_recorder/io",
"realsense_recorder/scripts",
"markit_rs_recorder",
"markit_rs_recorder/cmd",
"markit_rs_recorder/common",
"markit_rs_recorder/filters",
"markit_rs_recorder/io",
"markit_rs_recorder/scripts",
],
python_requires=">=3.6",
install_requires=requires,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_load_config.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from realsense_recorder.common.record import new_realsense_camera_system_from_yaml_file
from markit_rs_recorder.common.record import new_realsense_camera_system_from_yaml_file

p = new_realsense_camera_system_from_yaml_file("./realsense_config.yaml")

Expand Down
2 changes: 1 addition & 1 deletion tests/test_local_capture_static_interactive.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from realsense_recorder.cmd.calibrate import main
from markit_rs_recorder.cmd.calibrate import main


class DefaultArgs:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_local_record_seq.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from realsense_recorder.cmd.local_record_seq import main
from markit_rs_recorder.cmd.local_record_seq import main


class DefaultArgs:
Expand Down
20 changes: 20 additions & 0 deletions tests/test_reprojection.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import sys

# NOTES to YUTONG:
# New dependencies
from markit_rs_recorder.filters.fiducial import detect_fiducial_marker

# pip install pupil_apriltags -- works on Ubuntu but not on Windows
# Search "MAGIC NUMBER" for magic numbers


if __name__ == '__main__':
argv = sys.argv[1:]
detect_fiducial_marker(
"../virat/realsense_data/2023-04-21_202607",
marker_length_m=0.015,
enabled_cameras=['r08', 'r85'],
april_tag_family="tag25h9",
sequence_length=10,
debug=True
)

0 comments on commit 8f6e499

Please sign in to comment.