v6.34

Author: PBrockmann

PyAnalySeries.py

@@ -58,7 +58,7 @@
     filesName = None
 
 #========================================================================================
-version = 'v6.33'
+version = 'v6.34'
 
 open_ws = {}
 open_displayWindows = {} 
@@ -384,12 +384,15 @@ def load_WorkSheet(fileName):
                 }
 
                 if 'InterpolationMode' in df.columns:
+                    x2coords_idx = df.columns.get_loc('X2Coords')
+                    xoriginal_idx = x2coords_idx + 1
+
                     aDict = aDict | {
                         'InterpolationMode': df['InterpolationMode'][0],
                         'X1Coords': cleanSpaceList(df['X1Coords']),
                         'X2Coords': cleanSpaceList(df['X2Coords']),
-                        'XOriginal': df.columns[11],
-                        'XOriginalValues': addNanList(df.iloc[:,11])
+                        'XOriginal': df.columns[xoriginal_idx],
+                        'XOriginalValues': addNanList(df.iloc[:, xoriginal_idx])
                     }
 
                 itemDict_list.append(aDict)

releases.md

@@ -1,3 +1,6 @@
+ * 6.34
+   * Fix saving of original-axis values (including replicates) for interpolated series
+   * Add original-axis values column to the Data tab of displaySingleSeriesWindow for interpolated series
  * 6.33
    * Fix custom tooltip text visibility with dark/inverted color themes
  * 6.32
@@ -74,8 +77,8 @@
  * 6.03
    * Keep replicates in interpolation, filter
  * 6.02
-   * Rename replicates formerly referred to as duplicates in displaySingleSerieWindow
-   * Add quantiles and other stats in displaySingleSerieWindow
+   * Rename replicates formerly referred to as duplicates in displaySingleSeriesWindow
+   * Add quantiles and other stats in displaySingleSeriesWindow
    * Fix reading WS with trim trailing NaNs when interpolation
  * 6.01
    * Fix PyQt6 breaking change: update key and modifier enums (Qt.Key.Key_C, Qt.KeyboardModifier.ControlModifier).
@@ -168,7 +171,7 @@
  * 5.15
    * Fix Display Together and Display Stacked to disallow INTERPOLATION
    * Fix test on monotonic increasing and unique when import pointers
-   * Fix colors order (missing, duplicates) with displaySingleSerieWindow
+   * Fix colors order (missing, duplicates) with displaySingleSeriesWindow
  * 5.14
    * Fix style for buttons
    * Allow empty cells in 1st column when importing series

resources/defineInterpolationWindow.py

@@ -904,7 +904,7 @@ def saveInterpolationAndSeriesInterpolated(self):
             'InterpolationMode': self.interpolationMode,
             'X': self.X1Name,
             'XOriginal': self.X2Name,
-            'XOriginalValues': self.X2.to_list(),
+            'XOriginalValues': series2.index.to_list(),
             'X1Coords': self.X1Coords,
             'X2Coords': self.X2Coords,
             'Color': generate_color(exclude_color=self.series2Dict['Color']),

resources/displaySingleSeriesWindow.py

@@ -49,15 +49,33 @@ def __init__(self, Id, open_displayWindows, item):
         data_layout = QVBoxLayout()
         self.data_table = CustomQTableWidget()
         self.data_table.setRowCount(len(self.series))
-        self.data_table.setColumnCount(2)
-        self.data_table.setHorizontalHeaderLabels([self.xName, self.yName])
+
+        if 'XOriginalValues' in self.seriesDict:
+            self.data_table.setColumnCount(3)
+            self.data_table.setHorizontalHeaderLabels(
+                [self.xName, self.yName, self.seriesDict['XOriginal']]
+            )
+        else:
+            self.data_table.setColumnCount(2)
+            self.data_table.setHorizontalHeaderLabels(
+                [self.xName, self.yName]
+            )
+
         replicates = self.series.index.duplicated(keep=False)
         missing_values = self.series.isna().to_numpy()
         self.series = self.series.sort_index()
 
         for i in range(len(self.series)):
             self.data_table.setItem(i, 0, QTableWidgetItem(str(f'{self.series.index[i]:.6f}')))
             self.data_table.setItem(i, 1, QTableWidgetItem(str(f'{self.series.values[i]:.6f}')))
+
+            if 'XOriginalValues' in self.seriesDict:
+                if i < len(self.seriesDict['XOriginalValues']):
+                    text = f'{float(self.seriesDict["XOriginalValues"][i]):.6f}'
+                else:
+                    text = ""
+                self.data_table.setItem(i, 2, QTableWidgetItem(text))
+
             if missing_values[i]:
                 base = QColor('peachpuff')
                 alt = QColor('white') if i % 2 == 0 else QColor('whitesmoke')
@@ -70,6 +88,10 @@ def __init__(self, Id, open_displayWindows, item):
                 background_color = QColor('white') if i % 2 == 0 else QColor('whitesmoke')
             self.data_table.item(i, 0).setBackground(background_color)
             self.data_table.item(i, 1).setBackground(background_color)
+
+            if 'XOriginalValues' in self.seriesDict:
+                self.data_table.item(i, 2).setBackground(background_color)
+
         self.data_table.resizeColumnsToContents()
         self.data_table.set_italic_headers()
         self.data_table.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers)