Merge pull request #1 from thedropbears/tweaks

General UI tweaks

main.py

@@ -1,82 +1,149 @@
-#!/bin/env python3
-import time
 import pyglet
-import math
 from networktables import NetworkTables
 
 FIELD_WIDTH = 16.46
 FIELD_HEIGHT = 8.23
-FIELD_TO_WINDOW = 100
-WIN_WIDTH = int(FIELD_WIDTH * FIELD_TO_WINDOW)
-WIN_HEIGHT = int(FIELD_HEIGHT * FIELD_TO_WINDOW)
 
 ROBORIO_IP = "10.47.74.2"
 
 STANDBY_STATUS_STRING = f"No connection, waiting for {ROBORIO_IP}"
 
 GRAY = (127, 127, 127)
+BLACK = (0, 0, 0)
 RED = (255, 0, 0)
+BLUE = (0, 0, 255)
 YELLOW = (255, 255, 0)
 
 dashboard = NetworkTables.getTable("SmartDashboard")
 components = NetworkTables.getTable("components")
 field = dashboard.getSubTable("Field")
 indexer = components.getSubTable("indexer")
 
-window = pyglet.window.Window(width=WIN_WIDTH, height=WIN_HEIGHT, caption="TheDropBears Driver Station")
+window = pyglet.window.Window(caption="Drop Bears Dashboard", resizable=True)
 
 is_running = False
 uptime = 0.0
 
 batch = pyglet.graphics.Batch()
 
-status_label = pyglet.text.Label(STANDBY_STATUS_STRING, font_size=48, anchor_y="top", y=WIN_HEIGHT, width=WIN_WIDTH, multiline=True, batch=batch)
-
-ball_indicators = [pyglet.shapes.Circle(30 + 70 * i, WIN_HEIGHT - 120, 30, batch=batch, color=GRAY) for i in range(3)] # Tunnel, chimney, trap
+status_padding = 10
+status_label = pyglet.text.Label(
+    STANDBY_STATUS_STRING,
+    font_size=72,
+    anchor_y="top",
+    x=100,
+    y=window.height - status_padding,
+    width=window.width,
+    batch=batch,
+)
+
+field_image = pyglet.image.load("2022-field.png")
+field_image.anchor_x = field_image.width // 2
+field_image.anchor_y = field_image.height // 2
+drawn_field = pyglet.sprite.Sprite(
+    field_image, 0, 0, batch=batch
+)
+drawn_field.scale = 0.5
+field_x_right = drawn_field.width // 2 + 50
+field_y_top = drawn_field.height // 2 + 150
+field_to_window = drawn_field.x / FIELD_WIDTH
+
+ball_rad = 100
+ball_y = 250
+ball_outlines = [
+    pyglet.shapes.Circle(
+        150, window.height - ball_y, ball_rad, batch=batch, color=GRAY
+    ),  # tunnel
+    pyglet.shapes.Circle(
+        400, window.height - ball_y, ball_rad, batch=batch, color=GRAY
+    ),  # chimney
+    pyglet.shapes.Circle(
+        750, window.height - ball_y, ball_rad, batch=batch, color=GRAY
+    ),  # trap
+]
+ball_indicators = [
+    pyglet.shapes.Circle(
+        150, window.height - ball_y, ball_rad - 5, batch=batch, color=BLACK
+    ),  # tunnel
+    pyglet.shapes.Circle(
+        400, window.height - ball_y, ball_rad - 5, batch=batch, color=BLACK
+    ),  # chimney
+    pyglet.shapes.Circle(
+        750, window.height - ball_y, ball_rad - 5, batch=batch, color=BLACK
+    ),  # trap
+]
+balls_seperator = pyglet.shapes.Rectangle(
+    572.5, window.height - ball_y - ball_rad, 5, 200, color=GRAY, batch=batch
+)
 
 robot = pyglet.shapes.Rectangle(0, 0, 40, 40, batch=batch)
 robot.anchor_position = 20, 20
 robot_facing = pyglet.shapes.Rectangle(0, 0, 20, 10, color=RED, batch=batch)
 robot_facing.anchor_position = 0, 5
 
-goal = pyglet.shapes.Circle(WIN_WIDTH / 2, WIN_HEIGHT / 2, 60, batch=batch)
-effective_goal = pyglet.shapes.Circle(WIN_WIDTH / 2, WIN_HEIGHT / 2, 60, color=YELLOW, batch=batch)
+effective_goal = pyglet.shapes.Circle(
+    0, 0, 60, color=YELLOW, batch=batch
+)
 
 @window.event
 def on_key_press(symbol, mods):
     print(f"key pressed {symbol}")
 
+
 @window.event
 def on_draw():
     window.clear()
     batch.draw()
 
+
+@window.event
+def on_resize(width, height):
+    status_label.update(0, height - status_padding)
+    ball_indicators[0].y = height - ball_y
+    ball_indicators[1].y = height - ball_y
+    ball_indicators[2].y = height - ball_y
+    ball_outlines[0].y = height - ball_y
+    ball_outlines[1].y = height - ball_y
+    ball_outlines[2].y = height - ball_y
+    balls_seperator.y = height - ball_y - ball_rad
+    drawn_field.update(x=width - field_x_right, y=height - field_y_top)
+
+
 def update(dt):
     global is_running, status_label, uptime
     if is_running:
         if not NetworkTables.isConnected():
             status_label.text = STANDBY_STATUS_STRING
             is_running = False
         uptime += dt
+        """
         pos = field.getValue("estimator_pose", None)
         if pos is not None:
             robot.x = robot_facing.x = pos[0] * FIELD_TO_WINDOW
             robot.y = robot_facing.y = pos[1] * FIELD_TO_WINDOW
             robot.rotation = robot_facing.rotation = -pos[2]
+        """
         pos = field.getValue("effective_goal", None)
         if pos is not None:
-            effective_goal.x = pos[0] * FIELD_TO_WINDOW
-            effective_goal.y = pos[1] * FIELD_TO_WINDOW
+            effective_goal.x = drawn_field.x + pos[0] * field_to_window
+            effective_goal.y = drawn_field.y + pos[1] * field_to_window
 
         status_label.text = f"Uptime: {int(uptime)} s"
-        ball_indicators[0].color = YELLOW if indexer.getBoolean("has_cargo_in_tunnel", False) else GRAY
-        ball_indicators[1].color = YELLOW if indexer.getBoolean("has_cargo_in_chimney", False) else GRAY
-        ball_indicators[2].color = RED if indexer.getBoolean("has_trapped_cargo", False) else GRAY
+        ball_indicators[0].color = (
+            YELLOW if indexer.getBoolean("has_cargo_in_tunnel", False) else BLACK
+        )
+        ball_indicators[1].color = (
+            YELLOW if indexer.getBoolean("has_cargo_in_chimney", False) else BLACK
+        )
+        ball_indicators[2].color = (
+            RED if indexer.getBoolean("has_trapped_cargo", False) else BLACK
+        )
     else:
         NetworkTables.startClient(ROBORIO_IP)
         if NetworkTables.isConnected():
             is_running = True
             uptime = 0.0
 
-pyglet.clock.schedule_interval(update, 1/24.0)
+
+pyglet.clock.schedule_interval(update, 1 / 24.0)
 pyglet.app.run()