Add new opensfm settings

Former-commit-id: febf592f11

docker.settings.yaml

@@ -15,6 +15,7 @@ project_path: '/' #DO NOT CHANGE THIS OR DOCKER WILL NOT WORK. It should be '/'
 #zip_results: False
 #verbose: False
 #time: False
+#use_fixed_camera_params: False
 #opensfm_processes: 4 # by default this is set to $(nproc)
 #min_num_features: 4000
 #matcher_threshold: 2.0

opendm/config.py

@@ -151,6 +151,11 @@ def config():
                              'matcher-neighbors and this to 0 to skip '
                              'pre-matching. Default: %(default)s')
 
+    parser.add_argument('--use-fixed-camera-params',
+                        action='store_true',
+                        default=False,
+                        help='Turn off camera parameter optimization during bundler')
+
     parser.add_argument('--opensfm-processes',
                         metavar='<positive integer>',
                         default=1,

scripts/odm_app.py

@@ -46,7 +46,8 @@ class ODMApp(ecto.BlackBox):
                                            feature_min_frames=p.args.min_num_features,
                                            processes=p.args.opensfm_processes,
                                            matching_gps_neighbors=p.args.matcher_neighbors,
-                                           matching_gps_distance=p.args.matcher_distance),
+                                           matching_gps_distance=p.args.matcher_distance,
+                                           fixed_camera_params=p.args.use_fixed_camera_params),
                  'slam': ODMSlamCell(),
                  'cmvs': ODMCmvsCell(max_images=p.args.cmvs_maxImages),
                  'pmvs': ODMPmvsCell(level=p.args.pmvs_level,

scripts/opensfm.py

@@ -14,6 +14,7 @@ class ODMOpenSfMCell(ecto.Cell):
         params.declare("processes", "The application arguments.", context.num_cores)
         params.declare("matching_gps_neighbors", "The application arguments.", 8)
         params.declare("matching_gps_distance", "The application arguments.", 0)
+        params.declare("fixed_camera_params", "Optimize internal camera parameters", True)
 
     def declare_io(self, params, inputs, outputs):
         inputs.declare("tree", "Struct with paths", [])
@@ -70,7 +71,8 @@ class ODMOpenSfMCell(ecto.Cell):
                 "feature_process_size: %s" % self.params.feature_process_size,
                 "feature_min_frames: %s" % self.params.feature_min_frames,
                 "processes: %s" % self.params.processes,
-                "matching_gps_neighbors: %s" % self.params.matching_gps_neighbors
+                "matching_gps_neighbors: %s" % self.params.matching_gps_neighbors,
+                "optimize_camera_parameters: %s" % ('no' if self.params.fixed_camera_params else 'yes')
             ]
 
             if has_alt:

settings.yaml

@@ -15,6 +15,7 @@ project_path: '' # Example: '/home/user/ODMProjects
 #zip_results: False
 #verbose: False
 #time: False
+#use_fixed_camera_params: False
 #opensfm_processes: 4 # by default this is set to $(nproc)
 #min_num_features: 4000
 #matcher_threshold: 2.0