fetch actual report

This commit is contained in:
IliaDenisov
2026-03-17 16:27:14 +02:00
parent 0ce2690b3f
commit aaa35af8b7
3 changed files with 23 additions and 20 deletions
+4 -1
View File
@@ -157,7 +157,10 @@ func (e *client) BuildUI(w fyne.Window) {
toolbar := widget.NewToolbar( toolbar := widget.NewToolbar(
widget.NewToolbarAction( widget.NewToolbarAction(
theme.FolderIcon(), theme.FolderIcon(),
func() { e.loadWorld(mockWorld()) }), func() {
e.loadReport(0)
// e.loadWorld(mockWorld())
}),
widget.NewToolbarSeparator(), widget.NewToolbarSeparator(),
widget.NewToolbarAction( widget.NewToolbarAction(
theme.NavigateBackIcon(), theme.NavigateBackIcon(),
+18 -18
View File
@@ -525,7 +525,7 @@ func (*DarkTheme) BackgroundAnchorMode() BackgroundAnchorMode { return Backgroun
// Base styles for dark theme. // Base styles for dark theme.
func (*DarkTheme) PointStyle() Style { func (*DarkTheme) PointStyle() Style {
return Style{ return Style{
FillColor: cRGBA(120, 214, 198, 255), // brighter teal for dark bg FillColor: cRGBA(120, 214, 198, 255),
StrokeColor: nil, StrokeColor: nil,
StrokeWidthPx: 0, StrokeWidthPx: 0,
PointRadiusPx: 3.0, PointRadiusPx: 3.0,
@@ -535,7 +535,7 @@ func (*DarkTheme) PointStyle() Style {
func (*DarkTheme) LineStyle() Style { func (*DarkTheme) LineStyle() Style {
return Style{ return Style{
FillColor: nil, FillColor: nil,
StrokeColor: cRGBA(155, 175, 235, 220), // soft bluish StrokeColor: cRGBA(155, 175, 235, 255),
StrokeWidthPx: 2.0, StrokeWidthPx: 2.0,
StrokeDashes: nil, StrokeDashes: nil,
StrokeDashOffset: 0, StrokeDashOffset: 0,
@@ -544,8 +544,8 @@ func (*DarkTheme) LineStyle() Style {
func (*DarkTheme) CircleStyle() Style { func (*DarkTheme) CircleStyle() Style {
return Style{ return Style{
FillColor: cRGBA(186, 160, 255, 55), // soft lavender, low alpha FillColor: nil, // cRGBA(186, 160, 255, 255),
StrokeColor: cRGBA(186, 160, 255, 200), // soft lavender StrokeColor: cRGBA(186, 160, 255, 255),
StrokeWidthPx: 2.0, StrokeWidthPx: 2.0,
} }
} }
@@ -558,19 +558,19 @@ func (*DarkTheme) PointClassOverride(class PointClassID) (StyleOverride, bool) {
case PointClassTrackUnknown: case PointClassTrackUnknown:
return StyleOverride{ return StyleOverride{
FillColor: cRGBA(150, 160, 175, 230), FillColor: cRGBA(150, 160, 175, 255),
PointRadiusPx: new(3.0), PointRadiusPx: new(3.0),
}, true }, true
case PointClassTrackIncoming: case PointClassTrackIncoming:
return StyleOverride{ return StyleOverride{
FillColor: cRGBA(132, 219, 162, 245), FillColor: cRGBA(132, 219, 162, 255),
PointRadiusPx: new(3.5), PointRadiusPx: new(3.5),
}, true }, true
case PointClassTrackOutgoing: case PointClassTrackOutgoing:
return StyleOverride{ return StyleOverride{
FillColor: cRGBA(245, 178, 120, 245), FillColor: cRGBA(245, 178, 120, 255),
PointRadiusPx: new(3.5), PointRadiusPx: new(3.5),
}, true }, true
@@ -586,20 +586,20 @@ func (*DarkTheme) LineClassOverride(class LineClassID) (StyleOverride, bool) {
case LineClassTrackIncoming: case LineClassTrackIncoming:
return StyleOverride{ return StyleOverride{
StrokeColor: cRGBA(132, 219, 162, 220), StrokeColor: cRGBA(132, 219, 162, 255),
StrokeWidthPx: new(2.5), StrokeWidthPx: new(2.5),
}, true }, true
case LineCLassTrackOutgoing: case LineCLassTrackOutgoing:
return StyleOverride{ return StyleOverride{
StrokeColor: cRGBA(245, 178, 120, 220), StrokeColor: cRGBA(245, 178, 120, 255),
StrokeWidthPx: new(2.5), StrokeWidthPx: new(2.5),
}, true }, true
case LineClassMeasurement: case LineClassMeasurement:
d := []float64{6, 4} d := []float64{6, 4}
return StyleOverride{ return StyleOverride{
StrokeColor: cRGBA(170, 175, 190, 200), StrokeColor: cRGBA(170, 175, 190, 255),
StrokeWidthPx: new(1.8), StrokeWidthPx: new(1.8),
StrokeDashes: &d, StrokeDashes: &d,
StrokeDashOffset: new(0.), StrokeDashOffset: new(0.),
@@ -617,29 +617,29 @@ func (*DarkTheme) CircleClassOverride(class CircleClassID) (StyleOverride, bool)
case CircleClassHome: case CircleClassHome:
return StyleOverride{ return StyleOverride{
FillColor: cRGBA(120, 214, 198, 50), FillColor: nil, // cRGBA(120, 214, 198, 255),
StrokeColor: cRGBA(120, 214, 198, 210), StrokeColor: cRGBA(120, 214, 198, 255),
StrokeWidthPx: new(2.5), StrokeWidthPx: new(2.5),
}, true }, true
case CircleClassAcquired: case CircleClassAcquired:
return StyleOverride{ return StyleOverride{
FillColor: cRGBA(155, 175, 235, 45), FillColor: nil, // cRGBA(155, 175, 235, 255),
StrokeColor: cRGBA(155, 175, 235, 220), StrokeColor: cRGBA(155, 175, 235, 255),
StrokeWidthPx: new(2.2), StrokeWidthPx: new(2.2),
}, true }, true
case CircleClassOccupied: case CircleClassOccupied:
return StyleOverride{ return StyleOverride{
FillColor: cRGBA(245, 178, 120, 45), FillColor: nil, // cRGBA(245, 178, 120, 255),
StrokeColor: cRGBA(245, 178, 120, 220), StrokeColor: cRGBA(245, 178, 120, 255),
StrokeWidthPx: new(2.2), StrokeWidthPx: new(2.2),
}, true }, true
case CircleClassFree: case CircleClassFree:
return StyleOverride{ return StyleOverride{
FillColor: cRGBA(132, 219, 162, 45), FillColor: nil, // cRGBA(132, 219, 162, 255),
StrokeColor: cRGBA(132, 219, 162, 220), StrokeColor: cRGBA(132, 219, 162, 255),
StrokeWidthPx: new(2.2), StrokeWidthPx: new(2.2),
}, true }, true
+1 -1
View File
@@ -87,7 +87,7 @@ func NewWorld(width, height int) *World {
themeDefaultCircleStyleID: StyleIDDefaultCircle, themeDefaultCircleStyleID: StyleIDDefaultCircle,
themeDefaultPointStyleID: StyleIDDefaultPoint, themeDefaultPointStyleID: StyleIDDefaultPoint,
circleRadiusScaleFp: SCALE, circleRadiusScaleFp: 1,
derivedCache: make(map[derivedStyleKey]StyleID, 128), derivedCache: make(map[derivedStyleKey]StyleID, 128),