Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AnalysisBrowser: Make it faster #2092

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

AnalysisBrowser: Make it faster #2092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4bddf98
AnalysisBrowser: Update the panel
t-b Mar 7, 2024
4fc905e
AB_BrowserStartupSettings: Update it
t-b Mar 7, 2024
46a52ac
MIES_AnalysisBrowser.ipf: Rename AB_LoadType variable name
t-b Mar 7, 2024
100c268
changes
t-b Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 84 additions & 26 deletions Packages/MIES/MIES_AnalysisBrowser.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,15 @@
///
/// Has no dependencies on any hardware related functions.

static Constant EXPERIMENT_TREEVIEW_COLUMN = 0
static Constant DEVICE_TREEVIEW_COLUMN = 3
static Constant AB_LOAD_SWEEP = 0
static Constant AB_LOAD_STIMSET = 1
static StrConstant AB_UDATA_WORKINGDF = "datafolder"
static StrConstant AB_WORKFOLDER_NAME = "workFolder"
static Constant EXPERIMENT_TREEVIEW_COLUMN = 0
static Constant DEVICE_TREEVIEW_COLUMN = 3

static Constant AB_LOAD_SWEEP = 0
static Constant AB_LOAD_STIMSET = 1
static Constant AB_LOAD_TP_STORAGE = 2

static StrConstant AB_UDATA_WORKINGDF = "datafolder"
static StrConstant AB_WORKFOLDER_NAME = "workFolder"

static Function AB_ResetListBoxWaves()

Expand Down Expand Up @@ -365,13 +368,11 @@ static Function AB_LoadFile(discLocation)
strswitch(map[%FileType])
case ANALYSISBROWSER_FILE_TYPE_IGOR:
AB_LoadSweepsFromExperiment(map[%DiscLocation], device)
AB_LoadTPStorageFromIgor(map[%DiscLocation], map[%DataFolder], device)
AB_LoadUserCommentFromFile(map[%DiscLocation], map[%DataFolder], device)
break
case ANALYSISBROWSER_FILE_TYPE_NWBv1:
case ANALYSISBROWSER_FILE_TYPE_NWBv2:
AB_LoadSweepsFromNWB(map[%DiscLocation], map[%DataFolder], device)
AB_LoadTPStorageFromNWB(map[%DiscLocation], map[%DataFolder], device)
AB_LoadUserCommentAndHistoryFromNWB(map[%DiscLocation], map[%DataFolder], device)
break
default:
Expand Down Expand Up @@ -796,6 +797,37 @@ static Function AB_StoreChannelsBySweep(groupID, nwbVersion, channelList, sweeps
SetNumberInWaveNote(storage, NOTE_INDEX, numSweeps)
End

static Function AB_LoadTPStorageFromFile(string discLocation, string dataFolder, string fileType, string device, [variable overwrite])

if(ParamIsDefault(overwrite))
overwrite = 0
else
overwrite = !!overwrite
endif

DFREF targetDFR = GetAnalysisDeviceTestpulse(dataFolder, device)

if(overwrite)
KillOrMoveToTrash(dfr = targetDFR)
else
if(!IsDataFolderEmpty(targetDFR))
return 0
endif
endif

strswitch(fileType)
case ANALYSISBROWSER_FILE_TYPE_IGOR:
return AB_LoadTPStorageFromIgor(discLocation, dataFolder, device)
break
case ANALYSISBROWSER_FILE_TYPE_NWBv1:
case ANALYSISBROWSER_FILE_TYPE_NWBv2:
return AB_LoadTPStorageFromNWB(discLocation, dataFolder, device)
break
default:
ASSERT(0, "Invalid file type")
endswitch
End

static Function AB_LoadTPStorageFromIgor(expFilePath, expFolder, device)
string expFilePath, expFolder, device

Expand All @@ -821,7 +853,7 @@ static Function AB_LoadTPStorageFromIgor(expFilePath, expFolder, device)
return numWavesLoaded
End

Function AB_LoadTPStorageFromNWB(nwbFilePath, expFolder, device)
static Function AB_LoadTPStorageFromNWB(nwbFilePath, expFolder, device)
string nwbFilePath, expFolder, device

variable h5_fileID, testpulseGroup, numEntries, i
Expand Down Expand Up @@ -1536,7 +1568,7 @@ static Function AB_GUIRowIsStimsetsOnly(variable row)
End

/// @returns 0 if at least one sweep or stimset could be loaded, 1 otherwise
static Function AB_LoadFromExpandedRange(variable row, variable subSectionColumn, variable AB_LoadType, [variable overwrite, DFREF sweepBrowserDFR, WAVE/T dfCollect])
static Function AB_LoadFromExpandedRange(variable row, variable subSectionColumn, variable loadType, [variable overwrite, DFREF sweepBrowserDFR, WAVE/T dfCollect])

variable j, endRow, mapIndex, sweep, oneValidLoad, index
string device, discLocation, dataFolder, fileName, fileType
Expand All @@ -1560,7 +1592,7 @@ static Function AB_LoadFromExpandedRange(variable row, variable subSectionColumn
for(j = row; j < endRow; j += 1)

if(AB_GUIRowIsStimsetsOnly(row))
if(AB_LoadType != AB_LOAD_STIMSET)
if(loadType == AB_LOAD_SWEEP)
return 1
endif
device = ""
Expand All @@ -1586,13 +1618,19 @@ static Function AB_LoadFromExpandedRange(variable row, variable subSectionColumn
fileType = map[mapIndex][%FileType]
fileName = map[mapIndex][%FileName]

switch(AB_LoadType)
switch(loadType)
case AB_LOAD_STIMSET:
if(AB_LoadStimsetFromFile(discLocation, dataFolder, fileType, device, sweep, overwrite = overwrite) == 1)
continue
endif
oneValidLoad = 1
break
case AB_LOAD_TP_STORAGE:
if(AB_LoadTPStorageFromFile(discLocation, dataFolder, fileType, device, overwrite = overwrite) == 1)
continue
endif
oneValidLoad = 1
break
case AB_LOAD_SWEEP:
if(AB_LoadSweepFromFile(discLocation, dataFolder, fileType, device, sweep, overwrite = overwrite) == 1)
continue
Expand All @@ -1607,7 +1645,7 @@ static Function AB_LoadFromExpandedRange(variable row, variable subSectionColumn
SB_AddToSweepBrowser(sweepBrowserDFR, fileName, dataFolder, device, sweep)
break
default:
break
ASSERT(0, "Unexpected loadType")
endswitch
endfor

Expand Down Expand Up @@ -1638,14 +1676,14 @@ static Function AB_GetRowWithNextTreeView(selWave, startRow, col)
return numRows
End

static Function AB_LoadFromFile(AB_LoadType, [sweepBrowserDFR])
variable AB_LoadType
static Function AB_LoadFromFile(loadType, [sweepBrowserDFR])
variable loadType
DFREF sweepBrowserDFR

variable mapIndex, sweep, numRows, i, row, overwrite, oneValidLoad, index
string dataFolder, fileName, discLocation, fileType, device

if(AB_LoadType == AB_LOAD_SWEEP)
if(loadType == AB_LOAD_SWEEP)
ASSERT(!ParamIsDefault(sweepBrowserDFR), "create sweepBrowser DataFolder with SB_OpenSweepBrowser() prior")
ASSERT(IsGlobalDataFolder(sweepBrowserDFR), "sweepBrowser DataFolder does not exist")
endif
Expand All @@ -1666,29 +1704,30 @@ static Function AB_LoadFromFile(AB_LoadType, [sweepBrowserDFR])
row = indizes[i]

// handle not expanded EXPERIMENT and DEVICE COLUMNS
switch(AB_LoadType)
switch(loadType)
case AB_LOAD_STIMSET:
if(!AB_LoadFromExpandedRange(row, EXPERIMENT_TREEVIEW_COLUMN, AB_LoadType, overwrite = overwrite))
case AB_LOAD_TP_STORAGE:
if(!AB_LoadFromExpandedRange(row, EXPERIMENT_TREEVIEW_COLUMN, loadType, overwrite = overwrite))
oneValidLoad = 1
continue
endif
if(!AB_LoadFromExpandedRange(row, DEVICE_TREEVIEW_COLUMN, AB_LoadType, overwrite = overwrite))
if(!AB_LoadFromExpandedRange(row, DEVICE_TREEVIEW_COLUMN, loadType, overwrite = overwrite))
oneValidLoad = 1
continue
endif
break
case AB_LOAD_SWEEP:
if(!AB_LoadFromExpandedRange(row, EXPERIMENT_TREEVIEW_COLUMN, AB_LoadType, sweepBrowserDFR = sweepBrowserDFR, overwrite = overwrite, dfCollect = dfCollect))
if(!AB_LoadFromExpandedRange(row, EXPERIMENT_TREEVIEW_COLUMN, loadType, sweepBrowserDFR = sweepBrowserDFR, overwrite = overwrite, dfCollect = dfCollect))
oneValidLoad = 1
continue
endif
if(!AB_LoadFromExpandedRange(row, DEVICE_TREEVIEW_COLUMN, AB_LoadType, sweepBrowserDFR = sweepBrowserDFR, overwrite = overwrite, dfCollect = dfCollect))
if(!AB_LoadFromExpandedRange(row, DEVICE_TREEVIEW_COLUMN, loadType, sweepBrowserDFR = sweepBrowserDFR, overwrite = overwrite, dfCollect = dfCollect))
oneValidLoad = 1
continue
endif
break
default:
break
ASSERT(0, "Invalid loadType")
endswitch

sweep = str2num(GetLastNonEmptyEntry(expBrowserList, "sweep", row))
Expand All @@ -1703,7 +1742,7 @@ static Function AB_LoadFromFile(AB_LoadType, [sweepBrowserDFR])
discLocation = map[mapIndex][%DiscLocation]
fileType = map[mapIndex][%FileType]

switch(AB_LoadType)
switch(loadType)
case AB_LOAD_STIMSET:
if(AB_LoadStimsetFromFile(discLocation, dataFolder, fileType, device, sweep, overwrite = overwrite))
continue
Expand All @@ -1723,8 +1762,14 @@ static Function AB_LoadFromFile(AB_LoadType, [sweepBrowserDFR])
dfCollect[index] = dataFolder
SetNumberInWaveNote(dfCollect, NOTE_INDEX, index + 1)
break
default:
case AB_LOAD_TP_STORAGE:
if(AB_LoadTPStorageFromFile(discLocation, dataFolder, fileType, device, overwrite = overwrite))
continue
endif
oneValidLoad = 1
break
default:
ASSERT(0, "Invalid loadType")
endswitch
endfor

Expand Down Expand Up @@ -2681,6 +2726,7 @@ Function AB_BrowserStartupSettings()

HideTools/W=$panel/A
SetWindow $panel, userData(panelVersion)=""
SetWindow $panel, userData(datafolder)=""

SetCheckBoxState(panel, "checkbox_load_overwrite", CHECKBOX_UNSELECTED)

Expand All @@ -2689,8 +2735,8 @@ Function AB_BrowserStartupSettings()
SearchForInvalidControlProcs(panel)
print "Do not forget to increase ANALYSISBROWSER_PANEL_VERSION."

ListBox list_experiment_contents, win=$panel, listWave=$"", selWave=$""
ListBox listbox_AB_Folders, win=$panel, listWave=$"", selWave=$""
ListBox list_experiment_contents, win=$panel, listWave=$"", selWave=$"", colorWave=$""
ListBox listbox_AB_Folders, win=$panel, listWave=$"", selWave=$"", colorWave=$""

Execute/P/Z "DoWindow/R " + panel
Execute/P/Q/Z "COMPILEPROCEDURES "
Expand Down Expand Up @@ -3568,3 +3614,15 @@ static Function AB_MemoryFreeMappedDF()
AB_RemoveMapEntry(i)
endfor
End

Function AB_ButtonProc_LoadTPStorage(STRUCT WMButtonAction &ba) : ButtonControl

switch(ba.eventcode)
case 2:
AB_CheckPanelVersion(ba.win)

AB_LoadFromFile(AB_LOAD_TP_STORAGE)
endswitch

return 0
End
Loading