Improved output and file handling

Author: MrClock8163

src/instrumentman/inclination/__init__.py

@@ -5,8 +5,7 @@
     argument,
     option,
     IntRange,
-    File,
-    file_path
+    File
 )
 
 from ..utils import (
@@ -63,7 +62,13 @@ def cli_measure(**kwargs: Any) -> None:
 @argument(
     "input",
     help="inclination measurement file to process",
-    type=file_path()
+    type=File("rt", encoding="utf8")
+)
+@option(
+    "-o",
+    "--output",
+    help="file to save results to in CSV format",
+    type=File("wt", encoding="utf8", lazy=True)
 )
 def cli_calc(**kwargs: Any) -> None:
     """Calculate inclination from multiple measurements."""
@@ -80,12 +85,12 @@ def cli_calc(**kwargs: Any) -> None:
 @argument(
     "output",
     help="output file",
-    type=file_path()
+    type=File("wt", encoding="utf8", lazy=True)
 )
 @argument(
     "inputs",
     help="inclination measurement files",
-    type=file_path(exists=True),
+    type=File("rt", encoding="utf8"),
     nargs=-1,
     required=True
 )

src/instrumentman/inclination/app.py

@@ -1,7 +1,7 @@
 from io import TextIOWrapper
 from time import sleep
-from pathlib import Path
 from math import tan, atan, degrees
+from re import compile
 
 from click_extra import echo
 from geocompy.data import Angle, Coordinate
@@ -12,6 +12,9 @@
 from ..utils import echo_green
 
 
+_LINE = compile(r"^\d+(?:\.\d+)?(?:,\-?\d+\.\d+){2}$")
+
+
 def run_measure(
     tps: GeoCom,
     output: TextIOWrapper | None = None,
@@ -42,11 +45,13 @@ def run_measure(
         if fullangles.params is None:
             continue
 
+        az = fullangles.params[0]
         cross = fullangles.params[4]
         length = fullangles.params[5]
 
         echo(
-            f"{a % 360:d},{cross.asunit('deg') * 3600:.2f},"
+            f"{az.asunit('deg'):.4f},"
+            f"{cross.asunit('deg') * 3600:.2f},"
             f"{length.asunit('deg') * 3600:.2f}",
             output
         )
@@ -75,51 +80,75 @@ def main_measure(
 
 
 def main_merge(
-    inputs: list[Path],
-    output: Path
+    inputs: list[TextIOWrapper],
+    output: TextIOWrapper
 ) -> None:
-    with output.open("wt", encoding="utf8") as outfile:
-        echo("hz_deg,cross_sec,length_sec", outfile)
-        for item in inputs:
-            with item.open("rt", encoding="utf8") as infile:
-                next(infile)
-                echo(infile.read(), outfile, False)
+    echo("hz_deg,cross_sec,length_sec", output)
+    for item in inputs:
+        for line in item:
+            if not _LINE.match(line.strip()):
+                continue
+
+            echo(line, output, False)
 
     echo_green(f"Merged measurements from {len(inputs)} files.")
 
 
 def main_calc(
-    input: Path
+    input: TextIOWrapper,
+    output: TextIOWrapper | None = None
 ) -> None:
     points: list[Coordinate] = []
-    with input.open("rt", encoding="utf8") as file:
-        next(file)
-        for line in file:
-            fields = line.strip().split(",")
-            azimut = Angle(float(fields[0]), 'deg')
-            cross = Angle(float(fields[1]) / 3600, 'deg')
-            length = Angle(float(fields[2]) / 3600, 'deg')
-
-            coord = Coordinate(tan(cross), tan(length), 1)
-            bearing, inclination, s = coord.to_polar()
-
-            points.append(
-                Coordinate.from_polar(
-                    (bearing + azimut).normalized(),
-                    inclination,
-                    s
-                )
+
+    for line in input:
+        if not _LINE.match(line.strip()):
+            continue
+
+        fields = line.strip().split(",")
+        azimut = Angle(float(fields[0]), 'deg')
+        cross = Angle(float(fields[1]) / 3600, 'deg')
+        length = Angle(float(fields[2]) / 3600, 'deg')
+
+        coord = Coordinate(tan(cross), tan(length), 1)
+        bearing, inclination, s = coord.to_polar()
+
+        points.append(
+            Coordinate.from_polar(
+                (bearing + azimut).normalized(),
+                inclination,
+                s
             )
+        )
 
     x, x_dev = adjust_uniform_single([p.x for p in points])
     y, y_dev = adjust_uniform_single([p.y for p in points])
 
+    inc_x = degrees(atan(x)) * 3600
+    inc_y = degrees(atan(y)) * 3600
+    inc_x_dev = degrees(atan(x_dev)) * 3600
+    inc_y_dev = degrees(atan(y_dev)) * 3600
+
     direction, inc, _ = Coordinate(x, y, 1).to_polar()
 
+    if output is None:
+        echo(f"""Axis aligned:
+    inclination X: {inc_x:.1f}" +/- {inc_x_dev:.1f}"
+    inclination Y: {inc_y:.1f}" +/- {inc_y_dev:.1f}"
+Polar:
+    direction: {direction.asunit('deg'):.4f}°
+    inclination: {inc.asunit('deg') * 3600:.1f}\""""
+             )
+        return
+
+    echo(
+        "inc_x_sec,inc_x_dev_sec,inc_y_sec,inc_y_dev_sec,dir_deg,inc_sec",
+        output
+    )
+
     echo(
-        f"""Direction: {direction.to_dms()}
-Inclination: {inc.asunit('deg') * 3600:.1f} seconds
-Deviation easting: {degrees(atan(x_dev)) * 3600:.1f} seconds
-Deviation northing: {degrees(atan(y_dev)) * 3600:.1f} seconds
-        """
+        (
+            f"{inc_x:.1f},{inc_x_dev:.1f},{inc_y:.1f},{inc_y_dev:.1f},"
+            f"{direction.asunit('deg'):.4f},{inc.asunit('deg') * 3600:.1f}"
+        ),
+        output
     )