prevents smoothing extra device curves using rate of rise variables

Author: roasterdave

doc/help_dialogs/Input_files/symbolic.xlsx

@@ -144,25 +144,31 @@
         </tr>
         <tr>
             <td>R1</td>
-            <td>ET rate of rise</td>
+            <td>ET rate of rise (smoothed)</td>
             <td>Yes</td>
         </tr>
         <tr>
             <td>R2</td>
-            <td>BT rate of rise</td>
+            <td>BT rate of rise  (smoothed)</td>
             <td>Yes</td>
         </tr>
         <tr>
             <td>RB1</td>
-            <td>Background ET rate of rise</td>
+            <td>Background ET rate of rise  (smoothed)</td>
             <td>Yes</td>
         </tr>
         <tr>
             <td>RB2</td>
-            <td>Background BT rate of rise</td>
+            <td>Background BT rate of rise  (smoothed)</td>
             <td>Yes</td>
         </tr>
     </tbody>
+</table><table width="100%" border="1" padding="1" border-collapse="collapse">
+    <tbody>
+        <tr>
+            <td>Note: Smoothing is normally applied to all Extra Devices.  Smoothing is not applied when an Extra Device symbolic equation includes a rate of rise variable (R1, R2, RB1 or RB2).  Rate of rise variables already have smoothing applied.</td>
+        </tr>
+    </tbody>
 </table><br/><br/><b>SHIFTED SYMBOLIC VARIABLES</b><table width="100%" border="1" padding="1" border-collapse="collapse">
     <tbody>
         <tr>

doc/help_dialogs/Output_html/symbolic_help.html

@@ -10850,7 +10850,10 @@ def redraw(self, recomputeAllDeltas:bool = True, re_smooth_foreground:bool = Tru
                             timexi_lin = None
                         try:
                             if self.aw.extraCurveVisibility1[i]:
-                                if not self.flagon and (re_smooth_foreground or len(self.extrastemp1[i]) != len(self.extratimex[i])):
+                                # Rate of rise variables already have smoothing applied.  We don't smooth equations that use them.
+                                if any(x in self.extramathexpression1[i] for x in ['R1', 'RB1']):
+                                    self.extrastemp1[i] = self.extratemp1[i]
+                                elif not self.flagon and (re_smooth_foreground or len(self.extrastemp1[i]) != len(self.extratimex[i])):
                                     self.extrastemp1[i] = self.smooth_list(self.extratimex[i],
                                         (fill_gaps(self.extratemp1[i]) if self.interpolateDropsflag else self.extratemp1[i]),
                                         window_len=self.curvefilter,
@@ -10895,7 +10898,10 @@ def redraw(self, recomputeAllDeltas:bool = True, re_smooth_foreground:bool = Tru
                             self.adderror((QApplication.translate('Error Message','Exception:') + ' redraw() {0}').format(str(ex)),getattr(exc_tb, 'tb_lineno', '?'))
                         try:
                             if self.aw.extraCurveVisibility2[i]:
-                                if not self.flagon and (re_smooth_foreground or len(self.extrastemp2[i]) != len(self.extratimex[i])):
+                                # Rate of rise variables already have smoothing applied.  We don't smooth equations that use them.
+                                if any(x in self.extramathexpression2[i] for x in ['R2', 'RB2']):
+                                    self.extrastemp2[i] = self.extratemp2[i]
+                                elif not self.flagon and (re_smooth_foreground or len(self.extrastemp2[i]) != len(self.extratimex[i])):
                                     self.extrastemp2[i] = self.smooth_list(self.extratimex[i],
                                         (fill_gaps(self.extratemp2[i]) if self.interpolateDropsflag else self.extratemp2[i]),
                                         window_len=self.curvefilter,

src/artisanlib/canvas.py

@@ -45,11 +45,15 @@ def content() -> str:
     tbl_SymbolicVariables.add_row(['E3',QApplication.translate('HelpDlg','Last event value of the third event type'),' '])
     tbl_SymbolicVariables.add_row(['E4',QApplication.translate('HelpDlg','Last event value of the fourth event type'),' '])
     tbl_SymbolicVariables.add_row([' ',' ',' '])
-    tbl_SymbolicVariables.add_row(['R1',QApplication.translate('HelpDlg','ET rate of rise'),QApplication.translate('HelpDlg','Yes')])
-    tbl_SymbolicVariables.add_row(['R2',QApplication.translate('HelpDlg','BT rate of rise'),QApplication.translate('HelpDlg','Yes')])
-    tbl_SymbolicVariables.add_row(['RB1',QApplication.translate('HelpDlg','Background ET rate of rise'),QApplication.translate('HelpDlg','Yes')])
-    tbl_SymbolicVariables.add_row(['RB2',QApplication.translate('HelpDlg','Background BT rate of rise'),QApplication.translate('HelpDlg','Yes')])
+    tbl_SymbolicVariables.add_row(['R1',QApplication.translate('HelpDlg','ET rate of rise (smoothed)'),QApplication.translate('HelpDlg','Yes')])
+    tbl_SymbolicVariables.add_row(['R2',QApplication.translate('HelpDlg','BT rate of rise  (smoothed)'),QApplication.translate('HelpDlg','Yes')])
+    tbl_SymbolicVariables.add_row(['RB1',QApplication.translate('HelpDlg','Background ET rate of rise  (smoothed)'),QApplication.translate('HelpDlg','Yes')])
+    tbl_SymbolicVariables.add_row(['RB2',QApplication.translate('HelpDlg','Background BT rate of rise  (smoothed)'),QApplication.translate('HelpDlg','Yes')])
     strlist.append(tbl_SymbolicVariables.get_html_string(attributes={'width':'100%','border':'1','padding':'1','border-collapse':'collapse'}))
+    tbl_SymbolicVariablesbottom = prettytable.PrettyTable()
+    tbl_SymbolicVariablesbottom.header = False
+    tbl_SymbolicVariablesbottom.add_row([QApplication.translate('HelpDlg','Note: Smoothing is normally applied to all Extra Devices.  Smoothing is not applied when an Extra Device symbolic equation includes a rate of rise variable (R1, R2, RB1 or RB2).  Rate of rise variables already have smoothing applied.')])
+    strlist.append(tbl_SymbolicVariablesbottom.get_html_string(attributes={'width':'100%','border':'1','padding':'1','border-collapse':'collapse'}))
     strlist.append('<br/><br/><b>')
     strlist.append(QApplication.translate('HelpDlg','SHIFTED SYMBOLIC VARIABLES'))
     strlist.append('</b>')