LLNL-PyDV 3.8.0__tar.gz → 3.8.2__tar.gz

{llnl_pydv-3.8.0 → llnl_pydv-3.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LLNL-PyDV
-Version: 3.8.0
+Version: 3.8.2
 Summary: PyDV: Python Data Visualizer
 License: BSD
 License-File: LICENSE

{llnl_pydv-3.8.0 → llnl_pydv-3.8.2}/pydv/pdv.py

@@ -1613,18 +1613,6 @@ class Command(cmd.Cmd, object):
                 [PyDV]: stats a:b
                 [PyDV]: stats c d
         """
-
-        def find_mode(array):
-
-            try:
-                mode = scipy.stats.mode(array, keepdims=True)
-            except:
-                mode = scipy.stats.mode(array)
-            if mode.count[0] == 1 and len(array) != 1:
-                return numpy.nan, numpy.nan
-            else:
-                return mode.mode[0], mode.count[0]
-
         if not line:
             return 0
 
@@ -1638,25 +1626,7 @@ class Command(cmd.Cmd, object):
                     try:
                         curvidx = pdvutil.getCurveIndex(line[i], self.plotlist)
                         cur = self.plotlist[curvidx]
-                        numx, countx = find_mode(cur.x)
-                        numy, county = find_mode(cur.y)
-
-                        print('\nCurve ' + cur.plotname)
-                        print('\n\t         X:\t              Y:')
-                        print(f'\n\tlength:    {len(cur.x):<15.10g}\t{len(cur.y):<15.10g}')
-                        print(f'\tmean:      {numpy.mean(cur.x):<15.10g}\t{numpy.mean(cur.y):<15.10g}')
-                        print(f'\tmedian:    {numpy.median(cur.x):<15.10g}\t{numpy.median(cur.y):<15.10g}')
-                        print(f'\tmode:      {numx:<15.10g}\t{numy:<15.10g}')
-                        print(f'\t    count: {countx:<15.10g}\t{county:<15.10g}')
-                        print(f'\tstd:       {numpy.std(cur.x):<15.10g}\t{numpy.std(cur.y):<15.10g}')
-                        print(f'\tskew:      {scipy.stats.skew(cur.x):<15.10g}\t{scipy.stats.skew(cur.y):<15.10g}')
-                        print(f'\tkurtosis:  {scipy.stats.kurtosis(cur.x):<15.10g}\t{scipy.stats.kurtosis(cur.y):<15.10g}')  # noqae501
-                        print(f'\tmin:       {numpy.min(cur.x):<15.10g}\t{numpy.min(cur.y):<15.10g}')
-                        print(f'\t25%:       {numpy.quantile(cur.x,.25):<15.10g}\t{numpy.quantile(cur.y,.25):<15.10g}')
-                        print(f'\t50%:       {numpy.quantile(cur.x,.50):<15.10g}\t{numpy.quantile(cur.y,.50):<15.10g}')
-                        print(f'\t75%:       {numpy.quantile(cur.x,.75):<15.10g}\t{numpy.quantile(cur.y,.75):<15.10g}')
-                        print(f'\tmax:       {numpy.max(cur.x):<15.10g}\t{numpy.max(cur.y):<15.10g}')
-                        print(f'\tsum:       {numpy.sum(cur.x):<15.10g}\t{numpy.sum(cur.y):<15.10g}')
+                        pydvpy.stats(cur)
 
                     except pdvutil.CurveIndexError:
                         pass

{llnl_pydv-3.8.0 → llnl_pydv-3.8.2}/pydv/pdvplot.py

@@ -233,13 +233,13 @@ class Plotter(QMainWindow):
         # Create or clear table
         if self._tableWidget is None:
             self._tableWidget = QTableWidget(rows, cols, self)
-            self._tableWidget.setEditTriggers(QAbstractItemView.NoEditTriggers)
+            self._tableWidget.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers)
             self._tableWidget.setHorizontalHeaderLabels(headerLabels)
             self._tableWidget.setAlternatingRowColors(True)
-            self._tableWidget.setSelectionBehavior(QAbstractItemView.SelectRows)
+            self._tableWidget.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
 
             # Setup Right-click menu
-            self._tableWidget.setContextMenuPolicy(Qt.ActionsContextMenu)
+            self._tableWidget.setContextMenuPolicy(Qt.ContextMenuPolicy.ActionsContextMenu)
             deleteCurveAction = QAction("Delete selected curve(s)", self._tableWidget)
             deleteCurveAction.triggered.connect(self.__deleteCurve)
             self._tableWidget.addAction(deleteCurveAction)
@@ -257,7 +257,7 @@ class Plotter(QMainWindow):
             if c.edited:
                 prefix = '*'
             plotnameItem = QTableWidgetItem(self.tr("%s%s" % (prefix, c.plotname)))
-            plotnameItem.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
+            plotnameItem.setTextAlignment(Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignVCenter)
             self._tableWidget.setItem(row, col, plotnameItem)
             col += 1
 
@@ -324,7 +324,7 @@ class Plotter(QMainWindow):
             vbox.addWidget(scroll)
 
             hbox = QHBoxLayout(self._listDialog)
-            hbox.setAlignment(Qt.AlignCenter)
+            hbox.setAlignment(Qt.AlignmentFlag.AlignCenter)
 
             # Dismiss Button
             okButton = QPushButton(self._listDialog)
@@ -361,13 +361,13 @@ class Plotter(QMainWindow):
         # Create or clear table
         if self._menuTableWidget is None:
             self._menuTableWidget = QTableWidget(rows, cols, self)
-            self._menuTableWidget.setEditTriggers(QAbstractItemView.NoEditTriggers)
+            self._menuTableWidget.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers)
             self._menuTableWidget.setHorizontalHeaderLabels(headerLabels)
             self._menuTableWidget.setAlternatingRowColors(True)
-            self._menuTableWidget.setSelectionBehavior(QAbstractItemView.SelectRows)
+            self._menuTableWidget.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
 
             # Setup Right-click menu
-            self._menuTableWidget.setContextMenuPolicy(Qt.ActionsContextMenu)
+            self._menuTableWidget.setContextMenuPolicy(Qt.ContextMenuPolicy.ActionsContextMenu)
             plotCurveAction = QAction("Plot selected curve(s)", self._menuTableWidget)
             plotCurveAction.triggered.connect(self.__plotMenuCurve)
             self._menuTableWidget.addAction(plotCurveAction)
@@ -456,7 +456,7 @@ class Plotter(QMainWindow):
             vbox.addWidget(scroll)
 
             hbox = QHBoxLayout(self._menuDialog)
-            hbox.setAlignment(Qt.AlignCenter)
+            hbox.setAlignment(Qt.AlignmentFlag.AlignCenter)
 
             # Dismiss Button
             okButton = QPushButton(self._menuDialog)
@@ -560,7 +560,7 @@ class Plotter(QMainWindow):
         okButton.setMinimumSize(100, 20)
         okButton.setMaximumSize(100, 20)
         okButton.setText('OK')
-        hbox.addWidget(okButton, Qt.AlignCenter)
+        hbox.addWidget(okButton, Qt.AlignmentFlag.AlignCenter)
         vbox.addLayout(hbox)
 
         copy_dialog.resize(300, 500)

{llnl_pydv-3.8.0 → llnl_pydv-3.8.2}/pydv/pydvpy.py

@@ -2046,8 +2046,9 @@ def xmax(curvelist, max):
     curves = _convert_to_curvelist(curvelist)
 
     for c in curves:
-        c.x = c.x[np.where(c.x <= float(max))]
-        c.y = c.y[np.where(c.x <= float(max))]
+        mask = np.where(c.x <= float(max))
+        c.x = c.x[mask]
+        c.y = c.y[mask]
 
 
 def xmin(curvelist, min):
@@ -2063,8 +2064,9 @@ def xmin(curvelist, min):
     curves = _convert_to_curvelist(curvelist)
 
     for c in curves:
-        c.x = c.x[np.where(c.x >= float(min))]
-        c.y = c.y[np.where(c.x >= float(min))]
+        mask = np.where(c.x >= float(min))
+        c.x = c.x[mask]
+        c.y = c.y[mask]
 
 
 def xminmax(curvelist, min, max):
@@ -2082,8 +2084,9 @@ def xminmax(curvelist, min, max):
     curves = _convert_to_curvelist(curvelist)
 
     for c in curves:
-        c.x = c.x[np.where(np.logical_and(c.x >= float(min), c.x <= float(max)))]
-        c.y = c.y[np.where(np.logical_and(c.x >= float(min), c.x <= float(max)))]
+        mask = np.where(np.logical_and(c.x >= float(min), c.x <= float(max)))
+        c.x = c.x[mask]
+        c.y = c.y[mask]
 
 
 def ymax(curvelist, max):
@@ -2099,8 +2102,9 @@ def ymax(curvelist, max):
     curves = _convert_to_curvelist(curvelist)
 
     for c in curves:
-        c.x = c.x[np.where(c.y <= float(max))]
-        c.y = c.y[np.where(c.y <= float(max))]
+        mask = np.where(c.y <= float(max))
+        c.x = c.x[mask]
+        c.y = c.y[mask]
 
 
 def ymin(curvelist, min):
@@ -2116,8 +2120,9 @@ def ymin(curvelist, min):
     curves = _convert_to_curvelist(curvelist)
 
     for c in curves:
-        c.x = c.x[np.where(c.y >= float(min))]
-        c.y = c.y[np.where(c.y >= float(min))]
+        mask = np.where(c.y >= float(min))
+        c.x = c.x[mask]
+        c.y = c.y[mask]
 
 
 def yminmax(curvelist, min, max):
@@ -2135,8 +2140,9 @@ def yminmax(curvelist, min, max):
     curves = _convert_to_curvelist(curvelist)
 
     for c in curves:
-        c.x = c.x[np.where(np.logical_and(c.y >= float(min), c.y <= float(max)))]
-        c.y = c.y[np.where(np.logical_and(c.y >= float(min), c.y <= float(max)))]
+        mask = np.where(np.logical_and(c.y >= float(min), c.y <= float(max)))
+        c.x = c.x[mask]
+        c.y = c.y[mask]
 
 
 def yn(curvelist, n):
@@ -3324,6 +3330,45 @@ def getnumpoints(curve):
     return len(curve.x)
 
 
+def stats(curve):
+    """
+    Print statistics of the given curve.
+
+    :param curve: The given curve
+    """
+
+    def find_mode(array):
+
+        try:
+            mode = scipy.stats.mode(array, keepdims=True)
+        except:
+            mode = scipy.stats.mode(array)
+        if mode.count[0] == 1 and len(array) != 1:
+            return np.nan, np.nan
+        else:
+            return mode.mode[0], mode.count[0]
+
+    numx, countx = find_mode(curve.x)
+    numy, county = find_mode(curve.y)
+
+    print('\nCurve ' + curve.plotname)
+    print('\n\t         X:\t              Y:')
+    print(f'\n\tlength:    {len(curve.x):<15.10g}\t{len(curve.y):<15.10g}')
+    print(f'\tmean:      {np.mean(curve.x):<15.10g}\t{np.mean(curve.y):<15.10g}')
+    print(f'\tmedian:    {np.median(curve.x):<15.10g}\t{np.median(curve.y):<15.10g}')
+    print(f'\tmode:      {numx:<15.10g}\t{numy:<15.10g}')
+    print(f'\t    count: {countx:<15.10g}\t{county:<15.10g}')
+    print(f'\tstd:       {np.std(curve.x):<15.10g}\t{np.std(curve.y):<15.10g}')
+    print(f'\tskew:      {scipy.stats.skew(curve.x):<15.10g}\t{scipy.stats.skew(curve.y):<15.10g}')
+    print(f'\tkurtosis:  {scipy.stats.kurtosis(curve.x):<15.10g}\t{scipy.stats.kurtosis(curve.y):<15.10g}')  # noqae501
+    print(f'\tmin:       {np.min(curve.x):<15.10g}\t{np.min(curve.y):<15.10g}')
+    print(f'\t25%:       {np.quantile(curve.x,.25):<15.10g}\t{np.quantile(curve.y,.25):<15.10g}')
+    print(f'\t50%:       {np.quantile(curve.x,.50):<15.10g}\t{np.quantile(curve.y,.50):<15.10g}')
+    print(f'\t75%:       {np.quantile(curve.x,.75):<15.10g}\t{np.quantile(curve.y,.75):<15.10g}')
+    print(f'\tmax:       {np.max(curve.x):<15.10g}\t{np.max(curve.y):<15.10g}')
+    print(f'\tsum:       {np.sum(curve.x):<15.10g}\t{np.sum(curve.y):<15.10g}')
+
+
 def getrange(curvelist):
     """
     Get the range of the curve or list of curves.

llnl_pydv-3.8.2/pydv/scripts/date.txt

@@ -0,0 +1 @@
+10.22.2025

llnl_pydv-3.8.2/pydv/scripts/version.txt

@@ -0,0 +1 @@
+3.8.2

{llnl_pydv-3.8.0 → llnl_pydv-3.8.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool]
 [tool.poetry]
 name = "LLNL-PyDV"
-version = "3.8.0"
+version = "3.8.2"
 description = "PyDV: Python Data Visualizer"
 license = "BSD"
 classifiers = [
@@ -64,7 +64,7 @@ build-backend = "poetry.core.masonry.api"
 line-length = 79
 
 [tool.bumpver]
-current_version = "3.8.0"
+current_version = "3.8.2"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

llnl_pydv-3.8.0/pydv/scripts/date.txt

@@ -1 +0,0 @@
-09.02.2025

llnl_pydv-3.8.0/pydv/scripts/version.txt

@@ -1 +0,0 @@
-3.8.0