Merge remote-tracking branch 'origin/master'

2017-09-05 14:44:46 +02:00
parent 66c8ba8830 1d0bf304a5
commit 1a41997e96
4 changed files with 29 additions and 17 deletions
--- a/configuration/background_config/SINEG01-DSCR350_20170824_132443_398155.npy
+++ b/configuration/background_config/SINEG01-DSCR350_20170824_132443_398155.npy
--- a/configuration/background_config/SLG-LCAM-C042_20170822_164724_835983.npy
+++ b/configuration/background_config/SLG-LCAM-C042_20170822_164724_835983.npy
--- a/configuration/background_config/SLG-LCAM-C042_20170823_093554_835524.npy
+++ b/configuration/background_config/SLG-LCAM-C042_20170823_093554_835524.npy
--- a/configuration/camera_config/SLG-LCAM-C042.json
+++ b/configuration/camera_config/SLG-LCAM-C042.json
@@ -1,19 +1,31 @@
 {
-    "name": "SLG-LCAM-C042",
-    "camera_calibration": {
-        "angle_horizontal": 0.0,
-        "angle_vertical": 0.0,
-        "reference_marker_height": 100.0,
-        "reference_marker": [
-            0,
-            0,
-            100,
-            100
-        ],
-        "reference_marker_width": 100.0
-    },
-    "prefix": "SLG-LCAM-C042",
-    "mirror_y": false,
-    "rotate": 0,
-    "mirror_x": false
+ "camera_calibration": {
+  "reference_marker": [
+   0,
+   0,
+   100,
+   100
+  ],
+  "reference_marker_width": 100.0,
+  "reference_marker_height": 100.0,
+  "angle_horizontal": 0.0,
+  "angle_vertical": 0.0
+ },
+ "mirror_x": false,
+ "mirror_y": false,
+ "rotate": 0,
+ "name": "SLG-LCAM-C042",
+ "prefix": "SLG-LCAM-C042",
+ "calibration": {
+  "reference_marker_height": 101.0,
+  "horizontal_camera_angle": 1.0,
+  "vertical_camera_angle": 1.0,
+  "reference_marker": [
+   1,
+   1,
+   101,
+   101
+  ],
+  "reference_marker_width": 101.0
+ }
 }