luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix size and position

Browse source
This commit is contained in:
Júlio César Batista 2023-04-04 18:00:45 -03:00
parent d4feac75b4
commit 3a5c389d2b
No known key found for this signature in database
GPG key ID: 10C4B861BF314878
2 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
d2cli/main.go
View file

@ -750,7 +750,7 @@ func renderPDF(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, opt
return svg, nil return svg, nil
} }
func renderPPTX(ctx context.Context, ms *xmain.State, presentation *ppt.Pptx, plugin d2plugin.Plugin, opts d2svg.RenderOpts, outputPath string, page playwright.Page, diagram *d2target.Diagram, boardPath []string) error { func renderPPTX(ctx context.Context, ms *xmain.State, presentation *ppt.Presentation, plugin d2plugin.Plugin, opts d2svg.RenderOpts, outputPath string, page playwright.Page, diagram *d2target.Diagram, boardPath []string) error {
var currBoardPath []string var currBoardPath []string
// Root board doesn't have a name, so we use the output filename // Root board doesn't have a name, so we use the output filename
if diagram.Name == "" { if diagram.Name == "" {

38
lib/ppt/presentation.go
View file

@ -9,7 +9,10 @@ import (
"os" "os"
) )
type Pptx struct { // TODO: comments / references / assumptions
// TODO: update core files with metadata
type Presentation struct {
Slides []*Slide Slides []*Slide
} }
@ -17,33 +20,48 @@ type Slide struct {
Image []byte Image []byte
Width int Width int
Height int Height int
Top int
Left int
} }
func NewPresentation() *Pptx { func NewPresentation() *Presentation {
return &Pptx{} return &Presentation{}
} }
func (p *Pptx) AddSlide(pngContent []byte) error { func (p *Presentation) AddSlide(pngContent []byte) error {
src, err := png.Decode(bytes.NewReader(pngContent)) src, err := png.Decode(bytes.NewReader(pngContent))
if err != nil { if err != nil {
return fmt.Errorf("error decoding PNG image: %v", err) return fmt.Errorf("error decoding PNG image: %v", err)
} }
var width, height, top, left int
srcSize := src.Bounds().Size() srcSize := src.Bounds().Size()
height := int(float64(SLIDE_WIDTH) * (float64(srcSize.X) / float64(srcSize.Y)))
// compute the size and position to fit the slide
if srcSize.X > srcSize.Y {
width = SLIDE_WIDTH
height = int(float64(width) * (float64(srcSize.X) / float64(srcSize.Y)))
left = 0
top = (SLIDE_HEIGHT - height) / 2
} else {
height = SLIDE_HEIGHT
width = int(float64(height) * (float64(srcSize.X) / float64(srcSize.Y)))
top = 0
left = (SLIDE_WIDTH - width) / 2
}
p.Slides = append(p.Slides, &Slide{ p.Slides = append(p.Slides, &Slide{
Image: pngContent, Image: pngContent,
Width: SLIDE_WIDTH, Width: width,
Height: height, Height: height,
Top: top,
Left: left,
}) })
return nil return nil
} }
func (p *Pptx) SaveTo(filePath string) error { func (p *Presentation) SaveTo(filePath string) error {
// TODO: update core files with metadata
f, err := os.Create(filePath) f, err := os.Create(filePath)
if err != nil { if err != nil {
return err return err
@ -75,7 +93,7 @@ func (p *Pptx) SaveTo(filePath string) error {
} }
// TODO: center the image? // TODO: center the image?
err = addFile(zipFile, fmt.Sprintf("ppt/slides/%s.xml", slideFileName), getSlideXml(imageId, imageId, 0, 0, slide.Width, slide.Height)) err = addFile(zipFile, fmt.Sprintf("ppt/slides/%s.xml", slideFileName), getSlideXml(imageId, imageId, slide.Top, slide.Left, slide.Width, slide.Height))
if err != nil { if err != nil {
return err return err
} }