added cumultative histogram

nickdelgrosso · Oct 11, 2021 · 288359b · 288359b
1 parent 664f1e9
commit 288359b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/regexport/app.py b/regexport/app.py
@@ -12,7 +12,7 @@
 from regexport.views.main_window import MainWindow
 from regexport.views.plot_3d import PlotterModel, PlotterView
 from regexport.views.region_tree import BrainRegionTreeModel, BrainRegionTree
-from regexport.views.sidebar import Sidebar
+from regexport.views.sidebar import Layout
 from regexport.views.text_selector import TextSelectorModel, DropdownTextSelectorView
 
 
@@ -46,6 +46,9 @@ def __init__(self):
         self.num_spots_histogram = HistogramModel()
         self.num_spots_histogram.register(model=self.model)
 
+        self.num_spots_histogram2 = HistogramModel(cumulative=True)
+        self.num_spots_histogram2.register(model=self.model)
+
         self.download_biop_extensions_button = SaveBiopExtensionsActionModel()
         self.save_groovy_script_button = SaveGroovyScriptActionModel()
 
@@ -58,13 +61,20 @@ def create_gui(self) -> QMainWindow:
             main_widgets=(
                 BrainRegionTree(model=self.brain_region_tree),
                 PlotterView(model=self.plot_window),
-                Sidebar(
+                Layout(
                     widgets=(
                         DropdownTextSelectorView(model=self.colordata_selector_dropdown),
                         DropdownTextSelectorView(model=self.colormap_selector_model),
-                        HistogramView(model=self.num_spots_histogram),
+                        Layout(
+                            widgets=(
+                                HistogramView(model=self.num_spots_histogram),
+                                HistogramView(model=self.num_spots_histogram2),
+                            ),
+                            horizontal=True,
+                        ),
                         ChannelFilterView(model=self.channel_filter_model),
-                    )
+                    ),
+                    horizontal=False,
                 ),
             ),
             menu_actions=(

diff --git a/regexport/views/sidebar.py b/regexport/views/sidebar.py
@@ -1,17 +1,17 @@
 from typing import Tuple
 
-from PySide2.QtWidgets import QVBoxLayout, QWidget
+from PySide2.QtWidgets import QVBoxLayout, QWidget, QHBoxLayout
 
 from .utils import HasWidget
 
 
-class Sidebar(HasWidget):
+class Layout(HasWidget):
 
-    def __init__(self, widgets: Tuple[HasWidget, ...] = ()):
+    def __init__(self, widgets: Tuple[HasWidget, ...] = (), horizontal=False):
         self._widget = QWidget()
         HasWidget.__init__(self, widget=self._widget)
 
-        layout = QVBoxLayout()
+        layout = QHBoxLayout() if horizontal else QVBoxLayout()
         self._widget.setLayout(layout)
 
         self.widgets = widgets

diff --git a/tests/test_gui.py b/tests/test_gui.py
@@ -10,7 +10,7 @@
 from regexport.views.main_window import MainWindow
 from regexport.views.plot_3d import PlotterModel, PlotterView
 from regexport.views.region_tree import BrainRegionTree, BrainRegionTreeModel
-from regexport.views.sidebar import Sidebar
+from regexport.views.sidebar import Layout
 from regexport.views.text_selector import DropdownTextSelectorView, TextSelectorModel
 
 
@@ -39,7 +39,7 @@ def test_region_tree_renders_without_problems(qtbot):
 
 
 def test_sidebar_renders_without_problems(qtbot):
-    sidebar = Sidebar()
+    sidebar = Layout()
     qtbot.add_widget(sidebar.widget)