Add width parameter in col

* Width parameter works like bootstrap * Adapt Image to work with the new version
johnfercher · Feb 19, 2020 · 1a768eb · 1a768eb
1 parent a3d72ec
commit 1a768eb
Show file tree

Hide file tree

Showing 19 changed files with 382 additions and 193 deletions.
diff --git a/internal/examples/certificate/main.go b/internal/examples/certificate/main.go
@@ -15,21 +15,21 @@ func main() {
 	//m.SetBorder(true)
 
 	m.Row(20, func() {
-		m.Col(func() {
+		m.Col(4, func() {
 			_ = m.FileImage("internal/assets/images/frontpage.png", props.Rect{
 				Percent: 88,
 				Center:  true,
 			})
 		})
-		m.Col(func() {
+		m.Col(4, func() {
 			m.Text("Golang Certificate", props.Text{
 				Top:   12,
 				Align: consts.Center,
 				Size:  20,
 				Style: consts.BoldItalic,
 			})
 		})
-		m.Col(func() {
+		m.Col(4, func() {
 			_ = m.FileImage("internal/assets/images/frontpage.png", props.Rect{
 				Percent: 90,
 				Center:  true,
@@ -38,7 +38,7 @@ func main() {
 	})
 
 	m.Row(130, func() {
-		m.Col(func() {
+		m.Col(12, func() {
 			text := "Lorem Ipsum is simply dummy textá of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."
 			m.Text(text, props.Text{
 				Size:            13,
@@ -50,13 +50,13 @@ func main() {
 	})
 
 	m.Row(25, func() {
-		m.Col(func() {
+		m.Col(4, func() {
 			m.Signature("Gopher Senior")
 		})
-		m.Col(func() {
+		m.Col(4, func() {
 			m.Signature("Gopheroid")
 		})
-		m.Col(func() {
+		m.Col(4, func() {
 			m.Signature("Sign Here")
 		})
 	})

diff --git a/internal/examples/imagegrid/main.go b/internal/examples/imagegrid/main.go
@@ -0,0 +1,147 @@
+package main
+
+import (
+	"fmt"
+	"github.com/johnfercher/maroto/pkg/consts"
+	"github.com/johnfercher/maroto/pkg/pdf"
+	"github.com/johnfercher/maroto/pkg/props"
+	"os"
+	"time"
+)
+
+func main() {
+	begin := time.Now()
+	m := pdf.NewMaroto(consts.Portrait, consts.Letter)
+	m.SetBorder(true)
+
+	m.Row(40, func() {
+		m.Col(2, func() {
+			_ = m.FileImage("internal/assets/images/biplane.jpg", props.Rect{
+				Center:  true,
+				Percent: 80,
+			})
+		})
+		m.Col(4, func() {
+			_ = m.FileImage("internal/assets/images/biplane.jpg", props.Rect{
+				Center:  true,
+				Percent: 80,
+			})
+		})
+		m.Col(6, func() {
+			_ = m.FileImage("internal/assets/images/biplane.jpg", props.Rect{
+				Center:  true,
+				Percent: 80,
+			})
+		})
+	})
+
+	m.Row(40, func() {
+		m.Col(2, func() {
+			_ = m.FileImage("internal/assets/images/biplane.jpg", props.Rect{
+				Center:  false,
+				Percent: 50,
+				Left:    10,
+			})
+		})
+		m.Col(4, func() {
+			_ = m.FileImage("internal/assets/images/biplane.jpg", props.Rect{
+				Center:  false,
+				Percent: 50,
+				Top:     10,
+			})
+		})
+		m.Col(6, func() {
+			_ = m.FileImage("internal/assets/images/biplane.jpg", props.Rect{
+				Center:  false,
+				Percent: 50,
+				Left:    15,
+				Top:     15,
+			})
+		})
+	})
+
+	m.Row(40, func() {
+		m.Col(8, func() {
+			_ = m.FileImage("internal/assets/images/biplane.jpg", props.Rect{
+				Center:  true,
+				Percent: 80,
+			})
+		})
+		m.Col(4, func() {
+			_ = m.FileImage("internal/assets/images/biplane.jpg", props.Rect{
+				Center:  true,
+				Percent: 80,
+			})
+		})
+	})
+
+	m.Row(40, func() {
+		m.Col(6, func() {
+			_ = m.FileImage("internal/assets/images/frontpage.png", props.Rect{
+				Center:  false,
+				Percent: 80,
+				Top:     5,
+				Left:    10,
+			})
+		})
+		m.Col(4, func() {
+			_ = m.FileImage("internal/assets/images/frontpage.png", props.Rect{
+				Center:  false,
+				Percent: 80,
+				Top:     5,
+			})
+		})
+		m.Col(2, func() {
+			_ = m.FileImage("internal/assets/images/frontpage.png", props.Rect{
+				Center:  false,
+				Percent: 80,
+				Left:    5,
+			})
+		})
+	})
+
+	m.Row(40, func() {
+		m.Col(6, func() {
+			_ = m.FileImage("internal/assets/images/frontpage.png", props.Rect{
+				Center:  true,
+				Percent: 50,
+			})
+		})
+		m.Col(4, func() {
+			_ = m.FileImage("internal/assets/images/frontpage.png", props.Rect{
+				Center:  true,
+				Percent: 50,
+			})
+		})
+		m.Col(2, func() {
+			_ = m.FileImage("internal/assets/images/frontpage.png", props.Rect{
+				Center:  true,
+				Percent: 50,
+			})
+		})
+	})
+
+	m.Row(40, func() {
+		m.Col(4, func() {
+			_ = m.FileImage("internal/assets/images/frontpage.png", props.Rect{
+				Center:  true,
+				Percent: 80,
+			})
+		})
+		m.Col(8, func() {
+			_ = m.FileImage("internal/assets/images/frontpage.png", props.Rect{
+				Center:  true,
+				Percent: 80,
+			})
+		})
+	})
+
+	err := m.OutputFileAndClose("internal/examples/pdfs/imagegrid.pdf")
+	if err != nil {
+		fmt.Println("Could not save PDF:", err)
+		os.Exit(1)
+	}
+
+	end := time.Now()
+	fmt.Println(end.Sub(begin))
+}
diff --git a/internal/examples/pdfs/certificate.pdf b/internal/examples/pdfs/certificate.pdf
diff --git a/internal/examples/pdfs/imagegrid.pdf b/internal/examples/pdfs/imagegrid.pdf
diff --git a/internal/examples/pdfs/textgrid.pdf b/internal/examples/pdfs/textgrid.pdf
diff --git a/internal/examples/pdfs/zpl.pdf b/internal/examples/pdfs/zpl.pdf
diff --git a/internal/examples/sample1/main.go b/internal/examples/sample1/main.go
@@ -30,22 +30,22 @@ func main() {
 
 	m.RegisterHeader(func() {
 		m.Row(20, func() {
-			m.Col(func() {
+			m.Col(3, func() {
 				m.Base64Image(base64, consts.Jpg, props.Rect{
 					Center:  true,
 					Percent: 70,
 				})
 			})
 
-			m.ColSpaces(2)
+			m.ColSpace(3)
 
-			m.Col(func() {
+			m.Col(3, func() {
 				m.QrCode("https://github.com/johnfercher/maroto", props.Rect{
 					Percent: 75,
 				})
 			})
 
-			m.Col(func() {
+			m.Col(3, func() {
 				id := "https://github.com/johnfercher/maroto"
 				_ = m.Barcode(id, props.Barcode{
 					Center:     true,
@@ -63,15 +63,15 @@ func main() {
 		m.Line(1.0)
 
 		m.Row(12, func() {
-			m.Col(func() {
+			m.Col(0, func() {
 				_ = m.FileImage("internal/assets/images/gopherbw.png", props.Rect{
 					Center: true,
 				})
 			})
 
-			m.ColSpace()
+			m.ColSpace(0)
 
-			m.Col(func() {
+			m.Col(0, func() {
 				m.Text("Packages Report: Daily", props.Text{
 					Top: 4,
 				})
@@ -80,9 +80,9 @@ func main() {
 				})
 			})
 
-			m.ColSpace()
+			m.ColSpace(0)
 
-			m.Col(func() {
+			m.Col(0, func() {
 				m.Text("20/07/1994", props.Text{
 					Size:   10,
 					Style:  consts.BoldItalic,
@@ -95,7 +95,7 @@ func main() {
 		m.Line(1.0)
 
 		m.Row(22, func() {
-			m.Col(func() {
+			m.Col(0, func() {
 				m.Text(fmt.Sprintf("Small: %d, Medium %d", len(smallContent), len(mediumContent)), props.Text{
 					Size:  15,
 					Style: consts.Bold,
@@ -116,26 +116,26 @@ func main() {
 
 	m.RegisterFooter(func() {
 		m.Row(40, func() {
-			m.Col(func() {
+			m.Col(4, func() {
 				m.Signature("Signature 1", props.Font{
 					Family: consts.Courier,
 					Style:  consts.BoldItalic,
 					Size:   9,
 				})
 			})
 
-			m.Col(func() {
+			m.Col(4, func() {
 				m.Signature("Signature 2")
 			})
 
-			m.Col(func() {
+			m.Col(4, func() {
 				m.Signature("Signature 3")
 			})
 		})
 	})
 
 	m.Row(15, func() {
-		m.Col(func() {
+		m.Col(12, func() {
 			m.Text("Small Packages / 39u.", props.Text{
 				Top:   8,
 				Style: consts.Bold,
@@ -152,7 +152,7 @@ func main() {
 	})
 
 	m.Row(15, func() {
-		m.Col(func() {
+		m.Col(12, func() {
 			m.Text("Medium Packages / 22u.", props.Text{
 				Top:   8,
 				Style: consts.Bold,

diff --git a/internal/examples/textgrid/main.go b/internal/examples/textgrid/main.go
@@ -0,0 +1,36 @@
+package main
+
+import (
+	"fmt"
+	"github.com/johnfercher/maroto/pkg/consts"
+	"github.com/johnfercher/maroto/pkg/pdf"
+	"os"
+	"time"
+)
+
+func main() {
+	begin := time.Now()
+	m := pdf.NewMaroto(consts.Portrait, consts.Letter)
+	m.SetBorder(true)
+
+	m.Row(40, func() {
+		m.Col(2, func() {
+			m.Text("Any Text")
+		})
+		/*m.Col(4, func() {
+			m.Text("Any Text2")
+		})
+		m.Col(6, func() {
+			m.Text( "Any Text3")
+		})*/
+	})
+
+	err := m.OutputFileAndClose("internal/examples/pdfs/textgrid.pdf")
+	if err != nil {
+		fmt.Println("Could not save PDF:", err)
+		os.Exit(1)
+	}
+
+	end := time.Now()
+	fmt.Println(end.Sub(begin))
+}