keep track of the ui model in the window types, forward the updates t…

…o the views only if they are visible

core/rate/rate.go

@@ -39,7 +39,7 @@ type Counter struct {
 	clock core.Clock
 	view  View
 
-	listeners []interface{}
+	listeners []any
 
 	lastHourQSOs qsoList
 	lastQSOTime  time.Time
@@ -95,7 +95,7 @@ func (c *Counter) ContestChanged(contest core.Contest) {
 	c.view.SetGoals(contest.QSOsGoal, contest.PointsGoal, contest.MultisGoal)
 }
 
-func (c *Counter) Notify(listener interface{}) {
+func (c *Counter) Notify(listener any) {
 	c.listeners = append(c.listeners, listener)
 }
 

ui/callinfoView.go

@@ -78,10 +78,6 @@ func setupCallinfoView(builder *gtk.Builder, colors colorProvider, controller Ca
 	return result
 }
 
-func (c *callinfoView) SetCallinfoController(controller CallinfoController) {
-	c.controller = controller
-}
-
 func (v *callinfoView) RefreshStyle() {
 	v.style.Refresh()
 	if v.controller != nil {
@@ -94,10 +90,6 @@ func attr(name, value string) string {
 }
 
 func (v *callinfoView) SetCallsign(callsign string, worked, duplicate bool) {
-	if v == nil {
-		return
-	}
-
 	normalized := strings.ToUpper(strings.TrimSpace(callsign))
 	if normalized == "" {
 		normalized = "-"
@@ -115,35 +107,27 @@ func (v *callinfoView) SetCallsign(callsign string, worked, duplicate bool) {
 	}
 }
 
-func (v *callinfoView) SetDXCC(name, continent string, itu, cq int, arrlCompliant bool) {
-	if v == nil {
-		return
-	}
-
-	if name == "" {
+func (v *callinfoView) SetDXCC(dxccName, continent string, itu, cq int, arrlCompliant bool) {
+	if dxccName == "" {
 		v.dxccLabel.SetMarkup("")
 		return
 	}
 
-	text := fmt.Sprintf("%s, %s", name, continent)
+	text := fmt.Sprintf("%s, %s", dxccName, continent)
 	if itu != 0 {
 		text += fmt.Sprintf(", ITU %d", itu)
 	}
 	if cq != 0 {
 		text += fmt.Sprintf(", CQ %d", cq)
 	}
-	if name != "" && !arrlCompliant {
+	if dxccName != "" && !arrlCompliant {
 		text += ", <span foreground='red' font-weight='heavy'>not ARRL compliant</span>"
 	}
 
 	v.dxccLabel.SetMarkup(text)
 }
 
 func (v *callinfoView) SetValue(points, multis int) {
-	if v == nil {
-		return
-	}
-
 	style.RemoveClass(&v.valueLabel.Widget, callinfoWorthlessClass)
 	style.RemoveClass(&v.valueLabel.Widget, callinfoMultiClass)
 
@@ -158,10 +142,6 @@ func (v *callinfoView) SetValue(points, multis int) {
 }
 
 func (v *callinfoView) SetExchange(exchange string) {
-	if v == nil {
-		return
-	}
-
 	var exchangeMarkup string
 	if exchange == "" {
 		exchange = "-"
@@ -173,18 +153,10 @@ func (v *callinfoView) SetExchange(exchange string) {
 }
 
 func (v *callinfoView) SetUserInfo(value string) {
-	if v == nil {
-		return
-	}
-
 	v.userInfoLabel.SetText(value)
 }
 
 func (v *callinfoView) SetSupercheck(callsigns []core.AnnotatedCallsign) {
-	if v == nil {
-		return
-	}
-
 	var text string
 	for _, callsign := range callsigns {
 		// see https://docs.gtk.org/Pango/pango_markup.html for reference

ui/callinfoWindow.go

@@ -4,18 +4,33 @@ import (
 	"github.com/ftl/gmtry"
 	"github.com/gotk3/gotk3/gtk"
 
+	"github.com/ftl/hellocontest/core"
 	"github.com/ftl/hellocontest/ui/style"
 )
 
 const CallinfoWindowID = gmtry.ID("callinfo")
 
 type callinfoWindow struct {
-	*callinfoView
-	controller CallinfoController
+	callinfoView *callinfoView
+	controller   CallinfoController
 
 	window   *gtk.Window
 	geometry *gmtry.Geometry
 	style    *style.Style
+
+	callsign          string
+	worked            bool
+	duplicate         bool
+	dxccName          string
+	continent         string
+	itu               int
+	cq                int
+	arrlCompliant     bool
+	points            int
+	multis            int
+	exchange          string
+	userInfo          string
+	matchingCallsigns []core.AnnotatedCallsign
 }
 
 func setupCallinfoWindow(geometry *gmtry.Geometry, style *style.Style, controller CallinfoController) *callinfoWindow {
@@ -45,6 +60,12 @@ func (w *callinfoWindow) Show() {
 		w.window.SetTitle("Callsign Information")
 		w.window.Connect("destroy", w.onDestroy)
 		w.callinfoView = setupCallinfoView(builder, w.style.ForWidget(w.window.ToWidget()), w.controller)
+		w.callinfoView.SetCallsign(w.callsign, w.worked, w.duplicate)
+		w.callinfoView.SetDXCC(w.dxccName, w.continent, w.itu, w.cq, w.arrlCompliant)
+		w.callinfoView.SetValue(w.points, w.multis)
+		w.callinfoView.SetExchange(w.exchange)
+		w.callinfoView.SetUserInfo(w.userInfo)
+		w.callinfoView.SetSupercheck(w.matchingCallsigns)
 		w.window.Connect("style-updated", w.callinfoView.RefreshStyle)
 		connectToGeometry(w.geometry, CallinfoWindowID, w.window)
 	}
@@ -78,3 +99,58 @@ func (w *callinfoWindow) onDestroy() {
 	w.window = nil
 	w.callinfoView = nil
 }
+
+func (w *callinfoWindow) SetCallsign(callsign string, worked, duplicate bool) {
+	w.callsign = callsign
+	w.worked = worked
+	w.duplicate = duplicate
+
+	if w.callinfoView != nil {
+		w.callinfoView.SetCallsign(callsign, worked, duplicate)
+	}
+}
+
+func (w *callinfoWindow) SetDXCC(dxccName, continent string, itu, cq int, arrlCompliant bool) {
+	w.dxccName = dxccName
+	w.continent = continent
+	w.itu = itu
+	w.cq = cq
+	w.arrlCompliant = arrlCompliant
+
+	if w.callinfoView != nil {
+		w.callinfoView.SetDXCC(dxccName, continent, itu, cq, arrlCompliant)
+	}
+}
+
+func (w *callinfoWindow) SetValue(points, multis int) {
+	w.points = points
+	w.multis = multis
+
+	if w.callinfoView != nil {
+		w.callinfoView.SetValue(points, multis)
+	}
+}
+
+func (w *callinfoWindow) SetExchange(exchange string) {
+	w.exchange = exchange
+
+	if w.callinfoView != nil {
+		w.callinfoView.SetExchange(exchange)
+	}
+}
+
+func (w *callinfoWindow) SetUserInfo(userInfo string) {
+	w.userInfo = userInfo
+
+	if w.callinfoView != nil {
+		w.callinfoView.SetUserInfo(userInfo)
+	}
+}
+
+func (w *callinfoWindow) SetSupercheck(matchingCallsigns []core.AnnotatedCallsign) {
+	w.matchingCallsigns = matchingCallsigns
+
+	if w.callinfoView != nil {
+		w.callinfoView.SetSupercheck(matchingCallsigns)
+	}
+}

ui/rateView.go

@@ -25,9 +25,7 @@ func setupNewRateView(builder *gtk.Builder, colors colorProvider) *rateView {
 
 func (v *rateView) ShowRate(rate core.QSORate) {
 	v.indicator.SetRate(rate)
-	if v.indicatorArea != nil {
-		v.indicatorArea.QueueDraw()
-	}
+	v.indicatorArea.QueueDraw()
 }
 
 func (v *rateView) SetGoals(qsos int, points int, multis int) {

ui/rateWindow.go

@@ -11,6 +11,8 @@ import (
 const RateWindowID = "rate"
 
 type rateWindow struct {
+	rateView *rateView
+
 	window   *gtk.Window
 	geometry *gmtry.Geometry
 	style    *style.Style
@@ -19,8 +21,6 @@ type rateWindow struct {
 	qsosGoal   int
 	pointsGoal int
 	multisGoal int
-
-	*rateView
 }
 
 func setupRateWindow(geometry *gmtry.Geometry, style *style.Style) *rateWindow {

ui/scoreView.go

@@ -31,24 +31,17 @@ func setupNewScoreView(builder *gtk.Builder, colors colorProvider) *scoreView {
 func (v *scoreView) ShowScore(score core.Score) {
 	v.graph.SetGraphs(score.StackedGraphPerBand())
 
-	if v.tableLabel != nil {
-		renderedScore := fmt.Sprintf("<span allow_breaks='true' font_family='monospace'>%s</span>", score)
-		v.tableLabel.SetMarkup(renderedScore)
-	}
+	renderedScore := fmt.Sprintf("<span allow_breaks='true' font_family='monospace'>%s</span>", score)
+	v.tableLabel.SetMarkup(renderedScore)
 
-	if v.graphArea != nil {
-		v.graphArea.QueueDraw()
-	}
+	v.graphArea.QueueDraw()
 }
 
 func (v *scoreView) SetGoals(points int, multis int) {
 	v.graph.SetGoals(points, multis)
 }
 
 func (v *scoreView) RateUpdated(rate core.QSORate) {
-	if v == nil {
-		return
-	}
 	v.graph.UpdateTimeFrame()
 
 	if v.graphArea != nil {

ui/scoreWindow.go

@@ -11,15 +11,16 @@ import (
 const ScoreWindowID = "score"
 
 type scoreWindow struct {
+	scoreView *scoreView
+
 	window   *gtk.Window
 	geometry *gmtry.Geometry
 	style    *style.Style
 
 	score      core.Score
+	rate       core.QSORate
 	pointsGoal int
 	multisGoal int
-
-	*scoreView
 }
 
 func setupScoreWindow(geometry *gmtry.Geometry, style *style.Style) *scoreWindow {
@@ -50,6 +51,7 @@ func (w *scoreWindow) Show() {
 		w.scoreView = setupNewScoreView(builder, w.style.ForWidget(w.window.ToWidget()))
 		w.scoreView.SetGoals(w.pointsGoal, w.multisGoal)
 		w.scoreView.ShowScore(w.score)
+		w.scoreView.RateUpdated(w.rate)
 		connectToGeometry(w.geometry, ScoreWindowID, w.window)
 	}
 	w.window.ShowAll()
@@ -97,3 +99,10 @@ func (w *scoreWindow) SetGoals(points int, multis int) {
 		w.scoreView.SetGoals(points, multis)
 	}
 }
+
+func (w *scoreWindow) RateUpdated(rate core.QSORate) {
+	w.rate = rate
+	if w.scoreView != nil {
+		w.scoreView.RateUpdated(rate)
+	}
+}

ui/spotsView.go

@@ -89,10 +89,6 @@ func (v *spotsView) filterRow(row *gtk.ListBoxRow) bool {
 }
 
 func (v *spotsView) ShowFrame(frame core.BandmapFrame) {
-	if v == nil {
-		return
-	}
-
 	runAsync(func() {
 		v.currentFrame = frame
 		v.setupBands(frame.Bands)
@@ -109,9 +105,6 @@ func (v *spotsView) ShowFrame(frame core.BandmapFrame) {
 }
 
 func (v *spotsView) setupBands(bands []core.BandSummary) {
-	if v == nil {
-		return
-	}
 	bandsID := toBandsID(bands)
 	if bandsID == v.bandsID {
 		return
@@ -330,9 +323,6 @@ func updateListEntry(row *gtk.ListBoxRow, entry core.BandmapEntry) {
 }
 
 func (v *spotsView) EntryAdded(entry core.BandmapEntry) {
-	if v == nil {
-		return
-	}
 	runAsync(func() {
 		w := v.newListEntry(entry)
 		if w == nil {
@@ -343,9 +333,6 @@ func (v *spotsView) EntryAdded(entry core.BandmapEntry) {
 }
 
 func (v *spotsView) EntryUpdated(entry core.BandmapEntry) {
-	if v == nil {
-		return
-	}
 	runAsync(func() {
 		row := v.entryList.GetRowAtIndex(entry.Index)
 		if row == nil {
@@ -356,9 +343,6 @@ func (v *spotsView) EntryUpdated(entry core.BandmapEntry) {
 }
 
 func (v *spotsView) EntryRemoved(entry core.BandmapEntry) {
-	if v == nil {
-		return
-	}
 	runAsync(func() {
 		row := v.entryList.GetRowAtIndex(entry.Index)
 		if row == nil {