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