Merge branch 'dev' into master

camera_presets/Hawkeye/Hawkeye_Firefly_X_Lite_4k_Ultra_Wide - Curtis Campbell.json

@@ -0,0 +1,45 @@
+{
+    "name": "Hawkeye_Firefly X Lite__4k Ultra Wide",
+    "note": "",
+    "calibrated_by": "deadmoo",
+    "camera_brand": "Hawkeye",
+    "camera_model": "Firefly X Lite",
+    "lens_model": "",
+    "camera_setting": "4k Ultra Wide",
+    "calibrator_version": "0.2.1-alpha",
+    "date": "2021-08-23",
+    "calib_dimension": {
+        "w": 3840,
+        "h": 2160
+    },
+    "num_images": 16,
+    "use_opencv_fisheye": true,
+    "fisheye_params": {
+        "RMS_error": 1.37617120895551,
+        "camera_matrix": [
+            [
+                1899.5441875505342,
+                0.0,
+                1920.0
+            ],
+            [
+                0.0,
+                1425.3289503090905,
+                1080.0
+            ],
+            [
+                0.0,
+                0.0,
+                1.0
+            ]
+        ],
+        "distortion_coeffs": [
+            -0.04048086944649209,
+            0.024162499785652793,
+            -0.009614423183174505,
+            -0.009665050311279665
+        ]
+    },
+    "use_opencv_standard": false,
+    "calib_params": {}
+}

camera_presets/Hawkeye/firefly8s_hawkeye_2_7k_30_wide - Nuclear OverDrive Sindicato.json

@@ -0,0 +1,45 @@
+{
+    "name": "firefly8s_hawkeye__2.7k 30 wide",
+    "note": "",
+    "calibrated_by": "truog2003",
+    "camera_brand": "firefly8s",
+    "camera_model": "hawkeye",
+    "lens_model": "",
+    "camera_setting": "2.7k 30 wide",
+    "calibrator_version": "0.2.1-alpha",
+    "date": "2021-08-28",
+    "calib_dimension": {
+        "w": 1280,
+        "h": 720
+    },
+    "num_images": 10,
+    "use_opencv_fisheye": true,
+    "fisheye_params": {
+        "RMS_error": 0.13039440913402167,
+        "camera_matrix": [
+            [
+                577.9154252779942,
+                0.0,
+                640.0
+            ],
+            [
+                0.0,
+                577.4626037548595,
+                360.0
+            ],
+            [
+                0.0,
+                0.0,
+                1.0
+            ]
+        ],
+        "distortion_coeffs": [
+            0.024842363393347697,
+            0.006257377547097875,
+            -0.0037898765821426086,
+            0.0006455592915864194
+        ]
+    },
+    "use_opencv_standard": false,
+    "calib_params": {}
+}

gyroflow.py

@@ -2724,7 +2724,7 @@ def export_video(self):
 
         filename = QtWidgets.QFileDialog.getSaveFileName(self, "Export video", filter=export_file_filter)
         print("Output file: {}".format(filename[0]))
-
+        time.sleep(0.5) # Time to close file dialog
         # Handled in stabilizer
         #if filename[0] == self.infile_path:
         #    self.show_error("You can't overwride the input file")
@@ -2765,7 +2765,6 @@ def export_video(self):
             self.video_viewer.stop()
             viewer_thread = self.video_viewer.thread
 
-        time.sleep(0.5)
 
         self.stab.renderfile(start_time, stop_time, filename[0], out_size = out_size,
                              split_screen = split_screen, bitrate_mbits = bitrate,