Update app.py

app.py

@@ -9,6 +9,7 @@ import math
 from matplotlib.backends.backend_pdf import PdfPages
 from matplotlib.patches import FancyBboxPatch
 
+# --- Constants ---
 SPLIT_TIME = "17:30"
 BUSINESS_START = "09:30"
 BUSINESS_END = "01:30"
@@ -21,8 +22,8 @@ def process_schedule(file):
         # 读取 Excel，跳过前 8 行
         df = pd.read_excel(file, skiprows=8)
         
-        # 提取所需列 (G9, H9, J9)
-        df = df.iloc[:, [6, 7, 9]]  # G, H, J 列
+        # 提取所需列 (G, H, J)
+        df = df.iloc[:, [6, 7, 9]]
         df.columns = ['Hall', 'StartTime', 'EndTime']
         
         # 清理数据
@@ -47,25 +48,27 @@ def process_schedule(file):
         if business_end < business_start:
             business_end += timedelta(days=1)
         
-        # 标准化所有时间到同一天
+        # 标准化所有时间到同一天或第二天
         for idx, row in df.iterrows():
             end_time = row['EndTime']
+            # If end time is early in the morning (e.g., after midnight), move it to the next day
             if end_time.hour < 9:
                 df.at[idx, 'EndTime'] = end_time + timedelta(days=1)
-            
-            if row['StartTime'].hour >= 21 and end_time.hour < 9:
+            # Handle cases starting late and ending after midnight
+            elif 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['time_for_comparison'] >= datetime.combine(base_date, business_start.time())) &
+            (df['time_for_comparison'] <= business_end)
         )
         
         df = df[valid_times]
@@ -74,19 +77,16 @@ def process_schedule(file):
         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())
-        )
+        split_time_dt = datetime.strptime(f"{base_date} {SPLIT_TIME}", "%Y-%m-%d %H:%M")
         
-        part1 = df[df['time_for_comparison'] <= split_time_for_comparison].copy()
-        part2 = df[df['time_for_comparison'] > split_time_for_comparison].copy()
+        part1 = df[df['EndTime'] <= split_time_dt].copy()
+        part2 = df[df['EndTime'] > split_time_dt].copy()
         
         # 格式化时间显示
         for part in [part1, part2]:
             part['EndTime'] = part['EndTime'].dt.strftime('%-H:%M')
         
-        # 关键修改：精确读取C6单元格
+        # 精确读取C6单元格以获取日期
         date_df = pd.read_excel(
             file,
             skiprows=5,    # 跳过前5行（0-4）
@@ -139,20 +139,15 @@ def create_print_layout(data, title, date_str):
 
         gs = gridspec.GridSpec(num_rows + 1, num_cols, hspace=0.05, wspace=0.05, height_ratios=[0.1] + [1] * num_rows, figure=fig)
 
-        # --- 新增：预先计算单元格的目标宽度（以像素为单位）---
-        target_width_px = 1 
+        # --- 预先计算单元格的目标宽度（以像素为单位）---
+        target_width_px = 1  
         if total_items > 0:
-            # 创建一个临时坐标轴来测量其像素宽度
             ax_temp = fig.add_subplot(gs[1, 0])
-            # 必须绘制画布才能使用渲染器并获得几何属性
             fig.canvas.draw()
-            # 获取像素宽度并计算目标宽度（90%）
             target_width_px = ax_temp.get_window_extent().width * 0.90
-            # 移除临时坐标轴
             ax_temp.remove()
         # --- 预计算结束 ---
 
-        # 此字体大小计算仅用于顶部的日期
         available_height_per_row = (8.27 * 0.9 * (1 / 1.2)) / num_rows if num_rows > 0 else 1
         date_fontsize = min(40, max(10, available_height_per_row * 72 * 0.5))
 
@@ -191,34 +186,28 @@ def create_print_layout(data, title, date_str):
 
                     display_text = f"{hall}{end_time}"
                     
-                    # --- 修改部分：动态字体大小调整逻辑 ---
-                    # 创建一个文本对象
+                    # --- 动态字体大小调整逻辑 ---
                     t = ax.text(0.5, 0.5, display_text,
                                 fontweight='bold', ha='center', va='center',
                                 transform=ax.transAxes)
                     
-                    # 从一个较大的字号开始，迭代查找最佳字号
-                    current_size = 120  # 从更大的字号开始
+                    current_size = 120
                     while current_size > 1:
                         t.set_fontsize(current_size)
-                        # 获取渲染后的文本边界框
                         text_bbox = t.get_window_extent(renderer=fig.canvas.get_renderer())
                         
-                        # 如果文本宽度小于等于目标宽度，则此字号适用
                         if text_bbox.width <= target_width_px:
                             break
-                        current_size -= 2 # 步长可以大一点以提高速度
+                        current_size -= 2
                     # --- 修改结束 ---
 
                     ax.set_xticks([])
                     ax.set_yticks([])
-                else:
-                    print(f"Warning: Index out of bounds - idx={idx}, row_grid={row_grid}, col_grid={col_grid}")
 
         # 添加日期信息
         ax_date = fig.add_subplot(gs[0, :])
         ax_date.text(0.01, 0.5, f"{date_str} {title}",
-                     fontsize=date_fontsize * 0.5, # 日期使用之前计算的字号
+                     fontsize=date_fontsize * 0.5,
                      color=DATE_COLOR, fontweight='bold',
                      ha='left', va='center', transform=ax_date.transAxes)
         for spine in ax_date.spines.values():
@@ -256,24 +245,49 @@ 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("散厅时间快捷打印")
 
 uploaded_file = st.file_uploader("上传【放映场次核对表.xls】文件", type=["xls"])
 
 if uploaded_file:
-    part1, part2, date_str = process_schedule(uploaded_file)
+    with st.spinner("文件处理中..."):
+        part1, part2, date_str = process_schedule(uploaded_file)
 
     if part1 is not None and part2 is not None:
-        part1_output = create_print_layout(part1, "A", date_str)
-        part2_output = create_print_layout(part2, "C", date_str)
+        with st.spinner("正在生成布局..."):
+            part1_output = create_print_layout(part1, "A", date_str)
+            part2_output = create_print_layout(part2, "C", date_str)
 
         col1, col2 = st.columns(2)
 
         with col1:
             st.subheader("白班散场预览（时间 ≤ 17:30）")
             if part1_output:
+                # --- 新增：下载按钮 ---
+                png_data_1 = base64.b64decode(part1_output['png'].split(',')[1])
+                pdf_data_1 = base64.b64decode(part1_output['pdf'].split(',')[1])
+                
+                btn_col1, btn_col2 = st.columns(2)
+                with btn_col1:
+                    st.download_button(
+                        label="下载 PNG 图片",
+                        data=png_data_1,
+                        file_name=f"{date_str}-白班-A.png",
+                        mime="image/png",
+                        use_container_width=True
+                    )
+                with btn_col2:
+                    st.download_button(
+                        label="下载 PDF 文件",
+                        data=pdf_data_1,
+                        file_name=f"{date_str}-白班-A.pdf",
+                        mime="application/pdf",
+                        use_container_width=True
+                    )
+                # --- 新增结束 ---
+                
                 tab1_1, tab1_2 = st.tabs(["PDF 预览", "PNG 预览"])
                 with tab1_1:
                     st.markdown(display_pdf(part1_output['pdf']), unsafe_allow_html=True)
@@ -285,6 +299,29 @@ if uploaded_file:
         with col2:
             st.subheader("夜班散场预览（时间 > 17:30）")
             if part2_output:
+                # --- 新增：下载按钮 ---
+                png_data_2 = base64.b64decode(part2_output['png'].split(',')[1])
+                pdf_data_2 = base64.b64decode(part2_output['pdf'].split(',')[1])
+                
+                btn_col3, btn_col4 = st.columns(2)
+                with btn_col3:
+                    st.download_button(
+                        label="下载 PNG 图片",
+                        data=png_data_2,
+                        file_name=f"{date_str}-夜班-C.png",
+                        mime="image/png",
+                        use_container_width=True
+                    )
+                with btn_col4:
+                    st.download_button(
+                        label="下载 PDF 文件",
+                        data=pdf_data_2,
+                        file_name=f"{date_str}-夜班-C.pdf",
+                        mime="application/pdf",
+                        use_container_width=True
+                    )
+                # --- 新增结束 ---
+                
                 tab2_1, tab2_2 = st.tabs(["PDF 预览", "PNG 预览"])
                 with tab2_1:
                     st.markdown(display_pdf(part2_output['pdf']), unsafe_allow_html=True)