chart spacing

app/DocumentGeneration/pdf_generator.py

@@ -150,23 +150,12 @@ def calculate_real_page_numbers(request: ExportRequest, filtered_sections):
                     if y_title > 25:
                         temp_pdf.ln(3)
                     
-                    # Add chart title
-                    temp_pdf.set_font("Arial", "B", 16)
-                    temp_pdf.set_text_color(0, 0, 0)
-                    temp_pdf.set_xy(25, y_title)
-                    temp_pdf.cell(0, 14, chart_info["title"], ln=True)
-                    
-                    # Add subtle line under chart title
-                    text_width = temp_pdf.get_string_width(chart_info["title"])
-                    line_width = min(text_width + 8, 160)
-                    temp_pdf.set_draw_color(221, 221, 221)
-                    temp_pdf.set_line_width(0.3)
-                    temp_pdf.line(25, y_title + 14, 25 + line_width, y_title + 14)
+                    # Chart title is already included in the chart itself, no need for separate title
                     
                     # Add chart image
                     img_width = 160  # Much larger chart width
                     x = (210 - img_width) / 2
-                    y_img = y_title + 20
+                    y_img = y_title
                     
                     # Save image to temp file
                     with tempfile.NamedTemporaryFile(delete=False, suffix=".png") as tmp_img:
@@ -430,6 +419,28 @@ def create_pdf_document(request: ExportRequest):
             content_text = re.sub(r'<!--CHARTDATASTART-->.*?<!--CHARTDATAEND-->', '', content_text, flags=re.DOTALL)
             content_text = re.sub(r'<!--CHARTDATASTART-->.*$', '', content_text, flags=re.DOTALL)
             
+            # Remove chart titles from content to prevent duplicate headings
+            # Get chart titles for this section
+            section_charts = chart_info_map.get(section.title, [])
+            if not section_charts:
+                # Try case-insensitive match
+                for chart_source, charts in chart_info_map.items():
+                    if chart_source.lower() == section.title.lower():
+                        section_charts = charts
+                        break
+            
+            # Remove chart titles from content
+            for chart_info in section_charts:
+                chart_title = chart_info["title"]
+                # Remove various markdown heading formats for the chart title
+                patterns_to_remove = [
+                    rf'^#+\s*{re.escape(chart_title)}\s*$',  # # Title, ## Title, etc.
+                    rf'^\*\*{re.escape(chart_title)}\*\*\s*$',  # **Title**
+                    rf'^{re.escape(chart_title)}\s*$',  # Just the title
+                ]
+                for pattern in patterns_to_remove:
+                    content_text = re.sub(pattern, '', content_text, flags=re.MULTILINE | re.IGNORECASE)
+            
             # No need to filter section titles since we're not adding them manually
             
             # Skip enhance_subheadings_with_bold for grouped rendering to preserve ** markers
@@ -443,9 +454,9 @@ def create_pdf_document(request: ExportRequest):
                 # Add placeholder text to prevent blank page
                 pdf.multi_cell(160, 8, f"Content for {section.title} section is being processed...", align='L')
                 
-            # Add minimal spacer only if we have content
+            # Add visual separation between content and charts
             if content_text and content_text.strip():
-                pdf.ln(3)  # Small space after content
+                pdf.ln(15)  # More generous spacing for better visual separation
             
             # ---- Charts for this section ----
             charts_added = 0  # IMPORTANT: initialize to avoid NameError
@@ -525,8 +536,7 @@ def create_pdf_document(request: ExportRequest):
                         if y_title > 25:  # If not at top of page, add minimal space
                             pdf.ln(3)  # Minimal spacing to fit more charts per page
                         
-                        # Subheader (title) and subtle rule
-                        y_title = add_subheader(pdf, chart_info["title"], 16, y_title)
+                        # Chart title is already included in the chart itself, no need for separate subheader
 
                         # Centered image with larger dimensions for better visibility
                         img_width = 160  # Much larger chart width for better visibility