AI turns documents or topics into real, native PowerPoint decks—with native shapes, transitions and animations, data-backed charts and tables on demand, audio narration from speaker notes, and support for your own .pptx templates. · by Hugo He
refactor(tools): 统一画布配置管理并支持从 SVG 动态获取 PPTX 尺寸
hugohe3771c9eeb31c8
diff --git a/README.md b/README.mdindex 0b92bb6e..0221157d 100644--- a/README.md+++ b/README.md@@ -1,6 +1,6 @@# PPT Master - AI 驱动的多格式 SVG 内容生成系统-[](./VERSION)+[](https://github.com/hugohe3/ppt-master/releases)[](https://opensource.org/licenses/MIT)[](https://github.com/hugohe3/ppt-master/stargazers)diff --git a/tools/project_utils.py b/tools/project_utils.pyindex 342d190d..9d882794 100644--- a/tools/project_utils.py+++ b/tools/project_utils.py@@ -10,58 +10,19 @@ from pathlib import Pathfrom datetime import datetimefrom typing import Dict, List, Optional, Tuple--# 画布格式定义-CANVAS_FORMATS = {- 'ppt169': {- 'name': 'PPT 16:9',- 'dimensions': '1280×720',- 'viewbox': '0 0 1280 720',- 'aspect_ratio': '16:9'- },- 'ppt43': {- 'name': 'PPT 4:3',- 'dimensions': '1024×768',- 'viewbox': '0 0 1024 768',- 'aspect_ratio': '4:3'- },- 'wechat': {- 'name': '微信公众号头图',- 'dimensions': '900×383',- 'viewbox': '0 0 900 383',- 'aspect_ratio': '2.35:1'- },- 'xiaohongshu': {- 'name': '小红书',- 'dimensions': '1242×1660',- 'viewbox': '0 0 1242 1660',- 'aspect_ratio': '3:4'- },- 'moments': {- 'name': '朋友圈/Instagram',- 'dimensions': '1080×1080',- 'viewbox': '0 0 1080 1080',- 'aspect_ratio': '1:1'- },- 'story': {- 'name': 'Story/竖版',- 'dimensions': '1080×1920',- 'viewbox': '0 0 1080 1920',- 'aspect_ratio': '9:16'- },- 'banner': {- 'name': '横版 Banner',- 'dimensions': '1920×1080',- 'viewbox': '0 0 1920 1080',- 'aspect_ratio': '16:9'- },- 'a4': {- 'name': 'A4 打印',- 'dimensions': '1240×1754',- 'viewbox': '0 0 1240 1754',- 'aspect_ratio': '√2:1'+# 画布格式定义(统一来源)+try:+ from config import CANVAS_FORMATS+except ImportError:+ # 兜底:保持最小可用配置,避免运行时崩溃+ CANVAS_FORMATS = {+ 'ppt169': {+ 'name': 'PPT 16:9',+ 'dimensions': '1280×720',+ 'viewbox': '0 0 1280 720',+ 'aspect_ratio': '16:9'+ }}-}def parse_project_name(dir_name: str) -> Dict[str, str]:diff --git a/tools/svg_to_pptx.py b/tools/svg_to_pptx.pyindex cf69571b..fa6094bf 100644--- a/tools/svg_to_pptx.py+++ b/tools/svg_to_pptx.py@@ -46,19 +46,13 @@ except ImportError:# 导入项目工具模块sys.path.insert(0, str(Path(__file__).parent))try:- from project_utils import get_project_info, CANVAS_FORMATS+ from project_utils import get_project_info+ from config import CANVAS_FORMATSexcept ImportError:CANVAS_FORMATS = {- 'ppt169': {'name': 'PPT 16:9', 'dimensions': '1280x720', 'viewbox': '0 0 1280 720'},- 'ppt43': {'name': 'PPT 4:3', 'dimensions': '1024x768', 'viewbox': '0 0 1024 768'},- 'wechat': {'name': '微信公众号头图', 'dimensions': '900x383', 'viewbox': '0 0 900 383'},- 'xiaohongshu': {'name': '小红书', 'dimensions': '1242x1660', 'viewbox': '0 0 1242 1660'},- 'moments': {'name': '朋友圈/Instagram', 'dimensions': '1080x1080', 'viewbox': '0 0 1080 1080'},- 'story': {'name': 'Story/竖版', 'dimensions': '1080x1920', 'viewbox': '0 0 1080 1920'},- 'banner': {'name': '横版 Banner', 'dimensions': '1920x1080', 'viewbox': '0 0 1920 1080'},- 'a4': {'name': 'A4 打印', 'dimensions': '1240x1754', 'viewbox': '0 0 1240 1754'},+ 'ppt169': {'name': 'PPT 16:9', 'dimensions': '1280×720', 'viewbox': '0 0 1280 720'},}-+def get_project_info(path):return {'format': 'unknown', 'name': Path(path).name}@@ -112,24 +106,30 @@ for prefix, uri in NAMESPACES.items():ET.register_namespace(prefix, uri)-def get_slide_dimensions(canvas_format: str) -> Tuple[int, int]:+def get_slide_dimensions(canvas_format: str, custom_pixels: Optional[Tuple[int, int]] = None) -> Tuple[int, int]:"""获取幻灯片尺寸(EMU 单位)"""- if canvas_format not in CANVAS_FORMATS:- canvas_format = 'ppt169'-- dimensions = CANVAS_FORMATS[canvas_format]['dimensions']- match = re.match(r'(\d+)[×x](\d+)', dimensions)- if match:- width_px = int(match.group(1))- height_px = int(match.group(2))+ if custom_pixels:+ width_px, height_px = custom_pixelselse:- width_px, height_px = 1280, 720+ if canvas_format not in CANVAS_FORMATS:+ canvas_format = 'ppt169'++ dimensions = CANVAS_FORMATS[canvas_format]['dimensions']+ match = re.match(r'(\d+)[×x](\d+)', dimensions)+ if match:+ width_px = int(match.group(1))+ height_px = int(match.group(2))+ else:+ width_px, height_px = 1280, 720return int(width_px * EMU_PER_PIXEL), int(height_px * EMU_PER_PIXEL)-def get_pixel_dimensions(canvas_format: str) -> Tuple[int, int]:+def get_pixel_dimensions(canvas_format: str, custom_pixels: Optional[Tuple[int, int]] = None) -> Tuple[int, int]:"""获取画布像素尺寸"""+ if custom_pixels:+ return custom_pixels+if canvas_format not in CANVAS_FORMATS:canvas_format = 'ppt169'@@ -140,6 +140,30 @@ def get_pixel_dimensions(canvas_format: str) -> Tuple[int, int]:return 1280, 720+def get_viewbox_dimensions(svg_path: Path) -> Optional[Tuple[int, int]]:+ """从 SVG 的 viewBox 提取像素尺寸(返回整数)"""+ try:+ with open(svg_path, 'r', encoding='utf-8') as f:+ content = f.read(2000)++ match = re.search(r'viewBox="([^"]+)"', content)+ if not match:+ return None++ parts = re.split(r'[\s,]+', match.group(1).strip())+ if len(parts) < 4:+ return None++ width = float(parts[2])+ height = float(parts[3])+ if width <= 0 or height <= 0:+ return None++ return int(round(width)), int(round(height))+ except Exception:+ return None++def detect_format_from_svg(svg_path: Path) -> Optional[str]:"""从 SVG 文件的 viewBox 检测画布格式"""try:@@ -606,7 +630,8 @@ def create_pptx_with_native_svg(print(" 将使用纯 SVG 模式(可能在 Office LTSC 2021 等版本中不显示)")use_compat_mode = False- # 自动检测画布格式+ # 自动检测画布格式或从 viewBox 获取尺寸+ custom_pixels: Optional[Tuple[int, int]] = Noneif canvas_format is None:canvas_format = detect_format_from_svg(svg_files[0])if canvas_format and verbose:@@ -614,12 +639,17 @@ def create_pptx_with_native_svg(print(f" 检测到画布格式: {format_name}")if canvas_format is None:+ custom_pixels = get_viewbox_dimensions(svg_files[0])+ if custom_pixels and verbose:+ print(f" 使用 SVG viewBox 尺寸: {custom_pixels[0]} x {custom_pixels[1]} px")++ if canvas_format is None and custom_pixels is None:canvas_format = 'ppt169'if verbose:print(f" 使用默认格式: PPT 16:9")- width_emu, height_emu = get_slide_dimensions(canvas_format)- pixel_width, pixel_height = get_pixel_dimensions(canvas_format)+ width_emu, height_emu = get_slide_dimensions(canvas_format or 'ppt169', custom_pixels)+ pixel_width, pixel_height = get_pixel_dimensions(canvas_format or 'ppt169', custom_pixels)if verbose:print(f" 幻灯片尺寸: {pixel_width} x {pixel_height} px")