개정판 488ba687
issue #1005: 사용자가 생성한 Highlight 텍스트가 Final PDF에 생성되어야 한다
Change-Id: Ie803b8c57c5fff474eb52a48cdf617ac0deb3bb3
| FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.cs | ||
|---|---|---|
| 80 | 80 |
|
| 81 | 81 |
public Point GetPdfPointSystem(Point point) |
| 82 | 82 |
{
|
| 83 |
//point = new Point(point.X + mediaBox.Left * 3.0, point.Y - mediaBox.Bottom * 3.0); |
|
| 84 |
|
|
| 85 |
//강인구 테스트 |
|
| 86 |
//point = new Point(point.X + mediaBox.Left * scaleWidth, point.Y - mediaBox.Bottom * scaleHeight); |
|
| 87 | 83 |
point = new Point(point.X + pdfSize.Left * scaleWidth, point.Y - pdfSize.Bottom * scaleHeight); |
| 88 |
|
|
| 89 |
//point = new Point(point.X + mediaBox.Left / scaleWidth, point.Y - mediaBox.Bottom / scaleHeight); |
|
| 90 |
|
|
| 91 |
//return new Point((float)(point.X / zoomLevel), pdfSize.Height - (float)(point.Y / zoomLevel)); |
|
| 92 |
//return new Point((float)(point.X / scaleWidth), pdfSize.Height - (float)(point.Y / scaleHeight)); |
|
| 93 |
|
|
| 94 |
//return new Point((float)(point.X / scaleWidth)-1, pdfSize.Height - (float)(point.Y / scaleHeight)+1); |
|
| 95 |
//return new Point((float)(point.X / scaleWidth), pdfSize.Height - (float)(point.Y / scaleHeight)); |
|
| 96 |
|
|
| 97 | 84 |
return new Point((float)(point.X / scaleWidth), pdfSize.Height - (float)(point.Y / scaleHeight)); |
| 98 | 85 |
} |
| 99 | 86 |
|
| 87 |
public double GetPdfSize(double size) |
|
| 88 |
{
|
|
| 89 |
return (size / scaleWidth); |
|
| 90 |
} |
|
| 91 |
|
|
| 100 | 92 |
public List<Point> GetPdfPointSystem(List<Point> point) |
| 101 | 93 |
{
|
| 102 | 94 |
List<Point> dummy = new List<Point>(); |
| ... | ... | |
| 143 | 135 |
string TestFile = System.IO.Path.GetTempFileName(); |
| 144 | 136 |
|
| 145 | 137 |
#region 문서 경로를 가져오는 것과 Status를 Create (1단계) 로 수정 |
| 146 |
try
|
|
| 138 |
try |
|
| 147 | 139 |
{
|
| 148 | 140 |
using (KCOMEntities _entity = new KCOMEntities(KCOMDataModel.Common.ConnectStringBuilder.KCOMConnectionString().ToString())) |
| 149 | 141 |
{
|
| ... | ... | |
| 823 | 815 |
default: |
| 824 | 816 |
break; |
| 825 | 817 |
} |
| 826 |
if (control.isHighLight) paint = PaintSet.HIGHLIGHT;
|
|
| 818 |
if (control.isHighLight) paint |= PaintSet.Highlight;
|
|
| 827 | 819 |
|
| 828 | 820 |
double LineSize = Convert.ToDouble(data2.First()); |
| 829 | 821 |
double TextSize = Convert.ToDouble(data2[1]); |
| ... | ... | |
| 874 | 866 |
Point tempEndPoint = GetPdfPointSystem(control.EndPoint); |
| 875 | 867 |
bool isUnderLine = false; |
| 876 | 868 |
string Text = ""; |
| 877 |
int fontsize = 30;
|
|
| 869 |
double fontsize = 30;
|
|
| 878 | 870 |
|
| 879 | 871 |
System.Drawing.SizeF sizeF = new System.Drawing.SizeF((float)control.BoxWidth, (float)control.BoxHeight); |
| 880 | 872 |
Rect rect = new Rect(tempEndPoint, new Point(tempEndPoint.X + control.BoxWidth / scaleWidth, tempEndPoint.Y - control.BoxHeight / scaleHeight)); |
| ... | ... | |
| 917 | 909 |
default: |
| 918 | 910 |
break; |
| 919 | 911 |
} |
| 912 |
if (control.isHighLight) Paint |= PaintSet.Highlight; |
|
| 920 | 913 |
|
| 921 | 914 |
if (Paint == PaintSet.Hatch) |
| 922 | 915 |
{
|
| ... | ... | |
| 931 | 924 |
{
|
| 932 | 925 |
if (control.fontConfig.Count == 4) |
| 933 | 926 |
{
|
| 934 |
fontsize = Convert.ToInt32(control.fontConfig[3]);
|
|
| 927 |
fontsize = Convert.ToDouble(control.fontConfig[3]);
|
|
| 935 | 928 |
} |
| 936 | 929 |
|
| 937 | 930 |
//강인구 수정(2018.04.17) |
| ... | ... | |
| 957 | 950 |
decoration = TextDecorations.Underline; |
| 958 | 951 |
} |
| 959 | 952 |
|
| 960 |
|
|
| 961 |
|
|
| 962 | 953 |
if (control.isTrans) |
| 963 | 954 |
{
|
| 964 | 955 |
Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(newStartPoint, tempMidPoint, (int)LineSize, contentByte, _SetColor, Opacity); |
내보내기 Unified diff
