Add clutter removal option

app.py

@@ -10,10 +10,11 @@ description1 = (
 iface1 = gr.Interface(
                       fn = nonreflecting_plotter, 
                       inputs=[
-                        gr.Number(label="Circle Center X (a)", value=20),
-                        gr.Number(label="Circle Center Y (b)", value=20),
-                        gr.Number(label="Radius (r)", value=15),
-                        gr.Slider(minimum=3, maximum=1000, step=1, label="Number of Rays", value=50)
+                        gr.Number(label="Circle Center X (a)", value=20, info="X coordinate of Circle center"),
+                        gr.Number(label="Circle Center Y (b)", value=20, info="Y coordinate of Circle center"),
+                        gr.Number(label="Radius (r)", value=15, info="Radius of the circle"),
+                        gr.Slider(minimum=3, maximum=1000, step=1, label="Number of Rays", value=50, info="Number of rays to be plotted in total"),
+                        gr.Radio(label="Remove Clutter", choices=["Yes", "No"], value="No", info="Only keep rays that are INCIDENT by the surface."),
                     ],
                     outputs="image",
                     live=True,
@@ -27,10 +28,11 @@ description2 = ("A source of **light** placed at the **origin**. A spherical **R
 iface2 = gr.Interface(
                       fn = reflecting_plotter, 
                       inputs=[
-                        gr.Number(label="Circle Center X (a)", value=20),
-                        gr.Number(label="Circle Center Y (b)", value=20),
-                        gr.Number(label="Radius (r)", value=15),
-                        gr.Slider(minimum=3, maximum=1000, step=1, label="Number of Rays", value=50)
+                        gr.Number(label="Circle Center X (a)", value=20, info="X coordinate of Circle center"),
+                        gr.Number(label="Circle Center Y (b)", value=20, info="Y coordinate of Circle center"),
+                        gr.Number(label="Radius (r)", value=15, info="Radius of the circle"),
+                        gr.Slider(minimum=3, maximum=1000, step=1, label="Number of Rays", value=50, info="Number of rays to be plotted in total"),
+                        gr.Radio(label="Remove Clutter", choices=["Yes", "No"], value="No", info="Only keep rays that are REFLECTED by the surface."),
                     ],
                     outputs="image",
                     live=True,

backend/nonreflecting_ray_tracing.py

@@ -25,7 +25,7 @@ def is_angle_between(angle, start, end):
         return angle >= start or angle <= end
 
 
-def nonreflecting_plotter(a = 20, b = 20, r = 15, ray_count = 50):
+def nonreflecting_plotter(a = 20, b = 20, r = 15, ray_count = 50, clutter = "No"):
 
     max_dim = max(abs(a), abs(b), r) * 3
     fig, ax = plt.subplots()
@@ -99,8 +99,7 @@ def nonreflecting_plotter(a = 20, b = 20, r = 15, ray_count = 50):
     for angle in np.arange(0, 2 * mt.pi, increment):  # 1° steps
         dx = mt.cos(angle)
         dy = mt.sin(angle)
-        if is_angle_between(angle, lower_angle, upper_angle):
-            # continue
+        if is_angle_between(angle, lower_angle, upper_angle):            
             A = dx**2 + dy**2
             B = -2 * (a * dx + b * dy)
             C = a**2 + b**2 - r**2
@@ -120,6 +119,8 @@ def nonreflecting_plotter(a = 20, b = 20, r = 15, ray_count = 50):
             except ValueError:
                 continue 
         else:
+            if clutter == "Yes":
+                continue
             x, y = draw_line(angle)
             ax.plot(x, y, color='red', lw=1)
 

backend/reflecting_ray_tracing.py

@@ -55,7 +55,7 @@ def plot_reflection_on_circle(ax, angle, center, radius, ray_length=50, color='b
 
 
 
-def reflecting_plotter(a = 20, b = 20, r = 15, ray_count = 15):
+def reflecting_plotter(a = 20, b = 20, r = 15, ray_count = 15, clutter = "No"):
     max_dim = max(abs(a), abs(b), r) * 3
     fig, ax = plt.subplots()
     ax.set_xlim(-max_dim, max_dim)
@@ -66,6 +66,7 @@ def reflecting_plotter(a = 20, b = 20, r = 15, ray_count = 15):
     
     circle = plt.Circle((a, b), r, color='black', fill=False)
     ax.add_artist(circle)
+    ax.plot(a, b, 'ro', markersize=5)
     
     def inside_circle_plotter():
         """Function to plot the rays inside the circle"""
@@ -143,8 +144,9 @@ def reflecting_plotter(a = 20, b = 20, r = 15, ray_count = 15):
             plot_reflection_on_circle(ax, angle, center=(a, b), radius=r)
         
         else:
-            x, y = draw_line(angle)
-            ax.plot(x, y, color='red', lw=1, zorder=5)
+            if clutter == "No":
+                x, y = draw_line(angle)
+                ax.plot(x, y, color='red', lw=1, zorder=5)
     # plot_reflection_on_circle(ax, angle, center=(a, b), radius=r)
     ax.set_title(f'Rays with shadow from a perfectly reflective circle,\nCenter - ({a},{b}), Radius {r}')
     plt.grid(True)