Update h5_to_db.py

h5_to_db.py

@@ -69,12 +69,11 @@ def create_camera(db, image_path, camera_model):
     return db.add_camera(model, width, height, param_arr)
 
 
-def add_keypoints(db, h5_path, image_path, img_ext, camera_model, single_camera = True):
+def add_keypoints(db, h5_path, image_path, img_ext, camera_model, single_camera=True):
     keypoint_f = h5py.File(os.path.join(h5_path, 'keypoints.h5'), 'r')
     camera_id = None
     fname_to_id = {}
     
-    # 画像ディレクトリ内の全ファイルを取得
     import glob
     all_images = {}
     for ext in ['.jpg', '.jpeg', '.png', '.JPG', '.JPEG', '.PNG']:
@@ -85,23 +84,31 @@ def add_keypoints(db, h5_path, image_path, img_ext, camera_model, single_camera
     for filename in tqdm(list(keypoint_f.keys())):
         keypoints = keypoint_f[filename][()]
         
-        # 拡張子なしのファイル名で検索
         if filename not in all_images:
             raise IOError(f'Image not found for key: {filename}')
         
-        path = all_images[filename]  # 実際のフルパス
-        fname_with_ext = os.path.basename(path)  # 拡張子付きファイル名
+        path = all_images[filename]
+        fname_with_ext = os.path.basename(path)
         
         if camera_id is None or not single_camera:
             from PIL import Image
             img = Image.open(path)
             width, height = img.size
             
+            # 適切な初期値を設定
+            # あなたの画像: Width=1440, Height=1920
+            focal_length = float(max(width, height))  # 1920
+            cx = float(width / 2.0)   # 720.0
+            cy = float(height / 2.0)  # 960.0
+            k = 0.0  # 歪みなし
+            
+            print(f"カメラパラメータ: f={focal_length}, cx={cx}, cy={cy}, k={k}")
+            
             camera_id = db.add_camera(
                 model=2,  # SIMPLE_RADIAL
                 width=width,
                 height=height,
-                params=np.array([0.0, 0.0, 0.0, 0.0])  # COLMAPが最適化
+                params=np.array([focal_length, cx, cy, k], dtype=np.float64)
             )
         
         image_id = db.add_image(fname_with_ext, camera_id)