개정판 16fe076c
issue #1220: 직선 클라우드 텍스트 생성 오류 수정
Change-Id: I82c73beb57d1ebc3f972fea27e5a62c84aed1196
| FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.cs | ||
|---|---|---|
| 512 | 512 |
string UserID = control.UserID; |
| 513 | 513 |
double Interval = control.Interval; |
| 514 | 514 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(InnerData.First())); |
| 515 |
Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(StartPoint, EndPoint, LineSize, contentByte, control.DashSize, _SetColor, Opacity);
|
|
| 515 |
Controls_PDF.DrawSet_Line.DrawLine(StartPoint, EndPoint, LineSize, contentByte, control.DashSize, _SetColor, Opacity); |
|
| 516 | 516 |
switch (control.LineStyleSet) |
| 517 | 517 |
{
|
| 518 | 518 |
case LineStyleSet.ArrowLine: |
| 519 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, LineSize, contentByte, _SetColor, Opacity);
|
|
| 519 |
Controls_PDF.DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, LineSize, contentByte, _SetColor, Opacity); |
|
| 520 | 520 |
break; |
| 521 | 521 |
case LineStyleSet.CancelLine: |
| 522 | 522 |
{
|
| ... | ... | |
| 527 | 527 |
{
|
| 528 | 528 |
StartPoint = new Point(StartPoint.X, StartPoint.Y - (float)(control.Interval / 3.0)); |
| 529 | 529 |
EndPoint = new Point(EndPoint.X, EndPoint.Y - (float)(control.Interval / 3.0)); |
| 530 |
Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(StartPoint, EndPoint, LineSize, contentByte, DashSize, _SetColor, Opacity);
|
|
| 530 |
Controls_PDF.DrawSet_Line.DrawLine(StartPoint, EndPoint, LineSize, contentByte, DashSize, _SetColor, Opacity); |
|
| 531 | 531 |
} |
| 532 | 532 |
} |
| 533 | 533 |
break; |
| 534 | 534 |
case LineStyleSet.TwinLine: |
| 535 | 535 |
{
|
| 536 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, LineSize, contentByte, _SetColor, Opacity);
|
|
| 537 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(StartPoint, EndPoint, LineSize, contentByte, _SetColor, Opacity);
|
|
| 536 |
Controls_PDF.DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, LineSize, contentByte, _SetColor, Opacity); |
|
| 537 |
Controls_PDF.DrawSet_Arrow.SingleAllow(StartPoint, EndPoint, LineSize, contentByte, _SetColor, Opacity); |
|
| 538 | 538 |
} |
| 539 | 539 |
break; |
| 540 | 540 |
case LineStyleSet.DimLine: |
| 541 | 541 |
{
|
| 542 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.DimAllow(StartPoint, EndPoint, LineSize, contentByte, _SetColor, Opacity);
|
|
| 543 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, LineSize, contentByte, _SetColor, Opacity);
|
|
| 544 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(StartPoint, EndPoint, LineSize, contentByte, _SetColor, Opacity);
|
|
| 542 |
Controls_PDF.DrawSet_Arrow.DimAllow(StartPoint, EndPoint, LineSize, contentByte, _SetColor, Opacity); |
|
| 543 |
Controls_PDF.DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, LineSize, contentByte, _SetColor, Opacity); |
|
| 544 |
Controls_PDF.DrawSet_Arrow.SingleAllow(StartPoint, EndPoint, LineSize, contentByte, _SetColor, Opacity); |
|
| 545 | 545 |
} |
| 546 | 546 |
break; |
| 547 | 547 |
default: |
| ... | ... | |
| 570 | 570 |
|
| 571 | 571 |
if (EndPoint == MidPoint) |
| 572 | 572 |
{
|
| 573 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(MidPoint, StartPoint, LineSize, contentByte, _SetColor, Opacity);
|
|
| 573 |
Controls_PDF.DrawSet_Arrow.SingleAllow(MidPoint, StartPoint, LineSize, contentByte, _SetColor, Opacity); |
|
| 574 | 574 |
} |
| 575 | 575 |
else |
| 576 | 576 |
{
|
| 577 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(EndPoint, MidPoint, LineSize, contentByte, _SetColor, Opacity);
|
|
| 577 |
Controls_PDF.DrawSet_Arrow.SingleAllow(EndPoint, MidPoint, LineSize, contentByte, _SetColor, Opacity); |
|
| 578 | 578 |
} |
| 579 | 579 |
|
| 580 |
Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(PointSet, LineSize, contentByte, DashSize, _SetColor, Opacity);
|
|
| 580 |
Controls_PDF.DrawSet_Line.DrawLine(PointSet, LineSize, contentByte, DashSize, _SetColor, Opacity); |
|
| 581 | 581 |
|
| 582 | 582 |
} |
| 583 | 583 |
} |
| ... | ... | |
| 595 | 595 |
double Opacity = control.Opac; |
| 596 | 596 |
DoubleCollection DashSize = control.DashSize; |
| 597 | 597 |
|
| 598 |
Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(PointSet, LineSize, contentByte, DashSize, _SetColor, Opacity);
|
|
| 598 |
Controls_PDF.DrawSet_Line.DrawLine(PointSet, LineSize, contentByte, DashSize, _SetColor, Opacity); |
|
| 599 | 599 |
} |
| 600 | 600 |
break; |
| 601 | 601 |
#endregion |
| ... | ... | |
| 618 | 618 |
|
| 619 | 619 |
if (control.IsTransOn) |
| 620 | 620 |
{
|
| 621 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(MidPoint, StartPoint, (int)LineSize, contentByte, _SetColor, Opacity, true);
|
|
| 622 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(MidPoint, EndPoint, (int)LineSize, contentByte, _SetColor, Opacity, true);
|
|
| 621 |
Controls_PDF.DrawSet_Arrow.SingleAllow(MidPoint, StartPoint, (int)LineSize, contentByte, _SetColor, Opacity, true); |
|
| 622 |
Controls_PDF.DrawSet_Arrow.SingleAllow(MidPoint, EndPoint, (int)LineSize, contentByte, _SetColor, Opacity, true); |
|
| 623 | 623 |
} |
| 624 | 624 |
else |
| 625 | 625 |
{
|
| 626 |
Controls_PDF.HoneyPDFLib_DrawSet_Arc.DrawArc(StartPoint, MidPoint, EndPoint, (int)LineSize, contentByte, _SetColor, Opacity);
|
|
| 626 |
Controls_PDF.DrawSet_Arc.DrawArc(StartPoint, MidPoint, EndPoint, (int)LineSize, contentByte, _SetColor, Opacity); |
|
| 627 | 627 |
} |
| 628 | 628 |
|
| 629 | 629 |
} |
| ... | ... | |
| 642 | 642 |
double Opacity = control.Opac; |
| 643 | 643 |
List<Point> PointSet = GetPdfPointSystem(control.PointSet); |
| 644 | 644 |
|
| 645 |
Controls_PDF.HoneyPDFLib_DrawSet_Shape.DrawRectangle(PointSet, LineSize, contentByte, DashSize, _SetColor, PaintStyle, Opacity);
|
|
| 645 |
Controls_PDF.DrawSet_Shape.DrawRectangle(PointSet, LineSize, contentByte, DashSize, _SetColor, PaintStyle, Opacity); |
|
| 646 | 646 |
} |
| 647 | 647 |
break; |
| 648 | 648 |
#endregion |
| ... | ... | |
| 659 | 659 |
double Opacity = control.Opac; |
| 660 | 660 |
List<Point> PointSet = GetPdfPointSystem(control.PointSet); |
| 661 | 661 |
|
| 662 |
Controls_PDF.HoneyPDFLib_DrawSet_Shape.DrawPolygon(PointSet, LineSize, contentByte, DashSize, _SetColor, PaintStyle, Opacity);
|
|
| 662 |
Controls_PDF.DrawSet_Shape.DrawPolygon(PointSet, LineSize, contentByte, DashSize, _SetColor, PaintStyle, Opacity); |
|
| 663 | 663 |
} |
| 664 | 664 |
break; |
| 665 | 665 |
#endregion |
| ... | ... | |
| 676 | 676 |
DoubleCollection DashSize = control.DashSize; |
| 677 | 677 |
double Opacity = control.Opac; |
| 678 | 678 |
List<Point> PointSet = GetPdfPointSystem(control.PointSet); |
| 679 |
Controls_PDF.HoneyPDFLib_DrawSet_Shape.DrawCircle(StartPoint, EndPoint, LineSize, contentByte, DashSize, _SetColor, PaintStyle, Opacity, Angle, PointSet);
|
|
| 679 |
Controls_PDF.DrawSet_Shape.DrawCircle(StartPoint, EndPoint, LineSize, contentByte, DashSize, _SetColor, PaintStyle, Opacity, Angle, PointSet); |
|
| 680 | 680 |
|
| 681 | 681 |
} |
| 682 | 682 |
break; |
| ... | ... | |
| 730 | 730 |
|
| 731 | 731 |
if (isChain) |
| 732 | 732 |
{
|
| 733 |
Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(PointSet, LineSize, contentByte, DashSize, _SetColor, Opacity);
|
|
| 733 |
Controls_PDF.DrawSet_Line.DrawLine(PointSet, LineSize, contentByte, DashSize, _SetColor, Opacity); |
|
| 734 | 734 |
} |
| 735 | 735 |
else |
| 736 | 736 |
{
|
| ... | ... | |
| 750 | 750 |
} |
| 751 | 751 |
else |
| 752 | 752 |
{
|
| 753 |
Controls_PDF.HoneyPDFLib_DrawSet_Shape.DrawPolygon(PointSet, LineSize, contentByte, control.DashSize, _SetColor, PaintStyle, Opacity);
|
|
| 753 |
Controls_PDF.DrawSet_Shape.DrawPolygon(PointSet, LineSize, contentByte, control.DashSize, _SetColor, PaintStyle, Opacity); |
|
| 754 | 754 |
} |
| 755 | 755 |
} |
| 756 | 756 |
} |
| ... | ... | |
| 822 | 822 |
decoration = TextDecorations.Underline; |
| 823 | 823 |
} |
| 824 | 824 |
|
| 825 |
Controls_PDF.HoneyPDFLib_DrawSet_Text.DrawString(StartPoint, EndPoint, LineSize, contentByte, _SetColor, paint, TextSize, fontfamilly, fontStyle, fontWeight, decoration, Text, sizeF, Opacity, Angle);
|
|
| 825 |
Controls_PDF.DrawSet_Text.DrawString(StartPoint, EndPoint, LineSize, contentByte, _SetColor, paint, TextSize, fontfamilly, fontStyle, fontWeight, decoration, Text, sizeF, Opacity, Angle); |
|
| 826 | 826 |
} |
| 827 | 827 |
break; |
| 828 | 828 |
#endregion |
| ... | ... | |
| 923 | 923 |
if (control.isTrans) |
| 924 | 924 |
{
|
| 925 | 925 |
//인구 수정 Arrow Text Style적용 되도록 변경 |
| 926 |
Controls_PDF.HoneyPDFLib_DrawSet_Text.DrawString_ArrowText(tempEndPoint, new Point(tempEndPoint.X + control.BoxWidth / scaleWidth, tempEndPoint.Y - control.BoxHeight / scaleHeight),
|
|
| 927 |
newStartPoint, tempMidPoint, |
|
| 926 |
Controls_PDF.DrawSet_Text.DrawString_ArrowText(tempEndPoint, new Point(tempEndPoint.X + control.BoxWidth / scaleWidth, tempEndPoint.Y - control.BoxHeight / scaleHeight), |
|
| 927 |
newStartPoint, tempMidPoint, control.isFixed,
|
|
| 928 | 928 |
LineSize, contentByte, _SetColor, Paint, fontsize, isHighlight, new FontFamily(control.fontConfig[0]), fontStyle, fontWeight, decoration, Text, sizeF, Opacity, Angle); |
| 929 | 929 |
} |
| 930 | 930 |
else |
| ... | ... | |
| 952 | 952 |
} |
| 953 | 953 |
} |
| 954 | 954 |
//인구 수정 Arrow Text Style적용 되도록 변경 |
| 955 |
Controls_PDF.HoneyPDFLib_DrawSet_Text.DrawString_ArrowText(tempEndPoint, new Point(tempEndPoint.X + control.BoxWidth / scaleWidth, tempEndPoint.Y - control.BoxHeight / scaleHeight),
|
|
| 956 |
tempStartPoint, testP, |
|
| 955 |
Controls_PDF.DrawSet_Text.DrawString_ArrowText(tempEndPoint, new Point(tempEndPoint.X + control.BoxWidth / scaleWidth, tempEndPoint.Y - control.BoxHeight / scaleHeight), |
|
| 956 |
tempStartPoint, testP, control.isFixed ,
|
|
| 957 | 957 |
LineSize, contentByte, _SetColor, Paint, fontsize, isHighlight, |
| 958 | 958 |
new FontFamily(control.fontConfig[0]), fontStyle, fontWeight, decoration, Text, sizeF, Opacity, Angle); |
| 959 | 959 |
} |
| 960 | 960 |
else |
| 961 | 961 |
{
|
| 962 | 962 |
//인구 수정 Arrow Text Style적용 되도록 변경 |
| 963 |
Controls_PDF.HoneyPDFLib_DrawSet_Text.DrawString_ArrowText(tempEndPoint, new Point(tempEndPoint.X + control.BoxWidth / scaleWidth, tempEndPoint.Y - control.BoxHeight / scaleHeight),
|
|
| 964 |
newStartPoint, newMidPoint,
|
|
| 963 |
Controls_PDF.DrawSet_Text.DrawString_ArrowText(tempEndPoint, new Point(tempEndPoint.X + control.BoxWidth / scaleWidth, tempEndPoint.Y - control.BoxHeight / scaleHeight), |
|
| 964 |
newStartPoint, tempMidPoint, control.isFixed,
|
|
| 965 | 965 |
LineSize, contentByte, _SetColor, Paint, fontsize, isHighlight, new FontFamily(control.fontConfig[0]), fontStyle, fontWeight, decoration, Text, sizeF, Opacity, Angle); |
| 966 | 966 |
} |
| 967 | 967 |
} |
| 968 | 968 |
} |
| 969 | 969 |
catch (Exception ex) |
| 970 | 970 |
{
|
| 971 |
|
|
| 971 |
throw ex; |
|
| 972 | 972 |
} |
| 973 | 973 |
} |
| 974 | 974 |
break; |
| ... | ... | |
| 986 | 986 |
List<Point> PointSet = GetPdfPointSystem(control.PointSet); |
| 987 | 987 |
double Opacity = control.Opac; |
| 988 | 988 |
string UserNumber = control.UserNumber; |
| 989 |
Controls_PDF.HoneyPDFLib_DrawSet_Image.DrawSign(StartPoint, EndPoint, PointSet, contentByte, UserNumber, Angle, Opacity, finaldata.PROJECT_NO);
|
|
| 989 |
Controls_PDF.DrawSet_Image.DrawSign(StartPoint, EndPoint, PointSet, contentByte, UserNumber, Angle, Opacity, finaldata.PROJECT_NO); |
|
| 990 | 990 |
} |
| 991 | 991 |
break; |
| 992 | 992 |
#endregion |
| ... | ... | |
| 1050 | 1050 |
string FilePath = control.ImagePath; |
| 1051 | 1051 |
//Uri uri = new Uri(s.ImagePath); |
| 1052 | 1052 |
|
| 1053 |
Controls_PDF.HoneyPDFLib_DrawSet_Image.DrawImage(StartPoint, EndPoint, PointSet, contentByte, FilePath, Angle, Opacity);
|
|
| 1053 |
Controls_PDF.DrawSet_Image.DrawImage(StartPoint, EndPoint, PointSet, contentByte, FilePath, Angle, Opacity); |
|
| 1054 | 1054 |
} |
| 1055 | 1055 |
break; |
| 1056 | 1056 |
#endregion |
내보내기 Unified diff
