Update app.py

app.py

@@ -6,7 +6,7 @@ import io
 import base64
 import matplotlib.gridspec as gridspec
 import math
-import re  # 新增正则模块
+import re
 
 SPLIT_TIME = "17:30"
 BUSINESS_START = "09:30"
@@ -64,7 +64,7 @@ def process_schedule(file):
         
         valid_times = (
             ((df['time_for_comparison'] >= datetime.combine(base_date, business_start.time())) &
-             (df['time_for_comparison'] <= datetime.combine(base_date + timedelta(days=1), business_end.time())))
+            (df['time_for_comparison'] <= datetime.combine(base_date + timedelta(days=1), business_end.time()))
         )
         
         df = df[valid_times]
@@ -127,24 +127,25 @@ def create_print_layout(data, title, date_str):
     num_cols = 3
     num_rows = math.ceil(total_items / num_cols)
     
-    # 创建网格
-    gs = gridspec.GridSpec(num_rows + 1, num_cols, hspace=0.1, wspace=0.1, height_ratios=[1] * num_rows + [0.2])
+    # 创建网格（优化间距参数）
+    gs = gridspec.GridSpec(num_rows + 1, num_cols, 
+                         hspace=0.2, wspace=0.2,  # 增加行列间距
+                         height_ratios=[1.2] * num_rows + [0.2])
     
     # 计算最大字符数
     max_char_count = 0
     for hall, end_time in data.values:
-        # 清理LaTeX标记并计算实际显示字符数
         clean_hall = re.sub(r'\$.*?\$', '#', hall)
         clean_text = f"{clean_hall}{end_time}"
         current_count = len(clean_text)
         max_char_count = max(max_char_count, current_count)
     
-    # 动态计算基础字号（确保最长文本占90%宽度）
+    # 动态计算基础字号（优化计算参数）
     cell_width_inches = 5.83 / 3  # 每列宽度（A5横向）
-    available_width = cell_width_inches * 0.9 * 72  # 转换为点数（1英寸=72点）
-    avg_char_width = 0.6  # 经验值（Arial字体字符宽度系数）
+    available_width = cell_width_inches * 0.65 * 72  # 可用宽度减少到65%
+    avg_char_width = 0.8  # 加粗字体宽度系数
     base_fontsize = available_width / (max_char_count * avg_char_width)
-    base_fontsize = min(30, base_fontsize)  # 最大不超过30pt
+    base_fontsize = min(26, base_fontsize)  # 设置最大字号限制
     
     # 填充数据
     data_values = data.values.tolist()
@@ -168,18 +169,22 @@ def create_print_layout(data, title, date_str):
             
             ax = plt.subplot(gs[row, col])
             
+            # 设置单元格边界范围（增加内边距）
+            ax.set_xlim(0.1, 0.9)  # 左右各留10%边距
+            ax.set_ylim(0.1, 0.9)  # 上下各留10%边距
+            
             for spine in ax.spines.values():
                 spine.set_color(BORDER_COLOR)
                 spine.set_linewidth(0.5)
             
+            # 添加文本（字号缩小5%）
             ax.text(0.5, 0.5, f"{hall}{end_time}",
-                    fontsize=base_fontsize,
+                    fontsize=base_fontsize*0.95,
                     fontweight='bold',
                     ha='center',
-                    va='center')
+                    va='center',
+                    transform=ax.transAxes)
             
-            ax.set_xlim(-0.02, 1.02)
-            ax.set_ylim(-0.02, 1.02)
             ax.set_xticks([])
             ax.set_yticks([])