Skip to content

Commit

Permalink
update to lab update: minimal Tabber just returns impl
Browse files Browse the repository at this point in the history
  • Loading branch information
@rcoreilly
rcoreilly committed Dec 23, 2024
1 parent 1340e4b commit 3b4c82d
Show file tree
Hide file tree
Showing 27 changed files with 183 additions and 165 deletions.
8 changes: 4 additions & 4 deletions chans/chanplots/ak-plot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ func (pl *AKPlot) GVRun() { //types:add
s.Plot.Title = "AK G(V)"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {

Check failure on line 126 in chans/chanplots/ak-plot.go

View workflow job for this annotation

GitHub Actions / build 

pl.Tabs.AsLab undefined (type lab.Tabber has no field or method AsLab)
pl.Tabs.AsLab().PlotTensorFS(dir)

Check failure on line 127 in chans/chanplots/ak-plot.go

View workflow job for this annotation

GitHub Actions / build 

pl.Tabs.AsLab undefined (type lab.Tabber has no field or method AsLab)
}
}

Expand Down Expand Up @@ -195,8 +195,8 @@ func (pl *AKPlot) TimeRun() { //types:add
s.Plot.Title = "AK G(t)"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {

Check failure on line 198 in chans/chanplots/ak-plot.go

View workflow job for this annotation

GitHub Actions / build 

pl.Tabs.AsLab undefined (type lab.Tabber has no field or method AsLab)
pl.Tabs.AsLab().PlotTensorFS(dir)

Check failure on line 199 in chans/chanplots/ak-plot.go

View workflow job for this annotation

GitHub Actions / build 

pl.Tabs.AsLab undefined (type lab.Tabber has no field or method AsLab)
}
}

Expand Down
12 changes: 6 additions & 6 deletions chans/chanplots/gabab-plot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ func (pl *GababPlot) GVRun() { //types:add
s.Plot.Title = "GABA-B G(V)"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {

Check failure on line 126 in chans/chanplots/gabab-plot.go

View workflow job for this annotation

GitHub Actions / build 

pl.Tabs.AsLab undefined (type lab.Tabber has no field or method AsLab)
pl.Tabs.AsLab().PlotTensorFS(dir)

Check failure on line 127 in chans/chanplots/gabab-plot.go

View workflow job for this annotation

GitHub Actions / build 

pl.Tabs.AsLab undefined (type lab.Tabber has no field or method AsLab)
}
}

Expand Down Expand Up @@ -156,8 +156,8 @@ func (pl *GababPlot) GSRun() { //types:add
s.Plot.Title = "GABAB G(spike)"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {

Check failure on line 159 in chans/chanplots/gabab-plot.go

View workflow job for this annotation

GitHub Actions / build 

pl.Tabs.AsLab undefined (type lab.Tabber has no field or method AsLab)
pl.Tabs.AsLab().PlotTensorFS(dir)

Check failure on line 160 in chans/chanplots/gabab-plot.go

View workflow job for this annotation

GitHub Actions / build 

pl.Tabs.AsLab undefined (type lab.Tabber has no field or method AsLab)
}
}

Expand Down Expand Up @@ -208,8 +208,8 @@ func (pl *GababPlot) TimeRun() { //types:add
s.Plot.Title = "GABAB G(t)"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {

Check failure on line 211 in chans/chanplots/gabab-plot.go

View workflow job for this annotation

GitHub Actions / build 

pl.Tabs.AsLab undefined (type lab.Tabber has no field or method AsLab)
pl.Tabs.AsLab().PlotTensorFS(dir)

Check failure on line 212 in chans/chanplots/gabab-plot.go

View workflow job for this annotation

GitHub Actions / build 

pl.Tabs.AsLab undefined (type lab.Tabber has no field or method AsLab)
}
}

Expand Down
8 changes: 4 additions & 4 deletions chans/chanplots/kir-plot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ func (pl *KirPlot) GVRun() { //types:add
s.Plot.Title = "kIR G(V)"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {
pl.Tabs.AsLab().PlotTensorFS(dir)
}
}

Expand Down Expand Up @@ -163,8 +163,8 @@ func (pl *KirPlot) TimeRun() { //types:add
s.Plot.Title = "GkIR G(t)"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {
pl.Tabs.AsLab().PlotTensorFS(dir)
}
}

Expand Down
8 changes: 4 additions & 4 deletions chans/chanplots/mahp-plot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ func (pl *MahpPlot) GVRun() { //types:add
s.Plot.Title = "Mahp G(V)"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {
pl.Tabs.AsLab().PlotTensorFS(dir)
}
}

Expand Down Expand Up @@ -158,8 +158,8 @@ func (pl *MahpPlot) TimeRun() { //types:add
s.Plot.Title = "Mahp G(t)"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {
pl.Tabs.AsLab().PlotTensorFS(dir)
}
}

Expand Down
8 changes: 4 additions & 4 deletions chans/chanplots/nmda-plot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ func (pl *NMDAPlot) GVRun() { //types:add
s.Plot.Title = "NMDA G(V)"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {
pl.Tabs.AsLab().PlotTensorFS(dir)
}
}

Expand Down Expand Up @@ -164,8 +164,8 @@ func (pl *NMDAPlot) TimeRun() { //types:add
s.Plot.Title = "NMDA G(t)"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {
pl.Tabs.AsLab().PlotTensorFS(dir)
}
}

Expand Down
8 changes: 4 additions & 4 deletions chans/chanplots/sahp-plot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ func (pl *SahpPlot) GCaRun() { //types:add
s.Plot.Title = "sAHP G(Ca)"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {
pl.Tabs.AsLab().PlotTensorFS(dir)
}
}

Expand Down Expand Up @@ -131,8 +131,8 @@ func (pl *SahpPlot) TimeRun() { //types:add
s.Plot.Title = "sAHP G(t)"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {
pl.Tabs.AsLab().PlotTensorFS(dir)
}
}

Expand Down
8 changes: 4 additions & 4 deletions chans/chanplots/skca-plot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ func (pl *SKCaPlot) GCaRun() { //types:add
s.Plot.Title = "sK Ca G(Ca)"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {
pl.Tabs.AsLab().PlotTensorFS(dir)
}
}

Expand Down Expand Up @@ -143,8 +143,8 @@ func (pl *SKCaPlot) TimeRun() { //types:add
s.Plot.Title = "sK Ca G(t)"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {
pl.Tabs.AsLab().PlotTensorFS(dir)
}
}

Expand Down
4 changes: 2 additions & 2 deletions chans/chanplots/synca-plot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ func (pl *SynCaPlot) TimeRun() { //types:add
s.Plot.Title = "SynCa"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {
pl.Tabs.AsLab().PlotTensorFS(dir)
}
}

Expand Down
8 changes: 4 additions & 4 deletions chans/chanplots/vgcc-plot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ func (pl *VGCCPlot) GVRun() { //types:add
s.Plot.Title = "VGCC G(V)"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {
pl.Tabs.AsLab().PlotTensorFS(dir)
}
}

Expand Down Expand Up @@ -161,8 +161,8 @@ func (pl *VGCCPlot) TimeRun() { //types:add
s.Plot.Title = "VGCC G(t)"
})
}
if pl.Tabs != nil && pl.Tabs.AsDataTabs().IsVisible() {
pl.Tabs.PlotTensorFS(dir)
if pl.Tabs != nil && pl.Tabs.AsLab().IsVisible() {
pl.Tabs.AsLab().PlotTensorFS(dir)
}
}

Expand Down
21 changes: 11 additions & 10 deletions sims/bgdorsal/bg-dorsal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ func (ss *Sim) RunStats(mode Modes, level Levels, phase StatsPhase) {
}
if phase == Step && ss.GUI.Tabs != nil {
nm := mode.String() + "/" + level.String() + " Plot"
ss.GUI.Tabs.GoUpdatePlot(nm)
ss.GUI.Tabs.AsLab().GoUpdatePlot(nm)
}
}

Expand Down Expand Up @@ -708,15 +708,16 @@ func (ss *Sim) StatsInit() {
}
}
if ss.GUI.Tabs != nil {
_, idx := ss.GUI.Tabs.CurrentTab()
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Sequence))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Epoch))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Run))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Trial))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Test, Trial))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Test, Sequence))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Test, Epoch))
ss.GUI.Tabs.SelectTabIndex(idx)
tbs := ss.GUI.Tabs.AsLab()
_, idx := tbs.CurrentTab()
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Sequence))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Epoch))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Run))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Trial))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Test, Trial))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Test, Sequence))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Test, Epoch))
tbs.SelectTabIndex(idx)
}
}

Expand Down
21 changes: 11 additions & 10 deletions sims/bgventral/bg-ventral.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -530,8 +530,8 @@ func (ss *Sim) RunStats(mode Modes, level Levels, phase StatsPhase) {
}
if phase == Step && ss.GUI.Tabs != nil {
nm := mode.String() + "/" + level.String() + " Plot"
ss.GUI.Tabs.GoUpdatePlot(nm)
ss.GUI.Tabs.GoUpdatePlot("Train/TrialAll Plot")
ss.GUI.Tabs.AsLab().GoUpdatePlot(nm)
ss.GUI.Tabs.AsLab().GoUpdatePlot("Train/TrialAll Plot")
}
}

Expand Down Expand Up @@ -562,13 +562,14 @@ func (ss *Sim) StatsInit() {
}
}
if ss.GUI.Tabs != nil {
_, idx := ss.GUI.Tabs.CurrentTab()
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Trial))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Epoch))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Run))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Test, Trial))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Test, Epoch))
ss.GUI.Tabs.SelectTabIndex(idx)
tbs := ss.GUI.Tabs.AsLab()
_, idx := tbs.CurrentTab()
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Trial))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Epoch))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Run))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Test, Trial))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Test, Epoch))
tbs.SelectTabIndex(idx)
}
}

Expand Down Expand Up @@ -669,7 +670,7 @@ func (ss *Sim) ConfigStats() {
for i := range nrows {
row.Set(i, i)
}
ss.GUI.Tabs.PlotTensorFS(curModeDir.Dir("Stats"))
ss.GUI.Tabs.AsLab().PlotTensorFS(curModeDir.Dir("Stats"))
}
case Run:
stat = stats.StatMean.Call(subDir.Value(name)).Float1D(0)
Expand Down
13 changes: 7 additions & 6 deletions sims/choose/choose.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ func (ss *Sim) RunStats(mode Modes, level Levels, phase StatsPhase) {
}
if phase == Step && ss.GUI.Tabs != nil {
nm := mode.String() + "/" + level.String() + " Plot"
ss.GUI.Tabs.GoUpdatePlot(nm)
ss.GUI.Tabs.AsLab().GoUpdatePlot(nm)
}
}

Expand Down Expand Up @@ -696,11 +696,12 @@ func (ss *Sim) StatsInit() {
}
}
if ss.GUI.Tabs != nil {
_, idx := ss.GUI.Tabs.CurrentTab()
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Epoch))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Run))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Trial))
ss.GUI.Tabs.SelectTabIndex(idx)
tbs := ss.GUI.Tabs.AsLab()
_, idx := tbs.CurrentTab()
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Epoch))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Run))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Trial))
tbs.SelectTabIndex(idx)
}
}

Expand Down
13 changes: 7 additions & 6 deletions sims/deepfsa/deep-fsa.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ func (ss *Sim) RunStats(mode Modes, level Levels, phase StatsPhase) {
}
if phase == Step && ss.GUI.Tabs != nil {
nm := mode.String() + "/" + level.String() + " Plot"
ss.GUI.Tabs.GoUpdatePlot(nm)
ss.GUI.Tabs.AsLab().GoUpdatePlot(nm)
}
}

Expand Down Expand Up @@ -480,11 +480,12 @@ func (ss *Sim) StatsInit() {
}
}
if ss.GUI.Tabs != nil {
_, idx := ss.GUI.Tabs.CurrentTab()
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Epoch))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Run))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Test, Trial))
ss.GUI.Tabs.SelectTabIndex(idx)
tbs := ss.GUI.Tabs.AsLab()
_, idx := tbs.CurrentTab()
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Epoch))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Run))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Test, Trial))
tbs.SelectTabIndex(idx)
}
}

Expand Down
13 changes: 7 additions & 6 deletions sims/deepmove/deep-move.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ func (ss *Sim) RunStats(mode Modes, level Levels, phase StatsPhase) {
}
if phase == Step && ss.GUI.Tabs != nil {
nm := mode.String() + "/" + level.String() + " Plot"
ss.GUI.Tabs.GoUpdatePlot(nm)
ss.GUI.Tabs.AsLab().GoUpdatePlot(nm)
}
}

Expand Down Expand Up @@ -517,11 +517,12 @@ func (ss *Sim) StatsInit() {
}
}
if ss.GUI.Tabs != nil {
_, idx := ss.GUI.Tabs.CurrentTab()
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Epoch))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Run))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Test, Trial))
ss.GUI.Tabs.SelectTabIndex(idx)
tbs := ss.GUI.Tabs.AsLab()
_, idx := tbs.CurrentTab()
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Epoch))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Run))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Test, Trial))
tbs.SelectTabIndex(idx)
}
}

Expand Down
13 changes: 7 additions & 6 deletions sims/deepmusic/deep-music.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ func (ss *Sim) RunStats(mode Modes, level Levels, phase StatsPhase) {
}
if phase == Step && ss.GUI.Tabs != nil {
nm := mode.String() + "/" + level.String() + " Plot"
ss.GUI.Tabs.GoUpdatePlot(nm)
ss.GUI.Tabs.AsLab().GoUpdatePlot(nm)
}
}

Expand Down Expand Up @@ -499,11 +499,12 @@ func (ss *Sim) StatsInit() {
}
}
if ss.GUI.Tabs != nil {
_, idx := ss.GUI.Tabs.CurrentTab()
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Epoch))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Run))
ss.GUI.Tabs.PlotTensorFS(axon.StatsNode(ss.Stats, Test, Trial))
ss.GUI.Tabs.SelectTabIndex(idx)
tbs := ss.GUI.Tabs.AsLab()
_, idx := tbs.CurrentTab()
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Epoch))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Train, Run))
tbs.PlotTensorFS(axon.StatsNode(ss.Stats, Test, Trial))
tbs.SelectTabIndex(idx)
}
}

Expand Down
Loading

0 comments on commit 3b4c82d

Please sign in to comment.