From 23608c40d6bbe1fd8a0d14653d8fa1555a070b4f Mon Sep 17 00:00:00 2001 From: Michele Bortolomeazzi <38500587+MicheleBortol@users.noreply.github.com> Date: Mon, 19 Aug 2024 16:10:28 +0200 Subject: [PATCH] Add histogram and heatmap checkboxes. --- omero_vitessce/forms.py | 5 +++++ omero_vitessce/views.py | 20 +++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/omero_vitessce/forms.py b/omero_vitessce/forms.py index 2695fa5..e848eaa 100644 --- a/omero_vitessce/forms.py +++ b/omero_vitessce/forms.py @@ -58,6 +58,11 @@ def __init__(self, file_names, file_urls, empty_value=ConfigForm.default_embedding_y_col, strip=True, min_length=1, max_length=20, required=False) + self.fields["histograms"] = forms.BooleanField(initial=True, + required=False) + self.fields["heatmap"] = forms.BooleanField(initial=True, + required=False) + # Set default values for CharField fields self.fields["config file name"].initial = filename self.fields["cell id column"].initial = ConfigForm.default_cell_id_col diff --git a/omero_vitessce/views.py b/omero_vitessce/views.py index 3062d78..d57c0f7 100644 --- a/omero_vitessce/views.py +++ b/omero_vitessce/views.py @@ -132,15 +132,17 @@ def create_config(dataset_id, config_args): displays.append(sc) if config_args.get("expression") and config_args.get("cell identities"): - hm = vc.add_view(Vt.HEATMAP, dataset=vc_dataset) - fh = vc.add_view(Vt.FEATURE_VALUE_HISTOGRAM, dataset=vc_dataset) - oh = vc.add_view(Vt.OBS_SET_SIZES, dataset=vc_dataset) - fd = vc.add_view(Vt.OBS_SET_FEATURE_VALUE_DISTRIBUTION, - dataset=vc_dataset) - hists.append(fh) - hists.append(oh) - hists.append(fd) - displays.append(hm) + if config_args.get("histograms"): + fh = vc.add_view(Vt.FEATURE_VALUE_HISTOGRAM, dataset=vc_dataset) + oh = vc.add_view(Vt.OBS_SET_SIZES, dataset=vc_dataset) + fd = vc.add_view(Vt.OBS_SET_FEATURE_VALUE_DISTRIBUTION, + dataset=vc_dataset) + hists.append(fh) + hists.append(oh) + hists.append(fd) + if config_args.get("heatmap"): + hm = vc.add_view(Vt.HEATMAP, dataset=vc_dataset) + displays.append(hm) if config_args.get("segmentation"): segmentation = OmeZarrWrapper(