Skip to content

Commit ea7c6c9

Browse files
t-bt-b
authored
Merge pull request #576 from AllenInstitute/feature/rework-PA-enable-checkbox-logic
Feature/rework pa enable checkbox logic
2 parents 0b3df2c + 5e0d483 commit ea7c6c9

File tree

4 files changed

+20
-111
lines changed

4 files changed

+20
-111
lines changed

‎Packages/MIES/MIES_BrowserSettingsPanel.ipf‎

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,6 @@ static Function BSP_InitMainCheckboxes(win)
524524

525525
BSP_SetOVSControlStatus(bsPanel)
526526
BSP_SetARControlStatus(bsPanel)
527-
BSP_SetPAControlStatus(bsPanel)
528527

529528
return 1
530529
End
@@ -553,22 +552,6 @@ Function BSP_SetARControlStatus(win)
553552
BSP_SetControlStatus(win, controlList, AR_IsActive(win))
554553
End
555554

556-
/// @brief enable/disable the PA buttons
557-
///
558-
/// @param win specify mainPanel or bsPanel with OVS controls
559-
Function BSP_SetPAControlStatus(win)
560-
string win
561-
562-
string controlList
563-
564-
controlList = "group_properties_pulse;check_pulseAver_indTraces;check_pulseAver_showAver;check_pulseAver_zeroTrac;check_pulseAver_multGraphs;check_pulseAver_deconv;check_pulseAver_timeAlign;setvar_pulseAver_startPulse;setvar_pulseAver_endPulse;setvar_pulseAver_fallbackLength;"
565-
BSP_SetControlStatus(win, controlList, PA_IsActive(win))
566-
BSP_SetIndividualControlStatus(win)
567-
BSP_SetDeconvControlStatus(win)
568-
569-
BSP_SetDeconvControlStatus(win)
570-
End
571-
572555
/// @brief enable/disable the SF buttons
573556
///
574557
/// @param win specify mainPanel or bsPanel with OVS controls
@@ -579,31 +562,6 @@ Function BSP_SetSFControlStatus(win)
579562

580563
controlList = "group_properties_sweepFormula;SF_InfoTab;button_sweepFormula_display;button_sweepFormula_check;setvar_sweepFormula_parseResult;status_sweepFormula_parser;"
581564
BSP_SetControlStatus(win, controlList, SF_IsActive(win))
582-
BSP_SetIndividualControlStatus(win)
583-
End
584-
585-
/// @brief enable/disable the buttons that rely on displayed traces
586-
///
587-
/// @param win specify mainPanel or bsPanel with OVS controls
588-
Function BSP_SetIndividualControlStatus(win)
589-
string win
590-
591-
BSP_SetControlStatus(win, "check_pulseAver_timeAlign", PA_IndividualIsActive(win))
592-
End
593-
594-
/// @brief enable/disable deconvolution buttons depending on the status of @c check_pulseAver_showAver
595-
///
596-
/// @param win specify mainPanel or bsPanel with OVS controls
597-
Function BSP_SetDeconvControlStatus(win)
598-
string win
599-
600-
string controlList
601-
602-
controlList = "group_pulseAver_deconv;check_pulseAver_deconv;"
603-
BSP_SetControlStatus(win, controlList, PA_AverageIsActive(win))
604-
605-
controlList = "setvar_pulseAver_deconv_tau;setvar_pulseAver_deconv_smth;setvar_pulseAver_deconv_range;"
606-
BSP_SetControlStatus(win, controlList, PA_DeconvolutionIsActive(win))
607565
End
608566

609567
/// @brief enable/disable a list of controls
@@ -704,8 +662,7 @@ Function BSP_CheckBoxProc_PerPulseAver(cba) : CheckBoxControl
704662
switch(cba.eventCode)
705663
case 2: // mouse up
706664
mainPanel = GetMainWindow(cba.win)
707-
BSP_SetPAControlStatus(mainPanel)
708-
UpdateSweepPlot(mainPanel)
665+
PA_Update(mainPanel)
709666
break
710667
endswitch
711668

‎Packages/MIES/MIES_Constants.ipf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ Constant HARDWARE_DAC_EXTERNAL_TRIGGER = 0x1
585585

586586
/// Used to upgrade the GuiStateWave as well as the DA Ephys panel
587587
Constant DA_EPHYS_PANEL_VERSION = 49
588-
Constant DATABROWSER_PANEL_VERSION = 19
588+
Constant DATABROWSER_PANEL_VERSION = 20
589589
Constant SWEEPBROWSER_PANEL_VERSION = 6
590590
Constant WAVEBUILDER_PANEL_VERSION = 8
591591

‎Packages/MIES/MIES_DataBrowser_Macro.ipf‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -501,93 +501,93 @@ Window DataBrowser() : Graph
501501
CheckBox check_highlightRanges,userdata(ResizeControlsInfo) += A"zzzzzzzzzzzz!!#u:Du]k<zzzzzzzzzzz"
502502
CheckBox check_highlightRanges,userdata(ResizeControlsInfo) += A"zzz!!#u:Du]k<zzzzzzzzzzzzzz!!!"
503503
CheckBox check_highlightRanges,value= 0
504-
SetVariable setvar_pulseAver_fallbackLength,pos={114.00,225.00},size={137.00,18.00},bodyWidth=50,disable=3,proc=PA_SetVarProc_Common,title="Fallback Length"
504+
SetVariable setvar_pulseAver_fallbackLength,pos={114.00,225.00},size={137.00,18.00},bodyWidth=50,proc=PA_SetVarProc_Common,title="Fallback Length"
505505
SetVariable setvar_pulseAver_fallbackLength,help={"Pulse To Pulse Length in ms for edge cases which can not be computed."}
506506
SetVariable setvar_pulseAver_fallbackLength,userdata(tabnum)= "4"
507507
SetVariable setvar_pulseAver_fallbackLength,userdata(tabcontrol)= "Settings"
508508
SetVariable setvar_pulseAver_fallbackLength,userdata(ResizeControlsInfo)= A"!!,FI!!#Ap!!#@m!!#<Hz!!#`-A7TLfzzzzzzzzzzzzzz!!#r+D.OhkBk2=!z"
509509
SetVariable setvar_pulseAver_fallbackLength,userdata(ResizeControlsInfo) += A"zzzzzzzzzzzz!!#u:Du]k<zzzzzzzzzzz"
510510
SetVariable setvar_pulseAver_fallbackLength,userdata(ResizeControlsInfo) += A"zzz!!#u:Du]k<zzzzzzzzzzzzzz!!!"
511511
SetVariable setvar_pulseAver_fallbackLength,value= _NUM:100
512-
SetVariable setvar_pulseAver_endPulse,pos={132.00,204.00},size={122.00,18.00},bodyWidth=50,disable=3,proc=PA_SetVarProc_Common,title="Ending Pulse"
512+
SetVariable setvar_pulseAver_endPulse,pos={132.00,204.00},size={122.00,18.00},bodyWidth=50,proc=PA_SetVarProc_Common,title="Ending Pulse"
513513
SetVariable setvar_pulseAver_endPulse,userdata(tabnum)= "4"
514514
SetVariable setvar_pulseAver_endPulse,userdata(tabcontrol)= "Settings"
515515
SetVariable setvar_pulseAver_endPulse,userdata(ResizeControlsInfo)= A"!!,Fi!!#A[!!#@X!!#<Hz!!#`-A7TLfzzzzzzzzzzzzzz!!#r+D.OhkBk2=!z"
516516
SetVariable setvar_pulseAver_endPulse,userdata(ResizeControlsInfo) += A"zzzzzzzzzzzz!!#u:Du]k<zzzzzzzzzzz"
517517
SetVariable setvar_pulseAver_endPulse,userdata(ResizeControlsInfo) += A"zzz!!#u:Du]k<zzzzzzzzzzzzzz!!!"
518518
SetVariable setvar_pulseAver_endPulse,value= _NUM:inf
519-
SetVariable setvar_pulseAver_startPulse,pos={127.00,180.00},size={126.00,18.00},bodyWidth=50,disable=3,proc=PA_SetVarProc_Common,title="Starting Pulse"
519+
SetVariable setvar_pulseAver_startPulse,pos={127.00,180.00},size={126.00,18.00},bodyWidth=50,proc=PA_SetVarProc_Common,title="Starting Pulse"
520520
SetVariable setvar_pulseAver_startPulse,userdata(tabnum)= "4"
521521
SetVariable setvar_pulseAver_startPulse,userdata(tabcontrol)= "Settings"
522522
SetVariable setvar_pulseAver_startPulse,userdata(ResizeControlsInfo)= A"!!,Fc!!#AC!!#@`!!#<Hz!!#`-A7TLfzzzzzzzzzzzzzz!!#r+D.OhkBk2=!z"
523523
SetVariable setvar_pulseAver_startPulse,userdata(ResizeControlsInfo) += A"zzzzzzzzzzzz!!#u:Du]k<zzzzzzzzzzz"
524524
SetVariable setvar_pulseAver_startPulse,userdata(ResizeControlsInfo) += A"zzz!!#u:Du]k<zzzzzzzzzzzzzz!!!"
525525
SetVariable setvar_pulseAver_startPulse,value= _NUM:0
526-
CheckBox check_pulseAver_multGraphs,pos={124.00,162.00},size={121.00,15.00},disable=3,proc=PA_CheckProc_Common,title="Use multiple graphs"
526+
CheckBox check_pulseAver_multGraphs,pos={124.00,162.00},size={121.00,15.00},proc=PA_CheckProc_Common,title="Use multiple graphs"
527527
CheckBox check_pulseAver_multGraphs,help={"Show the single pulses in multiple graphs or only one graph with mutiple axis."}
528528
CheckBox check_pulseAver_multGraphs,userdata(tabnum)= "4"
529529
CheckBox check_pulseAver_multGraphs,userdata(tabcontrol)= "Settings"
530530
CheckBox check_pulseAver_multGraphs,userdata(ResizeControlsInfo)= A"!!,F]!!#A1!!#@V!!#<(z!!#`-A7TLfzzzzzzzzzzzzzz!!#r+D.OhkBk2=!z"
531531
CheckBox check_pulseAver_multGraphs,userdata(ResizeControlsInfo) += A"zzzzzzzzzzzz!!#u:Du]k<zzzzzzzzzzz"
532532
CheckBox check_pulseAver_multGraphs,userdata(ResizeControlsInfo) += A"zzz!!#u:Du]k<zzzzzzzzzzzzzz!!!"
533533
CheckBox check_pulseAver_multGraphs,value= 0
534-
CheckBox check_pulseAver_zeroTrac,pos={124.00,120.00},size={74.00,15.00},disable=3,proc=PA_CheckProc_Common,title="Zero traces"
534+
CheckBox check_pulseAver_zeroTrac,pos={124.00,120.00},size={74.00,15.00},proc=PA_CheckProc_Common,title="Zero traces"
535535
CheckBox check_pulseAver_zeroTrac,help={"Zero the individual traces using subsequent differentiation and integration"}
536536
CheckBox check_pulseAver_zeroTrac,userdata(tabnum)= "4"
537537
CheckBox check_pulseAver_zeroTrac,userdata(tabcontrol)= "Settings"
538538
CheckBox check_pulseAver_zeroTrac,userdata(ResizeControlsInfo)= A"!!,F]!!#@T!!#?M!!#<(z!!#`-A7TLfzzzzzzzzzzzzzz!!#r+D.OhkBk2=!z"
539539
CheckBox check_pulseAver_zeroTrac,userdata(ResizeControlsInfo) += A"zzzzzzzzzzzz!!#u:Du]k<zzzzzzzzzzz"
540540
CheckBox check_pulseAver_zeroTrac,userdata(ResizeControlsInfo) += A"zzz!!#u:Du]k<zzzzzzzzzzzzzz!!!"
541541
CheckBox check_pulseAver_zeroTrac,value= 0
542-
CheckBox check_pulseAver_showAver,pos={124.00,141.00},size={118.00,15.00},disable=3,proc=PA_CheckProc_Average,title="Show average trace"
542+
CheckBox check_pulseAver_showAver,pos={124.00,141.00},size={118.00,15.00},proc=PA_CheckProc_Average,title="Show average trace"
543543
CheckBox check_pulseAver_showAver,help={"Show the average trace"}
544544
CheckBox check_pulseAver_showAver,userdata(tabnum)= "4"
545545
CheckBox check_pulseAver_showAver,userdata(tabcontrol)= "Settings"
546546
CheckBox check_pulseAver_showAver,userdata(ResizeControlsInfo)= A"!!,F]!!#@q!!#@P!!#<(z!!#`-A7TLfzzzzzzzzzzzzzz!!#r+D.OhkBk2=!z"
547547
CheckBox check_pulseAver_showAver,userdata(ResizeControlsInfo) += A"zzzzzzzzzzzz!!#u:Du]k<zzzzzzzzzzz"
548548
CheckBox check_pulseAver_showAver,userdata(ResizeControlsInfo) += A"zzz!!#u:Du]k<zzzzzzzzzzzzzz!!!"
549549
CheckBox check_pulseAver_showAver,value= 0
550-
CheckBox check_pulseAver_indTraces,pos={124.00,99.00},size={134.00,15.00},disable=3,proc=PA_CheckProc_Individual,title="Show individual traces"
550+
CheckBox check_pulseAver_indTraces,pos={124.00,99.00},size={134.00,15.00},proc=PA_CheckProc_Individual,title="Show individual traces"
551551
CheckBox check_pulseAver_indTraces,help={"Show the individual traces"}
552552
CheckBox check_pulseAver_indTraces,userdata(tabnum)= "4"
553553
CheckBox check_pulseAver_indTraces,userdata(tabcontrol)= "Settings"
554554
CheckBox check_pulseAver_indTraces,userdata(ResizeControlsInfo)= A"!!,F]!!#@*!!#@j!!#<(z!!#`-A7TLfzzzzzzzzzzzzzz!!#r+D.OhkBk2=!z"
555555
CheckBox check_pulseAver_indTraces,userdata(ResizeControlsInfo) += A"zzzzzzzzzzzz!!#u:Du]k<zzzzzzzzzzz"
556556
CheckBox check_pulseAver_indTraces,userdata(ResizeControlsInfo) += A"zzz!!#u:Du]k<zzzzzzzzzzzzzz!!!"
557557
CheckBox check_pulseAver_indTraces,value= 1
558-
CheckBox check_pulseAver_deconv,pos={124.00,249.00},size={94.00,15.00},disable=3,proc=PA_CheckProc_Deconvolution,title="Deconvolution"
558+
CheckBox check_pulseAver_deconv,pos={124.00,249.00},size={94.00,15.00},proc=PA_CheckProc_Deconvolution,title="Deconvolution"
559559
CheckBox check_pulseAver_deconv,help={"Show Deconvolution: tau * dV/dt + V"}
560560
CheckBox check_pulseAver_deconv,userdata(tabnum)= "4"
561561
CheckBox check_pulseAver_deconv,userdata(tabcontrol)= "Settings"
562562
CheckBox check_pulseAver_deconv,userdata(ResizeControlsInfo)= A"!!,F]!!#B3!!#?u!!#<(z!!#`-A7TLfzzzzzzzzzzzzzz!!#r+D.OhkBk2=!z"
563563
CheckBox check_pulseAver_deconv,userdata(ResizeControlsInfo) += A"zzzzzzzzzzzz!!#u:Du]k<zzzzzzzzzzz"
564564
CheckBox check_pulseAver_deconv,userdata(ResizeControlsInfo) += A"zzz!!#u:Du]k<zzzzzzzzzzzzzz!!!"
565565
CheckBox check_pulseAver_deconv,value= 0
566-
CheckBox check_pulseAver_timeAlign,pos={124.00,348.00},size={101.00,15.00},disable=3,proc=PA_CheckProc_Common,title="Time Alignment"
566+
CheckBox check_pulseAver_timeAlign,pos={124.00,348.00},size={101.00,15.00},proc=PA_CheckProc_Common,title="Time Alignment"
567567
CheckBox check_pulseAver_timeAlign,help={"Automatically align all traces in the PA graph to a reference trace from the diagonal element"}
568568
CheckBox check_pulseAver_timeAlign,userdata(tabnum)= "4"
569569
CheckBox check_pulseAver_timeAlign,userdata(tabcontrol)= "Settings"
570570
CheckBox check_pulseAver_timeAlign,userdata(ResizeControlsInfo)= A"!!,F]!!#Bh!!#@.!!#<(z!!#`-A7TLfzzzzzzzzzzzzzz!!#r+D.OhkBk2=!z"
571571
CheckBox check_pulseAver_timeAlign,userdata(ResizeControlsInfo) += A"zzzzzzzzzzzz!!#u:Du]k<zzzzzzzzzzz"
572572
CheckBox check_pulseAver_timeAlign,userdata(ResizeControlsInfo) += A"zzz!!#u:Du]k<zzzzzzzzzzzzzz!!!"
573573
CheckBox check_pulseAver_timeAlign,value= 0
574-
SetVariable setvar_pulseAver_deconv_tau,pos={156.00,270.00},size={98.00,18.00},bodyWidth=50,disable=3,proc=PA_SetVarProc_Common,title="tau [ms]"
574+
SetVariable setvar_pulseAver_deconv_tau,pos={156.00,270.00},size={98.00,18.00},bodyWidth=50,proc=PA_SetVarProc_Common,title="tau [ms]"
575575
SetVariable setvar_pulseAver_deconv_tau,help={"Deconvolution time tau: tau * dV/dt + V"}
576576
SetVariable setvar_pulseAver_deconv_tau,userdata(tabnum)= "4"
577577
SetVariable setvar_pulseAver_deconv_tau,userdata(tabcontrol)= "Settings"
578578
SetVariable setvar_pulseAver_deconv_tau,userdata(ResizeControlsInfo)= A"!!,G,!!#BA!!#@(!!#<Hz!!#`-A7TLfzzzzzzzzzzzzzz!!#r+D.OhkBk2=!z"
579579
SetVariable setvar_pulseAver_deconv_tau,userdata(ResizeControlsInfo) += A"zzzzzzzzzzzz!!#u:Du]k<zzzzzzzzzzz"
580580
SetVariable setvar_pulseAver_deconv_tau,userdata(ResizeControlsInfo) += A"zzz!!#u:Du]k<zzzzzzzzzzzzzz!!!"
581581
SetVariable setvar_pulseAver_deconv_tau,limits={0,inf,0},value= _NUM:15
582-
SetVariable setvar_pulseAver_deconv_smth,pos={138.00,294.00},size={112.00,18.00},bodyWidth=50,disable=3,proc=PA_SetVarProc_Common,title="smoothing"
582+
SetVariable setvar_pulseAver_deconv_smth,pos={138.00,294.00},size={112.00,18.00},bodyWidth=50,proc=PA_SetVarProc_Common,title="smoothing"
583583
SetVariable setvar_pulseAver_deconv_smth,help={"Smoothing factor to use before the deconvolution is calculated. Set to 1 to do the calculation without smoothing."}
584584
SetVariable setvar_pulseAver_deconv_smth,userdata(tabnum)= "4"
585585
SetVariable setvar_pulseAver_deconv_smth,userdata(tabcontrol)= "Settings"
586586
SetVariable setvar_pulseAver_deconv_smth,userdata(ResizeControlsInfo)= A"!!,Fo!!#BM!!#@D!!#<Hz!!#`-A7TLfzzzzzzzzzzzzzz!!#r+D.OhkBk2=!z"
587587
SetVariable setvar_pulseAver_deconv_smth,userdata(ResizeControlsInfo) += A"zzzzzzzzzzzz!!#u:Du]k<zzzzzzzzzzz"
588588
SetVariable setvar_pulseAver_deconv_smth,userdata(ResizeControlsInfo) += A"zzz!!#u:Du]k<zzzzzzzzzzzzzz!!!"
589589
SetVariable setvar_pulseAver_deconv_smth,limits={1,inf,0},value= _NUM:1000
590-
SetVariable setvar_pulseAver_deconv_range,pos={135.00,315.00},size={118.00,18.00},bodyWidth=50,disable=3,proc=PA_SetVarProc_Common,title="display [ms]"
590+
SetVariable setvar_pulseAver_deconv_range,pos={135.00,315.00},size={118.00,18.00},bodyWidth=50,proc=PA_SetVarProc_Common,title="display [ms]"
591591
SetVariable setvar_pulseAver_deconv_range,help={"Time in ms from the beginning of the pulse that is used for the calculation"}
592592
SetVariable setvar_pulseAver_deconv_range,userdata(tabnum)= "4"
593593
SetVariable setvar_pulseAver_deconv_range,userdata(tabcontrol)= "Settings"

‎Packages/MIES/MIES_PulseAveraging.ipf‎

Lines changed: 6 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,8 @@ static Function PA_DeconvGatherSettings(win, deconvolution)
339339

340340
string bsPanel = BSP_GetPanel(win)
341341

342-
deconvolution.enable = PA_DeconvolutionIsActive(win)
342+
deconvolution.enable = GetCheckboxState(bsPanel, "check_pulseAver_deconv") \
343+
&& GetCheckboxState(bsPanel, "check_pulseAver_showAver")
343344
deconvolution.smth = GetSetVariable(bsPanel, "setvar_pulseAver_deconv_smth")
344345
deconvolution.tau = GetSetVariable(bsPanel, "setvar_pulseAver_deconv_tau")
345346
deconvolution.range = GetSetVariable(bsPanel, "setvar_pulseAver_deconv_range")
@@ -806,7 +807,6 @@ Function PA_CheckProc_Individual(cba) : CheckBoxControl
806807

807808
switch(cba.eventCode)
808809
case 2: // mouse up
809-
BSP_SetIndividualControlStatus(cba.win)
810810
PA_Update(cba.win)
811811
break
812812
endswitch
@@ -819,7 +819,6 @@ Function PA_CheckProc_Average(cba) : CheckBoxControl
819819

820820
switch(cba.eventCode)
821821
case 2: // mouse up
822-
BSP_SetDeconvControlStatus(cba.win)
823822
PA_Update(cba.win)
824823
break
825824
endswitch
@@ -832,8 +831,7 @@ Function PA_CheckProc_Deconvolution(cba) : CheckBoxControl
832831

833832
switch( cba.eventCode )
834833
case 2: // mouse up
835-
BSP_SetDeconvControlStatus(cba.win)
836-
PA_UpdateSweepPlotDeconvolution(cba.win, cba.checked)
834+
PA_UpdateSweepPlotDeconvolution(cba.win)
837835
break
838836
case -1: // control being killed
839837
break
@@ -863,75 +861,29 @@ Function PA_IsActive(win)
863861
return BSP_IsActive(win, MIES_BSP_PA)
864862
End
865863

866-
/// @brief checks if "show individual traces" in PA is activated.
867-
Function PA_IndividualIsActive(win)
868-
string win
869-
870-
string bsPanel
871-
872-
if(!PA_IsActive(win))
873-
return 0
874-
endif
875-
876-
bsPanel = BSP_GetPanel(win)
877-
return GetCheckBoxState(bsPanel, "check_pulseAver_indTraces")
878-
End
879-
880-
/// @brief checks if "show average trace" in PA is activated.
881-
Function PA_AverageIsActive(win)
882-
string win
883-
884-
string bsPanel
885-
886-
if(!PA_IsActive(win))
887-
return 0
888-
endif
889-
890-
bsPanel = BSP_GetPanel(win)
891-
return GetCheckboxState(bsPanel, "check_pulseAver_showAver")
892-
End
893-
894-
/// @brief checks if "show average trace" in PA is activated.
895-
Function PA_DeconvolutionIsActive(win)
896-
string win
897-
898-
string bsPanel
899-
900-
if(!PA_AverageIsActive(win))
901-
return 0
902-
endif
903-
904-
bsPanel = BSP_GetPanel(win)
905-
return GetCheckboxState(bsPanel, "check_pulseAver_deconv")
906-
End
907-
908864
/// @brief Update deconvolution traces in Sweep Plots
909-
static Function PA_UpdateSweepPlotDeconvolution(win, show)
865+
static Function PA_UpdateSweepPlotDeconvolution(win)
910866
string win
911-
variable show
912867

913868
string graph, graphs, horizAxis, vertAxis
914869
string traceName, fullPath, avgTrace
915870
string baseName, bsPanel
916871
variable i, numGraphs, j, numTraces, traceIndex
917872
STRUCT PulseAverageDeconvSettings deconvolution
918873

919-
win = GetMainWindow(win)
920874
if(!PA_IsActive(win))
921875
return 0
922876
endif
923877

924878
bsPanel = BSP_GetPanel(win)
925879
PA_DeconvGatherSettings(bsPanel, deconvolution)
926880

927-
show = !!show
928-
929881
graphs = PA_GetAverageGraphs()
930882
numGraphs = ItemsInList(graphs)
931883
for(i = 0; i < numGraphs; i += 1)
932884
graph = StringFromList(i, graphs)
933885

934-
if(show)
886+
if(deconvolution.enable)
935887
WAVE/T traces = TUD_GetUserDataAsWave(graph, "traceName", keys = {"traceType", "DiagonalElement"}, values = {"Average", "0"})
936888

937889
traceIndex = TUD_GetTraceCount(graph)
@@ -962,7 +914,7 @@ static Function PA_UpdateSweepPlotDeconvolution(win, show)
962914
{"Deconvolution", "0", horizAxis, vertAxis, "0"})
963915
TUD_SetUserData(graph, traceName, "fullPath", GetWavesDataFolder(deconv, 2))
964916
endfor
965-
else // !show
917+
else // !deconvolution.enable
966918
WAVE/T traces = TUD_GetUserDataAsWave(graph, "traceName", keys = {"traceType"}, values = {"Deconvolution"})
967919

968920
numTraces = DimSize(traces, ROWS)

0 commit comments

Comments
 (0)