refactor: changing expected format of force curve data to be a unified dataclass

Author: ahobbs7

src/napari_topostats/_plotting.py

@@ -244,19 +244,19 @@ def _process_event_coords(self, viewer, event):
 
         curve_num = shape_x * self.y_coord + self.x_coord
 
-        all_curve_data = layer.metadata["force_curves"]
-        self.channels_units = layer.metadata["force_curves_units"]
-        raw_metadata = layer.metadata["force_curves_meta"]
+        curves_data = layer.metadata["force_curves"]
+        raw_metadata = curves_data.metadata
+        self.channels_units = raw_metadata.channel_units
         try:
             self.metadata = {
-                "global": raw_metadata["top_level"],
-                f"curve_{curve_num}": raw_metadata["curves"][self.y_coord][self.x_coord],
-                f"curve_{curve_num}_approach": raw_metadata["segments"][self.y_coord][self.x_coord][0],
-                f"curve_{curve_num}_retract": raw_metadata["segments"][self.y_coord][self.x_coord][1],
+                "global": raw_metadata.toplevel,
+                f"curve_{curve_num}": raw_metadata[self.y_coord, self.x_coord],
+                f"curve_{curve_num}_approach": raw_metadata[self.y_coord, self.x_coord, 0],
+                f"curve_{curve_num}_retract": raw_metadata[self.y_coord, self.x_coord, 1],
             }
             if self.parameter_dialog is not None:
                 self.parameter_dialog.populate_parameters(self.metadata)
-            curve_dict = all_curve_data[self.y_coord][self.x_coord]
+            curve_dict = curves_data.get_default_volume()[self.y_coord, self.x_coord]
             self.set_available_channels(curve_dict.keys())
             self.update_curve(curve_dict)
         except IndexError:

src/napari_topostats/_widget_function.py

@@ -536,8 +536,6 @@ def _func():
                         return construct_error_args(
                             exception=e, raise_exception=True, topostats_error=True, type_class=self.type_class
                         )
-                    if isinstance(result, dict) and "message" in result and "exception" in result:
-                        return result
                     return (result, metadata)
 
                 def _handle_result(result):

src/napari_topostats/utils.py

@@ -270,16 +270,8 @@ def all_curves(
         if hasattr(curves, "dims"):
             shape_y = curves.dims[0]
             shape_x = curves.dims[1] if len(curves.dims) > 1 else 1
-        elif isinstance(curves[0], list):
-            shape_x = len(curves[0])
-            shape_y = len(curves)
         else:
-            shape_x = len(curves)
-            shape_y = 1
-
-    if isinstance(curves[0], list):
-        # If curves is a list of lists, flatten it.
-        curves = [item for sublist in curves for item in sublist]
+            raise ValueError("Curves must be of the CurvesDataset type defined by AFMReader.")
 
     image_map = [[None for _ in range(shape_x)] for _ in range(shape_y)]