Skip to content

Commit

Permalink
V5.1.8 on web site
Browse files Browse the repository at this point in the history
DClamp: Dynamic clamp parameters now updated when control panel window
opened. Seal Test: Holding potential setting in use now updated with
default holding potential of selected amplifier.
  • Loading branch information
johndempster committed Aug 5, 2016
1 parent 02677d0 commit 648aded
Show file tree
Hide file tree
Showing 59 changed files with 8,643 additions and 757 deletions.
12 changes: 7 additions & 5 deletions DCLAMPUnit.pas
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
// 29.09.15 DCLAMP Increments now take place either at end of protocol
// or after Nth record
// Updating time now reported in status bar
// 05.08.16 DCLAMP parameters now updated when form opened

interface

Expand Down Expand Up @@ -166,7 +167,7 @@ TDCLAMPFrm = class(TForm)
ComHandle : Integer ;
OverLapStructure : POverlapped ;
INIFileName : String ;
UpdatesEnabled : Boolean ;
// UpdatesEnabled : Boolean ;
// UpdateCounter : Integer ;
StepCounter : Integer ; // Gmax step number (in steps mode)
RecordCounter : Integer ; // Record counter (for Increment after record)
Expand Down Expand Up @@ -449,7 +450,7 @@ procedure TDCLAMPFrm.FormCreate(Sender: TObject);
// Initialisations when form created
// ---------------------------------
begin
UpdatesEnabled := False ;
// UpdatesEnabled := False ;
StepCounter := 0 ;
UpdateTicks := 0 ;
UpdateTicksMax := 0 ;
Expand Down Expand Up @@ -570,8 +571,9 @@ procedure TDCLAMPFrm.FormShow(Sender: TObject);
cbPlot.Items.Add('Time constants vs V') ;
cbPlot.ItemIndex := 0 ;

// Request update of dynamic clamp
UpdatesEnabled := True ;
// Update of dynamic clamp
UpdateDClamp ;
// UpdatesEnabled := True ;

end;

Expand Down Expand Up @@ -1291,7 +1293,7 @@ procedure TDClampFrm.LoadSettingsFile( const IniFileName : string ) ;
sgSteps.Cells[1,i] := format('%.4g %s',[Value,StepUnits[i]]) ;
end;

UpdatesEnabled := True ;
// UpdatesEnabled := True ;
// UpdateCounter := 0 ;

end ;
Expand Down
1 change: 1 addition & 0 deletions DEFSET.PAS
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ procedure TDefSetFrm.SetAOHoldingVoltage(
begin
if not Initialised then Exit ;
Main.SESLabIO.DACHoldingVoltage[AONum] := edLevel.Value ;

end ;


Expand Down
Binary file modified HelpSmith Files/WinWCP.chm
Binary file not shown.
Binary file modified HelpSmith Files/WinWCP.hsm
Binary file not shown.
5 changes: 4 additions & 1 deletion MDIForm.pas
Original file line number Diff line number Diff line change
Expand Up @@ -674,6 +674,9 @@
V5.1.7 13.07.16 curvefit.pas Access violation when T=0 cursor > half of display width fixed.
HekaUnit.pas Correct output channels now set by Heka_WriteDACS()
// fixing bug which caused holding voltage to be set to zero.
V5.1.8 05.08.16 DCLAMPUnit.pas DCLAMP parameters now updated when form opened
sealtest.pas Holding potential setting in use now updated with default holding potential of selected amplifier
=======================================================================}

interface
Expand Down Expand Up @@ -919,7 +922,7 @@ procedure TMain.FormShow(Sender: TObject);
Width := Screen.Width - Left - 20 ;
Height := Screen.Height - Top - 50 ;

ProgVersion := 'V5.1.7';
ProgVersion := 'V5.1.8';
Caption := 'WinWCP : Strathclyde Electrophysiology Software ' + ProgVersion ;

{ Get directory which contains WinWCP program }
Expand Down
33 changes: 22 additions & 11 deletions SEALTEST.PAS
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ unit Sealtest;
when EPC9PanelFrm title bar held down.
09.07.15 .. DACScale arrays increased to cope with up to 128 analog output channels
02.10.15 .. Zap pulse added to panel
// 05.11.15 HekaEPC9USB interface added
05.11.15 .. HekaEPC9USB interface added
05.08.16 .. Holding potential setting in use now updated with default holding potential of selected amplifier
(Change to SetCLampMode)
==================================================}

interface
Expand Down Expand Up @@ -405,7 +407,6 @@ begin

scDisplay.TUnits := Settings.TUnits ;


// Show available output channels
ckPulseToAO0.Visible := False ;
ckPulseToAO1.Visible := False ;
Expand All @@ -429,6 +430,8 @@ begin
edPulseWidth.Value := Settings.SealTest.PulseWidth ;

{ Update holding potential text boxes }


edHoldingVoltage1.Value := Settings.SealTest.HoldingVoltage1 ;
edHoldingVoltage2.Value := Settings.SealTest.HoldingVoltage2 ;
edHoldingVoltage3.Value := Settings.SealTest.HoldingVoltage3 ;
Expand Down Expand Up @@ -697,6 +700,23 @@ begin
ChangeUnits( edPulseHeight3, Units, Scale ) ;
ChangeUnits( edZapAmplitude, Units, Scale ) ;

// Use current default holding potential for selected AO channel
TestDAC := Min(Max(TestDAC,0),Main.SESLabIO.DACNumChannels-1) ;
case Settings.SealTest.Use of
2 : begin
Settings.SealTest.HoldingVoltage2 := Main.SESLabIO.DACHoldingVoltage[TestDAC] ;
edHoldingVoltage2.Value := Settings.SealTest.HoldingVoltage2 ;
end ;
3 : begin
Settings.SealTest.HoldingVoltage3 := Main.SESLabIO.DACHoldingVoltage[TestDAC] ;
edHoldingVoltage3.Value := Settings.SealTest.HoldingVoltage3 ;
end ;
else begin
Settings.SealTest.HoldingVoltage1 := Main.SESLabIO.DACHoldingVoltage[TestDAC] ;
edHoldingVoltage1.Value := Settings.SealTest.HoldingVoltage1 ;
end ;
end ;

end ;


Expand Down Expand Up @@ -1406,24 +1426,15 @@ begin
case Key of
{ F3 selects holding voltage #1 }
VK_F3 : begin
// Settings.SealTest.Use := 1 ;
// Settings.DAC[TestDAC].HoldingVoltage := edHoldingVoltage1.Value ;
// Settings.SealTest.PulseHeight := edPulseHeight1.Value ;
rbUseHoldingVoltage1.checked := True ;
end ;
{ F4 selects holding voltage #2 }
VK_F4 : begin
// Settings.SealTest.Use := 2 ;
// Settings.DAC[TestDAC].HoldingVoltage := edHoldingVoltage2.value ;
// Settings.SealTest.PulseHeight :=edPulseHeight2.Value ;
rbUseHoldingVoltage2.checked := True ;
end ;
{ F5 selects holding voltage #3 }
VK_F5 : begin
rbUseHoldingVoltage3.checked := True ;
// Settings.SealTest.Use := 3 ;
// Settings.DAC[TestDAC].HoldingVoltage := edHoldingVoltage3.Value ;
// Settings.SealTest.PulseHeight := 0.0 ;
end ;
end ;
end;
Expand Down
8 changes: 0 additions & 8 deletions SEALTEST.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -412,10 +412,6 @@ object SealTestFrm: TSealTestFrm
end
object CellTab: TTabSheet
Caption = 'Cell (G)'
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
object Label15: TLabel
Left = 12
Top = 4
Expand Down Expand Up @@ -519,10 +515,6 @@ object SealTestFrm: TSealTestFrm
object CellRTab: TTabSheet
Caption = 'Cell (R)'
ImageIndex = 2
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
object Label18: TLabel
Left = 12
Top = 4
Expand Down
Loading

0 comments on commit 648aded

Please sign in to comment.