From e7a01fc044d23c02c07a2f221df6f0f6f167c3b4 Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Thu, 2 Jan 2025 22:20:19 -0500 Subject: [PATCH] Codestyle fixes. --- glue_ar/common/scatter_export_options.py | 3 ++- glue_ar/common/scatter_gltf.py | 7 +++---- glue_ar/common/voxels.py | 2 +- glue_ar/jupyter/widgets.py | 6 ++---- glue_ar/qt/export_dialog.py | 3 ++- glue_ar/qt/widgets.py | 12 +++++------- 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/glue_ar/common/scatter_export_options.py b/glue_ar/common/scatter_export_options.py index c070f63..149cbbd 100644 --- a/glue_ar/common/scatter_export_options.py +++ b/glue_ar/common/scatter_export_options.py @@ -20,7 +20,8 @@ class ARVispyScatterExportOptions(State): min_value=0, max_value=7, docstring="Controls how many points are put into each mesh. " - "Higher means a larger filesize, but better performance.") + "Higher means a larger filesize, but better performance." + ) class ARIpyvolumeScatterExportOptions(State): diff --git a/glue_ar/common/scatter_gltf.py b/glue_ar/common/scatter_gltf.py index 785f81e..57067ff 100644 --- a/glue_ar/common/scatter_gltf.py +++ b/glue_ar/common/scatter_gltf.py @@ -211,8 +211,7 @@ def add_scatter_layer_gltf(builder: GLTFBuilder, triangles: List[Tuple[int, int, int]], bounds: Bounds, clip_to_bounds: bool = True, - points_per_mesh: Optional[int] = None, -): + points_per_mesh: Optional[int] = None): if layer_state is None: return @@ -537,7 +536,7 @@ def add_vispy_scatter_layer_gltf(builder: GLTFBuilder, if log_ppm == 7: ppm = None else: - ppm = 10 ** log_ppm + ppm = 10 ** log_ppm add_scatter_layer_gltf(builder=builder, viewer_state=viewer_state, @@ -565,7 +564,7 @@ def add_ipyvolume_scatter_layer_gltf(builder: GLTFBuilder, if log_ppm == 7: ppm = None else: - ppm = 10 ** log_ppm + ppm = 10 ** log_ppm add_scatter_layer_gltf(builder=builder, viewer_state=viewer_state, diff --git a/glue_ar/common/voxels.py b/glue_ar/common/voxels.py index b421a1b..13a4f4b 100644 --- a/glue_ar/common/voxels.py +++ b/glue_ar/common/voxels.py @@ -12,7 +12,7 @@ from glue_ar.common.volume_export_options import ARVoxelExportOptions from glue_ar.usd_utils import material_for_color, sanitize_path from glue_ar.utils import BoundsWithResolution, alpha_composite, binned_opacity, clamp, \ - clip_sides, frb_for_layer, get_resolution, hex_to_components, isomin_for_layer, \ + clip_sides, frb_for_layer, hex_to_components, isomin_for_layer, \ isomax_for_layer, layer_color, offset_triangles, unique_id, xyz_bounds from glue_ar.gltf_utils import SHORT_MAX, add_points_to_bytearray, add_triangles_to_bytearray, \ diff --git a/glue_ar/jupyter/widgets.py b/glue_ar/jupyter/widgets.py index 06e6751..89c3697 100644 --- a/glue_ar/jupyter/widgets.py +++ b/glue_ar/jupyter/widgets.py @@ -40,8 +40,7 @@ def info_icon(cb_property: CallbackProperty) -> v.Tooltip: def boolean_callback_widgets(instance: HasCallbackProperties, property: str, display_name: str, - **kwargs, -) -> Tuple[DOMWidget]: + **kwargs) -> Tuple[DOMWidget]: instance_type = type(instance) cb_property = getattr(instance_type, property) @@ -60,8 +59,7 @@ def number_callback_widgets(instance: HasCallbackProperties, property: str, display_name: str, label_for_value=False, - **kwargs, -) -> Tuple[DOMWidget]: + **kwargs) -> Tuple[DOMWidget]: value = getattr(instance, property) instance_type = type(instance) diff --git a/glue_ar/qt/export_dialog.py b/glue_ar/qt/export_dialog.py index 9ecff21..4a5aad8 100644 --- a/glue_ar/qt/export_dialog.py +++ b/glue_ar/qt/export_dialog.py @@ -69,7 +69,8 @@ def _update_layer_ui(self, state: State): continue row = QVBoxLayout() name = self.display_name(property) - widget_tuples, connection = widgets_for_callback_property(state, property, name, label_for_value=not is_log_pm) + widget_tuples, connection = widgets_for_callback_property(state, property, name, + label_for_value=not is_log_pm) self._layer_connections.append(connection) for widgets in widget_tuples: subrow = QHBoxLayout() diff --git a/glue_ar/qt/widgets.py b/glue_ar/qt/widgets.py index b9db227..b54bc1e 100644 --- a/glue_ar/qt/widgets.py +++ b/glue_ar/qt/widgets.py @@ -48,8 +48,7 @@ def info_button(cb_property: CallbackProperty) -> QPushButton: def boolean_callback_widgets(instance: HasCallbackProperties, property: str, display_name: str, - **kwargs, -) -> Tuple[Tuple[Tuple[QWidget]], connect_checkable_button]: + **kwargs) -> Tuple[Tuple[Tuple[QWidget]], connect_checkable_button]: value = getattr(instance, property) instance_type = type(instance) @@ -71,8 +70,7 @@ def number_callback_widgets(instance: HasCallbackProperties, property: str, display_name: str, label_for_value=True, - **kwargs, -) -> Tuple[Tuple[Tuple[QWidget]], connect_value]: + **kwargs) -> Tuple[Tuple[Tuple[QWidget]], connect_value]: value = getattr(instance, property) instance_type = type(instance) @@ -99,6 +97,7 @@ def number_callback_widgets(instance: HasCallbackProperties, if label_for_value: value_label = QLabel() + def update_label(value): value_label.setText(f"{value:.{places}f}") @@ -114,7 +113,7 @@ def on_widget_destroyed(widget, cb=remove_label_callback): update_label(value) add_callback(instance, property, update_label) slider.destroyed.connect(on_widget_destroyed) - + value_widgets = (slider, value_label) else: value_widgets = (slider,) @@ -135,8 +134,7 @@ def on_widget_destroyed(widget, cb=remove_label_callback): def widgets_for_callback_property(instance: HasCallbackProperties, property: str, display_name: str, - **kwargs, -) -> Tuple[Tuple[Tuple[QWidget]], BaseConnection]: + **kwargs) -> Tuple[Tuple[Tuple[QWidget]], BaseConnection]: t = type(getattr(instance, property)) if t is bool: