Update app.py

app.py

@@ -7,121 +7,87 @@ import base64
 import matplotlib.gridspec as gridspec
 import math
 from matplotlib.backends.backend_pdf import PdfPages
-import matplotlib.font_manager as fm # 新增导入
-import os # 新增导入
+# The 'FancyBboxPatch' is no longer needed for the new border style.
 
-# --- 全局常量 ---
 SPLIT_TIME = "17:30"
 BUSINESS_START = "09:30"
 BUSINESS_END = "01:30"
-BORDER_COLOR = 'grey'
+BORDER_COLOR = 'gray' # Changed to gray for the new style
 DATE_COLOR = '#A9A9A9'
-FONT_PATH = 'SimHei.ttf' # 字体文件路径
-
-# --- 字体设置 ---
-FONT_BOLD = None
-FONT_REGULAR = None
-FONT_WARNING_ISSUED = False
-
-def get_font_properties():
-    """加载字体文件并返回 FontProperties 对象"""
-    global FONT_BOLD, FONT_REGULAR, FONT_WARNING_ISSUED
-    if FONT_BOLD is None: # 只加载一次
-        if os.path.exists(FONT_PATH):
-            try:
-                FONT_BOLD = fm.FontProperties(fname=FONT_PATH, weight='bold')
-                FONT_REGULAR = fm.FontProperties(fname=FONT_PATH, weight='normal')
-            except Exception as e:
-                if not FONT_WARNING_ISSUED:
-                    st.warning(f"加载字体 '{FONT_PATH}' 失败: {e}. 将使用默认字体。")
-                    FONT_WARNING_ISSUED = True
-        else:
-            if not FONT_WARNING_ISSUED:
-                st.warning(f"字体文件 '{FONT_PATH}' 未找到。请将其放置在代码同目录下。将使用默认字体。")
-                FONT_WARNING_ISSUED = True
-
-def get_font_args(style='regular'):
-    """根据请求的样式返回字体参数字典"""
-    get_font_properties() # 确保字体已加载
-    if style == 'bold' and FONT_BOLD:
-        return {'fontproperties': FONT_BOLD}
-    if style == 'regular' and FONT_REGULAR:
-        return {'fontproperties': FONT_REGULAR}
-    # Fallback
-    return {'fontfamily': 'sans-serif', 'weight': 'bold' if style == 'bold' else 'normal'}
-
 
 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['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()
-        
+        split_time_obj = datetime.strptime(SPLIT_TIME, "%H:%M").time()
+        split_datetime = datetime.combine(base_date, split_time_obj)
+
+        part1 = df[df['time_for_comparison'] <= split_datetime].copy()
+        part2 = df[df['time_for_comparison'] > split_datetime].copy()
+
         # 格式化时间显示
         for part in [part1, part2]:
-            part['EndTime'] = part['EndTime'].dt.strftime('%-H:%M')
-        
+            # Use '%-H' for 24-hour format without leading zero on Linux/macOS
+            # Use '%#H' on Windows. A more cross-platform way is to format and remove later.
+            # Let's stick to '%H:%M' for universal 24-hour format e.g., "09:30"
+            part['EndTime'] = part['EndTime'].dt.strftime('%H:%M')
+
+
         # 关键修改：精确读取C6单元格
         date_df = pd.read_excel(
             file,
@@ -131,7 +97,7 @@ def process_schedule(file):
             header=None    # 无表头
         )
         date_cell = date_df.iloc[0, 0]
-        
+
         try:
             # 处理不同日期格式
             if isinstance(date_cell, str):
@@ -140,167 +106,178 @@ 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):
-    """创建基于精确表格布局的打印页面 (PNG 和 PDF)"""
+    """创建打印布局 (PNG 和 PDF)"""
     if data.empty:
         return None
 
-    # --- 1. 布局和尺寸计算 ---
-    A5_WIDTH_IN, A5_HEIGHT_IN = 5.83, 8.27
-    DPI = 300
-    MARGIN = 0.25 # 页边距 (英寸)
-    HEADER_HEIGHT_IN = 0.3 # 日期标题栏高度 (英寸)
-
-    content_width = A5_WIDTH_IN - (2 * MARGIN)
-    content_height = A5_HEIGHT_IN - (2 * MARGIN)
-    
-    total_items = len(data)
-    num_cols = 3
-    num_rows = math.ceil(total_items / num_cols)
-    
-    grid_height = content_height - HEADER_HEIGHT_IN
-    cell_width = content_width / num_cols
-    cell_height = grid_height / num_rows if num_rows > 0 else 0
-
-    # --- 2. 动态字体大小计算 ---
-    def calculate_font_size(fig):
-        # 使用一个典型的宽字符串来估算
-        sample_text = "8 88:88" 
-        target_width = cell_width * 0.9  # 目标宽度为单元格宽度的90%
-        
-        # 用初始字号10来测量
-        initial_fontsize = 10
-        t = fig.text(0.5, 0.5, sample_text, fontsize=initial_fontsize, **get_font_args('bold'))
-        # 渲染并获取边界框（以英寸为单位）
-        bbox = t.get_window_extent(renderer=fig.canvas.get_renderer())
-        text_width_in = bbox.width / fig.get_dpi()
-        t.remove() # 移除临时文本
+    # --- A5 Paper Dimensions in inches for precise layout ---
+    A5_WIDTH_IN = 5.83
+    A5_HEIGHT_IN = 8.27
+    NUM_COLS = 3
+
+    # --- Create Figures for PNG and PDF ---
+    png_fig = plt.figure(figsize=(A5_WIDTH_IN, A5_HEIGHT_IN), dpi=300)
+    pdf_fig = plt.figure(figsize=(A5_WIDTH_IN, A5_HEIGHT_IN), dpi=300)
+
+    # --- Internal drawing function to apply changes to both figures ---
+    def process_figure(fig):
+        plt.rcParams['font.family'] = 'sans-serif'
+        plt.rcParams['font.sans-serif'] = ['Arial Unicode MS']
+
+        total_items = len(data)
+        if total_items == 0:
+            plt.close(fig)
+            return
+
+        # --- 1. Redesign Print Layout ---
+        # Calculate number of rows needed
+        num_rows = math.ceil(total_items / NUM_COLS)
         
-        # 根据宽度比例调整字体大小
-        if text_width_in > 0:
-            scale_factor = target_width / text_width_in
-            return initial_fontsize * scale_factor
-        return initial_fontsize # 备用
-
-    # --- 3. 数据准备 (Z字形排序) ---
-    data_values = data.values.tolist()
-    while len(data_values) % num_cols != 0:
-        data_values.append(['', ''])
-
-    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
-            if new_index < len(sorted_data):
-                sorted_data[new_index] = item
-
-    # --- 4. 绘图 ---
-    fig = plt.figure(figsize=(A5_WIDTH_IN, A5_HEIGHT_IN), dpi=DPI)
-    final_fontsize = calculate_font_size(fig)
-    index_fontsize = final_fontsize * 0.35
-    date_fontsize = final_fontsize * 0.5
-    
-    # 绘制日期头
-    header_ax = fig.add_axes([MARGIN / A5_WIDTH_IN, (A5_HEIGHT_IN - MARGIN - HEADER_HEIGHT_IN) / A5_HEIGHT_IN, content_width / A5_WIDTH_IN, HEADER_HEIGHT_IN / A5_HEIGHT_IN])
-    header_ax.text(0.01, 0.5, f"{date_str} {title}",
-                     fontsize=date_fontsize,
+        # Remove all padding from the figure edges
+        fig.subplots_adjust(left=0, right=1, top=0.95, bottom=0)
+
+        # Create a grid with no space between cells. A small top row for the date.
+        gs = gridspec.GridSpec(
+            num_rows + 1,
+            NUM_COLS,
+            hspace=0,
+            wspace=0,
+            height_ratios=[0.3] + [1] * num_rows, # Make date row shorter
+            figure=fig
+        )
+
+        data_values = data.values.tolist()
+
+        # Pad data with empty values to make it a multiple of NUM_COLS
+        while len(data_values) % NUM_COLS != 0:
+            data_values.append(['', ''])
+
+        # --- Sort data column-first (Z-pattern) ---
+        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
+                if new_index < len(sorted_data):
+                    sorted_data[new_index] = item
+
+        # --- Dynamic Font Size Calculation ---
+        def get_dynamic_fontsize(text, cell_width_inches):
+            if not text:
+                return 1
+            # This factor is empirical, adjusts font size to fill ~90% of cell width
+            # A lower factor (e.g., 0.5) results in larger text.
+            ASPECT_RATIO_FACTOR = 0.55
+            num_chars = len(text)
+            # Formula: (target_width_points) / (num_characters * aspect_ratio)
+            fontsize = (cell_width_inches * 0.9 * 72) / (num_chars * ASPECT_RATIO_FACTOR)
+            return max(10, fontsize) # Return at least size 10
+
+        cell_width_inches = A5_WIDTH_IN / NUM_COLS
+
+        # --- Draw each data cell ---
+        for idx, (hall, end_time) in enumerate(sorted_data):
+            if hall and end_time:
+                row_grid = idx // NUM_COLS + 1  # +1 to skip date row
+                col_grid = idx % NUM_COLS
+                
+                ax = fig.add_subplot(gs[row_grid, col_grid])
+                
+                display_text = f"{hall} {end_time}"
+                
+                # Calculate optimal font size
+                fontsize = get_dynamic_fontsize(display_text, cell_width_inches)
+
+                ax.text(0.5, 0.5, display_text,
+                        fontsize=fontsize,
+                        fontweight='bold',
+                        ha='center',
+                        va='center',
+                        transform=ax.transAxes)
+
+                # --- 2. Change Cell Border ---
+                # Set a dotted gray border
+                for spine in ax.spines.values():
+                    spine.set_visible(True)
+                    spine.set_linestyle((0, (1, 2))) # Dotted line: (0, (on, off))
+                    spine.set_edgecolor(BORDER_COLOR)
+                    spine.set_linewidth(1.5)
+
+                ax.set_xticks([])
+                ax.set_yticks([])
+                ax.set_facecolor('none')
+
+        # --- Add date and title information to the top row ---
+        ax_date = fig.add_subplot(gs[0, :])
+        ax_date.text(0.01, 0.5, f"{date_str} {title}",
+                     fontsize=12,
                      color=DATE_COLOR,
+                     fontweight='bold',
                      ha='left',
                      va='center',
-                     transform=header_ax.transAxes,
-                     **get_font_args('bold'))
-    header_ax.set_axis_off()
-    
-    # 绘制每个单元格
-    for idx, (hall, end_time) in enumerate(sorted_data):
-        if hall and end_time:
-            row_grid = idx // num_cols
-            col_grid = idx % num_cols
-
-            # 计算单元格的绝对位置（从左下角开始，单位：英寸）
-            x_pos_in = MARGIN + (col_grid * cell_width)
-            y_pos_in = MARGIN + ( (num_rows - 1 - row_grid) * cell_height )
-            
-            # 转换为 Figure 的相对坐标 [left, bottom, width, height]
-            ax_rect = [x_pos_in / A5_WIDTH_IN, y_pos_in / A5_HEIGHT_IN, cell_width / A5_WIDTH_IN, cell_height / A5_HEIGHT_IN]
-            ax = fig.add_axes(ax_rect)
-
-            # 绘制主要文本
-            display_text = f"{hall}{end_time}"
-            ax.text(0.5, 0.5, display_text,
-                      fontsize=final_fontsize,
-                      ha='center',
-                      va='center',
-                      transform=ax.transAxes,
-                      **get_font_args('bold'))
-            
-            # 绘制左上角序号
-            ax.text(0.08, 0.92, str(idx + 1),
-                      fontsize=index_fontsize,
-                      color=BORDER_COLOR,
-                      ha='left',
-                      va='top',
-                      transform=ax.transAxes,
-                      **get_font_args('regular'))
-
-            # 设置边框为灰色点状虚线
-            for spine in ax.spines.values():
-                spine.set_color(BORDER_COLOR)
-                spine.set_linestyle(':')
-                spine.set_linewidth(1)
-            
-            ax.set_xticks([])
-            ax.set_yticks([])
-
-    # --- 5. 保存到内存 ---
-    # 保存 PNG
+                     transform=ax_date.transAxes)
+        
+        # Hide the border for the date cell
+        for spine in ax_date.spines.values():
+            spine.set_visible(False)
+        ax_date.set_xticks([])
+        ax_date.set_yticks([])
+        ax_date.set_facecolor('none')
+
+    # Process both the PNG and PDF figures with the new layout
+    process_figure(png_fig)
+    process_figure(pdf_fig)
+
+    # --- Save PNG ---
     png_buffer = io.BytesIO()
-    fig.savefig(png_buffer, format='png', pad_inches=0)
+    # Use pad_inches=0 because we handled margins with subplots_adjust
+    png_fig.savefig(png_buffer, format='png', pad_inches=0)
     png_buffer.seek(0)
     png_base64 = base64.b64encode(png_buffer.getvalue()).decode()
-    
-    # 保存 PDF
+    plt.close(png_fig)
+
+    # --- Save PDF ---
     pdf_buffer = io.BytesIO()
-    fig.savefig(pdf_buffer, format='pdf', pad_inches=0)
+    with PdfPages(pdf_buffer) as pdf:
+        # Use pad_inches=0 for PDF as well
+        pdf.savefig(pdf_fig, pad_inches=0)
     pdf_buffer.seek(0)
     pdf_base64 = base64.b64encode(pdf_buffer.getvalue()).decode()
-    
-    plt.close(fig)
+    plt.close(pdf_fig)
 
     return {
         'png': f'data:image/png;base64,{png_base64}',
         'pdf': f'data:application/pdf;base64,{pdf_base64}'
     }
 
+# --- PDF display function ---
 def display_pdf(base64_pdf):
-    """在Streamlit中嵌入显示PDF"""
+    """Embeds PDF in Streamlit for display"""
     pdf_display = f'<iframe src="{base64_pdf}" width="100%" height="800" type="application/pdf"></iframe>'
     return pdf_display
 
-# --- Streamlit 界面 ---
+# Streamlit UI
 st.set_page_config(page_title="散厅时间快捷打印", layout="wide")
 st.title("散厅时间快捷打印")
 
-# 检查并加载字体，如有需要会显示警告
-get_font_properties()
-
 uploaded_file = st.file_uploader("上传【放映场次核对表.xls】文件", type=["xls"])
 
 if uploaded_file:
     part1, part2, date_str = process_schedule(uploaded_file)
 
     if part1 is not None and part2 is not None:
-        # 生成包含 PNG 和 PDF 的字典
+        # Generate outputs containing both PNG and PDF data
         part1_output = create_print_layout(part1, "A", date_str)
         part2_output = create_print_layout(part2, "C", date_str)
 
@@ -309,6 +286,7 @@ if uploaded_file:
         with col1:
             st.subheader("白班散场预览（时间 ≤ 17:30）")
             if part1_output:
+                # Use tabs to show both PDF and PNG previews
                 tab1_1, tab1_2 = st.tabs(["PDF 预览", "PNG 预览"])
                 with tab1_1:
                     st.markdown(display_pdf(part1_output['pdf']), unsafe_allow_html=True)
@@ -320,6 +298,7 @@ if uploaded_file:
         with col2:
             st.subheader("夜班散场预览（时间 > 17:30）")
             if part2_output:
+                # Use tabs to show both PDF and PNG previews
                 tab2_1, tab2_2 = st.tabs(["PDF 预览", "PNG 预览"])
                 with tab2_1:
                     st.markdown(display_pdf(part2_output['pdf']), unsafe_allow_html=True)