Update app.py

app.py

@@ -8,84 +8,89 @@ import matplotlib.gridspec as gridspec
 import math
 from matplotlib.backends.backend_pdf import PdfPages
 
+# Constants
 SPLIT_TIME = "17:30"
 BUSINESS_START = "09:30"
 BUSINESS_END = "01:30"
-BORDER_COLOR = '#A9A9A9'
+BORDER_COLOR = 'grey' # Changed to grey for the new border
 DATE_COLOR = '#A9A9A9'
+A5_WIDTH_IN = 5.83
+A5_HEIGHT_IN = 8.27
+NUM_COLS = 3
+
 
 def process_schedule(file):
     """处理上传的 Excel 文件，生成排序和分组后的打印内容"""
     try:
         # 读取 Excel，跳过前 8 行
         df = pd.read_excel(file, skiprows=8)
-        
+
         # 提取所需列 (G9, H9, J9)
         df = df.iloc[:, [6, 7, 9]]  # G, H, J 列
         df.columns = ['Hall', 'StartTime', 'EndTime']
-        
+
         # 清理数据
         df = df.dropna(subset=['Hall', 'StartTime', 'EndTime'])
-        
+
         # 转换影厅格式为 "#号" 格式
         df['Hall'] = df['Hall'].str.extract(r'(\d+)号').astype(str) + ' '
-        
+
         # 保存原始时间字符串用于诊断
         df['original_end'] = df['EndTime']
-        
+
         # 转换时间为 datetime 对象
         base_date = datetime.today().date()
         df['StartTime'] = pd.to_datetime(df['StartTime'])
         df['EndTime'] = pd.to_datetime(df['EndTime'])
-        
+
         # 设置基准时间
         business_start = datetime.strptime(f"{base_date} {BUSINESS_START}", "%Y-%m-%d %H:%M")
         business_end = datetime.strptime(f"{base_date} {BUSINESS_END}", "%Y-%m-%d %H:%M")
-        
+
         # 处理跨天情况
         if business_end < business_start:
             business_end += timedelta(days=1)
-        
+
         # 标准化所有时间到同一天
         for idx, row in df.iterrows():
             end_time = row['EndTime']
             if end_time.hour < 9:
                 df.at[idx, 'EndTime'] = end_time + timedelta(days=1)
-            
+
             if row['StartTime'].hour >= 21 and end_time.hour < 9:
                 df.at[idx, 'EndTime'] = end_time + timedelta(days=1)
-        
+
         # 筛选营业时间内的场次
         df['time_for_comparison'] = df['EndTime'].apply(
             lambda x: datetime.combine(base_date, x.time())
         )
-        
+
         df.loc[df['time_for_comparison'].dt.hour < 9, 'time_for_comparison'] += timedelta(days=1)
-        
+
         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 = df[valid_times]
-        
+
         # 按散场时间排序
         df = df.sort_values('EndTime')
-        
+
         # 分割数据
         split_time = datetime.strptime(f"{base_date} {SPLIT_TIME}", "%Y-%m-%d %H:%M")
         split_time_for_comparison = df['time_for_comparison'].apply(
             lambda x: datetime.combine(base_date, split_time.time())
         )
-        
+
         part1 = df[df['time_for_comparison'] <= split_time_for_comparison].copy()
         part2 = df[df['time_for_comparison'] > split_time_for_comparison].copy()
-        
+
         # 格式化时间显示
         for part in [part1, part2]:
-            part['EndTime'] = part['EndTime'].dt.strftime('%-I:%M')
-        
-        # 关键修改：精确读取C6单元格
+            part['EndTime'] = part['EndTime'].dt.strftime('%-H:%M')
+
+        # 精确读取C6单元格
         date_df = pd.read_excel(
             file,
             skiprows=5,    # 跳过前5行（0-4）
@@ -94,7 +99,7 @@ def process_schedule(file):
             header=None    # 无表头
         )
         date_cell = date_df.iloc[0, 0]
-        
+
         try:
             # 处理不同日期格式
             if isinstance(date_cell, str):
@@ -103,104 +108,97 @@ def process_schedule(file):
                 date_str = pd.to_datetime(date_cell).strftime('%Y-%m-%d')
         except:
             date_str = datetime.today().strftime('%Y-%m-%d')
-        
+
         return part1[['Hall', 'EndTime']], part2[['Hall', 'EndTime']], date_str
-    
+
     except Exception as e:
         st.error(f"处理文件时出错: {str(e)}")
         return None, None, None
 
+
 def create_print_layout(data, title, date_str):
-    """
-    创建基于精确A5网格的打印布局 (PNG 和 PDF)，具有点状虚线边框和动态字体大小。
-    """
+    """创建精确的 A5 表格打印布局 (PNG 和 PDF)"""
     if data.empty:
         return None
 
-    # A5 纸张尺寸（英寸）和 DPI
-    A5_WIDTH_INCHES = 5.83
-    A5_HEIGHT_INCHES = 8.27
-    DPI = 300
+    # --- 内部绘图函数 ---
+    def generate_figure():
+        # --- 1. 计算布局和字体大小 ---
+        total_items = len(data)
+        num_rows = math.ceil(total_items / NUM_COLS) if total_items > 0 else 1
 
-    # 为 PNG 和 PDF 创建图形
-    png_fig = plt.figure(figsize=(A5_WIDTH_INCHES, A5_HEIGHT_INCHES), dpi=DPI)
-    pdf_fig = plt.figure(figsize=(A5_WIDTH_INCHES, A5_HEIGHT_INCHES), dpi=DPI)
+        # 定义日期标题行的高度（英寸），数据行将填充剩余空间
+        date_header_height_in = 0.3
+        data_area_height_in = A5_HEIGHT_IN - date_header_height_in
 
-    def process_figure(fig):
-        # 设置支持中文的字体
-        plt.rcParams['font.family'] = 'sans-serif'
-        plt.rcParams['font.sans-serif'] = ['Arial Unicode MS']
+        # 计算每个数据单元格的尺寸（英寸）
+        cell_width_in = A5_WIDTH_IN / NUM_COLS
+        cell_height_in = data_area_height_in / num_rows
+
+        # 将单元格宽度转换为点（1 英寸 = 72 点）
+        cell_width_pt = cell_width_in * 72
+        cell_height_pt = cell_height_in * 72
 
-        # 使网格充满整个画布，无边距
+        # --- 动态字体大小计算 ---
+        # 目标：文本总宽度为单元格宽度的 90%
+        target_text_width_pt = cell_width_pt * 0.9
+        # 启发式估算：假设最长文本为 "10 23:59" (8个字符)，平均字符宽度约为字体大小的0.6倍
+        # FONT_SIZE = target_width / (num_chars * avg_char_width_factor)
+        fontsize_from_width = target_text_width_pt / (8 * 0.6)
+        # 字体高度不能超过单元格高度（留出20%的垂直边距）
+        fontsize_from_height = cell_height_pt * 0.8
+        # 选择两者中较小的一个，以确保文本能完全容纳
+        base_fontsize = min(fontsize_from_width, fontsize_from_height)
+
+        # --- 2. 创建图形和网格 ---
+        fig = plt.figure(figsize=(A5_WIDTH_IN, A5_HEIGHT_IN), dpi=300)
+        # 设置无边距，让网格填满整个图纸
         fig.subplots_adjust(left=0, right=1, top=1, bottom=0)
 
-        # 计算网格维度
-        total_items = len(data)
-        num_cols = 3
-        num_rows = math.ceil(total_items / num_cols)
-        
-        if num_rows == 0:
-            return  # 如果没有数据则退出
-
-        # 创建网格布局，为日期/标题行分配较小的高度
-        height_ratios = [0.4] + [1] * num_rows
-        gs = gridspec.GridSpec(num_rows + 1, num_cols, 
-                               height_ratios=height_ratios,
-                               wspace=0, hspace=0, figure=fig)
-
-        # 准备数据，按Z字形（列优先）排序
+        # 设置字体
+        plt.rcParams['font.family'] = 'sans-serif'
+        plt.rcParams['font.sans-serif'] = ['Arial Unicode MS'] # 确保字体可用
+
+        # 创建网格，顶部为日期行，下方为数据行
+        # 使用高度（英寸）作为比率，GridSpec会自动归一化
+        gs = gridspec.GridSpec(
+            num_rows + 1, NUM_COLS,
+            hspace=0, wspace=0, # 无单元格间距
+            height_ratios=[date_header_height_in] + [cell_height_in] * num_rows,
+            figure=fig
+        )
+
+        # --- 3. 补全和排序数据 ---
         data_values = data.values.tolist()
-        while len(data_values) % num_cols != 0:
+        while len(data_values) % NUM_COLS != 0:
             data_values.append(['', ''])
 
-        rows_per_col_layout = math.ceil(len(data_values) / num_cols)
+        rows_per_col_layout = math.ceil(len(data_values) / NUM_COLS)
         sorted_data = [['', '']] * len(data_values)
         for i, item in enumerate(data_values):
             if item[0] and item[1]:
                 row_in_col = i % rows_per_col_layout
                 col_idx = i // rows_per_col_layout
-                new_index = row_in_col * num_cols + col_idx
+                new_index = row_in_col * NUM_COLS + col_idx
                 if new_index < len(sorted_data):
                     sorted_data[new_index] = item
-        
-        # --- 动态计算字体大小 ---
-        # 1. 找到最长的文本字符串
-        longest_string = ""
-        for hall, end_time in sorted_data:
-            if hall and end_time:
-                text = f"{hall}{end_time}"
-                if len(text) > len(longest_string):
-                    longest_string = text
-        
-        base_fontsize = 10  # 默认字体大小
-        if longest_string:
-            # 2. 计算单元格宽度（以磅为单位，1英寸=72磅）
-            fig_width_pt = fig.get_figwidth() * 72
-            cell_width_pt = fig_width_pt / num_cols
-            
-            # 3. 目标文本宽度为单元格宽度的80%
-            target_text_width_pt = cell_width_pt * 0.8
-            
-            # 4. 根据经验系数估算字体大小
-            # (字符宽度约等于字体大小的0.6倍)
-            char_width_factor = 0.6
-            base_fontsize = (target_text_width_pt / len(longest_string)) / char_width_factor
-
-        # 绘制数据单元格
+
+        # --- 4. 绘制数据单元格 ---
         for idx, (hall, end_time) in enumerate(sorted_data):
             if hall and end_time:
-                row_grid = idx // num_cols + 1  # +1 是因为日期行占了第0行
-                col_grid = idx % num_cols
-                
+                row_grid = idx // NUM_COLS + 1  # +1 因为日期行占了第0行
+                col_grid = idx % NUM_COLS
+
                 ax = fig.add_subplot(gs[row_grid, col_grid])
 
-                # 设置灰色点状虚线边框
+                # --- 设置点状虚线边框 ---
                 for spine in ax.spines.values():
                     spine.set_visible(True)
+                    spine.set_linestyle((0, (1, 2)))  # 点状线: (offset, (on_length, off_length))
                     spine.set_color(BORDER_COLOR)
-                    spine.set_linestyle(':')  # 点状线
-                    spine.set_linewidth(1)
+                    spine.set_linewidth(0.75) # 点状线可能需要稍粗一点才清晰
 
+                # 绘制居中对齐的文本
                 display_text = f"{hall}{end_time}"
                 ax.text(0.5, 0.5, display_text,
                         fontsize=base_fontsize,
@@ -210,35 +208,37 @@ def create_print_layout(data, title, date_str):
 
                 ax.set_xticks([])
                 ax.set_yticks([])
+                ax.set_facecolor('none')
 
-        # 在顶部添加日期/标题信息
+        # --- 5. 绘制日期标题 ---
         ax_date = fig.add_subplot(gs[0, :])
-        ax_date.text(0.02, 0.5, f"{date_str} {title}",
-                     fontsize=base_fontsize * 0.6,  # 日期字体稍小
-                     color=DATE_COLOR,
-                     fontweight='bold',
+        ax_date.text(0.01, 0.5, f"{date_str} {title}",
+                     fontsize=base_fontsize * 0.5, # 日期字体稍小
+                     color=DATE_COLOR, fontweight='bold',
                      ha='left', va='center',
                      transform=ax_date.transAxes)
-        ax_date.set_axis_off()
+        ax_date.set_axis_off() # 完全隐藏日期行的边框和刻度
+        ax_date.set_facecolor('none')
 
-    # --- 处理并保存图形 ---
-    process_figure(png_fig)
-    process_figure(pdf_fig)
+        return fig
+
+    # --- 生成并保存图形 ---
+    fig_for_output = generate_figure()
 
     # 保存为 PNG
     png_buffer = io.BytesIO()
-    png_fig.savefig(png_buffer, format='png') # 移除 bbox_inches 和 pad_inches
+    fig_for_output.savefig(png_buffer, format='png') # 无需 bbox_inches='tight'
     png_buffer.seek(0)
     png_base64 = base64.b64encode(png_buffer.getvalue()).decode()
-    plt.close(png_fig)
 
     # 保存为 PDF
     pdf_buffer = io.BytesIO()
     with PdfPages(pdf_buffer) as pdf:
-        pdf.savefig(pdf_fig) # 移除 bbox_inches 和 pad_inches
+        pdf.savefig(fig_for_output) # 无需 bbox_inches='tight'
     pdf_buffer.seek(0)
     pdf_base64 = base64.b64encode(pdf_buffer.getvalue()).decode()
-    plt.close(pdf_fig)
+
+    plt.close(fig_for_output) # 关闭图形，释放内存
 
     return {
         'png': f'data:image/png;base64,{png_base64}',
@@ -251,7 +251,7 @@ def display_pdf(base64_pdf):
     pdf_display = f'<iframe src="{base64_pdf}" width="100%" height="800" type="application/pdf"></iframe>'
     return pdf_display
 
-# Streamlit 界面
+# --- Streamlit 界面 ---
 st.set_page_config(page_title="散厅时间快捷打印", layout="wide")
 st.title("散厅时间快捷打印")