프로젝트

일반

사용자정보

개정판 5c64268e

ID5c64268e563c304d65cb73e52fecee5b584718ab
상위 f5f788c2
하위 45ac2822

김태성이(가) 일년 이상 전에 추가함

issue #00000 finalservice - polyline 닫히는 현상 수정

Change-Id: I497a5007442e0ea82e3e8f4f27736a9e84eb4427

차이점 보기:

FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/DrawSet_Cloud.cs
11 11
namespace MarkupToPDF.Controls_PDF
12 12
{
13 13
    public class DrawSet_Cloud : BaseMethod
14
    {  
15

  
16
            /// <summary>
17
            /// generate cloud between given p1 and p2
18
            /// </summary>
19
            /// <param name="p1"></param>
20
            /// <param name="p2"></param>
21
            /// <param name="arcLengthOrigin"></param>
22
            /// <param name="contentByte"></param>
23
          public static void GenerateLineWithCloud(Point p1, Point p2, double arcLength, PdfContentByte contentByte)
14
    {
15

  
16
        /// <summary>
17
        /// generate cloud between given p1 and p2
18
        /// </summary>
19
        /// <param name="p1"></param>
20
        /// <param name="p2"></param>
21
        /// <param name="arcLengthOrigin"></param>
22
        /// <param name="contentByte"></param>
23
        public static void GenerateLineWithCloud(Point p1, Point p2, double arcLength, PdfContentByte contentByte)
24 24
        {
25 25
            double l = MathSet.DistanceTo(p1, p2); /// p1와 p2의 길이
26 26
            double overlap = 5.5D / 6D;
......
31 31
                double dy = (p2.Y - p1.Y) / l;
32 32
                Point norm = MathSet.RotateAbout(new Point(0, 0), new Point(dx, dy), 100);
33 33

  
34
                
34

  
35 35
                int count = Convert.ToInt32(Math.Floor(l / arcLength)); // 두 선의 길이에서 normalize 된 사이즈만큼을 나눠 진행 수치의 갯수 파악
36 36

  
37 37
                Point lastPt = new Point(p1.X, p1.Y);
38 38
                Point uses = new Point(0, 0); //사용된 값 누적치
39 39
                uses = lastPt; //Point 첫번째꺼 대입
40
                contentByte.MoveTo((float)lastPt.X+ 0.5, (float)lastPt.Y + 0.5);
41
                System.Diagnostics.Debug.WriteLine("처음 lstpt : " +  lastPt);
40
                contentByte.MoveTo((float)lastPt.X + 0.5, (float)lastPt.Y + 0.5);
41
                System.Diagnostics.Debug.WriteLine("처음 lstpt : " + lastPt);
42 42
                for (int j = 0; j < count; j++) //dx , dy의 횟수차로 증감치를 결정
43 43
                {
44 44
                    /// update last point
......
64 64
                    uses.Y = lastPt.Y;
65 65
                }
66 66
            }
67
        } 
67
        }
68 68

  
69 69
        public static void DrawCloud(List<Point> points, double lineSize, double arcLength, PdfContentByte contentByte, System.Windows.Media.DoubleCollection DashSize,
70 70
                                    System.Drawing.Color color, System.Drawing.Color fillColor, PaintSet PaintStyle, double opac)
......
97 97
                    DrawSet_Shape.PaintFill(contentByte, PaintStyle, bs, opac);
98 98
                }
99 99

  
100
                Rectangle annotRect = new Rectangle((float)points.Min(x=>x.X), (float)points.Min(x => x.Y), (float)points.Max(x => x.X), (float)points.Max(x => x.Y));
101
             
100
                Rectangle annotRect = new Rectangle((float)points.Min(x => x.X), (float)points.Min(x => x.Y), (float)points.Max(x => x.X), (float)points.Max(x => x.Y));
101

  
102 102
                // Create cloud appearance
103 103
                Mkl.Testarea.Itext5.Annotate.CBorder cborder = new Mkl.Testarea.Itext5.Annotate.CBorder(contentByte, 1, 1, arcLength, annotRect);
104
             
105
                cborder.CreateCloudyPolygon(points.Select(x=>new[] {(float)x.X, (float)x.Y }).ToArray());
104

  
105
                cborder.CreateCloudyPolygon(points.Select(x => new[] { (float)x.X, (float)x.Y }).ToArray());
106 106

  
107 107
                DrawSet_Shape.PaintFill(contentByte, PaintSet.None, bs, opac);
108 108
                //double area = MathSet.AreaOf(points);
......
119 119
            contentByte.RestoreState();
120 120
        }
121 121

  
122
        public static void DrawCloudRect(List<Point> points, double lineSize, double arcLength, PdfContentByte contentByte, System.Windows.Media.DoubleCollection DashSize,
122
        public static void DrawCloudRect(List<Point> points, double lineSize, int rotate, double arcLength, PdfContentByte contentByte, System.Windows.Media.DoubleCollection DashSize,
123 123
                                    System.Drawing.Color color, System.Drawing.Color fillColor, PaintSet PaintStyle, double opac)
124 124
        {
125 125
            BaseColor bs = new BaseColor(color);
......
139 139

  
140 140
            contentByte.NewPath();
141 141
            {
142
                List<Point> rectPoints = new List<Point>();
143

  
144
                rectPoints.Add(new Point(points[0].X, points[0].Y));
145

  
146
                for (int i = 1; i <= points.Count; ++i)
147
                {
148
                    rectPoints.Add(new Point(points[i % points.Count].X, points[i % points.Count].Y));
149
                }
150

  
142 151
                if (PaintStyle != PaintSet.None)
143 152
                {
144 153
                    contentByte.NewPath();
145 154
                    contentByte.MoveTo(points[0].X, points[0].Y);
146
                    for (int i = 1; i <= points.Count; ++i) contentByte.LineTo(points[i % points.Count].X, points[i % points.Count].Y);
155

  
156
                    for (int i = 1; i <= points.Count; ++i)
157
                    {
158
                        contentByte.LineTo(points[i % points.Count].X, points[i % points.Count].Y);
159
                    }
160

  
147 161
                    bs = new BaseColor(fillColor);
148 162
                    DrawSet_Shape.PaintFill(contentByte, PaintStyle, bs, opac);
149 163
                }
164

  
150 165
                Rectangle annotRect = new Rectangle((float)points.Min(x => x.X), (float)points.Min(x => x.Y), (float)points.Max(x => x.X), (float)points.Max(x => x.Y));
151 166

  
152 167
                // Create cloud appearance
153 168
                Mkl.Testarea.Itext5.Annotate.CBorder cborder = new Mkl.Testarea.Itext5.Annotate.CBorder(contentByte, 1, 1, arcLength, annotRect);
154 169

  
155
                cborder.CreateCloudyRectangle(null);
170
                cborder.CreateCloudyPolygon(rectPoints.Select(x => new[] { (float)x.X, (float)x.Y }).ToArray());
171

  
172
                contentByte.SetColorStroke(bs);
173
                contentByte.ClosePathStroke();
174
                //DrawSet_Shape.PaintFill(contentByte, PaintSet.Outline, bs, opac);
156 175

  
157
                DrawSet_Shape.PaintFill(contentByte, PaintSet.Outline, bs, opac);
158 176
                //double area = MathSet.AreaOf(points);
159 177
                //if (area < 0) points.Reverse();
160 178
                //int count = points.Count;
FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/DrawSet_DrawString.cs
36 36
                                      string text, System.Drawing.SizeF size, double opac, double Angle)
37 37
        {
38 38

  
39
            if(string.IsNullOrWhiteSpace(text ))
39
            if (string.IsNullOrWhiteSpace(text))
40 40
            {
41 41
                text = "";
42 42
            }
......
51 51
                rect.BottomRight, rect.TopRight
52 52
            };
53 53

  
54
            double textMargin =0.5;
54
            double textMargin = 0.5;
55 55

  
56 56
            rect.Inflate(lineSize * textMargin, lineSize * textMargin);   /// 점을 중심으로 라인 두께가 그려짐으로 사각형 안쪽으로 텍스트가 쓰여지게 사각형을 키움
57 57

  
58 58
            var calRect = MathSet.GetPointsToRectX(points);
59
            if(lineSize*2 > calRect.Height) lineSize *= 0.3;    /// 텍스트가 뒤집어 지는것 방지
59
            if (lineSize * 2 > calRect.Height) lineSize *= 0.3;    /// 텍스트가 뒤집어 지는것 방지
60 60
            if (calRect.Top > calRect.Bottom)
61 61
            {
62
                calRect.Left += (float)(lineSize* textMargin);
63
                calRect.Top -= (float)(lineSize* textMargin);
64
                calRect.Right -= (float)(lineSize* textMargin);
65
                calRect.Bottom += (float)(lineSize* textMargin);
62
                calRect.Left += (float)(lineSize * textMargin);
63
                calRect.Top -= (float)(lineSize * textMargin);
64
                calRect.Right -= (float)(lineSize * textMargin);
65
                calRect.Bottom += (float)(lineSize * textMargin);
66 66
            }
67 67
            else ///Top이 작을 경우(예: 문서를 회전하여 Comment 작업한 경우)
68 68
            {
69
                calRect.Left += (float)(lineSize* textMargin);
70
                calRect.Top += (float)(lineSize* textMargin);
71
                calRect.Right -= (float)(lineSize* textMargin);
72
                calRect.Bottom -= (float)(lineSize* textMargin);
69
                calRect.Left += (float)(lineSize * textMargin);
70
                calRect.Top += (float)(lineSize * textMargin);
71
                calRect.Right -= (float)(lineSize * textMargin);
72
                calRect.Bottom -= (float)(lineSize * textMargin);
73 73
            }
74 74

  
75 75
            contentByte.SetLineWidth((float)lineSize);
......
85 85
                mat.RotateAt((float)Angle * -1, new System.Drawing.PointF((float)sp.X, (float)sp.Y));
86 86

  
87 87
            /// transform text border
88
            System.Drawing.PointF[] border = new System.Drawing.PointF[4] 
88
            System.Drawing.PointF[] border = new System.Drawing.PointF[4]
89 89
            {
90 90
                new System.Drawing.PointF((float)points[0].X, (float)points[0].Y),
91 91
                new System.Drawing.PointF((float)points[1].X, (float)points[1].Y),
......
112 112
                if ((PaintStyle & PaintSet.Highlight) == PaintSet.Highlight)
113 113
                {
114 114
                    contentByte.NewPath();
115
                    contentByte.MoveTo(points[0].X, points[0].Y);
116
                    for (int i = 1; i <= points.Count; ++i) contentByte.LineTo(points[i % points.Count].X, points[i % points.Count].Y);
117
                   
115
                    contentByte.MoveTo(transformed[0].X, transformed[0].Y);
116
                    for (int i = 1; i <= transformed.Count; ++i) contentByte.LineTo(transformed[i % transformed.Count].X, transformed[i % transformed.Count].Y);
117

  
118 118
                    DrawSet_Shape.PaintFill(contentByte, PaintStyle, bs, opac);
119 119
                }
120 120

  
121 121
                double ArcLength = 20 / (MarkupToPDF.scaleWidth > MarkupToPDF.scaleHeight ? MarkupToPDF.scaleWidth : MarkupToPDF.scaleHeight);
122 122

  
123
                Rectangle annotRect = new Rectangle((float)rectPoints.Min(x => x.X), (float)rectPoints.Min(x => x.Y), (float)rectPoints.Max(x => x.X), (float)rectPoints.Max(x => x.Y));
123
                List<Point> newPointSet = new List<Point>();
124 124

  
125
                // Create cloud appearance
126
                Mkl.Testarea.Itext5.Annotate.CBorder cborder = new Mkl.Testarea.Itext5.Annotate.CBorder(contentByte, 1, 1, ArcLength, annotRect);
125
                newPointSet.Add(new Point(transformed[0].X, transformed[0].Y));
126
                for (int i = 1; i <= transformed.Count; ++i) newPointSet.Add(new Point(transformed[i % points.Count].X, transformed[i % points.Count].Y));
127 127

  
128
                cborder.CreateCloudyRectangle(null);
129
                DrawSet_Text.PaintFill(contentByte,PaintSet.Outline, bs);
128
                Controls_PDF.DrawSet_Cloud.DrawCloud(newPointSet, lineSize, ArcLength, contentByte, new DoubleCollection(), color, color, PaintSet.None, opac);
130 129
            }
131 130
            else if (((PaintStyle & PaintSet.Highlight) == PaintSet.Highlight) || ((PaintStyle & PaintSet.Fill) == PaintSet.Fill))
132 131
            {
......
156 155

  
157 156
                UTF8Encoding utf8 = new UTF8Encoding();
158 157
                Byte[] utf8String = utf8.GetBytes(text);
159
                
158

  
160 159
                ColumnText.ShowTextAligned(contentByte, Element.ALIGN_CENTER, new Phrase(new Chunk(utf8.GetString(utf8String), itextFont)), origin[0].X, origin[0].Y, (float)-Angle);
161 160
            }
162 161
            /// multi line text
......
281 280

  
282 281
            return middle;
283 282
        }
284
    /// <summary>
285
    /// draw leader line for arrow_text
286
    /// </summary>
287
    /// <author>humkyung</author>
288
    /// <date>2019.06.12</date>
289
    /// <param name="start"></param>
290
    /// <param name="mid"></param>
291
    /// <param name="border"></param>
292
    /// <param name="LineSize"></param>
293
    /// <param name="contentByte"></param>
294
    /// <param name="color"></param>
295
    /// <param name="opac"></param>
296
    private static void DrawLeaderLine(Point start, Point mid, bool bIsFixed, List<Point> border, double LineSize, iTextSharp.text.pdf.PdfContentByte contentByte, System.Drawing.Color color, double opac)
283
        /// <summary>
284
        /// draw leader line for arrow_text
285
        /// </summary>
286
        /// <author>humkyung</author>
287
        /// <date>2019.06.12</date>
288
        /// <param name="start"></param>
289
        /// <param name="mid"></param>
290
        /// <param name="border"></param>
291
        /// <param name="LineSize"></param>
292
        /// <param name="contentByte"></param>
293
        /// <param name="color"></param>
294
        /// <param name="opac"></param>
295
        private static void DrawLeaderLine(Point start, Point mid, bool bIsFixed, List<Point> border, double LineSize, iTextSharp.text.pdf.PdfContentByte contentByte, System.Drawing.Color color, double opac)
297 296
        {
298 297
            /// prepare connection points
299 298
            List<Point> ptConns = new List<Point>();
......
338 337
        /// <param name="contentByte"></param>
339 338
        /// <param name="color"></param>
340 339
        /// <param name="opac"></param>
341
        private static void DrawLeaderLineNew(Point start, Point mid,Point end, bool bIsFixed,  double LineSize, iTextSharp.text.pdf.PdfContentByte contentByte, System.Drawing.Color color, double opac)
340
        private static void DrawLeaderLineNew(Point start, Point mid, Point end, bool bIsFixed, double LineSize, iTextSharp.text.pdf.PdfContentByte contentByte, System.Drawing.Color color, double opac)
342 341
        {
343 342
            Controls_PDF.DrawSet_Arrow.SingleAllow(start, bIsFixed ? mid : end, LineSize, contentByte, color, opac);
344 343
            Controls_PDF.DrawSet_Line.DrawLine(start, bIsFixed ? mid : end, LineSize, contentByte, new DoubleCollection(9999), color, opac);
FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/DrawSet_Shape.cs
92 92
                if (i == points.Count() - 1)
93 93
                {
94 94
                    contentByte.LineTo((float)points[i].X, (float)points[i].Y);
95
                    contentByte.LineTo((float)points[0].X, (float)points[0].Y);
95

  
96
                    if (points[i] != points[0])
97
                    {
98
                        contentByte.Stroke();
99
                    }
100

  
101
                }
102
            }
103

  
104

  
105
            DrawSet_Shape.PaintFill(contentByte, PaintStyle, bs, opac);
106
            contentByte.RestoreState();
107
            //contentByte.ClosePath();
108
        }
109

  
110
        public static void DrawTriangle(List<Point> points, double lineSize, PdfContentByte contentByte, System.Windows.Media.DoubleCollection DashSize,
111
                                        System.Drawing.Color color, PaintSet PaintStyle, double opac)
112
        {
113
            BaseColor bs = new BaseColor(color);
114
            contentByte.SaveState();
115
            PdfGState gs1 = new PdfGState();
116
            gs1.StrokeOpacity = (float)opac;
117
            gs1.FillOpacity = (float)opac;
118
            contentByte.SetGState(gs1);
119
            var rect = contentByte.PdfDocument.PageSize;
120
            contentByte.SetColorStroke(bs);
121
            if (DashSize.Count > 1)
122
            {
123
                List<float> DashSet = new List<float>();
124
                DashSize.ToList().ForEach(data => DashSet.Add((float)data * 1));
125
                contentByte.SetLineDash(DashSet.ToArray(), DashSet.Count - 2);
126
            }
127

  
128
            contentByte.SetLineWidth((float)lineSize);
129

  
130
            contentByte.NewPath();
131

  
132
            //사용은 가능하지만 연결성이 떨어짐
133
            for (int i = 0; i < points.Count(); i++)
134
            {
135
                if (i == 0)
136
                {
137
                    contentByte.MoveTo((float)points[i].X, (float)points[i].Y);
138
                }
139
                else
140
                {
141
                    contentByte.LineTo((float)points[i].X, (float)points[i].Y);
142
                }
143

  
144
                if (i == points.Count() - 1)
145
                {
146
                    contentByte.LineTo((float)points[i].X, (float)points[i].Y);
147
                    //contentByte.LineTo((float)points[0].X, (float)points[0].Y);
96 148
                }
97 149
            }
98 150

  
FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.cs
837 837
                                                            double Opacity = control.Opac;
838 838
                                                            List<Point> PointSet = GetPdfPointSystem(control.PointSet);
839 839

  
840
                                                            Controls_PDF.DrawSet_Shape.DrawPolygon(PointSet, LineSize, contentByte, DashSize, _SetColor, PaintStyle | PaintSet.Outline, Opacity);
840
                                                            Controls_PDF.DrawSet_Shape.DrawTriangle(PointSet, LineSize, contentByte, DashSize, _SetColor, PaintStyle | PaintSet.Outline, Opacity);
841 841
                                                        }
842 842
                                                        break;
843 843
                                                    #endregion
......
875 875
                                                            DoubleCollection DashSize = control.DashSize;
876 876

  
877 877
                                                            //드로잉 방식이 표현되지 않음
878
                                                            var rrrr = returnAngle(GetPdfPointSystem(control.StartPoint), GetPdfPointSystem(control.EndPoint));
878
                                                            var rotate = returnAngle(GetPdfPointSystem(control.StartPoint), GetPdfPointSystem(control.EndPoint));
879 879

  
880 880
                                                            double area = MathSet.AreaOf(GetPdfPointSystem(control.PointSet));
881 881
                                                            bool reverse = (area < 0);
882
                                                    
883
                                                            Controls_PDF.DrawSet_Cloud.DrawCloudRect(PointSet, LineSize, ArcLength, contentByte, control.DashSize, _SetColor, _SetColor, PaintStyle, Opacity);
884
                                                        }
882

  
883
                                                            Controls_PDF.DrawSet_Cloud.DrawCloudRect(PointSet, LineSize, (int)rotate, ArcLength, contentByte, control.DashSize, _SetColor, _SetColor, PaintStyle, Opacity);
884
                                                       }
885 885
                                                        break;
886 886
                                                    #endregion
887 887
                                                    #region CloudControl
FinalService/KCOM_FinalService/ProcessPublish/FinalProcess.exe.config
1
<?xml version="1.0" encoding="utf-8"?>
2
<configuration>
3
    <startup> 
4
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
5
    </startup>
6
</configuration>
FinalService/KCOM_FinalService/ProcessPublish/FinalService.ini
1
[PDFMovePath]
2
URL=\\192.168.0.67\finalpdf\
3
[ApprovedImgPath]
4
URL=\\192.168.0.67\finalpdf\Approved.png
5
[CheckmarkImgPath]
6
URL=\\192.168.0.67\finalpdf\checkmark.png
7
[DebugSavePath]
8
URL=D:\\Develop\\Ensemble\\{0}_app\\VPCS_DOCLIB\\{1}\\{2}\\ToVendor\\
9
[DebugResultUrlPath]
10
URL=http://cloud.devdoftech.co.kr:5977/FinalPDF/{0}_app/VPCS_DOCLIB/{1}/{2}/ToVendor/{3}
11
[FinalServiceName]
12
NAME=FinalService
13
[UpLoadServiceUrl]
14
URL=
15
[ConnectionString]
16
STRING=EVCOYxwadMNh7qzjMvRTwOacwyFatXgWjx//sssrSKTsvMkdvpdBa3Sj3mmhwABTiweSqNnWYgsIxUWXaBe8XE8G1CLaux2zPbyBWvqxJruTX0H5MqABZSEXXG82XaGL
17
[MARKUS_API]
18
URL=http://www.devdoftech.co.kr:5979/ServiceDeepView.svc
FinalService/KCOM_FinalService/ProcessPublish/Log.config
1
<?xml version="1.0" encoding="utf-8"?>
2
<configuration>
3
  <configSections>
4
    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
5
  </configSections>
6
  <log4net>
7
    <!--<appender name="EventLogAppender" type="log4net.Appender.EventLogAppender">
8
      <applicationName value="ServiceStation"/>
9
      <layout type="log4net.Layout.PatternLayout">
10
        <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
11
      </layout>
12
    </appender>-->
13
    <appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender">
14
      <file type="log4net.Util.PatternString" value="${programdata}\FinalService\Process\Log\"/>
15
      <appendtofile value="true"/>
16
      <datepattern value="'Final_'yyyy-MM-dd'.log'"/>
17
      <staticlogfilename value="false"/>
18
      <rollingstyle value="Date"/>
19
      <layout type="log4net.Layout.PatternLayout">
20
        <conversionpattern value="%d [%t] %-5p - %m%n"/>
21
      </layout>
22
    </appender>
23
    <root>
24
      <level value="All" />
25
      <!-- <appender-ref ref="EventLogAppender" />-->
26
      <appender-ref ref="RollingFileAppender" />
27
    </root>
28
  </log4net>
29
</configuration>
KCOM/App.xaml.cs
251 251
                basicHttpBinding.TransferMode = TransferMode.Buffered;
252 252
                basicHttpBinding.MessageEncoding = WSMessageEncoding.Text;
253 253
                basicHttpBinding.HostNameComparisonMode = HostNameComparisonMode.StrongWildcard;
254
                basicHttpBinding.AllowCookies = false;
255
                basicHttpBinding.BypassProxyOnLocal = false;
254
                //basicHttpBinding.AllowCookies = false;
255
                //basicHttpBinding.BypassProxyOnLocal = false;
256 256
                //basicHttpBinding.UseDefaultWebProxy = false;
257 257
                //basicHttpBinding.ProxyAddress = new Uri("Http://localhost:8888");
258 258

  
KCOM/Events/SaveCommand.cs
81 81
            try
82 82
            {
83 83
                var mainmenu = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu;
84
                var client = mainmenu.BaseClient;
84
                //var client = mainmenu.BaseClient;
85 85

  
86 86
                foreach (var UserState in UserStates)
87 87
                {
......
99 99
                        System.Diagnostics.Debug.WriteLine(value.ID);
100 100
                    });
101 101

  
102
                    var SaveResult = client.SaveMarkupData(UserState, Project_No, document_id, user_id, markupdata);
102
                    var SaveResult = await ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseTaskClient.SaveMarkupDataAsync(UserState, Project_No, document_id, user_id, markupdata);
103 103

  
104 104
                    result = SaveResult;
105 105

  
KCOM/KCOM.csproj
992 992
      <SubType>Designer</SubType>
993 993
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
994 994
    </None>
995
    <None Include="MARKUS - 복사본.ini">
996
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
997
    </None>
995 998
    <None Include="MARKUS.ini">
996 999
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
997 1000
    </None>
......
1461 1464
		  PostBuildMacros;
1462 1465
	  </PostBuildEventDependsOn>
1463 1466
    <PostBuildEvent>if $(ConfigurationName) == Release_Default (
1467

  
1468

  
1469
call $(SolutionDir)obfuscarBuild.Bat $(SolutionDir) $(TargetDir) $(ProjectDir)obfuscar.xml
1470
xcopy /s "$(TargetDir)Obfuscator_Output" "$(TargetDir)" /Y /F
1471
rd "$(TargetDir)Obfuscator_Output" /s
1472
rd "$(SolutionDir)Setup\Release_default\" /s
1473

  
1474
xcopy "$(TargetDir)" "$(SolutionDir)Setup\Release_default\" /S /Y /F 
1475

  
1464 1476
 cd $(SolutionDir)
1465 1477
 call "PublishSign.bat"
1466
 
1478

  
1467 1479
 rem call "appCast_Daelim.bat" "@(VersionNumber)"
1468 1480
 call "appCast_SNI.bat" "@(VersionNumber)"
1469 1481
call "appCast_doftech.bat" "@(VersionNumber)"
......
1471 1483
 rem "appCast_bseng.bat" "@(VersionNumber)"
1472 1484
 rem  call "appCast_Daelim_test.bat" "@(VersionNumber)"
1473 1485

  
1474
call $(SolutionDir)obfuscarBuild.Bat $(SolutionDir) $(TargetDir) $(ProjectDir)obfuscar.xml
1475
xcopy /s "$(TargetDir)Obfuscator_Output" "$(TargetDir)" /Y /F
1476
)
1477
</PostBuildEvent>
1486
)</PostBuildEvent>
1478 1487
  </PropertyGroup>
1479 1488
  <UsingTask TaskName="TransformXml" AssemblyFile="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Web\Microsoft.Web.Publishing.Tasks.dll" />
1480 1489
  <Target Name="app_config_AfterCompile" AfterTargets="AfterCompile" Condition="Exists('app.$(Configuration).config')">
KCOM/KCOM.csproj.user
53 53
  </PropertyGroup>
54 54
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_SNI|x64'">
55 55
    <StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram>
56
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjA5MDJjMWUyODAxODliNzkiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6InlvbmdtaW4wMSJ9</StartArguments>
56
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjA5MDJjMWUyODAxOGUyZjciLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6InlvbmdtaW4wMSJ9</StartArguments>
57 57
  </PropertyGroup>
58 58
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_Hyosung|AnyCPU'">
59 59
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQzOTMzIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiJPTDEiLCJVc2VySUQiOiJkb2Z0ZWNoIn0=</StartArguments>
KCOM/MARKUS.ini
1
#DevDoftech ???? INI
2 1
[Internal]
3
IP=192.168.0.67
2
IP=localhost
4 3
[External]
5
IP=192.168.0.67
4
IP=125.129.196.207
6 5
[BaseClientAddress]
7
URL=http://192.168.0.67:5978
6
URL=http://localhost:44301
8 7
[HubAddress]
9 8
URL=http://192.168.0.67:5100/
10 9
[UpdateVer64]
......
16 15
[KCOM_Get_FinalImage_Get_PdfImage]
17 16
URL=http://192.168.0.67:5977/Get_FInalImage/Get_PdfImage.asmx
18 17
[KCOM_kr_co_devdoftech_cloud_FileUpload]
19
URL=http://192.168.0.67:5977/ImageUpload/FileUpload.asmx
18
URL=http://125.129.196.207:44301/ImageUpload/FileUpload.asmx
20 19
[mainServerImageWebPath]
21 20
URL=http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
22 21
[subServerImageWebPath]
23 22
URL=http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
24 23
[Debug_BaseClientAddress]
25
URL=http://192.168.0.67:5978
24
URL=http://192.168.0.67:5979
26 25
[HOST_DOMAIN]
27 26
DOMAIN=
28 27
[GetConversionStateFailed]
......
38 37
[PortForwarding]
39 38
HUB=5100:5100
40 39
RESOURCE=5977:5977
41
BASE=5978:5978
40
BASE=5979:5979
42 41
[GetImageResourceFailed]
43 42
MSG=7ZW064u5IOusuOyEnOydmCB7MH0gUGFnZSBDb252ZXJ06rCAIOygleyDgeyggeydtOyngCDslYrsirXri4jri6QuIOq0gOumrOyekOyXkOqyjCDrrLjsnZjtlbQg7KO87IS47JqULg==
43

  
44

  
45
[COMMON]
46
IsDocumentHistory = false
KCOM/Properties/AssemblyInfo.cs
51 51
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
52 52
// 지정되도록 할 수 있습니다.
53 53
// [assembly: AssemblyVersion("1.0.*")]
54
[assembly: AssemblyVersion("5.1.0.0")]
55
[assembly: AssemblyFileVersion("5.1.0.0")]
54
[assembly: AssemblyVersion("5.1.1.1")]
55
[assembly: AssemblyFileVersion("5.1.1.1")]
56 56
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)]
KCOM/Services/BaseServices.cs
24 24
    {
25 25
        //const string DeepZoomUrl = @"http://{baseUrl}/TileSource/{TileSourcePath}/{ItemsPath}/{SharepointItemID}/{PageNo}.jpg";
26 26
        public ServiceDeepViewClient BaseClient;
27
        public KcomService.ServiceDeepViewClient BaseTaskClient;
27
        public KcomService.ServiceDeepViewClient BaseTaskClient
28
        {
29
            get {return new KcomService.ServiceDeepViewClient(App._binding, App._EndPoint); }
30
        }
31

  
28 32
        public ViewInfo _ViewInfo;
29 33
        public DOCINFO _DocInfo;
30 34
        public DOCUMENT_ITEM _DocItem;
......
58 62
        }
59 63
        public void ServiceOn()
60 64
        {
61
            BaseTaskClient = new KcomService.ServiceDeepViewClient(App._binding, App._EndPoint);
65
            //BaseTaskClient = new KcomService.ServiceDeepViewClient(App._binding, App._EndPoint);
62 66
            BaseClient = new ServiceDeepViewClient(App._binding, App._EndPoint);
63 67

  
64 68
            BaseClient.GetDocInfoCompleted += BaseClient_GetDocInfoCompleted; //문서 섬네일, 페이지크기, 마크업 정보 [3]
KCOM/Views/MainMenu.xaml.cs
680 680
        /// <param name="e"></param>
681 681
        private async void pageNavigator_PageChanging(object sender, Controls.Sample.PageChangeEventArgs e)
682 682
        {
683
            System.Diagnostics.Debug.WriteLine("pageNavigator PageChanging");
683 684
            //    await PageLoadAsync(e.CurrentPage,e.PageNumber);
684 685
            //}
685 686

  
......
692 693

  
693 694
            // 페이지 이미지 변경
694 695

  
695

  
696 696
            /// 컨트롤을 새로 생성한다.
697
            Common.ViewerDataModel.Instance.MarkupControls_USER.Clear();    //전체 제거
698
            Common.ViewerDataModel.Instance.MarkupControls.Clear();         //전체 제거
699

  
700 697
            ViewerDataModel.Instance.ImageViewPath = tempPageImage;
701 698
            ViewerDataModel.Instance.ImageViewWidth = 1;
702 699
            ViewerDataModel.Instance.ImageViewHeight = 1;
703 700

  
704 701
            await PageChangingAsync(page, PageNo, ViewerDataModel.Instance.NewPagImageCancelToken());
705
           
702
            
703
            ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Clear();
704
            Common.ViewerDataModel.Instance.MarkupControls_USER.Clear();    //전체 제거
705
            Common.ViewerDataModel.Instance.MarkupControls.Clear();         //전체 제거
706

  
706 707
            await MarkupLoadAsync(PageNo, ViewerDataModel.Instance.PageAngle, ViewerDataModel.Instance.NewMarkupCancelToken());
707 708

  
708 709
            //var pagechangeTask = PageChangingAsync(page, page.PAGE_NUMBER, ViewerDataModel.Instance.NewPagImageCancelToken());
......
4893 4894

  
4894 4895
                bool result = await ConsolidationMethod();
4895 4896

  
4896
                System.Threading.Thread.Sleep(500);
4897
                //System.Threading.Thread.Sleep(500);
4897 4898

  
4898 4899
                if (result)
4899 4900
                {
KCOM_API/Properties/PublishProfiles/FolderProfile.pubxml
7 7
  <PropertyGroup>
8 8
    <WebPublishMethod>FileSystem</WebPublishMethod>
9 9
    <PublishProvider>FileSystem</PublishProvider>
10
    <LastUsedBuildConfiguration>Release_Default</LastUsedBuildConfiguration>
11
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
10
    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
11
    <LastUsedPlatform>x64</LastUsedPlatform>
12 12
    <SiteUrlToLaunchAfterPublish />
13 13
    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
14 14
    <ExcludeApp_Data>False</ExcludeApp_Data>
15
    <publishUrl>D:\Temp\WCF</publishUrl>
16
    <DeleteExistingFiles>False</DeleteExistingFiles>
15
    <publishUrl>D:\Source\Repos\MARKUS\publish\MarkusAPI</publishUrl>
16
    <DeleteExistingFiles>True</DeleteExistingFiles>
17 17
  </PropertyGroup>
18 18
</Project>
KCOM_API/Properties/PublishProfiles/FolderProfile.pubxml.user
6 6
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
7 7
  <PropertyGroup>
8 8
    <TimeStampOfAssociatedLegacyPublishXmlFile />
9
    <_PublishTargetUrl>D:\Temp\WCF</_PublishTargetUrl>
10
    <History>True|2022-11-08T08:24:41.4219984Z;True|2022-11-05T17:01:00.1307411+09:00;True|2022-11-05T16:59:58.7400279+09:00;</History>
9
    <_PublishTargetUrl>D:\Source\Repos\MARKUS\publish\MarkusAPI</_PublishTargetUrl>
10
    <History>True|2023-04-07T07:43:58.8972257Z;True|2023-04-07T14:06:40.4572438+09:00;True|2023-04-07T09:30:34.5436846+09:00;True|2023-04-06T14:45:18.6746547+09:00;True|2022-11-08T17:24:41.4219984+09:00;True|2022-11-05T17:01:00.1307411+09:00;True|2022-11-05T16:59:58.7400279+09:00;</History>
11 11
  </PropertyGroup>
12 12
  <ItemGroup>
13 13
    <File Include="ActiveService.svc">
14 14
      <publishTime>06/22/2021 14:27:43</publishTime>
15 15
    </File>
16 16
    <File Include="bin/CommonLib.dll">
17
      <publishTime>11/08/2022 17:09:39</publishTime>
17
      <publishTime>04/07/2023 16:42:58</publishTime>
18 18
    </File>
19 19
    <File Include="bin/CommonLib.pdb">
20
      <publishTime>11/08/2022 17:09:39</publishTime>
20
      <publishTime>04/07/2023 16:42:58</publishTime>
21 21
    </File>
22 22
    <File Include="bin/CompareLib.dll">
23 23
      <publishTime>03/27/2018 10:07:16</publishTime>
......
62 62
      <publishTime>09/19/2015 15:28:04</publishTime>
63 63
    </File>
64 64
    <File Include="bin/IFinalPDF.dll">
65
      <publishTime>11/08/2022 17:09:40</publishTime>
65
      <publishTime>04/07/2023 16:42:58</publishTime>
66 66
    </File>
67 67
    <File Include="bin/IFinalPDF.pdb">
68
      <publishTime>11/08/2022 17:09:40</publishTime>
68
      <publishTime>04/07/2023 16:42:58</publishTime>
69 69
    </File>
70 70
    <File Include="bin/IKCOM.dll">
71
      <publishTime>11/08/2022 17:09:51</publishTime>
71
      <publishTime>04/07/2023 16:43:04</publishTime>
72 72
    </File>
73 73
    <File Include="bin/IKCOM.pdb">
74
      <publishTime>11/08/2022 17:09:51</publishTime>
74
      <publishTime>04/07/2023 16:43:04</publishTime>
75 75
    </File>
76 76
    <File Include="bin/it/ZedGraph.resources.dll">
77 77
      <publishTime>09/19/2015 15:28:04</publishTime>
......
80 80
      <publishTime>09/19/2015 15:28:04</publishTime>
81 81
    </File>
82 82
    <File Include="bin/KCOMDataModel.dll">
83
      <publishTime>11/08/2022 17:09:45</publishTime>
83
      <publishTime>04/07/2023 16:42:59</publishTime>
84 84
    </File>
85 85
    <File Include="bin/KCOMDataModel.dll.config">
86 86
      <publishTime>06/08/2020 15:07:57</publishTime>
87 87
    </File>
88 88
    <File Include="bin/KCOMDataModel.pdb">
89
      <publishTime>11/08/2022 17:09:45</publishTime>
89
      <publishTime>04/07/2023 16:42:59</publishTime>
90 90
    </File>
91 91
    <File Include="bin/KCOM_API.dll">
92
      <publishTime>11/08/2022 17:09:55</publishTime>
92
      <publishTime>04/07/2023 16:43:54</publishTime>
93 93
    </File>
94 94
    <File Include="bin/KCOM_API.pdb">
95
      <publishTime>11/08/2022 17:09:55</publishTime>
95
      <publishTime>04/07/2023 16:43:54</publishTime>
96 96
    </File>
97 97
    <File Include="bin/Leadtools.Codecs.Cmp.dll">
98 98
      <publishTime>06/29/2017 11:38:22</publishTime>
......
124 124
    <File Include="bin/Markus.Image.OpenCV.dll">
125 125
      <publishTime>06/19/2020 06:34:52</publishTime>
126 126
    </File>
127
    <File Include="bin/Newtonsoft.Json.dll">
128
      <publishTime>03/18/2021 05:03:36</publishTime>
129
    </File>
127 130
    <File Include="bin/OpenCvSharp.Blob.dll">
128 131
      <publishTime>05/24/2020 11:52:48</publishTime>
129 132
    </File>
......
157 160
    <File Include="bin/tr/ZedGraph.resources.dll">
158 161
      <publishTime>09/19/2015 15:28:04</publishTime>
159 162
    </File>
163
    <File Include="bin/WcfExtensions.ServiceModel.dll">
164
      <publishTime>01/07/2011 06:25:40</publishTime>
165
    </File>
160 166
    <File Include="bin/x64/concrt140.dll">
161 167
      <publishTime>09/18/2019 14:23:10</publishTime>
162 168
    </File>
......
224 230
      <publishTime>07/10/2019 14:11:36</publishTime>
225 231
    </File>
226 232
    <File Include="Web.config">
227
      <publishTime>11/08/2022 17:24:40</publishTime>
233
      <publishTime>04/07/2023 16:43:56</publishTime>
228 234
    </File>
229 235
  </ItemGroup>
230 236
</Project>
KCOM_API/ServiceDeepView.svc.cs
29 29
    {
30 30
        public ServiceDeepView()
31 31
        {
32
            //System.Diagnostics.Debug.WriteLine(OperationContext.Current.RequestContext.RequestMessage.Headers.Action.ToString());
32
            //System.Diagnostics.Trace.WriteLine(OperationContext.Current.RequestContext.RequestMessage.Headers.Action.ToString());
33 33
        }
34 34

  
35 35
        /// <summary>
......
74 74
            }
75 75
            catch (Exception ex)
76 76
            {
77
                System.Diagnostics.Debug.WriteLine("KCOM_API - GetVersionData : " + ex.ToString());
77
                System.Diagnostics.Trace.WriteLine("KCOM_API - GetVersionData : " + ex.ToString());
78 78

  
79 79
                url = null;
80 80
            }
......
125 125
            }
126 126
            catch (Exception ex)
127 127
            {
128
                System.Diagnostics.Debug.WriteLine("KCOM_API - GetSystemData : " + ex.ToString());
128
                System.Diagnostics.Trace.WriteLine("KCOM_API - GetSystemData : " + ex.ToString());
129 129

  
130 130
            }
131 131
            return null;
......
202 202
                }
203 203
                catch (Exception ex)
204 204
                {
205
                    System.Diagnostics.Debug.WriteLine("KCOM_API - EditFavoriteVP : " + ex.ToString());
205
                    System.Diagnostics.Trace.WriteLine("KCOM_API - EditFavoriteVP : " + ex.ToString());
206 206

  
207 207
                    return false;
208 208
                }
......
234 234
                }
235 235
                catch (Exception ex)
236 236
                {
237
                    System.Diagnostics.Debug.WriteLine("KCOM_API - DelFavoriteVP : " + ex.ToString());
237
                    System.Diagnostics.Trace.WriteLine("KCOM_API - DelFavoriteVP : " + ex.ToString());
238 238

  
239 239
                    return false;
240 240
                }
......
282 282
            }
283 283
            catch (Exception ex)
284 284
            {
285
                System.Diagnostics.Debug.WriteLine("KCOM_API - GetCompareRect : " + ex.ToString());
285
                System.Diagnostics.Trace.WriteLine("KCOM_API - GetCompareRect : " + ex.ToString());
286 286
                //throw new FaultException(ex.ToString() + " Inner Exception : " + ex.InnerException?.ToString());
287 287
            }
288 288

  
......
332 332
            }
333 333
            catch (Exception ex)
334 334
            {
335
                System.Diagnostics.Debug.WriteLine("KCOM_API - GetCompareRect : " + ex.ToString());
335
                System.Diagnostics.Trace.WriteLine("KCOM_API - GetCompareRect : " + ex.ToString());
336 336
                //throw new FaultException(ex.ToString() + " Inner Exception : " + ex.InnerException?.ToString());
337 337
            }
338 338

  
......
370 370
        //    string outPutFile = compareLib.ImageCompare_File(resultOrigin, resultTarget);
371 371
        //    var result = compareLib.GetBoundBoxInImage(outPutFile);
372 372

  
373
        //    System.Diagnostics.Debug.WriteLine(new TimeSpan(stopwatch.ElapsedTicks));
373
        //    System.Diagnostics.Trace.WriteLine(new TimeSpan(stopwatch.ElapsedTicks));
374 374

  
375 375
        //    return result;
376 376
        //}
......
483 483
            }
484 484
            catch (Exception ex)
485 485
            {
486
                System.Diagnostics.Debug.WriteLine("KCOM_API - SetFinalPDF : " + ex.ToString());
486
                System.Diagnostics.Trace.WriteLine("KCOM_API - SetFinalPDF : " + ex.ToString());
487 487

  
488 488
                _result.Status = FinalStatus.Error;
489 489

  
......
579 579
            }
580 580
            catch (Exception ex)
581 581
            {
582
                System.Diagnostics.Debug.WriteLine("KCOM_API - GetVPRevisionHistory : " + ex.ToString());
582
                System.Diagnostics.Trace.WriteLine("KCOM_API - GetVPRevisionHistory : " + ex.ToString());
583 583
            }
584 584
            finally
585 585
            {
......
613 613
            }
614 614
            catch (Exception ex)
615 615
            {
616
                System.Diagnostics.Debug.WriteLine("KCOM_API - GetVPRevisionFirstOrDefault : " + ex.ToString());
616
                System.Diagnostics.Trace.WriteLine("KCOM_API - GetVPRevisionFirstOrDefault : " + ex.ToString());
617 617
            }
618 618
            finally
619 619
            {
......
645 645
            }
646 646
            catch (Exception ex)
647 647
            {
648
                System.Diagnostics.Debug.WriteLine("KCOM_API - GetDocInfo : " + ex.ToString());
648
                System.Diagnostics.Trace.WriteLine("KCOM_API - GetDocInfo : " + ex.ToString());
649 649
            }
650 650
            finally
651 651
            {
......
699 699
            }
700 700
            catch (Exception ex)
701 701
            {
702
                System.Diagnostics.Debug.WriteLine("KCOM_API - GetDocumentItemInfo : " + ex.ToString());
702
                System.Diagnostics.Trace.WriteLine("KCOM_API - GetDocumentItemInfo : " + ex.ToString());
703 703

  
704 704
                new FaultException("GetDocumentItemInfo Error - "  + ex.ToString());
705 705
                //throw new FaultException(ex.ToString());
......
732 732
            }
733 733
            catch (Exception ex)
734 734
            {
735
                System.Diagnostics.Debug.WriteLine("KCOM_API - GetDocItemID : " + ex.ToString());
735
                System.Diagnostics.Trace.WriteLine("KCOM_API - GetDocItemID : " + ex.ToString());
736 736
                //System.Diagnostics.Trace.WriteLine("GetVendorItemInfo Error : " + ex);
737 737
                //Common.Helper.SystemErrorNotify(SERVICE_NAME.API, LEVEL.MEDIUM, ERROR_TYPE.CONVERT, "GetDocumentItemInfo / " + ex.Message, param.documentID, param.projectNo);
738 738
            }
......
864 864
            }
865 865
            catch (Exception ex)
866 866
            {
867
                System.Diagnostics.Debug.WriteLine("KCOM_API - GetMarkupInfoItems : " + ex.ToString());
867
                System.Diagnostics.Trace.WriteLine("KCOM_API - GetMarkupInfoItems : " + ex.ToString());
868 868

  
869 869
                return _result;
870 870
            }
......
980 980
            }
981 981
            catch (Exception ex)
982 982
            {
983
                System.Diagnostics.Debug.WriteLine("KCOM_API - GetSyncMarkupInfoItems : " + ex.ToString());
983
                System.Diagnostics.Trace.WriteLine("KCOM_API - GetSyncMarkupInfoItems : " + ex.ToString());
984 984
                return _result;
985 985
            }
986 986
            finally
......
1053 1053
            }
1054 1054
            catch (Exception ex)
1055 1055
            {
1056
                System.Diagnostics.Debug.WriteLine("KCOM_API - GetDeptData : " + ex.ToString());
1056
                System.Diagnostics.Trace.WriteLine("KCOM_API - GetDeptData : " + ex.ToString());
1057 1057
            }
1058 1058
            finally
1059 1059
            {
......
1098 1098
            }
1099 1099
            catch (Exception ex)
1100 1100
            {
1101
                System.Diagnostics.Debug.WriteLine("KCOM_API - DeleteMarkup : " + ex.ToString());
1101
                System.Diagnostics.Trace.WriteLine("KCOM_API - DeleteMarkup : " + ex.ToString());
1102 1102
            }
1103 1103
            finally
1104 1104
            {
......
1134 1134
                }
1135 1135
                catch (Exception ex)
1136 1136
                {
1137
                    System.Diagnostics.Debug.WriteLine("KCOM_API - SetFavoriteVP : " + ex.ToString());
1137
                    System.Diagnostics.Trace.WriteLine("KCOM_API - SetFavoriteVP : " + ex.ToString());
1138 1138
                    return false;
1139 1139
                }
1140 1140

  
......
1185 1185
        //                return false;
1186 1186
        //            }
1187 1187
        //        }
1188
        //        catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1188
        //        catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1189 1189
        //        {
1190 1190
        //            return false;
1191 1191
        //        }
......
1215 1215
        //                return false;
1216 1216
        //            }
1217 1217
        //        }
1218
        //        catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1218
        //        catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1219 1219
        //        {
1220 1220
        //            return false;
1221 1221
        //        }
......
1250 1250
                }
1251 1251
                catch (Exception ex)
1252 1252
                {
1253
                    System.Diagnostics.Debug.WriteLine("KCOM_API - SaveMarkupData Get markup_info: " + ex.ToString());
1253
                    System.Diagnostics.Trace.WriteLine("KCOM_API - SaveMarkupData Get markup_info: " + ex.ToString());
1254 1254
                    markup_info = null;
1255 1255
                }
1256 1256

  
......
1292 1292
                }
1293 1293
                catch (Exception ex)
1294 1294
                {
1295
                    System.Diagnostics.Debug.WriteLine("KCOM_API - SaveMarkupData  Get markup_info_version : " + ex.ToString());
1295
                    System.Diagnostics.Trace.WriteLine("KCOM_API - SaveMarkupData  Get markup_info_version : " + ex.ToString());
1296 1296
                    markup_info_version = null;
1297 1297
                }
1298 1298

  
......
1353 1353
                }
1354 1354
                catch (Exception ex)
1355 1355
                {
1356
                    System.Diagnostics.Debug.WriteLine("KCOM_API - SaveMarkupData  set mlmarkup_data : " + ex.ToString());
1356
                    System.Diagnostics.Trace.WriteLine("KCOM_API - SaveMarkupData  set mlmarkup_data : " + ex.ToString());
1357 1357
                    return false;
1358 1358
                }
1359 1359
            }
......
1387 1387
                }
1388 1388
                catch (Exception ex)
1389 1389
                {
1390
                    System.Diagnostics.Debug.WriteLine("KCOM_API - SavePageMarkupData : " + ex.ToString());
1390
                    System.Diagnostics.Trace.WriteLine("KCOM_API - SavePageMarkupData : " + ex.ToString());
1391 1391

  
1392 1392
                    markup_info = null;
1393 1393
                }
......
1430 1430
                }
1431 1431
                catch (Exception ex)
1432 1432
                {
1433
                    System.Diagnostics.Debug.WriteLine("KCOM_API - SavePageMarkupData get markup_info_version : " + ex.ToString());
1433
                    System.Diagnostics.Trace.WriteLine("KCOM_API - SavePageMarkupData get markup_info_version : " + ex.ToString());
1434 1434
                    markup_info_version = null;
1435 1435
                }
1436 1436

  
......
1475 1475
                }
1476 1476
                catch (Exception ex)
1477 1477
                {
1478
                    System.Diagnostics.Debug.WriteLine("KCOM_API - SavePageMarkupData set mlmarkup_data : " + ex.ToString());
1478
                    System.Diagnostics.Trace.WriteLine("KCOM_API - SavePageMarkupData set mlmarkup_data : " + ex.ToString());
1479 1479
                    return false;
1480 1480
                }
1481 1481
            }
......
1496 1496
        //            return Entity.MARKUP_DATA_GROUP.ToList().LastOrDefault().ID;
1497 1497
        //        }
1498 1498
        //    }
1499
        //    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1499
        //    catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1500 1500
        //    {
1501 1501
        //        return 0;
1502 1502
        //    }
......
1513 1513
        //            Entity.SaveChanges();
1514 1514
        //        }
1515 1515
        //    }
1516
        //    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1516
        //    catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1517 1517
        //    {
1518 1518
        //        return false;
1519 1519
        //    }
......
1534 1534
            }
1535 1535
            catch (Exception ex)
1536 1536
            {
1537
                System.Diagnostics.Debug.WriteLine("KCOM_API - UpdateMarkupData: " + ex.ToString());
1537
                System.Diagnostics.Trace.WriteLine("KCOM_API - UpdateMarkupData: " + ex.ToString());
1538 1538
                return false;
1539 1539
            }
1540 1540
            return true;
......
1554 1554
            }
1555 1555
            catch (Exception ex)
1556 1556
            {
1557
                System.Diagnostics.Debug.WriteLine("KCOM_API - SaveSymbol: " + ex.ToString());
1557
                System.Diagnostics.Trace.WriteLine("KCOM_API - SaveSymbol: " + ex.ToString());
1558 1558
                return false;
1559 1559
            }
1560 1560
            return true;
......
1573 1573
            }
1574 1574
            catch (Exception ex)
1575 1575
            {
1576
                System.Diagnostics.Debug.WriteLine("KCOM_API - AddPublicSymbol: " + ex.ToString());
1576
                System.Diagnostics.Trace.WriteLine("KCOM_API - AddPublicSymbol: " + ex.ToString());
1577 1577
                return false;
1578 1578
            }
1579 1579
            return true;
......
1604 1604
            }
1605 1605
            catch (Exception ex)
1606 1606
            {
1607
                System.Diagnostics.Debug.WriteLine("KCOM_API - DeleteSymbol : " + ex.ToString());
1607
                System.Diagnostics.Trace.WriteLine("KCOM_API - DeleteSymbol : " + ex.ToString());
1608 1608

  
1609 1609
                return false;
1610 1610
            }
......
1635 1635
            }
1636 1636
            catch (Exception ex)
1637 1637
            {
1638
                System.Diagnostics.Debug.WriteLine("KCOM_API - RenameSymbol: " + ex.ToString());
1638
                System.Diagnostics.Trace.WriteLine("KCOM_API - RenameSymbol: " + ex.ToString());
1639 1639
                return false;
1640 1640
            }
1641 1641
            return true;
......
1655 1655
            }
1656 1656
            catch (Exception ex)
1657 1657
            {
1658
                System.Diagnostics.Debug.WriteLine("KCOM_API - AddCheckListHistory: " + ex.ToString());
1658
                System.Diagnostics.Trace.WriteLine("KCOM_API - AddCheckListHistory: " + ex.ToString());
1659 1659
                return false;
1660 1660
            }
1661 1661
            return true;
......
1675 1675
            }
1676 1676
            catch (Exception ex)
1677 1677
            {
1678
                System.Diagnostics.Debug.WriteLine("KCOM_API - SaveCheckListHistory: " + ex.ToString());
1678
                System.Diagnostics.Trace.WriteLine("KCOM_API - SaveCheckListHistory: " + ex.ToString());
1679 1679
                return false;
1680 1680
            }
1681 1681
            return true;
......
1708 1708
                    Entity.SaveChanges();
1709 1709
                }
1710 1710
            }
1711
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1711
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1712 1712
                return false;
1713 1713
            }
1714 1714
            return true;
......
1726 1726
                    Entity.SaveChanges();
1727 1727
                }
1728 1728
            }
1729
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1729
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1730 1730
                return false;
1731 1731
            }
1732 1732
            return true;
......
1744 1744
                    Check_value = Entity.CHECK_LIST.Where(info => info.ID == _id).FirstOrDefault();
1745 1745
                }
1746 1746
            }
1747
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1747
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1748 1748
                return null;
1749 1749
            }
1750 1750
            return Check_value;
......
1761 1761
                    list = Entity.CHECK_LIST.Where(i => i.PROJECT_NO == project_no && i.DOCUMENT_NO == doc_no && i.USER_ID == user_id).OrderBy(p => p.CREATE_TIME).ToList();
1762 1762
                }
1763 1763
            }
1764
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1764
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1765 1765
                return null;
1766 1766
            }
1767 1767
            return list;
......
1778 1778
                    history = Entity.CHECK_LIST_HISTORY.Where(data => data.CHECKLIST_ID == _id).ToList();
1779 1779
                }
1780 1780
            }
1781
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1781
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1782 1782
                return null;
1783 1783
            }
1784 1784
            return history;
......
1795 1795
                    Check_Item = Entity.CHECK_LIST_HISTORY.Where(info => info.CHECKLIST_ID == checklist_id && info.REVISION == rev).FirstOrDefault();
1796 1796
                }
1797 1797
            }
1798
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1798
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1799 1799
                return null;
1800 1800
            }
1801 1801
            return Check_Item;
......
1824 1824
                    Entity.SaveChanges();
1825 1825
                }
1826 1826
            }
1827
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1827
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1828 1828
                return false;
1829 1829
            }
1830 1830
            return true;
......
1843 1843
                    markupInfo = Entity.MARKUP_INFO.Where(entity => entity.DOCINFO_ID == _id).OrderByDescending(i => i.CONSOLIDATE).OrderByDescending(j => j.CREATE_TIME).FirstOrDefault();
1844 1844
                }
1845 1845
            }
1846
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1846
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1847 1847
                return null;
1848 1848
            }
1849 1849
            return markupInfo;
......
1868 1868
                                  select data.DATA).ToList();
1869 1869
                }
1870 1870
            }
1871
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1871
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1872 1872
                return null;
1873 1873
            }
1874 1874
            return markupdata;
......
1886 1886
                    Entity.SaveChanges();
1887 1887
                }
1888 1888
            }
1889
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1889
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1890 1890
                return false;
1891 1891
            }
1892 1892
            return true;
......
1904 1904
                    Entity.SaveChanges();
1905 1905
                }
1906 1906
            }
1907
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1907
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1908 1908
                return false;
1909 1909
            }
1910 1910
            return true;
......
1922 1922
                    Entity.SaveChanges();
1923 1923
                }
1924 1924
            }
1925
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1925
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1926 1926
                return false;
1927 1927
            }
1928 1928
            return true;
......
1941 1941
                    Entity.SaveChanges();
1942 1942
                }
1943 1943
            }
1944
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1944
            catch (Exception ex) {
1945
                System.Diagnostics.Trace.WriteLine(ex);
1945 1946
                return false;
1946 1947
            }
1947 1948
            return true;
......
1960 1961
                    Entity.SaveChanges();
1961 1962
                }
1962 1963
            }
1963
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1964
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1964 1965
                return false;
1965 1966
            }
1966 1967
            return true;
......
1978 1979
                    mlresult = Entity.MARKUP_DATA.Where(data => data.MARKUPINFO_VERSION_ID == _versionid).ToList();
1979 1980
                }
1980 1981
            }
1981
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
1982
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
1982 1983
                return null;
1983 1984
            }
1984 1985
            return mlresult;
......
2043 2044
                    Entity.SaveChanges();
2044 2045
                }
2045 2046
            }
2046
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
2047
            catch (Exception ex) {
2048
                System.Diagnostics.Trace.WriteLine(ex);
2047 2049
                return false;
2048 2050
            }
2049 2051
            return true;
......
2116 2118
            }
2117 2119
            catch (Exception ex)
2118 2120
            {
2119
                System.Diagnostics.Debug.WriteLine(ex);
2121
                System.Diagnostics.Trace.WriteLine(ex);
2120 2122
                consolidate = false;
2121 2123
            }
2122 2124

  
......
2308 2310

  
2309 2311
                }
2310 2312
            }
2311
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
2313
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
2312 2314
                return false;
2313 2315
            }
2314 2316
            return true;
......
2409 2411
                    Custom_List = Entity.SYMBOL_PUBLIC.Select(data => data.DEPARTMENT).Distinct().ToList();
2410 2412
                }
2411 2413
            }
2412
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
2414
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
2413 2415
                return null;
2414 2416
            }
2415 2417
            return Custom_List;
......
2434 2436
                    
2435 2437
                }
2436 2438
            }
2437
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
2439
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
2438 2440
                return null;
2439 2441
            }
2440 2442
            return Custom_List;
......
2465 2467
                    }
2466 2468
                }
2467 2469
            }
2468
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
2470
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
2469 2471
                return null;
2470 2472
            }
2471 2473
            return result;
......
2489 2491
                    }
2490 2492
                }
2491 2493
            }
2492
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
2494
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
2493 2495
                return null;
2494 2496
            }
2495 2497
            return result;
......
2528 2530
                }
2529 2531

  
2530 2532
            }
2531
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
2533
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
2532 2534
                return null;
2533 2535
            }
2534 2536
            return result;
......
2569 2571
            }
2570 2572
            catch (Exception ex)
2571 2573
            {
2572
                System.Diagnostics.Debug.WriteLine(ex);
2574
                System.Diagnostics.Trace.WriteLine(ex);
2573 2575
                return null;
2574 2576
            }
2575 2577
            return result;
......
2611 2613
            }
2612 2614
            catch (Exception ex)
2613 2615
            {
2614
                System.Diagnostics.Debug.WriteLine(ex);
2616
                System.Diagnostics.Trace.WriteLine(ex);
2615 2617
            }
2616 2618
            return result;
2617 2619
        }
......
2651 2653
            }
2652 2654
            catch (Exception ex)
2653 2655
            {
2654
                System.Diagnostics.Debug.WriteLine(ex);
2656
                System.Diagnostics.Trace.WriteLine(ex);
2655 2657
            }
2656 2658
            return result;
2657 2659
        }
......
2693 2695
                    result = Entity.RUN_PROJECTS.Where(i => i.PROJECT_NO == project_no).FirstOrDefault().PROJECT_NAME.ToString();
2694 2696
                }
2695 2697
            }
2696
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
2698
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
2697 2699
                return null;
2698 2700
            }
2699 2701
            return result;
......
2714 2716
                    && i.REVISION != current_rev).OrderByDescending(i => i.GROUP_NO).ToList();
2715 2717
                }
2716 2718
            }
2717
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
2719
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
2718 2720
                return null;
2719 2721
            }
2720 2722
            return result;
......
2736 2738
                              select info).First();
2737 2739
                }
2738 2740
            }
2739
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
2741
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
2740 2742
                return null;
2741 2743
            }
2742 2744
            return docinfo;
......
2776 2778
                        }
2777 2779
                        catch (Exception ex)
2778 2780
                        {
2779
                            System.Diagnostics.Debug.WriteLine("KCOM_API - GetPrintDocItemList displaycolor : " + ex.ToString());
2781
                            System.Diagnostics.Trace.WriteLine("KCOM_API - GetPrintDocItemList displaycolor : " + ex.ToString());
2780 2782

  
2781 2783
                            displaycolor = "#FFFFFF";
2782 2784
                        }
......
2830 2832
                    entity.SaveChanges();
2831 2833
                }
2832 2834
            }
2833
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
2835
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
2834 2836
                return false;
2835 2837
            }
2836 2838
            return true;
......
2941 2943
                    }                    
2942 2944
                }
2943 2945
            }
2944
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
2946
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
2945 2947
                throw;
2946 2948
            }
2947 2949
            return docinfo;
......
2978 2980
                    
2979 2981
                }
2980 2982
            }
2981
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
2983
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
2982 2984
                throw;
2983 2985
            }
2984 2986
            return item;
......
3015 3017
                    }
3016 3018
                }
3017 3019
            }
3018
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
3020
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
3019 3021
                throw;
3020 3022
            }
3021 3023
            return results;
......
3043 3045
                    }                    
3044 3046
                }
3045 3047
            }
3046
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
3048
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
3047 3049
                throw;
3048 3050
            }
3049 3051
            return markupInfo;
......
3082 3084
                    }
3083 3085
                }
3084 3086
            }
3085
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
3087
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
3086 3088
                throw;
3087 3089
            }
3088 3090
            return results;
......
3113 3115
                    }                    
3114 3116
                }
3115 3117
            }
3116
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
3118
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
3117 3119
                throw;
3118 3120
            }
3119 3121
            return results;
......
3147 3149
                    }
3148 3150
                }                    
3149 3151
            }
3150
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
3152
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
3151 3153
                throw;
3152 3154
            }
3153 3155
            return result;
......
3182 3184
                        result = true;
3183 3185
                }
3184 3186
            }
3185
            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex);
3187
            catch (Exception ex) { System.Diagnostics.Trace.WriteLine(ex);
3186 3188
                throw;
3187 3189
            }
3188 3190
            return result;
......
3207 3209
                    }
... 이 차이점은 표시할 수 있는 최대 줄수를 초과해서 이 차이점은 잘렸습니다.

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)