개정판 1588306f
Fix: MARKUS 라인 사이즈를 PDF 라인 사이즈로 변경하는 로직 수정
Change-Id: I45b491b8bcc9b996d48c73bf3dc35b728df035a6
| FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.cs | ||
|---|---|---|
| 692 | 692 |
var PaintStyle = control.PaintState; |
| 693 | 693 |
Point EndPoint = GetPdfPointSystem(control.EndPoint); |
| 694 | 694 |
List<Point> PointSet = GetPdfPointSystem(control.PointSet); |
| 695 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(InnerData.First())); |
|
| 695 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(InnerData.First()), scaleWidth);
|
|
| 696 | 696 |
double Opacity = control.Opac; |
| 697 | 697 |
DoubleCollection DashSize = control.DashSize; |
| 698 | 698 |
|
| ... | ... | |
| 716 | 716 |
|
| 717 | 717 |
var Opacity = control.Opac; |
| 718 | 718 |
string UserID = control.UserID; |
| 719 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(InnerData.First())); |
|
| 719 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(InnerData.First()), scaleWidth);
|
|
| 720 | 720 |
bool IsTransOn = control.IsTransOn; |
| 721 | 721 |
|
| 722 | 722 |
if (control.IsTransOn) |
| ... | ... | |
| 743 | 743 |
using (S_RectControl control = JsonSerializerHelper.JsonDeserialize<S_RectControl>(item)) |
| 744 | 744 |
{
|
| 745 | 745 |
string[] data2 = control.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
| 746 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(data2.First())); |
|
| 746 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(data2.First()), scaleWidth);
|
|
| 747 | 747 |
var PaintStyle = control.PaintState; |
| 748 | 748 |
double Angle = control.Angle; |
| 749 | 749 |
DoubleCollection DashSize = control.DashSize; |
| ... | ... | |
| 759 | 759 |
using (S_TriControl control = JsonSerializerHelper.JsonDeserialize<S_TriControl>(item)) |
| 760 | 760 |
{
|
| 761 | 761 |
string[] data2 = control.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
| 762 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(data2.First())); |
|
| 762 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(data2.First()), scaleWidth);
|
|
| 763 | 763 |
var PaintStyle = control.Paint; |
| 764 | 764 |
double Angle = control.Angle; |
| 765 | 765 |
//StrokeColor = _SetColor, //색상은 레드 |
| ... | ... | |
| 776 | 776 |
using (S_CircleControl control = JsonSerializerHelper.JsonDeserialize<S_CircleControl>(item)) |
| 777 | 777 |
{
|
| 778 | 778 |
string[] data2 = control.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
| 779 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(data2.First())); |
|
| 779 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(data2.First()), scaleWidth);
|
|
| 780 | 780 |
var StartPoint = GetPdfPointSystem(control.StartPoint); |
| 781 | 781 |
var EndPoint = GetPdfPointSystem(control.EndPoint); |
| 782 | 782 |
var PaintStyle = control.PaintState; |
| ... | ... | |
| 794 | 794 |
using (S_RectCloudControl control = JsonSerializerHelper.JsonDeserialize<S_RectCloudControl>(item)) |
| 795 | 795 |
{
|
| 796 | 796 |
string[] data2 = control.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
| 797 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(data2.First())); |
|
| 797 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(data2.First()), scaleWidth);
|
|
| 798 | 798 |
List<Point> PointSet = GetPdfPointSystem(control.PointSet); |
| 799 | 799 |
double size = MathSet.DistanceTo(GetPdfPointSystem(control.StartPoint), GetPdfPointSystem(control.EndPoint)); |
| 800 | 800 |
|
| ... | ... | |
| 819 | 819 |
using (S_CloudControl control = JsonSerializerHelper.JsonDeserialize<S_CloudControl>(item)) |
| 820 | 820 |
{
|
| 821 | 821 |
string[] data2 = control.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
| 822 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(data2.First())); |
|
| 822 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(data2.First()), scaleWidth);
|
|
| 823 | 823 |
double Toler = control.Toler; |
| 824 | 824 |
List<Point> PointSet = GetPdfPointSystem(control.PointSet); |
| 825 | 825 |
double ArcLength = (control.ArcLength == 0 ? 10 : control.ArcLength) / (scaleWidth > scaleHeight ? scaleWidth : scaleHeight); |
| ... | ... | |
| 948 | 948 |
// //testPoint = Test(rect, newMidPoint); |
| 949 | 949 |
//} |
| 950 | 950 |
|
| 951 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(data2.First())); |
|
| 951 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(data2.First()), scaleWidth);
|
|
| 952 | 952 |
System.Drawing.Color FontColor = _SetColor; |
| 953 | 953 |
bool isHighlight = control.isHighLight; |
| 954 | 954 |
double Opacity = control.Opac; |
| ... | ... | |
| 1412 | 1412 |
Point EndPoint = GetPdfPointSystem(control.EndPoint); |
| 1413 | 1413 |
DoubleCollection DashSize = control.DashSize; |
| 1414 | 1414 |
List<Point> PointSet = GetPdfPointSystem(control.PointSet); |
| 1415 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(InnerData.First())); |
|
| 1415 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(InnerData.First()), scaleWidth);
|
|
| 1416 | 1416 |
|
| 1417 | 1417 |
double Opacity = control.Opac; |
| 1418 | 1418 |
|
| ... | ... | |
| 1440 | 1440 |
var Opacity = control.Opac; |
| 1441 | 1441 |
string UserID = control.UserID; |
| 1442 | 1442 |
double Interval = control.Interval; |
| 1443 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(InnerData.First())); |
|
| 1443 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(InnerData.First()), scaleWidth);
|
|
| 1444 | 1444 |
Controls_PDF.DrawSet_Line.DrawLine(StartPoint, EndPoint, LineSize, contentByte, control.DashSize, setColor, Opacity); |
| 1445 | 1445 |
switch (control.LineStyleSet) |
| 1446 | 1446 |
{
|
| ... | ... | |
| 1525 | 1525 |
} |
| 1526 | 1526 |
if (control.isHighLight) paint |= PaintSet.Highlight; |
| 1527 | 1527 |
|
| 1528 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(data2.First())); |
|
| 1528 |
double LineSize = Common.ConverterLineSize.Convert(Convert.ToInt32(data2.First()), scaleWidth);
|
|
| 1529 | 1529 |
double TextSize = Convert.ToDouble(data2[1]); |
| 1530 | 1530 |
System.Drawing.Color FontColor = setColor; |
| 1531 | 1531 |
double Angle = control.Angle; |
내보내기 Unified diff
