V5.2.6 on web site

Record to Disk: Unwanted stimulus produced in first Free Run recording sweep after a stimulus protocol now prevented (rec.pas).
johndempster · Mar 17, 2017 · 36d03cf · 36d03cf
1 parent e5f6ae9
commit 36d03cf
Show file tree

Hide file tree

Showing 21 changed files with 190 additions and 161 deletions.
diff --git a/HelpSmith Files/WinWCP.chm b/HelpSmith Files/WinWCP.chm
diff --git a/HelpSmith Files/WinWCP.hsm b/HelpSmith Files/WinWCP.hsm
diff --git a/LEAKSUB.PAS b/LEAKSUB.PAS
@@ -404,9 +404,7 @@ begin
            LeakfH.NumRecords := 0 ;
            SaveHeader( LeakfH ) ;
            end
-     else MessageDlg( 'FileCreate Error ='+ IntToStr(LeakfH.FileHandle),
-             mtWarning, [mbOK], 0 ) ;
-
+     else ShowMessage( 'FileCreate Error ='+ IntToStr(LeakfH.FileHandle));
 
      { Current and voltage channel offsets into ADC buffer }
      IOffset := Channel[cbCurrent.ItemIndex].ChannelOffset;

diff --git a/LEAKSUB.dfm b/LEAKSUB.dfm
@@ -62,6 +62,7 @@ object LeakSubFrm: TLeakSubFrm
     MaxADCValue = 2047
     MinADCValue = -2048
     NumBytesPerSample = 2
+    FloatingPointSamples = False
     FixZeroLevels = False
     DisplaySelected = False
     FontSize = 8

diff --git a/MDIForm.pas b/MDIForm.pas
@@ -691,6 +691,8 @@
           01.03.17   User-defined digital waveform now working
    V5.2.5 03.03.17   Recompiled with Delphi XE6 to correct missing .Zoom property
                      from TRichEdit component which has been added since XE3
+   V5.2.6 17.03.17   Record to Disk: Unwanted stimulus produced in first Free Run recording sweep
+                     after a stimulus protocol now prevented (rec.pas).
             =======================================================================}
 
 interface
@@ -936,7 +938,7 @@ procedure TMain.FormShow(Sender: TObject);
       Width := Screen.Width - Left - 20 ;
       Height := Screen.Height - Top - 50 ;
 
-      ProgVersion := 'V5.2.5';
+      ProgVersion := 'V5.2.6';
       Caption := 'WinWCP : Strathclyde Electrophysiology Software ' + ProgVersion ;
 
       { Get directory which contains WinWCP program }

diff --git a/PRINTGRA.PAS b/PRINTGRA.PAS
@@ -151,7 +151,6 @@ function TPrintGraphFrm.GetCurrentPrinterName : string ;
 const
     MaxSize = 256 ;
 var
-   n,ch,Row : Integer ;
    DeviceName,DeviceDriver,Port : PChar ;
    DeviceMode : THandle ;
 begin

diff --git a/REC.PAS b/REC.PAS
@@ -117,6 +117,10 @@ unit Rec;
   27.02.17 .. UpdateDisplay now called during .bOpenOLAWindowClick to ensure
               window duration is valid when on-line window opened.
   01.03.17 .. Display time scaling no longer changes between and within sweeps.
+  17.03.17 .. Main.SESLabIO.StimulusStartFlag now cleared in StartSweep() in
+              all recording modes other than rmProtocol to avoid generation of
+              unwanted stimulus from previous protocol in first sweep following
+              a stimulus protocol sweep
   ==============================================================================}
 interface
 
@@ -406,19 +410,16 @@ type
   end;
 
 
-
 var
   RecordFrm: TRecordFrm;
 
-
 implementation
 
 {$R *.DFM}
 
 uses MDiform, AmpModule, StimModule , RecPlotUnit, Sealtest,
   TritonPanelUnit, DirectorySelectUnit, Replay, Zero, DCLAMPUnit;
 
-
 procedure TRecordFrm.FormShow(Sender: TObject);
 { ------------------------------------
   Initialisation when form is created
@@ -908,6 +909,7 @@ begin
         if (Main.SESLabIO.StimulusStartFlag = True) and
            (not Main.SESLabIO.DACActive) and
            (not bRecord.enabled) then begin
+           outputdebugstring(pchar('stimulus started'));
            Main.SESLabIO.StartStimulus ;
            end ;
 
@@ -1050,6 +1052,7 @@ begin
                           [RawFH.NumRecords,
                            NumRecordsDone,Settings.NumRecordsRequired] ) ;
          Main.StatusBar.Panels[0].Text :=  edStatus.Text ;
+         Main.SESLabIO.StimulusStartFlag := False ;
          end ;
 
      State := SweepInProgress ;

diff --git a/REC.dfm b/REC.dfm
@@ -77,6 +77,7 @@ object RecordFrm: TRecordFrm
     MaxADCValue = 32768
     MinADCValue = -32768
     NumBytesPerSample = 2
+    FloatingPointSamples = False
     FixZeroLevels = False
     DisplaySelected = False
     FontSize = 8

diff --git a/SETFITPA.PAS b/SETFITPA.PAS
@@ -62,7 +62,6 @@ type
     procedure bInitialiseClick(Sender: TObject);
   private
     { Private declarations }
-    LastPar : Array[0..9] of Single ;
     procedure SetParameterLine( var erPar : TRichEdit ;
                                 var ed : TValidatedEdit ;
                                 var ck : TCheckBox ;

diff --git a/SETFITPA.dfm b/SETFITPA.dfm
@@ -293,6 +293,7 @@ object SetFitParsFrm: TSetFitParsFrm
       ParentFont = False
       ReadOnly = True
       TabOrder = 16
+      Zoom = 100
     end
     object erPar1: TRichEdit
       Left = 4
@@ -312,6 +313,7 @@ object SetFitParsFrm: TSetFitParsFrm
       ParentFont = False
       ReadOnly = True
       TabOrder = 17
+      Zoom = 100
     end
     object erpar2: TRichEdit
       Left = 4
@@ -331,6 +333,7 @@ object SetFitParsFrm: TSetFitParsFrm
       ParentFont = False
       ReadOnly = True
       TabOrder = 18
+      Zoom = 100
     end
     object erpar3: TRichEdit
       Left = 4
@@ -350,6 +353,7 @@ object SetFitParsFrm: TSetFitParsFrm
       ParentFont = False
       ReadOnly = True
       TabOrder = 19
+      Zoom = 100
     end
     object erpar4: TRichEdit
       Left = 4
@@ -369,6 +373,7 @@ object SetFitParsFrm: TSetFitParsFrm
       ParentFont = False
       ReadOnly = True
       TabOrder = 20
+      Zoom = 100
     end
     object erpar5: TRichEdit
       Left = 160
@@ -388,6 +393,7 @@ object SetFitParsFrm: TSetFitParsFrm
       ParentFont = False
       ReadOnly = True
       TabOrder = 21
+      Zoom = 100
     end
     object erpar6: TRichEdit
       Left = 160
@@ -407,6 +413,7 @@ object SetFitParsFrm: TSetFitParsFrm
       ParentFont = False
       ReadOnly = True
       TabOrder = 22
+      Zoom = 100
     end
     object erpar7: TRichEdit
       Left = 160
@@ -426,6 +433,7 @@ object SetFitParsFrm: TSetFitParsFrm
       ParentFont = False
       ReadOnly = True
       TabOrder = 23
+      Zoom = 100
     end
     object erpar8: TRichEdit
       Left = 160
@@ -445,6 +453,7 @@ object SetFitParsFrm: TSetFitParsFrm
       ParentFont = False
       ReadOnly = True
       TabOrder = 24
+      Zoom = 100
     end
     object edpar8: TValidatedEdit
       Left = 200
@@ -491,6 +500,7 @@ object SetFitParsFrm: TSetFitParsFrm
       ParentFont = False
       ReadOnly = True
       TabOrder = 27
+      Zoom = 100
     end
     object edpar9: TValidatedEdit
       Left = 200

diff --git a/TritonPanelUnit.dfm b/TritonPanelUnit.dfm
@@ -42,6 +42,10 @@ object TritonPanelFrm: TTritonPanelFrm
         TabOrder = 0
         object AutoPage: TTabSheet
           Caption = 'Auto'
+          ExplicitLeft = 0
+          ExplicitTop = 0
+          ExplicitWidth = 0
+          ExplicitHeight = 0
           object GroupBox6: TGroupBox
             Left = 8
             Top = 56
@@ -300,7 +304,7 @@ object TritonPanelFrm: TTritonPanelFrm
               OnKeyPress = edVHoldKeyPress
               ShowHint = True
               Text = ' -90 mV'
-              Value = -0.090000003576278680
+              Value = -0.090000003576278690
               Scale = 1000.000000000000000000
               Units = 'mV'
               NumberFormat = '%.4g'
@@ -434,6 +438,10 @@ object TritonPanelFrm: TTritonPanelFrm
         object CapacityPage: TTabSheet
           Caption = 'Capacity'
           ImageIndex = 1
+          ExplicitLeft = 0
+          ExplicitTop = 0
+          ExplicitWidth = 0
+          ExplicitHeight = 0
           object panCFast: TPanel
             Left = 1
             Top = 2
@@ -719,6 +727,10 @@ object TritonPanelFrm: TTritonPanelFrm
         object ResistancePage: TTabSheet
           Caption = 'Resistance'
           ImageIndex = 2
+          ExplicitLeft = 0
+          ExplicitTop = 0
+          ExplicitWidth = 0
+          ExplicitHeight = 0
           object panRLeak: TPanel
             Left = 1
             Top = 26
@@ -897,6 +909,10 @@ object TritonPanelFrm: TTritonPanelFrm
         object JunctionPotPage: TTabSheet
           Caption = 'Junction Pot.'
           ImageIndex = 3
+          ExplicitLeft = 0
+          ExplicitTop = 0
+          ExplicitWidth = 0
+          ExplicitHeight = 0
           object panJunctionPot: TPanel
             Left = 1
             Top = 2

diff --git a/TritonPanelUnit.pas b/TritonPanelUnit.pas
@@ -245,8 +245,8 @@   TTritonPanelFrm = class(TForm)
     CHANOFFEnabled : Array[0..MaxTecellaChannels-1] of Boolean ;
     LEAKEnabled : Array[0..MaxTecellaChannels-1] of Boolean ;
     LEAKFineEnabled : Array[0..MaxTecellaChannels-1] of Boolean ;
-    CHANOFFFineEnabled : Array[0..MaxTecellaChannels-1] of Boolean ;
-    IClampMode : Array[0..MaxTecellaChannels-1] of Boolean ;
+//    CHANOFFFineEnabled : Array[0..MaxTecellaChannels-1] of Boolean ;
+//    IClampMode : Array[0..MaxTecellaChannels-1] of Boolean ;
     ZapAmplitude : Single ;
     ZapDuration : Single ;
     UseAnalogLeakSubtraction : Boolean ;

diff --git a/WinWCP.chm b/WinWCP.chm
diff --git a/WinWCP/WinWCP.mia b/WinWCP/WinWCP.mia
@@ -2116,7 +2116,7 @@ Removes this InstallAware Software Corporation product
 0
 {74EADCE1-2F26-4E19-A146-570F55B98FEA}
 $TARGETDIR$\winwcp.exe
-WinWCP V5.2.4
+WinWCP V5.2.6
 $DESKTOPDIR$
 
 
@@ -2126,7 +2126,7 @@ $DESKTOPDIR$
 0|
 {F728F386-31E8-45B1-83DF-DF1CA070C974}
 $TARGETDIR$\winwcp.exe
-WinWCP V5.2.4
+WinWCP V5.2.6
 $SHORTCUTFOLDER$