Merge pull request #64 from tavaughan/dev-tv-detector-cleanup

MNT: Consolidate Calibrator code into detector folder

Author: keiranbarr

data/calibrator_config.json

@@ -0,0 +1,11 @@
+{
+  "serial_identifier": "example_detector",
+  "camera_implementation": "picamera",
+  "camera_connection": {
+    "usb_id": 0
+  },
+  "camera_intrinsic_parameters": {},
+  "calibrator_configuration": {
+    "data_path": "./example_data_path/"
+  }
+}

data/config.json

@@ -23,18 +23,17 @@
     ImageResolution, \
     IntrinsicParameters, \
     PoseSolverFrame
-from src.calibrator.api import \
+from src.detector.api import \
     GetCalibrationResultRequest, \
     GetCalibrationResultResponse, \
+    GetCameraParametersRequest, \
+    GetCameraParametersResponse, \
+    GetMarkerSnapshotsRequest, \
+    GetMarkerSnapshotsResponse, \
     ListCalibrationDetectorResolutionsRequest, \
     ListCalibrationDetectorResolutionsResponse, \
     ListCalibrationResultMetadataRequest, \
     ListCalibrationResultMetadataResponse
-from src.detector.api import \
-    GetCameraParametersRequest, \
-    GetCameraParametersResponse, \
-    GetMarkerSnapshotsRequest, \
-    GetMarkerSnapshotsResponse
 from src.pose_solver.api import \
     AddTargetMarkerResponse, \
     AddMarkerCornersRequest, \

data/detector_config.json

@@ -19,7 +19,7 @@
     GetMarkerSnapshotsResponse, \
     StartCaptureRequest, \
     StopCaptureRequest
-from src.calibrator.api import \
+from src.detector.api import \
     AddCalibrationImageResponse, \
     CalibrateResponse, \
     GetCalibrationImageResponse, \

src/calibrator/__init__.py

@@ -1,2 +1,6 @@
+from .calibrator import Calibrator
 from .detector import Detector
-from .fileio import DetectorConfiguration
+from .interfaces import \
+    AbstractCameraInterface, \
+    AbstractMarkerInterface
+from .structures import DetectorConfiguration

src/calibrator/api/__init__.py

@@ -12,3 +12,21 @@
 from .set_marker_dictionary_request import SetMarkerDictionaryRequest
 from .start_capture_request import StartCaptureRequest
 from .stop_capture_request import StopCaptureRequest
+
+from .add_calibration_image_request import AddCalibrationImageRequest
+from .add_calibration_image_response import AddCalibrationImageResponse
+from .calibrate_request import CalibrateRequest
+from .calibrate_response import CalibrateResponse
+from .delete_staged_request import DeleteStagedRequest
+from .get_calibration_image_request import GetCalibrationImageRequest
+from .get_calibration_image_response import GetCalibrationImageResponse
+from .get_calibration_result_request import GetCalibrationResultRequest
+from .get_calibration_result_response import GetCalibrationResultResponse
+from .list_calibration_detector_resolutions_request import ListCalibrationDetectorResolutionsRequest
+from .list_calibration_detector_resolutions_response import ListCalibrationDetectorResolutionsResponse
+from .list_calibration_image_metadata_request import ListCalibrationImageMetadataRequest
+from .list_calibration_image_metadata_response import ListCalibrationImageMetadataResponse
+from .list_calibration_result_metadata_request import ListCalibrationResultMetadataRequest
+from .list_calibration_result_metadata_response import ListCalibrationResultMetadataResponse
+from .update_calibration_image_metadata_request import UpdateCalibrationImageMetadataRequest
+from .update_calibration_result_metadata_request import UpdateCalibrationResultMetadataRequest