개정판 53393bae
Converter
- Converter Searview 잘못된 Return값 제외
Viewer
- CloudControl, rectCloud, Textcontrol, ArrowTextControl CloudArcDepth 0.8로 고정
- Save, Load시 ArcLength 바인딩 되도록 수정
- 권한이 없을 경우 단축키 권한 제외(Ctrl + A, C, V)
- License 체크시 Member테이블에 없을 경우 등록된 사용자가 아닙니다 후 종료 되도록 설정
FinalItem
- CloudControl, rectCloud ArcLength 받아서 그려주도록 변경
| ConvertService/ConverterService/ConvertionWebService/Conversion.asmx.cs | ||
|---|---|---|
| 67 | 67 |
{
|
| 68 | 68 |
using (DeepView_Entity deepViewEntity = new DeepView_Entity(ConnectStringBuilder.DeepViewConnectionString().ToString())) |
| 69 | 69 |
{
|
| 70 |
_result = ConnectStringBuilder.DeepViewConnectionString().ToString(); |
|
| 70 |
//_result = ConnectStringBuilder.DeepViewConnectionString().ToString();
|
|
| 71 | 71 |
//var _RunProjects = deepViewEntity.RUN_PROJECTS.Where(r => r.PROJECT_NO == projNumber && DateTime.Parse(r.RUN_DATETIME)<= DateTime.Now); |
| 72 | 72 |
//var _RunProjects = deepViewEntity.RUN_PROJECTS.Where(r => r.PROJECT_NO == projNumber); |
| 73 | 73 |
var _RunProjects = deepViewEntity.RUN_PROJECTS.Where(r => r.PROJECT_NO != null); |
| FinalService/KCOM_FinalService/ConsoleApp1/Program.cs | ||
|---|---|---|
| 58 | 58 |
{
|
| 59 | 59 |
|
| 60 | 60 |
//FINAL_PDF item = _entity.FINAL_PDF.Where(d => d.ID == "ngKwBgMotw8d56dea3839120d").FirstOrDefault(); |
| 61 |
FINAL_PDF item = _entity.FINAL_PDF.Where(d => d.ID == "Fu6YnWN2fO8d5a43e9de1d867").FirstOrDefault();
|
|
| 61 |
FINAL_PDF item = _entity.FINAL_PDF.Where(d => d.ID == "5lGkK3USjB8d5bc829ae4f178").FirstOrDefault();
|
|
| 62 | 62 |
//_entity.FINAL_PDF.AddObject(new FINAL_PDF |
| 63 | 63 |
//{
|
| 64 | 64 |
// ID = Guid.NewGuid().ToString(), |
| FinalService/KCOM_FinalService/MarkupToPDF/Controls/Polygon/CloudControl.cs | ||
|---|---|---|
| 19 | 19 |
{
|
| 20 | 20 |
private const string PART_CloudPath = "PART_CloudPath"; |
| 21 | 21 |
private const string PART_CloudSubPath = "PART_CloudSubPath"; |
| 22 |
private const double _CloudArcDepth = 0.55; |
|
| 22 | 23 |
|
| 23 | 24 |
public Path Base_CloudPath = null; |
| 24 | 25 |
public Path Base_CloudSubPath = null; |
| ... | ... | |
| 697 | 698 |
for (j = 1; j < (count - 1); j++) |
| 698 | 699 |
{
|
| 699 | 700 |
ArcSegment arcSeg = new ArcSegment(); |
| 700 |
arcSeg.Size = new Size(arcLength * 0.8, arcLength * 0.8); /// x size and y size of arc
|
|
| 701 |
arcSeg.Size = new Size(arcLength * _CloudArcDepth, arcLength * _CloudArcDepth); /// x size and y size of arc
|
|
| 701 | 702 |
arcSeg.Point = new Point(p1.X + j * dx * arcLength, p1.Y + j * dy * arcLength); /// end point of arc |
| 702 | 703 |
lastPt = arcSeg.Point; /// save last point |
| 703 | 704 |
arcSeg.RotationAngle = theta + 90; |
| ... | ... | |
| 710 | 711 |
{
|
| 711 | 712 |
arcLength = MathSet.DistanceTo(lastPt, p2); |
| 712 | 713 |
ArcSegment arcSeg = new ArcSegment(); |
| 713 |
arcSeg.Size = new Size(arcLength * 0.8, arcLength * 0.8); /// x size and y size of arc
|
|
| 714 |
arcSeg.Size = new Size(arcLength * _CloudArcDepth, arcLength * _CloudArcDepth); /// x size and y size of arc
|
|
| 714 | 715 |
arcSeg.Point = new Point(p2.X, p2.Y); /// end point of arc |
| 715 | 716 |
arcSeg.RotationAngle = theta; |
| 716 | 717 |
if (true == reverse) arcSeg.SweepDirection = SweepDirection.Clockwise; |
| FinalService/KCOM_FinalService/MarkupToPDF/Controls/Shape/RectCloudControl.cs | ||
|---|---|---|
| 24 | 24 |
|
| 25 | 25 |
public Path Base_ArcPath = null; |
| 26 | 26 |
public Path Base_BodyPath = null; |
| 27 |
private const double _CloudArcDepth = 0.55; /// 2018.05.14 added by humkyung |
|
| 27 | 28 |
|
| 28 | 29 |
#endregion |
| 29 | 30 |
|
| ... | ... | |
| 559 | 560 |
for (j = 1; j < (count - 1); j++) |
| 560 | 561 |
{
|
| 561 | 562 |
ArcSegment arcSeg = new ArcSegment(); |
| 562 |
arcSeg.Size = new Size(arcLength * 0.8, arcLength * 0.8); /// x size and y size of arc
|
|
| 563 |
arcSeg.Size = new Size(arcLength * _CloudArcDepth, arcLength * _CloudArcDepth); /// x size and y size of arc
|
|
| 563 | 564 |
arcSeg.Point = new Point(p1.X + j * dx * arcLength, p1.Y + j * dy * arcLength); /// end point of arc |
| 564 | 565 |
lastPt = arcSeg.Point; /// save last point |
| 565 | 566 |
arcSeg.RotationAngle = theta + 90; |
| ... | ... | |
| 572 | 573 |
{
|
| 573 | 574 |
arcLength = MathSet.DistanceTo(lastPt, p2); |
| 574 | 575 |
ArcSegment arcSeg = new ArcSegment(); |
| 575 |
arcSeg.Size = new Size(arcLength * 0.8, arcLength * 0.8); /// x size and y size of arc
|
|
| 576 |
arcSeg.Size = new Size(arcLength * _CloudArcDepth, arcLength * _CloudArcDepth); /// x size and y size of arc
|
|
| 576 | 577 |
arcSeg.Point = new Point(p2.X, p2.Y); /// end point of arc |
| 577 | 578 |
arcSeg.RotationAngle = theta; |
| 578 | 579 |
if (true == reverse) arcSeg.SweepDirection = SweepDirection.Clockwise; |
| FinalService/KCOM_FinalService/MarkupToPDF/Controls/Text/ArrowTextControl.cs | ||
|---|---|---|
| 27 | 27 |
public TextBox Base_TextBox = null; |
| 28 | 28 |
public TextBlock Base_TextBlock = null; |
| 29 | 29 |
|
| 30 |
private const double _CloudArcDepth = 0.55; /// 2018.05.14 added by humkyung |
|
| 31 |
|
|
| 30 | 32 |
#region Object & Variable |
| 31 | 33 |
GeometryGroup instanceGroup = new GeometryGroup(); |
| 32 | 34 |
|
| ... | ... | |
| 1469 | 1471 |
for (j = 1; j < (count - 1); j++) |
| 1470 | 1472 |
{
|
| 1471 | 1473 |
ArcSegment arcSeg = new ArcSegment(); |
| 1472 |
arcSeg.Size = new Size(arcLength * 0.8, arcLength * 0.8); /// x size and y size of arc
|
|
| 1474 |
arcSeg.Size = new Size(arcLength * _CloudArcDepth, arcLength * _CloudArcDepth); /// x size and y size of arc
|
|
| 1473 | 1475 |
arcSeg.Point = new Point(p1.X + j * dx * arcLength, p1.Y + j * dy * arcLength); /// end point of arc |
| 1474 | 1476 |
lastPt = arcSeg.Point; /// save last point |
| 1475 | 1477 |
arcSeg.RotationAngle = theta + 90; |
| ... | ... | |
| 1482 | 1484 |
{
|
| 1483 | 1485 |
arcLength = MathSet.DistanceTo(lastPt, p2); |
| 1484 | 1486 |
ArcSegment arcSeg = new ArcSegment(); |
| 1485 |
arcSeg.Size = new Size(arcLength * 0.8, arcLength * 0.8); /// x size and y size of arc
|
|
| 1487 |
arcSeg.Size = new Size(arcLength * _CloudArcDepth, arcLength * _CloudArcDepth); /// x size and y size of arc
|
|
| 1486 | 1488 |
arcSeg.Point = new Point(p2.X, p2.Y); /// end point of arc |
| 1487 | 1489 |
arcSeg.RotationAngle = theta; |
| 1488 | 1490 |
if (true == reverse) arcSeg.SweepDirection = SweepDirection.Clockwise; |
| FinalService/KCOM_FinalService/MarkupToPDF/Controls/Text/TextControl.cs | ||
|---|---|---|
| 34 | 34 |
public RotateTransform _rotation = null; |
| 35 | 35 |
public TranslateTransform _translation = null; |
| 36 | 36 |
public ScaleTransform _scale = null; |
| 37 |
private const double _CloudArcDepth = 0.55; /// 2018.05.14 added by humkyung |
|
| 37 | 38 |
|
| 38 | 39 |
public bool IsSelected |
| 39 | 40 |
{
|
| ... | ... | |
| 482 | 483 |
for (j = 1; j < (count - 1); j++) |
| 483 | 484 |
{
|
| 484 | 485 |
ArcSegment arcSeg = new ArcSegment(); |
| 485 |
arcSeg.Size = new Size(arcLength * 0.8, arcLength * 0.8);
|
|
| 486 |
arcSeg.Size = new Size(arcLength * _CloudArcDepth, arcLength * _CloudArcDepth);
|
|
| 486 | 487 |
|
| 487 | 488 |
arcSeg.Point = new Point(p1.X + j * dx * arcLength, p1.Y + j * dy * arcLength); |
| 488 | 489 |
lastPt = arcSeg.Point; |
| ... | ... | |
| 496 | 497 |
{
|
| 497 | 498 |
arcLength = MathSet.DistanceTo(lastPt, p2); |
| 498 | 499 |
ArcSegment arcSeg = new ArcSegment(); |
| 499 |
arcSeg.Size = new Size(arcLength * 0.8, arcLength * 0.8);
|
|
| 500 |
arcSeg.Size = new Size(arcLength * _CloudArcDepth, arcLength * _CloudArcDepth);
|
|
| 500 | 501 |
arcSeg.Point = new Point(p2.X, p2.Y); |
| 501 | 502 |
arcSeg.RotationAngle = theta; |
| 502 | 503 |
|
| FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.cs | ||
|---|---|---|
| 699 | 699 |
string[] data2 = control.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
| 700 | 700 |
double LineSize = Convert.ToDouble(data2.First()); |
| 701 | 701 |
List<Point> PointSet = GetPdfPointSystem(control.PointSet); |
| 702 |
double ArcLength = 30; |
|
| 702 |
//double ArcLength = 30;
|
|
| 703 | 703 |
double size = MathSet.DistanceTo(GetPdfPointSystem(control.StartPoint), GetPdfPointSystem(control.EndPoint)); |
| 704 | 704 |
|
| 705 |
ArcLength = (size * 0.13); |
|
| 705 |
|
|
| 706 |
double ArcLength = control.ArcLength == 0 ? 10 : control.ArcLength; |
|
| 707 |
|
|
| 708 |
//ArcLength = (size * 0.13); |
|
| 706 | 709 |
|
| 707 | 710 |
//강인구 수정(클라우드 사이즈) |
| 708 | 711 |
//if (ArcLength <= 10) |
| 709 | 712 |
//{
|
| 710 | 713 |
// ArcLength = 10; |
| 711 | 714 |
//} |
| 712 |
if (ArcLength <= 3) |
|
| 713 |
{
|
|
| 714 |
ArcLength = 10; |
|
| 715 |
} |
|
| 716 |
else if (ArcLength <= 10) |
|
| 717 |
{
|
|
| 718 |
ArcLength = 20; |
|
| 719 |
} |
|
| 720 |
else if (ArcLength <= 30) |
|
| 721 |
{
|
|
| 722 |
ArcLength = 30; |
|
| 723 |
} |
|
| 715 |
//if (ArcLength <= 3)
|
|
| 716 |
//{
|
|
| 717 |
// ArcLength = 10;
|
|
| 718 |
//}
|
|
| 719 |
//else if (ArcLength <= 10)
|
|
| 720 |
//{
|
|
| 721 |
// ArcLength = 20;
|
|
| 722 |
//}
|
|
| 723 |
//else if (ArcLength <= 30)
|
|
| 724 |
//{
|
|
| 725 |
// ArcLength = 30;
|
|
| 726 |
//}
|
|
| 724 | 727 |
|
| 725 | 728 |
var PaintStyle = control.PaintState; |
| 726 | 729 |
double Opacity = control.Opac; |
| ... | ... | |
| 750 | 753 |
double LineSize = Convert.ToDouble(data2.First()); |
| 751 | 754 |
double Toler = control.Toler; |
| 752 | 755 |
List<Point> PointSet = GetPdfPointSystem(control.PointSet); |
| 753 |
double ArcLength = control.ArcLength; |
|
| 756 |
double ArcLength = control.ArcLength == 0 ? 10 : control.ArcLength;
|
|
| 754 | 757 |
var PaintStyle = control.PaintState; |
| 755 | 758 |
double Opacity = control.Opac; |
| 756 | 759 |
bool isTransOn = control.IsTrans; |
| ... | ... | |
| 1144 | 1147 |
pdfStamper.Outlines = root; |
| 1145 | 1148 |
pdfStamper.Close(); |
| 1146 | 1149 |
pdfReader.Close(); |
| 1147 |
} |
|
| 1150 |
}
|
|
| 1148 | 1151 |
} |
| 1149 | 1152 |
#endregion |
| 1150 | 1153 |
} |
| FinalService/KCOM_FinalService/MarkupToPDF/Serialize/S_Control/Detail/S_RectCloudControl.cs | ||
|---|---|---|
| 31 | 31 |
public PaintSet PaintState { get; set; } //Rectagle Style
|
| 32 | 32 |
[DataMember] |
| 33 | 33 |
public DoubleCollection DashSize { get; set; }
|
| 34 |
//강인구 추가 ArcLength |
|
| 35 |
[DataMember] |
|
| 36 |
public double ArcLength { get; set; } // 호의 높이
|
|
| 34 | 37 |
public void Dispose() |
| 35 | 38 |
{
|
| 36 | 39 |
GC.Collect(); |
| KCOM/Events/Event_KeyEvent.cs | ||
|---|---|---|
| 88 | 88 |
#region 전체 선택(Ctrl + A) |
| 89 | 89 |
case Key.A: |
| 90 | 90 |
{
|
| 91 |
if (ViewerDataModel.Instance.IsPressCtrl) |
|
| 91 |
if (ViewerDataModel.Instance.IsPressCtrl && (App.ViewInfo.CreateFinalPDFPermission || App.ViewInfo.NewCommentPermission))
|
|
| 92 | 92 |
{
|
| 93 | 93 |
this.dzMainMenu.InkControl_Convert(); |
| 94 | 94 |
|
| ... | ... | |
| 221 | 221 |
#region 붙여넣기(Ctrl + V) |
| 222 | 222 |
case Key.V: |
| 223 | 223 |
{
|
| 224 |
if (ViewerDataModel.Instance.IsPressCtrl) |
|
| 224 |
if (ViewerDataModel.Instance.IsPressCtrl && (App.ViewInfo.CreateFinalPDFPermission || App.ViewInfo.NewCommentPermission))
|
|
| 225 | 225 |
{
|
| 226 | 226 |
//마크업 붙여넣기 |
| 227 | 227 |
//if (Clipboard.GetText().Contains("|DZ|"))
|
| ... | ... | |
| 453 | 453 |
#region 저장하기(Ctrl + S) |
| 454 | 454 |
case Key.S: |
| 455 | 455 |
{
|
| 456 |
if (ViewerDataModel.Instance.IsPressCtrl) |
|
| 456 |
if (ViewerDataModel.Instance.IsPressCtrl && (App.ViewInfo.CreateFinalPDFPermission || App.ViewInfo.NewCommentPermission))
|
|
| 457 | 457 |
{
|
| 458 | 458 |
//컨트롤을 그리는 도중일 경우 컨트롤 삭제 |
| 459 | 459 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(this.dzMainMenu.currentControl); |
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 926 | 926 |
} |
| 927 | 927 |
else |
| 928 | 928 |
{
|
| 929 |
if (task.Result == "2")
|
|
| 929 |
switch(task.Result)
|
|
| 930 | 930 |
{
|
| 931 |
MessageBox.Show("권한이 없습니다.");
|
|
| 932 |
System.Diagnostics.Process.GetCurrentProcess().Kill(); |
|
| 931 |
case "2": |
|
| 932 |
{
|
|
| 933 |
MessageBox.Show("권한이 없습니다.");
|
|
| 934 |
System.Diagnostics.Process.GetCurrentProcess().Kill(); |
|
| 935 |
} |
|
| 936 |
break; |
|
| 937 |
case "404": |
|
| 938 |
{
|
|
| 939 |
MessageBox.Show("등록된 사용자가 아닙니다.");
|
|
| 940 |
System.Diagnostics.Process.GetCurrentProcess().Kill(); |
|
| 941 |
} |
|
| 942 |
break; |
|
| 933 | 943 |
} |
| 934 |
|
|
| 935 |
Console.WriteLine(task.Result); |
|
| 936 | 944 |
} |
| 937 | 945 |
}); |
| 938 | 946 |
|
| MarkupToPDF/Controls/Parsing/MarkupCopy.cs | ||
|---|---|---|
| 647 | 647 |
STemp.EndPoint = instance.EndPoint; |
| 648 | 648 |
STemp.PaintState = instance.Paint; |
| 649 | 649 |
STemp.DashSize = instance.DashSize; |
| 650 |
STemp.ArcLength = instance.ArcLength; |
|
| 650 | 651 |
STemp.Name = instance.GetType().Name.ToString(); |
| 651 | 652 |
///강인구 추가(2017.11.02) |
| 652 | 653 |
///Memo 추가 |
| ... | ... | |
| 876 | 877 |
STemp.DashSize = instance.DashSize; |
| 877 | 878 |
STemp.StartPoint = instance.StartPoint; |
| 878 | 879 |
STemp.EndPoint = instance.EndPoint; |
| 880 |
STemp.ArcLength = instance.ArcLength; |
|
| 879 | 881 |
foreach (var point in instance.PointSet) |
| 880 | 882 |
{
|
| 881 | 883 |
STemp.PointSet.Add(point); |
| ... | ... | |
| 1311 | 1313 |
STemp.PaintState = instance.Paint; |
| 1312 | 1314 |
STemp.DashSize = instance.DashSize; |
| 1313 | 1315 |
STemp.Name = instance.GetType().Name.ToString(); |
| 1316 |
STemp.ArcLength = instance.ArcLength; |
|
| 1314 | 1317 |
ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize())); |
| 1315 | 1318 |
} |
| 1316 | 1319 |
} |
| ... | ... | |
| 1490 | 1493 |
STemp.DashSize = instance.DashSize; |
| 1491 | 1494 |
STemp.StartPoint = instance.StartPoint; |
| 1492 | 1495 |
STemp.EndPoint = instance.EndPoint; |
| 1496 |
STemp.ArcLength = instance.ArcLength; |
|
| 1497 |
|
|
| 1493 | 1498 |
foreach (var point in instance.PointSet) |
| 1494 | 1499 |
{
|
| 1495 | 1500 |
STemp.PointSet.Add(point); |
| MarkupToPDF/Controls/Parsing/MarkupParse.cs | ||
|---|---|---|
| 2920 | 2920 |
PointSet = s.PointSet, |
| 2921 | 2921 |
StrokeColor = _SetColor, |
| 2922 | 2922 |
LineSize = Convert.ToDouble(data2.First()), |
| 2923 |
ArcLength = s.ArcLength, |
|
| 2923 | 2924 |
UserID = s.UserID |
| 2924 | 2925 |
}; |
| 2925 | 2926 |
|
| ... | ... | |
| 3825 | 3826 |
TopRightPoint = s.TR, |
| 3826 | 3827 |
PointSet = s.PointSet, |
| 3827 | 3828 |
StrokeColor = _SetColor, |
| 3829 |
ArcLength = s.ArcLength, |
|
| 3828 | 3830 |
LineSize = Convert.ToDouble(data2.First()), |
| 3829 | 3831 |
UserID = s.UserID |
| 3830 | 3832 |
}; |
| ... | ... | |
| 4529 | 4531 |
PointSet = s.PointSet, |
| 4530 | 4532 |
StrokeColor = _SetColor, |
| 4531 | 4533 |
LineSize = Convert.ToDouble(data2.First()), |
| 4532 |
UserID = s.UserID |
|
| 4534 |
UserID = s.UserID, |
|
| 4535 |
ArcLength = s.ArcLength |
|
| 4533 | 4536 |
}; |
| 4534 | 4537 |
instance.Memo = s.Memo; |
| 4535 | 4538 |
//Layer.Children.Add(instance); |
| ... | ... | |
| 4853 | 4856 |
TopRightPoint = s.TR, |
| 4854 | 4857 |
PointSet = s.PointSet, |
| 4855 | 4858 |
StrokeColor = _SetColor, |
| 4856 |
|
|
| 4859 |
ArcLength = s.ArcLength, |
|
| 4857 | 4860 |
LineSize = Convert.ToDouble(data2.First()), |
| 4858 | 4861 |
UserID = s.UserID |
| 4859 | 4862 |
}; |
| MarkupToPDF/Controls/Polygon/CloudControl.cs | ||
|---|---|---|
| 23 | 23 |
public Path Base_CloudPath = null; |
| 24 | 24 |
public Path Base_CloudSubPath = null; |
| 25 | 25 |
|
| 26 |
private const double _CloudArcDepth = 0.55; /// 2018.05.14 added by humkyung
|
|
| 26 |
private const double _CloudArcDepth = 0.8; /// 2018.05.14 added by humkyung
|
|
| 27 | 27 |
|
| 28 | 28 |
static CloudControl() |
| 29 | 29 |
{
|
| ... | ... | |
| 735 | 735 |
|
| 736 | 736 |
if (isTransOn) // true라면 클라우드 컨트롤 |
| 737 | 737 |
{
|
| 738 |
ArcLength = ArcLength == 0 ? 10 : ArcLength; |
|
| 739 |
|
|
| 738 | 740 |
PathFigure pathFigure = CloudControl.GenerateLineWithCloud(this.PointSet[count - 1], this.PointSet[0], this.ArcLength - 5, reverse); |
| 739 | 741 |
|
| 740 | 742 |
if (this.Paint == PaintSet.Fill) |
| MarkupToPDF/Controls/Shape/RectCloudControl.cs | ||
|---|---|---|
| 25 | 25 |
public Path Base_ArcPath = null; |
| 26 | 26 |
public Path Base_BodyPath = null; |
| 27 | 27 |
|
| 28 |
private const double _CloudArcDepth = 0.55; /// 2018.05.14 added by humkyung
|
|
| 28 |
private const double _CloudArcDepth = 0.8; /// 2018.05.14 added by humkyung
|
|
| 29 | 29 |
|
| 30 | 30 |
#endregion |
| 31 | 31 |
|
| ... | ... | |
| 459 | 459 |
//this.FillColor = new SolidColorBrush(Colors.Red); |
| 460 | 460 |
this.PathSubData = pathGeometry; |
| 461 | 461 |
} |
| 462 |
|
|
| 462 |
ArcLength = ArcLength == 0 ? 10 : ArcLength; |
|
| 463 | 463 |
|
| 464 | 464 |
#endregion |
| 465 | 465 |
#region Cloud 만들기 |
| MarkupToPDF/Controls/Text/ArrowTextControl.cs | ||
|---|---|---|
| 27 | 27 |
public TextBox Base_TextBox = null; |
| 28 | 28 |
public TextBlock Base_TextBlock = null; |
| 29 | 29 |
|
| 30 |
private const double _CloudArcDepth = 0.8; /// 2018.05.14 added by humkyung |
|
| 31 |
|
|
| 30 | 32 |
#region Object & Variable |
| 31 | 33 |
GeometryGroup instanceGroup = new GeometryGroup(); |
| 32 | 34 |
|
| ... | ... | |
| 1470 | 1472 |
for (j = 1; j < (count - 1); j++) |
| 1471 | 1473 |
{
|
| 1472 | 1474 |
ArcSegment arcSeg = new ArcSegment(); |
| 1473 |
arcSeg.Size = new Size(arcLength * 0.8, arcLength * 0.8); /// x size and y size of arc
|
|
| 1475 |
arcSeg.Size = new Size(arcLength * _CloudArcDepth, arcLength * _CloudArcDepth); /// x size and y size of arc
|
|
| 1474 | 1476 |
arcSeg.Point = new Point(p1.X + j * dx * arcLength, p1.Y + j * dy * arcLength); /// end point of arc |
| 1475 | 1477 |
lastPt = arcSeg.Point; /// save last point |
| 1476 | 1478 |
arcSeg.RotationAngle = theta + 90; |
| ... | ... | |
| 1483 | 1485 |
{
|
| 1484 | 1486 |
arcLength = MathSet.DistanceTo(lastPt, p2); |
| 1485 | 1487 |
ArcSegment arcSeg = new ArcSegment(); |
| 1486 |
arcSeg.Size = new Size(arcLength * 0.8, arcLength * 0.8); /// x size and y size of arc
|
|
| 1488 |
arcSeg.Size = new Size(arcLength * _CloudArcDepth, arcLength * _CloudArcDepth); /// x size and y size of arc
|
|
| 1487 | 1489 |
arcSeg.Point = new Point(p2.X, p2.Y); /// end point of arc |
| 1488 | 1490 |
arcSeg.RotationAngle = theta; |
| 1489 | 1491 |
if (true == reverse) arcSeg.SweepDirection = SweepDirection.Clockwise; |
| MarkupToPDF/Controls/Text/TextControl.cs | ||
|---|---|---|
| 40 | 40 |
public TranslateTransform _translation = null; |
| 41 | 41 |
public ScaleTransform _scale = null; |
| 42 | 42 |
|
| 43 |
private const double _CloudArcDepth = 0.55; /// 2018.05.14 added by humkyung
|
|
| 43 |
private const double _CloudArcDepth = 0.8; /// 2018.05.14 added by humkyung
|
|
| 44 | 44 |
|
| 45 | 45 |
public bool IsSelected |
| 46 | 46 |
{
|
| MarkupToPDF/Serialize/S_Control/Detail/S_RectCloudControl.cs | ||
|---|---|---|
| 31 | 31 |
public PaintSet PaintState { get; set; } //Rectagle Style
|
| 32 | 32 |
[DataMember] |
| 33 | 33 |
public DoubleCollection DashSize { get; set; }
|
| 34 |
//강인구 추가 ArcLength |
|
| 35 |
[DataMember] |
|
| 36 |
public double ArcLength { get; set; } // 호의 높이
|
|
| 34 | 37 |
public void Dispose() |
| 35 | 38 |
{
|
| 36 | 39 |
GC.Collect(); |
내보내기 Unified diff
