개정판 97def53a
issue #937: fixed arrow is missing because of line size conversion
Change-Id: I0e482c7bbb73d3c0367b5570b85613d923ea1478
| FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/HoneyPDFLib_DrawSet_Arrow.cs | ||
|---|---|---|
| 43 | 43 |
contentByte.RestoreState(); |
| 44 | 44 |
} |
| 45 | 45 |
|
| 46 |
public static void DimAllow(System.Windows.Point p1, System.Windows.Point p2, int lineSize, PdfContentByte contentByte,
|
|
| 46 |
public static void DimAllow(System.Windows.Point p1, System.Windows.Point p2, double lineSize, PdfContentByte contentByte,
|
|
| 47 | 47 |
SolidColorBrush color, double opac, bool isFixPoint = false) |
| 48 | 48 |
{
|
| 49 | 49 |
contentByte.SaveState(); |
| FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/HoneyPDFLib_DrawSet_DrawString.cs | ||
|---|---|---|
| 304 | 304 |
|
| 305 | 305 |
contentByte.RestoreState(); |
| 306 | 306 |
|
| 307 |
DrawLeaderLine(ptHead, ptMid, transformed, (int)lineSize, contentByte, color, opac);
|
|
| 307 |
DrawLeaderLine(ptHead, ptMid, transformed, lineSize, contentByte, color, opac); |
|
| 308 | 308 |
} |
| 309 | 309 |
|
| 310 | 310 |
/// <summary> |
| ... | ... | |
| 319 | 319 |
/// <param name="contentByte"></param> |
| 320 | 320 |
/// <param name="color"></param> |
| 321 | 321 |
/// <param name="opac"></param> |
| 322 |
private static void DrawLeaderLine(Point start, Point mid, List<Point> border, int LineSize, iTextSharp.text.pdf.PdfContentByte contentByte, SolidColorBrush color, double opac)
|
|
| 322 |
private static void DrawLeaderLine(Point start, Point mid, List<Point> border, double LineSize, iTextSharp.text.pdf.PdfContentByte contentByte, SolidColorBrush color, double opac)
|
|
| 323 | 323 |
{
|
| 324 | 324 |
/// prepare connection points |
| 325 | 325 |
List<Point> ptConns = new List<Point>(); |
| ... | ... | |
| 343 | 343 |
} |
| 344 | 344 |
} |
| 345 | 345 |
|
| 346 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(start, mid, (int)LineSize, contentByte, color, opac);
|
|
| 347 |
Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(start, mid, (int)LineSize, contentByte, new DoubleCollection(9999), color, opac);
|
|
| 348 |
Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(mid, anchor.Value, (int)LineSize, contentByte, new DoubleCollection(9999), color, opac);
|
|
| 346 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(start, mid, LineSize, contentByte, color, opac); |
|
| 347 |
Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(start, mid, LineSize, contentByte, new DoubleCollection(9999), color, opac); |
|
| 348 |
Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(mid, anchor.Value, LineSize, contentByte, new DoubleCollection(9999), color, opac); |
|
| 349 | 349 |
} |
| 350 | 350 |
|
| 351 | 351 |
private static void PaintFill(PdfContentByte contentByte, PaintSet PaintStyle, BaseColor bs) |
| FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.cs | ||
|---|---|---|
| 520 | 520 |
switch (control.LineStyleSet) |
| 521 | 521 |
{
|
| 522 | 522 |
case LineStyleSet.ArrowLine: |
| 523 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, (int)LineSize, contentByte, _SetColor, Opacity);
|
|
| 523 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, LineSize, contentByte, _SetColor, Opacity); |
|
| 524 | 524 |
break; |
| 525 | 525 |
case LineStyleSet.CancelLine: |
| 526 | 526 |
{
|
| ... | ... | |
| 537 | 537 |
break; |
| 538 | 538 |
case LineStyleSet.TwinLine: |
| 539 | 539 |
{
|
| 540 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, (int)LineSize, contentByte, _SetColor, Opacity);
|
|
| 541 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(StartPoint, EndPoint, (int)LineSize, contentByte, _SetColor, Opacity);
|
|
| 540 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, LineSize, contentByte, _SetColor, Opacity); |
|
| 541 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(StartPoint, EndPoint, LineSize, contentByte, _SetColor, Opacity); |
|
| 542 | 542 |
} |
| 543 | 543 |
break; |
| 544 | 544 |
case LineStyleSet.DimLine: |
| 545 | 545 |
{
|
| 546 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.DimAllow(StartPoint, EndPoint, (int)LineSize, contentByte, _SetColor, Opacity);
|
|
| 547 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, (int)LineSize, contentByte, _SetColor, Opacity);
|
|
| 548 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(StartPoint, EndPoint, (int)LineSize, contentByte, _SetColor, Opacity);
|
|
| 546 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.DimAllow(StartPoint, EndPoint, LineSize, contentByte, _SetColor, Opacity); |
|
| 547 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, LineSize, contentByte, _SetColor, Opacity); |
|
| 548 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(StartPoint, EndPoint, LineSize, contentByte, _SetColor, Opacity); |
|
| 549 | 549 |
} |
| 550 | 550 |
break; |
| 551 | 551 |
default: |
내보내기 Unified diff
