Update app.py

app.py

@@ -94,6 +94,34 @@ def plot_triangle(x1, y1, x2, y2, x3, y3, I_x, I_y, U_x, U_y, G_x, G_y, midpoint
     triangle = Polygon([(x1, y1), (x2, y2), (x3, y3)], closed=True, edgecolor='b', facecolor='lightblue')
     ax.add_patch(triangle)
     
+    # Adjust the plot limits and aspect ratio
+    padding = 3
+    ax.set_xlim([min(x1, x2, x3) - padding, max(x1, x2, x3) + padding])
+    ax.set_ylim([min(y1, y2, y3) - padding, max(y1, y2, y3) + padding])
+    ax.set_aspect('equal', adjustable='datalim')
+    
+    ax.set_title('Solved Triangle', fontsize=18)
+    ax.set_xlabel('X-axis', fontsize=12)
+    ax.set_ylabel('Y-axis', fontsize=12)
+    
+    # Add a light grid
+    plt.grid(color='gray', linestyle='--', linewidth=0.5, alpha=0.5)
+    st.pyplot(fig)
+
+    # Add legend
+    handles = [
+        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=vertex_color, markersize=7, label=vertex_labels[0]),
+        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=vertex_color, markersize=7, label=vertex_labels[1]),
+        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=vertex_color, markersize=7, label=vertex_labels[2]),
+        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=midpoint_color, markersize=7, label=midpoints_labels[0]),
+        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=midpoint_color, markersize=7, label=midpoints_labels[1]),
+        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=midpoint_color, markersize=7, label=midpoints_labels[2]),
+        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=incenter_color, markersize=7, label=key_points_labels[0]),
+        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=circumcenter_color, markersize=7, label=key_points_labels[1]),
+        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=centroid_color, markersize=7, label=key_points_labels[2])
+    ]
+    ax.legend(handles=handles, loc='upper left', fontsize=12)
+
     # Define colors for different points
     vertex_color = 'blue'
     midpoint_color = 'green'
@@ -127,7 +155,7 @@ def plot_triangle(x1, y1, x2, y2, x3, y3, I_x, I_y, U_x, U_y, G_x, G_y, midpoint
     midpoint_name = ["M1", "M2", "M3"]
     for i, (mx, my) in enumerate(midpoints):
         ax.scatter(mx, my, color=midpoint_color, zorder=3)
-        ax.text(mx, my, midpoint_name[i], fontsize=10, ha="left", va="bottom", color=midpoint_color)
+        ax.text(mx*1.003, my*1.003, midpoint_name[i], fontsize=10, ha="left", va="bottom", color=midpoint_color)
 
 
     # Draw the inscribed circle (incircle)
@@ -140,32 +168,6 @@ def plot_triangle(x1, y1, x2, y2, x3, y3, I_x, I_y, U_x, U_y, G_x, G_y, midpoint
     circumcircle = Circle((U_x, U_y), radius_circum, color=circumcenter_color, fill=False, linestyle='--', linewidth=2, label="Circumscribed Circle")
     ax.add_patch(circumcircle)
     
-    # Add legend
-    handles = [
-        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=vertex_color, markersize=8, label=vertex_labels[0]),
-        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=vertex_color, markersize=8, label=vertex_labels[1]),
-        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=vertex_color, markersize=8, label=vertex_labels[2]),
-        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=midpoint_color, markersize=8, label=midpoints_labels[0]),
-        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=midpoint_color, markersize=8, label=midpoints_labels[1]),
-        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=midpoint_color, markersize=8, label=midpoints_labels[2]),
-        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=incenter_color, markersize=8, label=key_points_labels[0]),
-        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=circumcenter_color, markersize=8, label=key_points_labels[1]),
-        plt.Line2D([0], [0], marker='o', color='w', markerfacecolor=centroid_color, markersize=8, label=key_points_labels[2])
-    ]
-    ax.legend(handles=handles, loc='upper left', fontsize=12)
-    
-    # Adjust the plot limits and aspect ratio
-    padding = 3
-    ax.set_xlim([min(x1, x2, x3) - padding, max(x1, x2, x3) + padding])
-    ax.set_ylim([min(y1, y2, y3) - padding, max(y1, y2, y3) + padding])
-    ax.set_aspect('equal', adjustable='datalim')
-    
-    ax.set_title('Solved Triangle', fontsize=18)
-    ax.set_xlabel('X-axis', fontsize=12)
-    ax.set_ylabel('Y-axis', fontsize=12)
-    
-    plt.grid(True)
-    st.pyplot(fig)
 
 # Function to check if the sides form a valid triangle
 def is_valid_triangle(a, b, c):
@@ -176,7 +178,7 @@ def is_valid_triangle(a, b, c):
 def main():
     st.title("Advanced Triangle Solver")
 
-    st.sidebar.header("Enter the coordinates of the three points:")
+    st.sidebar.header("Enter the cartesion coordinates for the three points of a triangle:")
 
     # Coordinates input (X1, Y1), (X2, Y2), (X3, Y3)
     x1 = st.sidebar.number_input("X1", min_value=-100.0, max_value=100.0, step=0.1, format="%.3f")
@@ -252,7 +254,7 @@ def main():
             st.markdown(f"Side c: **{format_zero(c):.3f}** units")
 
         
-        col1, col2, col3 = st.columns(3)
+        col1, col2 = st.columns(2)
 
         with col1:
             st.subheader("Incenter of Triangle:")
@@ -264,11 +266,10 @@ def main():
             st.markdown(f"Coordinates: **({format_zero(U_x):.3f}, {format_zero(U_y):.3f})**")
             st.markdown(f"Radius: **{radius_circum:.3f}** units")
         
-        with col3:
-            st.subheader("Other Properties:")
-            st.markdown(f"Area: **{format_zero(area):.3f}** square units")
-            st.markdown(f"Perimeter: **{format_zero(perimeter):.3f}** units")
-            st.markdown(f"Centroid: **({format_zero(G_x):.3f}, {format_zero(G_y):.3f})**")
+        st.subheader("Other Properties:")
+        st.markdown(f"Area: **{format_zero(area):.3f}** square units")
+        st.markdown(f"Perimeter: **{format_zero(perimeter):.3f}** units")
+        st.markdown(f"Centroid: **({format_zero(G_x):.3f}, {format_zero(G_y):.3f})**")
 
         # Display triangle graph with midpoints and colored points
         plot_triangle(x1, y1, x2, y2, x3, y3, I_x, I_y, U_x, U_y, G_x, G_y, midpoints, a, b, c)