xarray-graph 0.2.2__py3-none-any.whl → 0.2.3__py3-none-any.whl

xarray_graph/XarrayGraph.py

@@ -905,8 +905,9 @@ class XarrayGraph(QMainWindow):
             item.deleteLater()
             self.add_region(region)
             
-            # stop drawing regions (draw one at a time)
-            self._set_region_drawing_mode(False)
+            # stop drawing regions (draw one at a time)?
+            if self._draw_single_region_action.isChecked():
+                self._set_region_drawing_mode(False)
 
     def _setup_ui(self) -> None:
         self._setup_menubar()
@@ -916,11 +917,13 @@ class XarrayGraph(QMainWindow):
         self._control_panel_toolbar.setStyleSheet("QToolBar{spacing:2px;}")
         self._control_panel_toolbar.setIconSize(QSize(DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE))
         self._control_panel_toolbar.setMovable(False)
+        self._control_panel_toolbar.setContextMenuPolicy(Qt.ContextMenuPolicy.PreventContextMenu)
 
         self._plot_grid_toolbar = QToolBar()
         self._plot_grid_toolbar.setStyleSheet("QToolBar{spacing:2px;}")
         self._plot_grid_toolbar.setIconSize(QSize(DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE))
         self._plot_grid_toolbar.setMovable(False)
+        self._plot_grid_toolbar.setContextMenuPolicy(Qt.ContextMenuPolicy.PreventContextMenu)
         icon_button = QToolButton()
         icon_button.setIcon(qta.icon('fa5s.cubes', options=[{'opacity': 0.5}]))
         icon_button.pressed.connect(self.refresh)
@@ -991,6 +994,18 @@ class XarrayGraph(QMainWindow):
         self._region_button.clicked.connect(self._set_region_drawing_mode)
         self._action_after_dim_iter_things = self._plot_grid_toolbar.addWidget(self._region_button)
 
+        self._region_button_menu = QMenu()
+        self._draw_single_region_action = QAction('Draw single region', self._region_button_menu, checkable=True, checked=True)
+        self._draw_multiple_regions_action = QAction('Draw multiple regions', self._region_button_menu, checkable=True, checked=False)
+        self._region_button_menu.addAction(self._draw_single_region_action)
+        self._region_button_menu.addAction(self._draw_multiple_regions_action)
+        group = QActionGroup(self._region_button_menu)
+        group.addAction(self._draw_single_region_action)
+        group.addAction(self._draw_multiple_regions_action)
+        group.setExclusive(True)
+        self._region_button.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
+        self._region_button.customContextMenuRequested.connect(lambda pos: self._region_button_menu.exec_(self._region_button.mapToGlobal(pos)))
+
         self._home_button = QToolButton()
         self._home_button.setIcon(qta.icon('mdi.home-outline', options=[{'opacity': 0.5}]))
         self._home_button.setToolTip('Autoscale all plots')
@@ -1497,6 +1512,13 @@ class XarrayGraph(QMainWindow):
 
         self._control_panel.addWidget(scroll_area)
     
+    # def _show_region_context_menu(self, pos: QPoint) -> None:
+    #     if not hasattr(self, '_region_button_menu'):
+    #         self._region_button_menu = QMenu()
+    #     menu = QMenu()
+    #     menu.addAction('Draw X-axis regions until unchecked', self.clear_regions)
+    #     menu.exec(self.sender().mapToGlobal(pos))
+    
     def _set_region_drawing_mode(self, draw: bool | None = None) -> None:
         if draw is None:
             draw = self._region_button.isChecked()
@@ -1725,7 +1747,7 @@ class XarrayGraph(QMainWindow):
                 i = np.argpartition(x, len(x) // 2)[len(x) // 2]
                 return x[i]
         if measure_type in ['Min', 'Max', 'AbsMax', 'Peaks']:
-            peak_width = self._peak_width_spinbox.value()
+            peak_width = self._peak_half_width_spinbox.value()
             if peak_width > 0:
                 def get_peak_index_range(mask, center_index):
                     start, stop = center_index, center_index + 1
@@ -2010,21 +2032,21 @@ class XarrayGraph(QMainWindow):
                 dims = yarr.dims
                 
                 # region mask for fit optimization and/or evaluation
-                if regions and (self._curve_fit_optimize_in_visible_regions_checkbox.isChecked() or self._curve_fit_evaluate_in_visible_regions_checkbox.isChecked()):
+                if regions and (self._curve_fit_optimize_in_regions_checkbox.isChecked() or self._curve_fit_evaluate_in_regions_checkbox.isChecked()):
                     # mask for combined regions
                     regions_mask = np.full(xdata.shape, False)
                     for region in regions:
                         xmin, xmax = region
                         regions_mask[(xdata >= xmin) & (xdata <= xmax)] = True
 
-                if regions and self._curve_fit_optimize_in_visible_regions_checkbox.isChecked():
+                if regions and self._curve_fit_optimize_in_regions_checkbox.isChecked():
                     xinput = xdata[regions_mask]
                     yinput = ydata[regions_mask]
                 else:
                     xinput = xdata
                     yinput = ydata
 
-                if regions and self._curve_fit_evaluate_in_visible_regions_checkbox.isChecked():
+                if regions and self._curve_fit_evaluate_in_regions_checkbox.isChecked():
                     xoutput = xdata[regions_mask]
                 else:
                     xoutput = xdata

{xarray_graph-0.2.2.dist-info → xarray_graph-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xarray-graph
-Version: 0.2.2
+Version: 0.2.3
 Summary: PyQt/PySide UI for graphing (x,y) slices of Xarray datasets.
 Keywords: PyQt,PySide,xarray,graph
 Home-page: https://github.com/marcel-goldschen-ohm/xarray-graph

xarray_graph-0.2.3.dist-info/RECORD

@@ -0,0 +1,9 @@
+xarray_graph-0.2.3.dist-info/METADATA,sha256=GaDxbjSvASvVLDl5BMk0KvQpzJHH301TgcX-OzGihFM,1488
+xarray_graph-0.2.3.dist-info/WHEEL,sha256=vnE8JVcI2Wz7GRKorsPArnBdnW2SWKWGow5gu5tHlRU,90
+xarray_graph-0.2.3.dist-info/entry_points.txt,sha256=aW9CKuCZREtN_3Mtg4dKrysPMmHc-tQdUCNmzQYE_vA,61
+xarray_graph-0.2.3.dist-info/licenses/LICENSE,sha256=OE7VkhwkLeFeY8LXi86O-nMXC9B3WsBSILLfPmYGd-8,1077
+xarray_graph/XarrayGraph.py,sha256=0fi5RZ0rt7WS6nIaYoPfEfuDg_StsJJkbpEa9_F60BY,102020
+xarray_graph/__init__.py,sha256=1aAM-Fcno60-ou3AnSqt5HKm6UmZrtULGzg2LF34IJE,48
+xarray_graph/__main__.py,sha256=8c74k8lpaqOuMeKlcBahOKfgo08O7xmJs_htvKKKpck,2274
+xarray_graph/tmp/RegionsManager.py,sha256=0nnrO1e1mqvrs88doO51SJ3JvMNW5wXBKOp2nLQcUFs,1841
+xarray_graph-0.2.3.dist-info/RECORD,,

xarray_graph-0.2.2.dist-info/RECORD

@@ -1,9 +0,0 @@
-xarray_graph-0.2.2.dist-info/METADATA,sha256=YnbvMx6HyGmM7juG94B0Gad3GQnBs0ecGrBdCkAmRsE,1488
-xarray_graph-0.2.2.dist-info/WHEEL,sha256=vnE8JVcI2Wz7GRKorsPArnBdnW2SWKWGow5gu5tHlRU,90
-xarray_graph-0.2.2.dist-info/entry_points.txt,sha256=aW9CKuCZREtN_3Mtg4dKrysPMmHc-tQdUCNmzQYE_vA,61
-xarray_graph-0.2.2.dist-info/licenses/LICENSE,sha256=OE7VkhwkLeFeY8LXi86O-nMXC9B3WsBSILLfPmYGd-8,1077
-xarray_graph/XarrayGraph.py,sha256=nYBqXwW92Jjsb7g4M1zq7ROttf--Pe4rGAOHrx7NT_E,100555
-xarray_graph/__init__.py,sha256=1aAM-Fcno60-ou3AnSqt5HKm6UmZrtULGzg2LF34IJE,48
-xarray_graph/__main__.py,sha256=8c74k8lpaqOuMeKlcBahOKfgo08O7xmJs_htvKKKpck,2274
-xarray_graph/tmp/RegionsManager.py,sha256=0nnrO1e1mqvrs88doO51SJ3JvMNW5wXBKOp2nLQcUFs,1841
-xarray_graph-0.2.2.dist-info/RECORD,,