Radar scope update 1

battlewords/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.1.3"
+__version__ = "0.1.4"
 __all__ = ["models", "generator", "logic", "ui"]

battlewords/ui.py

@@ -3,8 +3,11 @@ from . import __version__ as version
 from typing import Iterable, Tuple, Optional
 
 import matplotlib.pyplot as plt
+from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
+from matplotlib import colors as mcolors
 import tempfile
 import os
+from PIL import Image
 
 from .generator import generate_puzzle, sort_word_file
 from .logic import build_letter_map, reveal_cell, guess_word, is_game_over, compute_tier
@@ -14,6 +17,12 @@ from .word_loader import get_wordlist_files, load_word_list  # use loader direct
 
 CoordLike = Tuple[int, int]
 
+def fig_to_pil_rgba(fig):
+    canvas = FigureCanvas(fig)
+    canvas.draw()
+    w, h = fig.canvas.get_width_height()
+    img = np.frombuffer(canvas.buffer_rgba(), dtype=np.uint8).reshape(h, w, 4)
+    return Image.fromarray(img, mode="RGBA")
 
 def _coord_to_xy(c) -> CoordLike:
     # Supports dataclass Coord(x, y) or a 2-tuple/list.
@@ -288,6 +297,45 @@ def _render_sidebar():
         else:
             st.info("No word lists found in words/ directory. Using built-in fallback.")
 
+def _create_radar_scope(size=4, bgcolor="none", scope_color="green"):
+    fig, ax = plt.subplots(figsize=(size, size), dpi=100)
+    ax.set_facecolor(bgcolor)
+    fig.patch.set_alpha(0.5)
+    ax.set_zorder(0)
+    
+    
+    # Hide decorations but keep patch/frame on
+    for spine in ax.spines.values():
+        spine.set_visible(False)
+    ax.set_xticks([])
+    ax.set_yticks([])
+    
+    # Center lines
+    ax.axhline(0, color=scope_color, alpha=0.8, zorder=1)
+    ax.axvline(0, color=scope_color, alpha=0.8, zorder=1)
+    # ax.set_xticks(range(1, size + 1))
+    # ax.set_yticks(range(1, size + 1))
+    
+    # Circles at 25% and 50% radius
+    for radius in [0.33, 0.66, 1.0]:
+        circle = plt.Circle((0, 0), radius, fill=False, color=scope_color, alpha=0.8, zorder=1)
+        ax.add_patch(circle)
+    
+    # Radial lines at 0, 30, 45, 90 degrees
+    angles = [0, 30, 60, 120, 150, 210, 240, 300, 330]
+    for angle in angles:
+        rad = np.deg2rad(angle)
+        x = np.cos(rad)
+        y = np.sin(rad)
+        ax.plot([0, x], [0, y], color=scope_color, alpha=0.5, zorder=1)
+    
+    # Set limits and remove axes
+    #ax.set_xlim(-0.5, 0.5)
+    #ax.set_ylim(-0.5, 0.5)
+    ax.set_aspect('equal', adjustable='box')
+    #ax.axis('off')
+    
+    return fig, ax
 
 def _render_radar(puzzle: Puzzle, size: int, r_max: float = 0.85, max_frames: int = 30, sinusoid_expand: bool = True, stagger_radar: bool = False):
     import numpy as np
@@ -318,11 +366,19 @@ def _render_radar(puzzle: Puzzle, size: int, r_max: float = 0.85, max_frames: in
     r_min = 0.15
     ring_linewidth = 4  # thickness of the ring stroke
 
-    fig, ax = plt.subplots(figsize=(3, 3))
+    rgba_labels = mcolors.to_rgba("#FFFFFF", 0.7)
+    rgba_ticks  = mcolors.to_rgba("#FFFFFF", 0.66) 
+    
+    fig, ax = _create_radar_scope(size=3, bgcolor="#4b7bc4", scope_color="#ffffff") 
+    imgscope = fig_to_pil_rgba(fig)
+    plt.close(fig)
+    fig, ax = plt.subplots(figsize=(3, 3))    
     ax.set_xlim(0.2, size)
     ax.set_ylim(size, 0.2)
     ax.set_xticks(range(1, size + 1))
     ax.set_yticks(range(1, size + 1))
+    ax.tick_params(axis="both", which="both", labelcolor=rgba_labels)
+    ax.tick_params(axis="both", which="both", colors=rgba_ticks)
     ax.grid(True, which="both", linestyle="--", alpha=0.3)
     # ax.set_title("Radar")
     ax.set_aspect('equal', adjustable='box')
@@ -366,14 +422,25 @@ def _render_radar(puzzle: Puzzle, size: int, r_max: float = 0.85, max_frames: in
     bg_ax.imshow(grad_img, aspect='auto', interpolation='bilinear')
     bg_ax.axis('off')
 
+    # Overlay the radar scope image centered in the main axes
+    scope_ax = fig.add_axes([-0.075, -0.075, 1.15, 1.15], zorder=1)
+    scope_ax.imshow(imgscope, aspect='auto', interpolation='lanczos')
+    scope_ax.axis('off')
+
     # Main axes above the background, with solid interior color for the radar grid
-    ax.set_facecolor('#4b7bc4')  # interior of the radar
-    ax.set_zorder(1)
+    ax.set_facecolor('none')  # interior of the radar
+    ax.set_zorder(2)
+    #ax.axis('off')
+    # Hide decorations but keep patch/frame on
+    for spine in ax.spines.values():
+        spine.set_visible(False)
+    # ax.set_xticks([])
+    # ax.set_yticks([])
 
     # Create ring (annulus-like) patches for each radar blip using Circle with stroke
     rings: list[Circle] = []
     for x, y in zip(xs, ys):
-        ring = Circle((x, y), radius=r_min, fill=False, edgecolor='#9ceffe', linewidth=ring_linewidth, alpha=1.0, zorder=2)
+        ring = Circle((x, y), radius=r_min, fill=False, edgecolor='#9ceffe', linewidth=ring_linewidth, alpha=1.0, zorder=3)
         ax.add_patch(ring)
         rings.append(ring)
 
@@ -405,8 +472,8 @@ def _render_radar(puzzle: Puzzle, size: int, r_max: float = 0.85, max_frames: in
         # Read the GIF into memory
         tmpfile.seek(0)
         gif_bytes = tmpfile.read()
-    st.image(gif_bytes, width='stretch')
-    os.unlink(tmpfile.name)  # Now safe to delete
+    st.image(gif_bytes, width='content', output_format="auto")
+    os.unlink(tmpfile.name) 
 
 
 def _render_grid(state: GameState, letter_map):