개정판 b61655f1
issue #937: markus 화면과 final pdf 간 scale 오류 수정중
Change-Id: I3c27bd1a920716cb258a170525b0e5e8e96c81c3
| FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/HoneyPDFLib_DrawSet_Arc.cs | ||
|---|---|---|
| 22 | 22 |
contentByte.SetColorStroke(bs); |
| 23 | 23 |
|
| 24 | 24 |
|
| 25 |
|
|
| 26 |
contentByte.SetLineWidth((float)lineSize - 2); |
|
| 25 |
contentByte.SetLineWidth((float)lineSize); |
|
| 26 |
//contentByte.SetLineWidth((float)lineSize - 2);
|
|
| 27 | 27 |
contentByte.NewPath(); |
| 28 | 28 |
contentByte.MoveTo((float)p1.X, (float)p1.Y); |
| 29 | 29 |
|
| FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/HoneyPDFLib_DrawSet_Arrow.cs | ||
|---|---|---|
| 129 | 129 |
BaseColor bs = new BaseColor(color.Color.R, color.Color.G, color.Color.B, color.Color.A); |
| 130 | 130 |
contentByte.SetColorFill(bs); |
| 131 | 131 |
contentByte.SetColorStroke(bs); |
| 132 |
contentByte.SetLineWidth((float)lineSize - 2); |
|
| 132 |
//contentByte.SetLineWidth((float)lineSize - 2); |
|
| 133 |
contentByte.SetLineWidth((float)lineSize); |
|
| 133 | 134 |
|
| 134 | 135 |
double theta = Math.Atan2((p2.Y - p1.Y), (p2.X - p1.X)) * 180 / Math.PI; |
| 135 | 136 |
|
| FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/HoneyPDFLib_DrawSet_Cloud.cs | ||
|---|---|---|
| 118 | 118 |
var rect = contentByte.PdfDocument.PageSize; |
| 119 | 119 |
contentByte.SetColorStroke(bs); |
| 120 | 120 |
List<float> DashSet = new List<float>(); |
| 121 |
/// WPF defines a device-independent pixel as 1 / 96 per inch |
|
| 122 |
/// iTextSharp : "the default for the size of the unit in default user space (1/72 inch) |
|
| 123 |
lineSize = lineSize * 72 / 96; |
|
| 121 | 124 |
|
| 122 |
if (lineSize < 3) |
|
| 125 |
/*if (lineSize < 3)
|
|
| 123 | 126 |
{
|
| 124 | 127 |
lineSize = 2.5; |
| 125 | 128 |
} |
| 126 | 129 |
|
| 130 |
contentByte.SetLineWidth((float)lineSize - 2); |
|
| 131 |
*/ |
|
| 127 | 132 |
|
| 128 | 133 |
DashSize.ToList().ForEach(data => DashSet.Add((float)data * 2)); |
| 129 | 134 |
contentByte.SetLineDash(DashSet.ToArray(), DashSet.Count - 2); |
| 130 |
contentByte.SetLineWidth((float)lineSize - 2); |
|
| 135 |
//contentByte.SetLineWidth((float)lineSize - 2); |
|
| 136 |
contentByte.SetLineWidth((float)lineSize); |
|
| 131 | 137 |
|
| 132 | 138 |
var getMidSet = MathSet.FindCentroid(points); |
| 133 | 139 |
contentByte.NewPath(); |
| FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/HoneyPDFLib_DrawSet_DrawString.cs | ||
|---|---|---|
| 163 | 163 |
contentByte.SetLineDash(DashSet.ToArray(), DashSet.Count - 2); |
| 164 | 164 |
} |
| 165 | 165 |
|
| 166 |
contentByte.SetLineWidth((float)lineSize - 2); |
|
| 166 |
//contentByte.SetLineWidth((float)lineSize - 2); |
|
| 167 |
contentByte.SetLineWidth((float)lineSize); |
|
| 167 | 168 |
|
| 168 | 169 |
var getMidSet = MathSet.FindCentroid(points); |
| 169 | 170 |
contentByte.NewPath(); |
| ... | ... | |
| 254 | 255 |
|
| 255 | 256 |
//lineSize = 1; |
| 256 | 257 |
var calRect = MathSet.GetPointsToRectX(point); |
| 257 |
contentByte.SetLineWidth((float)lineSize - 2); |
|
| 258 |
//contentByte.SetLineWidth((float)lineSize - 2); |
|
| 259 |
contentByte.SetLineWidth((float)lineSize); |
|
| 260 |
|
|
| 258 | 261 |
//PaintStyle = MarkupEditToolKit.Common.PaintSet.Fill; |
| 259 | 262 |
|
| 260 | 263 |
switch (PaintStyle) |
| ... | ... | |
| 471 | 474 |
|
| 472 | 475 |
//lineSize = 1; |
| 473 | 476 |
var calRect = MathSet.GetPointsToRectX(point); |
| 474 |
contentByte.SetLineWidth((float)lineSize - 2); |
|
| 477 |
//contentByte.SetLineWidth((float)lineSize - 2); |
|
| 478 |
contentByte.SetLineWidth((float)lineSize); |
|
| 479 |
|
|
| 475 | 480 |
//PaintStyle = MarkupEditToolKit.Common.PaintSet.Fill; |
| 476 | 481 |
|
| 477 | 482 |
switch (PaintStyle) |
| FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/HoneyPDFLib_DrawSet_Line.cs | ||
|---|---|---|
| 28 | 28 |
DashSize.ToList().ForEach(data => DashSet.Add((float)data * 1)); |
| 29 | 29 |
contentByte.SetLineDash(DashSet.ToArray(), DashSet.Count - 2); |
| 30 | 30 |
} |
| 31 |
if (lineSize < 3) |
|
| 31 |
|
|
| 32 |
/// WPF defines a device-independent pixel as 1 / 96 per inch |
|
| 33 |
/// iTextSharp : "the default for the size of the unit in default user space (1/72 inch) |
|
| 34 |
lineSize = lineSize * 72 / 96; |
|
| 35 |
|
|
| 36 |
/*if (lineSize < 3) |
|
| 32 | 37 |
{
|
| 33 | 38 |
lineSize = 2.5; |
| 34 | 39 |
} |
| 35 | 40 |
|
| 36 |
contentByte.SetLineWidth((float)lineSize - (float)2); |
|
| 41 |
contentByte.SetLineWidth((float)lineSize - 2); |
|
| 42 |
*/ |
|
| 43 |
contentByte.SetLineWidth((float)lineSize); |
|
| 37 | 44 |
contentByte.MoveTo((float)startP.X, (float)startP.Y); |
| 38 | 45 |
contentByte.LineTo((float)endP.X, (float)endP.Y); |
| 39 | 46 |
contentByte.Stroke(); |
| FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/HoneyPDFLib_DrawSet_Shape.cs | ||
|---|---|---|
| 32 | 32 |
|
| 33 | 33 |
} |
| 34 | 34 |
|
| 35 |
if (lineSize < 3) |
|
| 35 |
/// WPF defines a device-independent pixel as 1 / 96 per inch |
|
| 36 |
/// iTextSharp : "the default for the size of the unit in default user space (1/72 inch) |
|
| 37 |
lineSize = lineSize * 72 / 96; |
|
| 38 |
|
|
| 39 |
/*if (lineSize < 3) |
|
| 36 | 40 |
{
|
| 37 | 41 |
lineSize = 2.5; |
| 38 | 42 |
} |
| 43 |
|
|
| 39 | 44 |
contentByte.SetLineWidth((float)lineSize - 2); |
| 45 |
*/ |
|
| 46 |
contentByte.SetLineWidth((float)lineSize); |
|
| 40 | 47 |
contentByte.NewPath(); |
| 41 | 48 |
contentByte.MoveTo((float)points.First().X, (float)points.First().Y); |
| 42 | 49 |
|
| ... | ... | |
| 80 | 87 |
contentByte.SetLineDash(DashSet.ToArray(), DashSet.Count - 2); |
| 81 | 88 |
} |
| 82 | 89 |
|
| 83 |
if (lineSize < 3) |
|
| 90 |
/// WPF defines a device-independent pixel as 1 / 96 per inch |
|
| 91 |
/// iTextSharp : "the default for the size of the unit in default user space (1/72 inch) |
|
| 92 |
lineSize = lineSize * 72 / 96; |
|
| 93 |
|
|
| 94 |
/*if (lineSize < 3) |
|
| 84 | 95 |
{
|
| 85 | 96 |
lineSize = 2.5; |
| 86 | 97 |
} |
| 87 | 98 |
|
| 88 | 99 |
contentByte.SetLineWidth((float)lineSize - 2); |
| 100 |
*/ |
|
| 101 |
contentByte.SetLineWidth((float)lineSize); |
|
| 89 | 102 |
|
| 90 | 103 |
//var calRect = GetPointsToRectX(points); |
| 91 | 104 |
//contentByte.Rectangle(calRect.Left, calRect.Bottom, calRect.Width, calRect.Height); |
| ... | ... | |
| 130 | 143 |
contentByte.SetLineDash(DashSet.ToArray(), DashSet.Count - 2); |
| 131 | 144 |
} |
| 132 | 145 |
|
| 133 |
if (lineSize < 3) |
|
| 146 |
/// WPF defines a device-independent pixel as 1 / 96 per inch |
|
| 147 |
/// iTextSharp : "the default for the size of the unit in default user space (1/72 inch) |
|
| 148 |
lineSize = lineSize * 72 / 96; |
|
| 149 |
|
|
| 150 |
/*if (lineSize < 3) |
|
| 134 | 151 |
{
|
| 135 | 152 |
lineSize = 2.5; |
| 136 | 153 |
} |
| 154 |
|
|
| 137 | 155 |
contentByte.SetLineWidth((float)lineSize - 2); |
| 156 |
*/ |
|
| 157 |
contentByte.SetLineWidth((float)lineSize); |
|
| 138 | 158 |
|
| 139 | 159 |
contentByte.NewPath(); |
| 140 | 160 |
var midPoint = MathSet.getMiddlePoint(sp, ep); |
내보내기 Unified diff
