Upload 7 files

README.md

@@ -1,10 +1,10 @@
 ---
-title: Continuous Beam RC Design - Thai Standards
-emoji: 🏗️
+title: "Continuous Beam RC Design - Thai Standards"
+emoji: "🏗️"
 colorFrom: blue
 colorTo: green
 sdk: gradio
-sdk_version: 5.34.2
+sdk_version: "4.0.0"
 app_file: app.py
 pinned: false
 ---
@@ -57,4 +57,4 @@ A comprehensive continuous beam reinforced concrete design application using fin
 
 ---
 
-*Using advanced finite element analysis for accurate continuous beam behavior*
+*Using advanced finite element analysis for accurate continuous beam behavior*

continuous_beam.py

@@ -1078,87 +1078,139 @@ class ContinuousBeam:
         ax.add_patch(plt.Rectangle((0, 0), total_length, beam_height, 
                                   fill=False, edgecolor='black', linewidth=2))
         
-        # Draw stirrups for each span
+        # Draw detailed stirrup layout for each span
         for i, span_data in enumerate(design_results):
             span_start = span_positions[i]
             span_end = span_positions[i + 1]
             span_length = span_end - span_start
             
-            # Get stirrup information
-            stirrup_info = []
+            # Get stirrup information with locations
+            stirrup_regions = []
             for stirrup in span_data['stirrups']:
                 if 'No stirrups' not in stirrup['stirrup_spacing']:
-                    spacing_str = stirrup['stirrup_spacing'].replace(' mm c/c', '')
-                    try:
-                        spacing = float(spacing_str) / 1000  # Convert mm to m
-                        stirrup_info.append({
-                            'location': stirrup['location'],
-                            'spacing': spacing,
-                            'shear': stirrup['shear']
-                        })
-                    except:
-                        pass
+                    # Extract stirrup type and spacing
+                    stirrup_parts = stirrup['stirrup_spacing'].split(' @ ')
+                    if len(stirrup_parts) == 2:
+                        stirrup_type = stirrup_parts[0]  # e.g., "RB9" or "RB6"
+                        spacing_str = stirrup_parts[1].replace(' mm c/c', '')
+                        try:
+                            spacing_mm = float(spacing_str)
+                            spacing_m = spacing_mm / 1000
+                            
+                            stirrup_regions.append({
+                                'location': stirrup['location'],
+                                'type': stirrup_type,
+                                'spacing_mm': spacing_mm,
+                                'spacing_m': spacing_m,
+                                'shear': stirrup['shear']
+                            })
+                        except:
+                            pass
             
-            if stirrup_info:
-                # Determine stirrup spacing pattern
-                # For simplicity, use average spacing
-                avg_spacing = np.mean([s['spacing'] for s in stirrup_info])
+            if stirrup_regions:
+                # Create detailed stirrup pattern for the span
+                # Divide span into regions based on stirrup requirements
+                regions = {
+                    'Left Support': {'start': span_start, 'end': span_start + span_length * 0.25},
+                    'Mid-span': {'start': span_start + span_length * 0.25, 'end': span_start + span_length * 0.75},
+                    'Right Support': {'start': span_start + span_length * 0.75, 'end': span_end}
+                }
                 
-                # Draw stirrups
-                num_stirrups = int(span_length / avg_spacing) + 1
-                for j in range(num_stirrups):
-                    x_pos = span_start + j * avg_spacing
-                    if x_pos <= span_end:
-                        # Draw stirrup as vertical line
-                        ax.plot([x_pos, x_pos], [0, beam_height], 'g-', linewidth=2, alpha=0.7)
-                        
-                        # Add stirrup symbol (small rectangle)
-                        stirrup_width = avg_spacing * 0.1
-                        ax.add_patch(plt.Rectangle((x_pos - stirrup_width/2, beam_height*0.1), 
-                                                  stirrup_width, beam_height*0.8, 
-                                                  fill=False, edgecolor='green', linewidth=1))
-                
-                # Add detailed spacing annotations with dimension lines
-                mid_span = (span_start + span_end) / 2
+                stirrup_positions = []
+                stirrup_labels = []
                 
-                # Main spacing annotation
-                ax.annotate(f'Stirrups @ {avg_spacing*1000:.0f}mm c/c', 
-                           xy=(mid_span, beam_height + 0.1), 
-                           ha='center', va='bottom', fontsize=9,
-                           bbox=dict(boxstyle="round,pad=0.2", facecolor="lightgreen", alpha=0.7))
+                for stirrup_region in stirrup_regions:
+                    location = stirrup_region['location']
+                    if location in regions:
+                        region_start = regions[location]['start']
+                        region_end = regions[location]['end']
+                        region_length = region_end - region_start
+                        spacing = stirrup_region['spacing_m']
+                        
+                        # Calculate stirrup positions in this region
+                        num_stirrups = max(2, int(region_length / spacing) + 1)
+                        actual_spacing = region_length / (num_stirrups - 1) if num_stirrups > 1 else region_length
+                        
+                        for j in range(num_stirrups):
+                            x_pos = region_start + j * actual_spacing
+                            if x_pos <= region_end:
+                                stirrup_positions.append(x_pos)
+                                stirrup_labels.append({
+                                    'x': x_pos,
+                                    'type': stirrup_region['type'],
+                                    'spacing': stirrup_region['spacing_mm'],
+                                    'location': location
+                                })
                 
-                # Add dimension lines between first few stirrups to show actual spacing
-                if num_stirrups >= 2:
-                    # Show spacing between first two stirrups
-                    x1 = span_start
-                    x2 = span_start + avg_spacing
-                    dim_y = beam_height + 0.25
+                # Draw all stirrups
+                colors = {'RB6': 'green', 'RB9': 'darkgreen'}
+                for pos in stirrup_positions:
+                    # Draw stirrup as detailed U-shape
+                    stirrup_width = 0.02
                     
-                    # Dimension line
-                    ax.annotate('', xy=(x1, dim_y), xytext=(x2, dim_y),
-                               arrowprops=dict(arrowstyle='<->', color='red', lw=1.5))
+                    # Main vertical lines
+                    ax.plot([pos, pos], [beam_height*0.05, beam_height*0.95], 'g-', linewidth=3, alpha=0.8)
                     
-                    # Dimension text
-                    ax.text((x1 + x2) / 2, dim_y + 0.02, f'{avg_spacing*1000:.0f}mm', 
-                           ha='center', va='bottom', fontsize=8, color='red', fontweight='bold',
-                           bbox=dict(boxstyle="round,pad=0.1", facecolor="white", alpha=0.9))
+                    # Horizontal top and bottom connections
+                    ax.plot([pos-stirrup_width, pos+stirrup_width], [beam_height*0.05, beam_height*0.05], 'g-', linewidth=2, alpha=0.8)
+                    ax.plot([pos-stirrup_width, pos+stirrup_width], [beam_height*0.95, beam_height*0.95], 'g-', linewidth=2, alpha=0.8)
                     
-                    # Vertical dimension lines from stirrups to dimension line
-                    ax.plot([x1, x1], [beam_height, dim_y - 0.01], 'r--', linewidth=1, alpha=0.7)
-                    ax.plot([x2, x2], [beam_height, dim_y - 0.01], 'r--', linewidth=1, alpha=0.7)
+                    # Side connections
+                    ax.plot([pos-stirrup_width, pos-stirrup_width], [beam_height*0.05, beam_height*0.95], 'g-', linewidth=2, alpha=0.8)
+                    ax.plot([pos+stirrup_width, pos+stirrup_width], [beam_height*0.05, beam_height*0.95], 'g-', linewidth=2, alpha=0.8)
+                
+                # Add spacing dimensions between stirrups
+                if len(stirrup_positions) >= 2:
+                    # Group consecutive stirrups and show spacing
+                    prev_pos = stirrup_positions[0]
+                    for k in range(1, min(4, len(stirrup_positions))):  # Show first few spacings
+                        curr_pos = stirrup_positions[k]
+                        spacing_actual = (curr_pos - prev_pos) * 1000  # Convert to mm
+                        
+                        # Dimension line above beam
+                        dim_y = beam_height + 0.15 + (k-1) * 0.08
+                        ax.annotate('', xy=(prev_pos, dim_y), xytext=(curr_pos, dim_y),
+                                   arrowprops=dict(arrowstyle='<->', color='red', lw=1.5))
+                        
+                        # Spacing text
+                        ax.text((prev_pos + curr_pos) / 2, dim_y + 0.02, f'{spacing_actual:.0f}mm', 
+                               ha='center', va='bottom', fontsize=7, color='red', fontweight='bold',
+                               bbox=dict(boxstyle="round,pad=0.1", facecolor="white", alpha=0.9))
+                        
+                        # Vertical dimension lines
+                        ax.plot([prev_pos, prev_pos], [beam_height, dim_y - 0.01], 'r--', linewidth=1, alpha=0.5)
+                        ax.plot([curr_pos, curr_pos], [beam_height, dim_y - 0.01], 'r--', linewidth=1, alpha=0.5)
+                        
+                        prev_pos = curr_pos
+                
+                # Add stirrup type and spacing summary
+                mid_span = (span_start + span_end) / 2
+                
+                # Create summary text for stirrup types used
+                stirrup_summary = []
+                for region in stirrup_regions:
+                    stirrup_summary.append(f"{region['type']} @ {region['spacing_mm']:.0f}mm ({region['location']})")
+                
+                summary_text = "\n".join(stirrup_summary)
+                ax.text(mid_span, beam_height + 0.4, f'Span {i+1} Stirrups:\n{summary_text}', 
+                       ha='center', va='bottom', fontsize=8,
+                       bbox=dict(boxstyle="round,pad=0.3", facecolor="lightgreen", alpha=0.7))
         
         # Draw supports
-        for pos in span_positions:
+        for i, pos in enumerate(span_positions):
             # Support line
             ax.plot([pos, pos], [-0.1, beam_height + 0.05], 'r--', linewidth=2, alpha=0.7)
             
-            # Support symbol
+            # Support symbol (triangle)
             triangle = plt.Polygon([
                 [pos - 0.05, -0.1],
                 [pos + 0.05, -0.1],
                 [pos, -0.2]
             ], fill=True, facecolor='red', edgecolor='black')
             ax.add_patch(triangle)
+            
+            # Support label
+            ax.text(pos, -0.25, f'Support {i+1}', ha='center', va='top', fontsize=8, fontweight='bold')
         
         # Add dimension lines and labels
         for i, span in enumerate(self.spans):
@@ -1174,20 +1226,27 @@ class ContinuousBeam:
             ax.text(span_center, -0.35, f'{span["length"]}m', 
                    ha='center', va='top', fontsize=10)
         
-        # Formatting
-        ax.set_xlim(-0.2, total_length + 0.2)
-        ax.set_ylim(-0.5, beam_height + 0.4)
+        # Formatting with more space for detailed annotations
+        ax.set_xlim(-0.3, total_length + 0.3)
+        ax.set_ylim(-0.6, beam_height + 0.8)
         ax.set_xlabel('Distance along beam (m)', fontsize=12)
-        ax.set_ylabel('Beam Height', fontsize=12)
-        ax.set_title('Shear Stirrup Layout', fontsize=14, fontweight='bold')
+        ax.set_ylabel('Beam Cross-Section', fontsize=12)
+        ax.set_title('Detailed Shear Stirrup Layout with Spacing Dimensions', fontsize=14, fontweight='bold')
         ax.grid(True, alpha=0.3)
         
-        # Add legend
+        # Add comprehensive legend
         legend_elements = [
-            plt.Line2D([0], [0], color='green', linewidth=2, alpha=0.7, label='Stirrups'),
-            plt.Line2D([0], [0], color='red', linestyle='--', linewidth=2, alpha=0.7, label='Supports')
+            plt.Line2D([0], [0], color='green', linewidth=3, alpha=0.8, label='Stirrups (U-shaped)'),
+            plt.Line2D([0], [0], color='red', linestyle='-', linewidth=1.5, label='Spacing Dimensions'),
+            plt.Line2D([0], [0], color='red', linestyle='--', linewidth=2, alpha=0.7, label='Supports'),
+            plt.Rectangle((0,0),1,1, facecolor='lightgreen', alpha=0.7, label='Stirrup Details')
         ]
-        ax.legend(handles=legend_elements, loc='upper right')
+        ax.legend(handles=legend_elements, loc='upper right', fontsize=10)
+        
+        # Add beam dimensions annotation
+        ax.text(total_length/2, -0.45, f'Beam: {self.beam_width}mm × {self.beam_depth}mm', 
+               ha='center', va='center', fontsize=10, fontweight='bold',
+               bbox=dict(boxstyle="round,pad=0.3", facecolor="lightyellow", alpha=0.8))
         
         plt.tight_layout()