Merge pull request #192 from CWRUbotix/comp-measuring

Find full shipwreck measurements

Author: benjaminwp18

src/surface/gui/gui/widgets/tabs/shipwreck.py

@@ -49,6 +49,8 @@
 
 BLACK = QColor(Qt.GlobalColor.black)
 
+SHIPWRECK_BOW_LENGTH_CM = 30 + 16.6
+
 
 class Eye(IntEnum):
     LEFT = 0
@@ -102,6 +104,10 @@ def has_all_points(
     )
 
 
+def format_length(length: float) -> str:
+    return f'{length}, {length + SHIPWRECK_BOW_LENGTH_CM}'
+
+
 class ShipwreckTab(QWidget):
     click_left_signal = pyqtSignal(QMouseEvent)
     click_right_signal = pyqtSignal(QMouseEvent)
@@ -453,7 +459,7 @@ def calc_world_points(self) -> None:
         self.world_points_label.setText(
             f'3D (mm): {"\t".join([str(point) for point in world_points])}'
         )
-        self.length_label.setText(f'Length (mm): {length}')
+        self.length_label.setText(f'Length (mm): {format_length(length)}')
 
         ds: dict[Eye, list[float]] = {Eye.LEFT: [], Eye.RIGHT: []}
         thetas: dict[Eye, list[float]] = {Eye.LEFT: [], Eye.RIGHT: []}
@@ -481,9 +487,11 @@ def calc_world_points(self) -> None:
         self.underwater_world_points_label.setText(
             f'3D (mm): {"\t".join([str(point) for point in uw_world_points])}'
         )
-        self.underwater_length_label.setText(f'Length (mm): {uw_length}')
+        self.underwater_length_label.setText(f'Length (mm): {format_length(uw_length)}')
 
-        self.scaled_length_label.setText(f'Length (mm): {uw_length * LENGTH_SCALE_FACTOR}')
+        self.scaled_length_label.setText(
+            'Length (mm): ' + format_length(uw_length * LENGTH_SCALE_FACTOR)
+        )
 
     @staticmethod
     def solve_stereo_projection(