xarray-graph 0.2.3__tar.gz → 0.2.5__tar.gz

{xarray_graph-0.2.3 → xarray_graph-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xarray-graph
-Version: 0.2.3
+Version: 0.2.5
 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
@@ -22,9 +22,9 @@ Requires-Dist: numpy>=1.26.2
 Requires-Dist: xarray>=2023.12.0
 Requires-Dist: qtpy>=2.4.1
 Requires-Dist: qtawesome>=1.3.0
-Requires-Dist: pyqt-ext>=1.2.1
-Requires-Dist: pyqtgraph-ext>=1.2.0
-Requires-Dist: xarray-treeview>=1.2.2
+Requires-Dist: pyqt-ext>=1.2.5
+Requires-Dist: pyqtgraph-ext>=1.2.6
+Requires-Dist: xarray-treeview>=1.2.6
 Requires-Dist: scipy>=1.11.4
 Requires-Dist: lmfit>=1.2.2
 Description-Content-Type: text/markdown

{xarray_graph-0.2.3 → xarray_graph-0.2.5}/pyproject.toml

@@ -11,9 +11,9 @@ dependencies = [
     "xarray>=2023.12.0",
     "qtpy>=2.4.1",
     "qtawesome>=1.3.0",
-    "pyqt-ext>=1.2.1",
-    "pyqtgraph-ext>=1.2.0",
-    "xarray-treeview>=1.2.2",
+    "pyqt-ext>=1.2.5",
+    "pyqtgraph-ext>=1.2.6",
+    "xarray-treeview>=1.2.6",
     "scipy>=1.11.4",
     "lmfit>=1.2.2",
 ]
@@ -35,7 +35,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
 ]
-version = "0.2.3"
+version = "0.2.5"
 
 [project.license]
 text = "MIT"

{xarray_graph-0.2.3 → xarray_graph-0.2.5}/src/xarray_graph/XarrayGraph.py

@@ -153,7 +153,7 @@ class XarrayGraph(QMainWindow):
         self._notes_edit.setPlainText(self.attrs.get('notes', ''))
 
         # populate array math selections
-        # self._update_array_math_comboboxes()
+        self._update_array_math_comboboxes()
     
     @property
     def dims(self) -> list[str]:
@@ -1069,6 +1069,7 @@ class XarrayGraph(QMainWindow):
         self._data_treeview.setModel(model)
         self._data_treeview.selectionWasChanged.connect(self._on_tree_selection_changed)
         self._data_treeviewer.setSizes([100, 1])
+        self._data_treeviewer.metadata_tabs.setCurrentIndex(1)
 
         self._xdim_combobox = QComboBox()
         self._xdim_combobox.currentTextChanged.connect(self.set_xdim)
@@ -1191,7 +1192,7 @@ class XarrayGraph(QMainWindow):
         self._math_operator_combobox.setSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Preferred)
 
         self._math_eval_button = QPushButton('Evaluate')
-        # self._math_eval_button.clicked.connect(self.eval_array_math)
+        self._math_eval_button.pressed.connect(self.eval_array_math)
 
         math_group = QGroupBox('Array math')
         grid = QGridLayout(math_group)
@@ -1512,13 +1513,6 @@ 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()
@@ -1667,57 +1661,48 @@ class XarrayGraph(QMainWindow):
                 if isinstance(item, XAxisRegion):
                     item.setFontSize(self._textitem_fontsize_spinbox.value())
 
-    # def _update_array_math_comboboxes(self) -> None:
-    #     var_items = []
-    #     item = self._data_treeview.model().root
-    #     while item is not None:
-    #         if item.is_var():
-    #             var_items += [item.name_from_path(maxchar=100)]
-    #         item = item.next_depth_first()
-    #     self._math_lhs_combobox.clear()
-    #     self._math_rhs_combobox.clear()
-    #     self._math_lhs_combobox.addItems(var_items)
-    #     self._math_rhs_combobox.addItems(var_items)
+    def _update_array_math_comboboxes(self) -> None:
+        var_paths = [item.path for item in self._data_treeview.model().root().depth_first() if item.is_var()]
+        for i in range(len(var_paths)):
+            if len(var_paths[i]) > 100:
+                var_paths[i] = '...' + var_paths[i][-97:]
+        self._math_lhs_combobox.clear()
+        self._math_rhs_combobox.clear()
+        self._math_lhs_combobox.addItems(var_paths)
+        self._math_rhs_combobox.addItems(var_paths)
     
-    # def eval_array_math(self) -> None:
-    #     var_items = []
-    #     item = self._data_treeview.model().root
-    #     while item is not None:
-    #         if item.is_var():
-    #             var_items += [item]
-    #         item = item.next_depth_first()
-    #     lhs_item = var_items[self._math_lhs_combobox.currentIndex()]
-    #     rhs_item = var_items[self._math_rhs_combobox.currentIndex()]
-    #     lhs: xr.DataArray = lhs_item.node.inherited_data(lhs_item.key)
-    #     rhs: xr.DataArray = rhs_item.node.inherited_data(rhs_item.key)
-    #     op = self._math_operator_combobox.currentText()
-    #     # TODO: limit vars to the intersection of their coords
-    #     if op == '+':
-    #         result = lhs + rhs
-    #     elif op == '-':
-    #         result = lhs - rhs
-    #     elif op == '*':
-    #         result = lhs * rhs
-    #     elif op == '/':
-    #         result = lhs / rhs
-    #     # append result as child of lhs_item
-    #     # TODO: handle result name collisions
-    #     result_name = self._math_result_name_edit.text().strip()
-    #     ds = xr.Dataset(data_vars={result.name: result})
-    #     result_node = XarrayTreeNode(name=result_name, dataset=ds, parent=lhs_item.node)
+    def eval_array_math(self) -> None:
+        var_items = [item for item in self._data_treeview.model().root().depth_first() if item.is_var()]
+        lhs_item = var_items[self._math_lhs_combobox.currentIndex()]
+        rhs_item = var_items[self._math_rhs_combobox.currentIndex()]
+        lhs: xr.DataArray = lhs_item.node[lhs_item.key]
+        rhs: xr.DataArray = rhs_item.node[rhs_item.key]
+        op = self._math_operator_combobox.currentText()
+        if op == '+':
+            result = lhs + rhs
+        elif op == '-':
+            result = lhs - rhs
+        elif op == '*':
+            result = lhs * rhs
+        elif op == '/':
+            result = lhs / rhs
+        # append result as child of lhs_item
+        result_name = self._math_result_name_edit.text().strip()
+        if result_name == '':
+            result_name = self._math_result_name_edit.placeholderText()
+        result_ds = xr.Dataset(data_vars={result.name: result})
+        result_node = DataTree(name=result_name, data=result_ds, parent=lhs_item.node)
         
-    #     # update data tree
-    #     self.data = self.data
-
-    #     # make sure newly added node is selected and expanded
-    #     model: XarrayTreeModel = self._data_treeview.model()
-    #     item: XarrayTreeItem = model.root
-    #     while item is not None:
-    #         if item.node is result_node and item.is_var():
-    #             index: QModelIndex = model.createIndex(item.row(), 0, item)
-    #             self._data_treeview.selectionModel().select(index, QItemSelectionModel.SelectionFlag.Select | QItemSelectionModel.SelectionFlag.Rows)
-    #             self._data_treeview.setExpanded(model.parent(index), True)
-    #         item = item.next_depth_first()
+        # update data tree
+        self.data = self.data
+
+        # make sure newly added fit nodes are selected and expanded
+        model: XarrayTreeModel = self._data_treeview.model()
+        for item in model.root().depth_first():
+            if item.node is result_node and item.is_var():
+                index: QModelIndex = model.createIndex(item.sibling_index, 0, item)
+                self._data_treeview.selectionModel().select(index, QItemSelectionModel.SelectionFlag.Select | QItemSelectionModel.SelectionFlag.Rows)
+                self._data_treeview.setExpanded(model.parent(index), True)
     
     # # @Slot()
     # # def on_axes_item_changed(self):