Merge pull request #1209 from pierotofy/odsfix

Fix --optimize-disk-space issue with OpenMVS

stages/openmvs.py

@@ -83,7 +83,10 @@ class ODMOpenMVSStage(types.ODM_Stage):
             if args.optimize_disk_space:
                 files = [scene_dense,
                          os.path.join(tree.openmvs, 'scene_dense.ply'),
-                         os.path.join(tree.openmvs, 'scene_dense_dense_filtered.mvs')]
+                         os.path.join(tree.openmvs, 'scene_dense_dense_filtered.mvs'),
+                         octx.path("undistorted", "tracks.csv"),
+                         octx.path("undistorted", "reconstruction.json")
+                        ]
                 for f in files:
                     if os.path.exists(f):
                         os.remove(f)

stages/run_opensfm.py

@@ -132,9 +132,16 @@ class ODMOpenSfMStage(types.ODM_Stage):
         
         if args.optimize_disk_space:
             os.remove(octx.path("tracks.csv"))
-            os.remove(octx.path("undistorted", "tracks.csv"))
-            os.remove(octx.path("undistorted", "reconstruction.json"))
             if io.dir_exists(octx.path("undistorted", "depthmaps")):
                 files = glob.glob(octx.path("undistorted", "depthmaps", "*.npz"))
                 for f in files:
-                    os.remove(f)
+                    os.remove(f)
+
+            # Keep these if using OpenMVS
+            if args.fast_orthophoto or args.use_opensfm_dense:
+                files = [octx.path("undistorted", "tracks.csv"),
+                         octx.path("undistorted", "reconstruction.json")
+                        ]
+                for f in files:
+                    if os.path.exists(f):
+                        os.remove(f)