개정판 f633b10b
Viewer CloundControl 클라우드 간격 변경
FinalPDF CloudControl 클라우드 간격 변경
FinalPDF ArrowTextControl 옵션 적용 설정
| FinalService/KCOM_FinalService/MarkupToPDF/Controls/Polygon/CloudControl.cs | ||
|---|---|---|
| 412 | 412 |
get { return _toler; }
|
| 413 | 413 |
set { _toler = value; }
|
| 414 | 414 |
} |
| 415 |
private double _arcLength = 10; |
|
| 415 |
//강인구 수정 클라우드 사이즈 |
|
| 416 |
//private double _arcLength = 10; |
|
| 417 |
private double _arcLength = 30; |
|
| 416 | 418 |
public double ArcLength |
| 417 | 419 |
{
|
| 418 | 420 |
get { return _arcLength; }
|
| ... | ... | |
| 591 | 593 |
this._pathSubGeometry = new PathGeometry(); |
| 592 | 594 |
int count = this.PointSet.Count; |
| 593 | 595 |
|
| 596 |
//인구 수정 클라우드 크기 설정(2018.04.19) |
|
| 597 |
double size = 0; |
|
| 598 |
double tmp = 0; |
|
| 599 |
|
|
| 600 |
for (int i = 0; i < count - 1; i++) |
|
| 601 |
{
|
|
| 602 |
tmp = size; |
|
| 603 |
size = Math.Max(MathSet.DistanceTo(this.PointSet[i], this.PointSet[i + 1]), tmp); |
|
| 604 |
} |
|
| 605 |
ArcLength = (size * 0.05); |
|
| 606 |
|
|
| 607 |
if (ArcLength <= 3) |
|
| 608 |
{
|
|
| 609 |
ArcLength = 10; |
|
| 610 |
} |
|
| 611 |
else if (ArcLength <= 10) |
|
| 612 |
{
|
|
| 613 |
ArcLength = 20; |
|
| 614 |
} |
|
| 615 |
else if (ArcLength <= 30) |
|
| 616 |
{
|
|
| 617 |
ArcLength = 30; |
|
| 618 |
} |
|
| 619 |
///////////////////////////////////////// |
|
| 620 |
|
|
| 594 | 621 |
if (isTransOn) // true라면 클라우드 컨트롤 |
| 595 | 622 |
{
|
| 596 | 623 |
for (int i = 0; i < (count - 1); i++) |
| FinalService/KCOM_FinalService/MarkupToPDF/Controls/Shape/RectCloudControl.cs | ||
|---|---|---|
| 450 | 450 |
|
| 451 | 451 |
double size = MathSet.DistanceTo(this.StartPoint, this.EndPoint); |
| 452 | 452 |
ArcLength = (size * 0.05); |
| 453 |
if (ArcLength <= 10) |
|
| 453 |
|
|
| 454 |
//강인구 수정(클라우드 사이즈) |
|
| 455 |
//if (ArcLength <= 10) |
|
| 456 |
//{
|
|
| 457 |
// ArcLength = 10; |
|
| 458 |
//} |
|
| 459 |
if (ArcLength <= 3) |
|
| 454 | 460 |
{
|
| 455 | 461 |
ArcLength = 10; |
| 456 | 462 |
} |
| 463 |
else if (ArcLength <= 10) |
|
| 464 |
{
|
|
| 465 |
ArcLength = 20; |
|
| 466 |
} |
|
| 467 |
else if (ArcLength <= 30) |
|
| 468 |
{
|
|
| 469 |
ArcLength = 30; |
|
| 470 |
} |
|
| 457 | 471 |
|
| 458 | 472 |
//ArcLength = 10; |
| 459 | 473 |
|
| FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.cs | ||
|---|---|---|
| 468 | 468 |
scaleWidth = float.Parse(currentPage.PAGE_WIDTH) / pdfSize.Width; |
| 469 | 469 |
scaleHeight = float.Parse(currentPage.PAGE_HEIGHT) / pdfSize.Height; |
| 470 | 470 |
|
| 471 |
if (cropBox != null && cropBox.Width < mediaBox.Width || cropBox.Height < cropBox.Height)
|
|
| 471 |
if (cropBox != null && cropBox.Width < mediaBox.Width || cropBox.Height < mediaBox.Height)
|
|
| 472 | 472 |
{
|
| 473 | 473 |
mediaBox = cropBox; |
| 474 | 474 |
} |
| ... | ... | |
| 701 | 701 |
List<Point> PointSet = GetPdfPointSystem(control.PointSet); |
| 702 | 702 |
double ArcLength = 30; |
| 703 | 703 |
double size = MathSet.DistanceTo(GetPdfPointSystem(control.StartPoint), GetPdfPointSystem(control.EndPoint)); |
| 704 |
|
|
| 704 | 705 |
ArcLength = (size * 0.13); |
| 705 |
if (ArcLength <= 10) |
|
| 706 |
|
|
| 707 |
//강인구 수정(클라우드 사이즈) |
|
| 708 |
//if (ArcLength <= 10) |
|
| 709 |
//{
|
|
| 710 |
// ArcLength = 10; |
|
| 711 |
//} |
|
| 712 |
if (ArcLength <= 3) |
|
| 706 | 713 |
{
|
| 707 | 714 |
ArcLength = 10; |
| 708 | 715 |
} |
| 716 |
else if (ArcLength <= 10) |
|
| 717 |
{
|
|
| 718 |
ArcLength = 20; |
|
| 719 |
} |
|
| 720 |
else if (ArcLength <= 30) |
|
| 721 |
{
|
|
| 722 |
ArcLength = 30; |
|
| 723 |
} |
|
| 724 |
|
|
| 709 | 725 |
var PaintStyle = control.PaintState; |
| 710 | 726 |
double Opacity = control.Opac; |
| 711 | 727 |
DoubleCollection DashSize = control.DashSize; |
| ... | ... | |
| 914 | 930 |
{
|
| 915 | 931 |
fontsize = Convert.ToInt32(control.fontConfig[3]); |
| 916 | 932 |
} |
| 917 |
} |
|
| 918 |
catch (Exception ex) |
|
| 919 |
{
|
|
| 920 |
|
|
| 921 |
} |
|
| 933 |
|
|
| 934 |
//강인구 수정(2018.04.17) |
|
| 935 |
var TextStyle = Common.StringToFont.ConFontStyle(control.fontConfig[1]); |
|
| 936 |
|
|
| 937 |
FontStyle fontStyle = FontStyles.Normal; |
|
| 938 |
if (FontStyles.Italic == TextStyle) |
|
| 939 |
{
|
|
| 940 |
fontStyle = FontStyles.Italic; |
|
| 941 |
} |
|
| 942 |
|
|
| 943 |
FontWeight fontWeight = FontWeights.Black; |
|
| 944 |
|
|
| 945 |
var TextWeight = Common.StringToFont.ConFontWeight(control.fontConfig[2]); |
|
| 946 |
if (FontWeights.Bold == TextWeight) |
|
| 947 |
{
|
|
| 948 |
fontWeight = FontWeights.Bold; |
|
| 949 |
} |
|
| 950 |
|
|
| 951 |
TextDecorationCollection decoration = TextDecorations.Baseline; |
|
| 952 |
if (control.fontConfig.Count() == 5) |
|
| 953 |
{
|
|
| 954 |
decoration = TextDecorations.Underline; |
|
| 955 |
} |
|
| 956 |
|
|
| 957 |
|
|
| 922 | 958 |
|
| 923 | 959 |
if (control.isTrans) |
| 924 | 960 |
{
|
| 925 | 961 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(newStartPoint, tempMidPoint, (int)LineSize, contentByte, _SetColor, Opacity); |
| 926 | 962 |
Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(newStartPoint, tempMidPoint, (int)LineSize, contentByte, new DoubleCollection(9999), _SetColor, Opacity); |
| 927 | 963 |
Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(tempMidPoint, newEndPoint, (int)LineSize, contentByte, new DoubleCollection(9999), _SetColor, Opacity); |
| 928 |
Controls_PDF.HoneyPDFLib_DrawSet_Text.DrawString_ArrowText(tempEndPoint, new Point(tempEndPoint.X + control.BoxWidth / scaleWidth, tempEndPoint.Y - control.BoxHeight / scaleHeight), LineSize, |
|
| 929 |
contentByte, _SetColor, Paint, fontsize, isHighlight, new FontFamily(), new FontStyle(), new FontWeight(), new TextDecorationCollection(), Text, sizeF, Opacity, Angle); |
|
| 964 |
//인구 수정 Arrow Text Style적용 되도록 변경 |
|
| 965 |
Controls_PDF.HoneyPDFLib_DrawSet_Text.DrawString_ArrowText(tempEndPoint, new Point(tempEndPoint.X + control.BoxWidth / scaleWidth, tempEndPoint.Y - control.BoxHeight / scaleHeight), LineSize, |
|
| 966 |
contentByte, _SetColor, Paint, fontsize, isHighlight, new FontFamily(), fontStyle, fontWeight, decoration, Text, sizeF, Opacity, Angle); |
|
| 967 |
//Controls_PDF.HoneyPDFLib_DrawSet_Text.DrawString_ArrowText(tempEndPoint, new Point(tempEndPoint.X + control.BoxWidth / scaleWidth, tempEndPoint.Y - control.BoxHeight / scaleHeight), LineSize, |
|
| 968 |
// contentByte, _SetColor, Paint, fontsize, isHighlight, new FontFamily(), new FontStyle(), new FontWeight(), new TextDecorationCollection(), Text, sizeF, Opacity, Angle); |
|
| 930 | 969 |
|
| 931 | 970 |
} |
| 932 | 971 |
else |
| ... | ... | |
| 956 | 995 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(tempStartPoint, testP, (int)LineSize, contentByte, _SetColor, Opacity); |
| 957 | 996 |
Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(tempStartPoint, testP, (int)LineSize, contentByte, new DoubleCollection(9999), _SetColor, Opacity); |
| 958 | 997 |
Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(testP, newEndPoint, (int)LineSize, contentByte, new DoubleCollection(9999), _SetColor, Opacity); |
| 998 |
|
|
| 999 |
//인구 수정 Arrow Text Style적용 되도록 변경 |
|
| 959 | 1000 |
//Controls_PDF.HoneyPDFLib_DrawSet_Text.DrawString_ArrowText(tempEndPoint, new Point(tempEndPoint.X + control.BoxWidth / 3, tempEndPoint.Y - control.BoxHeight / 3), LineSize, contentByte, _SetColor, Paint, fontsize, isHighlight, |
| 960 | 1001 |
// new FontFamily(), new FontStyle(), new FontWeight(), new TextDecorationCollection(), Text, sizeF, Opacity, Angle); |
| 961 | 1002 |
Controls_PDF.HoneyPDFLib_DrawSet_Text.DrawString_ArrowText(tempEndPoint, new Point(tempEndPoint.X + control.BoxWidth / scaleWidth, tempEndPoint.Y - control.BoxHeight / scaleHeight), LineSize, contentByte, _SetColor, Paint, fontsize, isHighlight, |
| 962 |
new FontFamily(), new FontStyle(), new FontWeight(), new TextDecorationCollection(), Text, sizeF, Opacity, Angle);
|
|
| 1003 |
new FontFamily(), fontStyle, fontWeight, decoration, Text, sizeF, Opacity, Angle);
|
|
| 963 | 1004 |
} |
| 964 | 1005 |
else |
| 965 | 1006 |
{
|
| 966 | 1007 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(newStartPoint, newMidPoint, (int)LineSize, contentByte, _SetColor, Opacity); |
| 967 | 1008 |
Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(newStartPoint, newMidPoint, (int)LineSize, contentByte, new DoubleCollection(9999), _SetColor, Opacity); |
| 968 | 1009 |
Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(newMidPoint, newEndPoint, (int)LineSize, contentByte, new DoubleCollection(9999), _SetColor, Opacity); |
| 969 |
Controls_PDF.HoneyPDFLib_DrawSet_Text.DrawString_ArrowText(tempEndPoint, new Point(tempEndPoint.X + control.BoxWidth / scaleWidth, tempEndPoint.Y - control.BoxHeight / scaleHeight), LineSize, contentByte, _SetColor, Paint, fontsize, isHighlight, new FontFamily(), new FontStyle(), new FontWeight(), new TextDecorationCollection(), Text, sizeF, Opacity, Angle); |
|
| 970 |
} |
|
| 1010 |
|
|
| 1011 |
//인구 수정 Arrow Text Style적용 되도록 변경 |
|
| 1012 |
//Controls_PDF.HoneyPDFLib_DrawSet_Text.DrawString_ArrowText(tempEndPoint, new Point(tempEndPoint.X + control.BoxWidth / scaleWidth, tempEndPoint.Y - control.BoxHeight / scaleHeight), LineSize, contentByte, _SetColor, Paint, fontsize, isHighlight, new FontFamily(), new FontStyle(), new FontWeight(), new TextDecorationCollection(), Text, sizeF, Opacity, Angle); |
|
| 1013 |
Controls_PDF.HoneyPDFLib_DrawSet_Text.DrawString_ArrowText(tempEndPoint, new Point(tempEndPoint.X + control.BoxWidth / scaleWidth, tempEndPoint.Y - control.BoxHeight / scaleHeight), LineSize, contentByte, _SetColor, Paint, fontsize, isHighlight, new FontFamily(), fontStyle, fontWeight, decoration, Text, sizeF, Opacity, Angle); |
|
| 1014 |
|
|
| 1015 |
|
|
| 1016 |
} |
|
| 1017 |
} |
|
| 1018 |
|
|
| 1019 |
} |
|
| 1020 |
catch (Exception ex) |
|
| 1021 |
{
|
|
| 1022 |
|
|
| 971 | 1023 |
} |
| 972 | 1024 |
} |
| 973 | 1025 |
break; |
| MarkupToPDF/Controls/Parsing/MarkupParse.cs | ||
|---|---|---|
| 3024 | 3024 |
}; |
| 3025 | 3025 |
Layer.Children.Add(instance); |
| 3026 | 3026 |
instance.pointSet = s.PointSet; |
| 3027 |
instance.PointSet = s.PointSet; |
|
| 3027 | 3028 |
instance.ApplyTemplate(); |
| 3028 | 3029 |
instance.ClosePath(); |
| 3029 | 3030 |
instance.ChangePaint(s.PaintState); |
| MarkupToPDF/Controls/Polygon/CloudControl.cs | ||
|---|---|---|
| 413 | 413 |
set { _toler = value; }
|
| 414 | 414 |
} |
| 415 | 415 |
//강인구 수정 클라우드 사이즈 |
| 416 |
//private double _arcLength = 10;
|
|
| 417 |
private double _arcLength = 30; |
|
| 416 |
private double _arcLength;
|
|
| 417 |
//private double _arcLength = 30;
|
|
| 418 | 418 |
public double ArcLength |
| 419 | 419 |
{
|
| 420 | 420 |
get { return _arcLength; }
|
| ... | ... | |
| 593 | 593 |
this._pathSubGeometry = new PathGeometry(); |
| 594 | 594 |
int count = this.PointSet.Count; |
| 595 | 595 |
|
| 596 |
|
|
| 597 |
//인구 수정 클라우드 크기 설정(2018.04.19) |
|
| 598 |
double size = 0; |
|
| 599 |
double tmp = 0; |
|
| 600 |
|
|
| 601 |
for (int i = 0; i < count - 1; i++) |
|
| 602 |
{
|
|
| 603 |
tmp = size; |
|
| 604 |
size = Math.Max(MathSet.DistanceTo(this.PointSet[i], this.PointSet[i + 1]), tmp); |
|
| 605 |
} |
|
| 606 |
ArcLength = (size * 0.05); |
|
| 607 |
|
|
| 608 |
if (ArcLength <= 3) |
|
| 609 |
{
|
|
| 610 |
ArcLength = 10; |
|
| 611 |
} |
|
| 612 |
else if (ArcLength <= 10) |
|
| 613 |
{
|
|
| 614 |
ArcLength = 20; |
|
| 615 |
} |
|
| 616 |
else if (ArcLength <= 30) |
|
| 617 |
{
|
|
| 618 |
ArcLength = 30; |
|
| 619 |
} |
|
| 620 |
///////////////////////////////////////// |
|
| 621 |
|
|
| 596 | 622 |
if (isTransOn) // true라면 클라우드 컨트롤 |
| 597 | 623 |
{
|
| 598 | 624 |
for (int i = 0; i < (count - 1); i++) |
| ... | ... | |
| 715 | 741 |
|
| 716 | 742 |
int count = this.PointSet.Count; |
| 717 | 743 |
|
| 718 |
|
|
| 719 |
|
|
| 720 | 744 |
if (isTransOn) // true라면 클라우드 컨트롤 |
| 721 | 745 |
{
|
| 722 | 746 |
PathFigure pathFigure = CloudControl.GenerateLineWithCloud(this.PointSet[count - 1], this.PointSet[0], this.ArcLength - 5, reverse); |
내보내기 Unified diff
