OrgGo/unipdf
1
0
Fork 0
mirror of https://github.com/unidoc/unipdf.git synced 2025-05-09 19:29:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implemented : Dashed Line

Browse Source
This commit is contained in:
Sakib Sami 2018-06-12 03:55:27 +06:00
parent 0feaca4aea
commit 8ac0d45e2f
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pdf/contentstream/draw/shapes.go
View File

@ -6,7 +6,6 @@ import (
pdfcontent "github.com/unidoc/unidoc/pdf/contentstream"
pdfcore "github.com/unidoc/unidoc/pdf/core"
pdf "github.com/unidoc/unidoc/pdf/model"
"fmt"
)
type Circle struct {
@ -357,8 +356,8 @@ func (line Line) Draw(gsName string) ([]byte, *pdf.PdfRectangle, error) {
return creator.Bytes(), bbox, nil
}
// Defines a dashed line between point 1 (X1,Y1) and point 2 (X2,Y2). The dashed line ending styles can be none (regular line),
// or arrows at either end. The dashed line also has a specified width, color and opacity.
// Defines a line between point 1 (X1,Y1) and point 2 (X2,Y2). The line ending styles can be none (regular line),
// or arrows at either end. The line also has a specified width, color and opacity.
type DashedLine struct {
X1 float64
Y1 float64
@ -383,7 +382,6 @@ func (line DashedLine) Draw(gsName string) ([]byte, *pdf.PdfRectangle, error) {
L := math.Sqrt(math.Pow(dx, 2.0) + math.Pow(dy, 2.0))
w := line.LineWidth
fmt.Println("LineWidth = ", w)
pi := math.Pi
@ -501,6 +499,10 @@ func (line DashedLine) Draw(gsName string) ([]byte, *pdf.PdfRectangle, error) {
creator := pdfcontent.NewContentCreator()
// Draw line with arrow
creator.
Add_q().
Add_rg(line.LineColor.R(), line.LineColor.G(), line.LineColor.B())
if len(gsName) > 1 {
// If a graphics state is provided, use it. (Used for transparency settings here).
creator.Add_gs(pdfcore.PdfObjectName(gsName))
@ -510,12 +512,12 @@ func (line DashedLine) Draw(gsName string) ([]byte, *pdf.PdfRectangle, error) {
pathBbox := path.GetBoundingBox()
DrawPathWithCreator(path, creator)
creator.
Add_d([]int64{int64(path.Length() / 2)}, 0).
Add_S()
//Add_q()
DrawDashedPathWithCreator(path, creator)
Add_d([]int64{3}, 0).
Add_S().
Add_q().
Add_f()
// Bounding box - global coordinate system.
bbox := &pdf.PdfRectangle{}

8
pdf/creator/creator_test.go
View File

@ -1028,19 +1028,19 @@ func TestBorderedTable2(t *testing.T) {
p := NewParagraph("Hello")
cell.SetContent(p)
cell.SetBorderColorAndWidthByStyle(CellBorderStyleBoxTop, ColorBlue, 1)
//cell.SetBorderLineStyle(CellBorderLineStyleDashed)
cell.SetBorderLineStyle(CellBorderLineStyleDashed)
cell2 := table.NewCell()
p2 := NewParagraph("World")
cell2.SetContent(p2)
cell2.SetBorderColorAndWidthByStyle(CellBorderStyleBoxBottom, ColorRed, 1)
//cell2.SetBorderLineStyle(CellBorderLineStyleDashed)
cell2.SetBorderLineStyle(CellBorderLineStyleDashed)
cell3 := table.NewCell()
p3 := NewParagraph("Welcome to")
cell3.SetContent(p3)
cell3.SetBorderColorAndWidthByStyle(CellBorderStyleBoxLeft, ColorBlue, 1)
//cell3.SetBorderLineStyle(CellBorderLineStyleDashed)
cell3.SetBorderLineStyle(CellBorderLineStyleDashed)
table.SkipCells(1)
cell4 := table.NewCell()
@ -1048,7 +1048,7 @@ func TestBorderedTable2(t *testing.T) {
cell4.SetContent(p4)
cell4.SetBorderColorAndWidthByStyle(CellBorderStyleBoxRight, ColorGreen, 1)
//cell4.SetBorderColorAndWidthByStyle(CellBorderStyleBoxBottom, ColorGreen, 1)
//cell4.SetBorderLineStyle(CellBorderLineStyleDashed)
cell4.SetBorderLineStyle(CellBorderLineStyleDashed)
c := New()
c.Draw(table)