프로젝트

일반

사용자정보

개정판 4b33593a

ID4b33593af2d21c965519dca3b91c9da85144c88d
상위 a5e5fff6
하위 faf998c6

김태성이(가) 약 2년 전에 추가함

issue #000000 datetime thread 충돌 수정

Change-Id: I819879ff73b14328ff57ed9613fcde413eebcdc1

차이점 보기:

ConvertService/ServiceBase/Markus.Service.Station/StationService/ServiceStationTask.cs
139 139
        }
140 140
    
141 141
        /// <summary>
142
        /// DB에 있는 대기중인 Item을 가져온다.
142
        /// DB에 있는 대기중인 Item을 가져와서 프로세스 실행
143
        /// 
143 144
        /// </summary>
144 145
        public void setDataBaseWaitingList()
145 146
        {
......
153 154
                {
154 155
                    //ReflashSubService();
155 156

  
156
                    if (AliveConvertQueue.Count(x => x.ID == convert.ID || x.DOCUMENT_ID == convert.DOCUMENT_ID) == 0)
157
                    if (AliveConvertQueue.Count(x => x.ID == convert.ID 
158
                                              || x.DOCUMENT_ID == convert.DOCUMENT_ID  // 같은 경로로 다운로드 및 작업되어 추가
159
                                              || (x.STATUS <= (int)StatusCodeType.Wait && x.DOCUMENT_URL == convert.DOCUMENT_URL)) == 0)
160
                                                 //  같은 url을 다운로드시 서버의 퍼포먼스가 좋지 않으면 다운로드 오류 발생하여 추가
157 161
                    {
158 162
                        if (convert.STATUS > (int)StatusCodeType.None)
159 163
                        {
......
173 177
#if DEBUG
174 178
                    else
175 179
                    {
180
                        if (AliveConvertQueue.Where(x => x.STATUS <= (int)StatusCodeType.Wait && x.DOCUMENT_URL == convert.DOCUMENT_URL) is var items)
181
                        {
182
                            if (System.Environment.UserInteractive)
183
                            {
184
                                if (items.Count() > 0)
185
                                {
186
                                    Console.WriteLine($"Same DOCUMENT_URL : {((StatusCodeType)items.First().STATUS).ToString()} - {items.First().DOCUMENT_URL}");
187
                                }
188
                            }
189
                        }
190

  
176 191
                        if (AliveConvertQueue.Count(x => x.ID == convert.ID) > 0)
177 192
                        {
178 193
                            if (System.Environment.UserInteractive)
179 194
                            {
180
                                Console.WriteLine($"AliveConvertQueue.Count(x => x.ID == convert.ID) : {convert.ID}");
195
                                Console.WriteLine($"same convert.ID : {convert.ID}");
181 196
                            }
182 197
                        }
183 198

  
......
185 200
                        {
186 201
                            if (System.Environment.UserInteractive)
187 202
                            {
188
                                Console.WriteLine($"AliveConvertQueue.Count(x.DOCUMENT_ID == convert.DOCUMENT_ID) : {convert.DOCUMENT_ID}");
203
                                Console.WriteLine($"same convert.DOCUMENT_ID : {convert.DOCUMENT_ID}");
189 204
                            }
190 205
                        }
191

  
192 206
                    }
193 207
#endif
194 208
                    /// 2022.11.28 수정
DataBase/EntityModel.sln
1 1

2 2
Microsoft Visual Studio Solution File, Format Version 12.00
3
# Visual Studio 15
4
VisualStudioVersion = 15.0.28307.757
3
# Visual Studio Version 17
4
VisualStudioVersion = 17.3.32929.385
5 5
MinimumVisualStudioVersion = 10.0.40219.1
6 6
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDataBaseTest", "WpfDataBaseTest\WpfDataBaseTest.csproj", "{B8F30C6E-9544-4DE8-A9B2-775FD30E2AC9}"
7 7
EndProject
DataBase/EntityModel/DOCUMENT_ITEM.cs
31 31
        public string RESULT { get; set; }
32 32
        public string PROJECT_NO { get; set; }
33 33
        public string Link { get; set; }
34
        public string ENSEMBLEINFO_URL { get; set; }
34 35
    
35 36
        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
36 37
        public virtual ICollection<ATTACH_URL> ATTACH_URL { get; set; }
DataBase/EntityModel/FINAL_PDF.cs
17 17
        public string ID { get; set; }
18 18
        public string PROJECT_NO { get; set; }
19 19
        public string DOCINFO_ID { get; set; }
20
        public int MARKUPINFO_ID { get; set; }
20
        public string MARKUPINFO_ID { get; set; }
21 21
        public string CREATE_USER_ID { get; set; }
22 22
        public System.DateTime CREATE_DATETIME { get; set; }
23 23
        public int STATUS { get; set; }
DataBase/EntityModel/MarkusModel.edmx
82 82
          <Property Name="RESULT" Type="nvarchar" MaxLength="50" />
83 83
          <Property Name="PROJECT_NO" Type="nvarchar" MaxLength="10" Nullable="false" />
84 84
          <Property Name="Link" Type="varchar(max)" />
85
          <Property Name="ENSEMBLEINFO_URL" Type="nvarchar" MaxLength="500" />
85 86
        </EntityType>
86 87
        <EntityType Name="ERROR_LOG">
87 88
          <Key>
......
120 121
          <Property Name="ID" Type="nvarchar" MaxLength="50" Nullable="false" />
121 122
          <Property Name="PROJECT_NO" Type="nvarchar" MaxLength="10" Nullable="false" />
122 123
          <Property Name="DOCINFO_ID" Type="nvarchar" MaxLength="50" Nullable="false" />
123
          <Property Name="MARKUPINFO_ID" Type="int" Nullable="false" />
124
          <Property Name="MARKUPINFO_ID" Type="nvarchar" MaxLength="50" Nullable="false" />
124 125
          <Property Name="CREATE_USER_ID" Type="nvarchar" MaxLength="50" Nullable="false" />
125 126
          <Property Name="CREATE_DATETIME" Type="datetime" Nullable="false" />
126 127
          <Property Name="STATUS" Type="int" Nullable="false" />
......
548 549
          <Property Name="PROJECT_NO" Type="String" MaxLength="10" FixedLength="false" Unicode="true" Nullable="false" />
549 550
          <Property Name="Link" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
550 551
          <NavigationProperty Name="ATTACH_URL" Relationship="Self.FK_ATTACH_URL_DOCUMENT_ITEM" FromRole="DOCUMENT_ITEM" ToRole="ATTACH_URL" />
552
          <Property Name="ENSEMBLEINFO_URL" Type="String" MaxLength="500" FixedLength="false" Unicode="true" />
551 553
        </EntityType>
552 554
        <EntityType Name="ERROR_LOG">
553 555
          <Key>
......
928 930
          <Property Name="ID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
929 931
          <Property Name="PROJECT_NO" Type="String" Nullable="false" MaxLength="10" FixedLength="false" Unicode="true" />
930 932
          <Property Name="DOCINFO_ID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
931
          <Property Name="MARKUPINFO_ID" Type="Int32" Nullable="false" />
933
          <Property Name="MARKUPINFO_ID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
932 934
          <Property Name="CREATE_USER_ID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
933 935
          <Property Name="CREATE_DATETIME" Type="DateTime" Nullable="false" Precision="3" />
934 936
          <Property Name="STATUS" Type="Int32" Nullable="false" />
......
1015 1017
          <EntitySetMapping Name="DOCUMENT_ITEM">
1016 1018
            <EntityTypeMapping TypeName="MarkusDBModel.DOCUMENT_ITEM">
1017 1019
              <MappingFragment StoreEntitySet="DOCUMENT_ITEM">
1020
                <ScalarProperty Name="ENSEMBLEINFO_URL" ColumnName="ENSEMBLEINFO_URL" />
1018 1021
                <ScalarProperty Name="ID" ColumnName="ID" />
1019 1022
                <ScalarProperty Name="REVISION" ColumnName="REVISION" />
1020 1023
                <ScalarProperty Name="DOCUMENT_NO" ColumnName="DOCUMENT_NO" />
FinalService/KCOM_FinalService/KCOM_FinalService.sln
1 1

2 2
Microsoft Visual Studio Solution File, Format Version 12.00
3
# Visual Studio 15
4
VisualStudioVersion = 15.0.27130.2010
3
# Visual Studio Version 16
4
VisualStudioVersion = 16.0.32929.386
5 5
MinimumVisualStudioVersion = 10.0.40219.1
6 6
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KCOM_FinalService", "KCOM_FinalService\KCOM_FinalService.csproj", "{2BE3F054-D494-4712-927F-47E2FFB52170}"
7 7
	ProjectSection(ProjectDependencies) = postProject
......
43 43
EndProject
44 44
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UploadFinal_Bseng", "Upload\UploadFinal_Bseng\UploadFinal_Bseng.csproj", "{BA75F8CB-9124-4C72-99EA-BEAA7694E4FF}"
45 45
EndProject
46
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RefinalDPF", "RefinalDPF\RefinalDPF.csproj", "{E465E364-BA2C-433E-9517-1813E92F9B8E}"
47
EndProject
46 48
Global
47 49
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
48 50
		Debug|Any CPU = Debug|Any CPU
......
249 251
		{BA75F8CB-9124-4C72-99EA-BEAA7694E4FF}.Release|x64.Build.0 = Release|Any CPU
250 252
		{BA75F8CB-9124-4C72-99EA-BEAA7694E4FF}.Release|x86.ActiveCfg = Release|Any CPU
251 253
		{BA75F8CB-9124-4C72-99EA-BEAA7694E4FF}.Release|x86.Build.0 = Release|Any CPU
254
		{E465E364-BA2C-433E-9517-1813E92F9B8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
255
		{E465E364-BA2C-433E-9517-1813E92F9B8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
256
		{E465E364-BA2C-433E-9517-1813E92F9B8E}.Debug|x64.ActiveCfg = Debug|Any CPU
257
		{E465E364-BA2C-433E-9517-1813E92F9B8E}.Debug|x64.Build.0 = Debug|Any CPU
258
		{E465E364-BA2C-433E-9517-1813E92F9B8E}.Debug|x86.ActiveCfg = Debug|Any CPU
259
		{E465E364-BA2C-433E-9517-1813E92F9B8E}.Debug|x86.Build.0 = Debug|Any CPU
260
		{E465E364-BA2C-433E-9517-1813E92F9B8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
261
		{E465E364-BA2C-433E-9517-1813E92F9B8E}.Release|Any CPU.Build.0 = Release|Any CPU
262
		{E465E364-BA2C-433E-9517-1813E92F9B8E}.Release|x64.ActiveCfg = Release|Any CPU
263
		{E465E364-BA2C-433E-9517-1813E92F9B8E}.Release|x64.Build.0 = Release|Any CPU
264
		{E465E364-BA2C-433E-9517-1813E92F9B8E}.Release|x86.ActiveCfg = Release|Any CPU
265
		{E465E364-BA2C-433E-9517-1813E92F9B8E}.Release|x86.Build.0 = Release|Any CPU
252 266
	EndGlobalSection
253 267
	GlobalSection(SolutionProperties) = preSolution
254 268
		HideSolutionNode = FALSE
FinalService/KCOM_FinalService/KCOM_FinalService/FinalService.ini
15 15
[ConnectionString]
16 16
STRING=EVCOYxwadMNh7qzjMvRTwOacwyFatXgWjx//sssrSKTsvMkdvpdBa3Sj3mmhwABTiweSqNnWYgsIxUWXaBe8XE8G1CLaux2zPbyBWvqxJruTX0H5MqABZSEXXG82XaGL
17 17
[MARKUS_API]
18
URL=http://www.devdoftech.co.kr:5979/ServiceDeepView.svc
18
URL=http://www.devdoftech.co.kr:5979/ServiceDeepView.svc
19
#[Remoting]
20
#port=9098
FinalService/KCOM_FinalService/KCOM_FinalService/Remoting/RemFinalPDFStation.cs
52 52
            _Logger = eventLog;
53 53

  
54 54
            Init();
55
            TryReFinal();
55

  
56
            if (!Environment.UserInteractive)
57
            {
58

  
59
                TryReFinal();
60
            }
56 61

  
57 62
        }
58 63

  
......
310 315
            if (_T.Count() > 0)
311 316
            {
312 317
                FINAL_PDF _item = _T.First();
313
                SetFinalState(_item.ID, FinalStatus.PdfStamp,e.Message);
314
                _Logger.Write($"PdfStamp Final ID : {_item.ID} message : {e.Message} ",LogLevel.Info);
318

  
319
                string msg = null;
320

  
321
                if(e.Message.Length > 1000)
322
                {
323
                    msg = e.Message.Substring(0, 1000);
324
                }
325
                else
326
                {
327
                    msg = e.Message;
328
                }
329

  
330
                SetFinalState(_item.ID, FinalStatus.PdfStamp, msg);
331
                _Logger.Write($"PdfStamp Final ID : {_item.ID} message : {msg} ",LogLevel.Info);
315 332
            }
316 333
        }
317 334

  
FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/DrawSet_Symbol.cs
64 64
                {
65 65
                    
66 66
                    xamlToPngConverter.Convert(xamlDataStream, 205, 89, 96, 96, XAMLtoPNG.ScaleTO.OriginalSize, streamOut);
67
             
67

  
68 68
                    if (streamOut.Length > 0)
69 69
                    {
70 70
                        Image img = Image.GetInstance(streamOut.ReadFully());
......
85 85
                        #endregion
86 86

  
87 87
                        img.ScaleAbsolute(Rect.Width, Rect.Height);
88
                        img.SetAbsolutePosition((float)sp.X, (float)sp.Y - Rect.Height);
88

  
89
                        var x = Math.Min(sp.X, ep.X);
90
                        var y = Math.Min(sp.Y, ep.Y);
91

  
92
                        img.SetAbsolutePosition((float)x, (float)y);
93

  
94
                        //if ((sp.X - ep.X) > 0)
95
                        //{
96
                        //    img.SetAbsolutePosition((float)ep.X, (float)sp.Y);
97
                        //}
98
                        //else
99
                        //{
100
                        //    img.SetAbsolutePosition((float)sp.X, (float)sp.Y - Rect.Height);
101
                        //}
89 102

  
90 103
                        iTextSharp.awt.geom.AffineTransform affineTransform = new iTextSharp.awt.geom.AffineTransform();
91 104
                        affineTransform.Rotate(Angle * -1, sp.X, sp.Y);
FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/PDFLib_DrawSet_Text.cs
15 15
    public partial class PDFLib_DrawSet_Text : BaseMethod
16 16
    {
17 17
        public static Size ComputeScaleFactor(Size availableSize, Size contentSize)
18
        {
18
        {  
19 19
            double scaleX = 1.0;
20 20
            double scaleY = 1.0;
21 21

  
......
75 75

  
76 76
            #region 폰트 지정
77 77
            //string ARIALUNI_TFF = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Fonts), "Arial Unicode MS.TTF");
78

  
79
            //인구 테스트
80
            //string ARIALUNI_TFF = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Fonts), "Arial Unicode MS.TTF");
81
            //string ARIALUNI_TFF = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Fonts), "Arial");
82

  
83
            BaseFont bf = CommonFont.CreateBaseFont(Markus.Fonts.FontDictionary.FONT_ARIAL, BaseFont.WINANSI, BaseFont.EMBEDDED, BaseFont.CACHED);
84
            #endregion
85

  
86
            #region 박스 영역 계산
87
            //var rect = GetPointsToRectX(pointSet);
88
            //var rectM = getRectMiddlePoint(new Rect(sp, ep)); 
89
            var midP = MathSet.getMiddlePoint(sp, ep);
90
            List<System.Windows.Point> tempPoint = new List<System.Windows.Point>();
91
            foreach (var item in pointSet)
92
            {
93
                tempPoint.Add(MathSet.RotateAbout(midP, item, angle));
94
            }
95
            var rect = GetPointsToRectX(tempPoint);
96

  
97
            #endregion
98
            Size size = new Size();
99
            //var fontSize = rect.Height;
100
            //var Ros = new System.Windows.Controls.TextBlock() { Text = text, FontFamily = new FontFamily("Arial") };
101

  
102
            Size scale = ComputeScaleFactor(new Size(rect.Width, rect.Height),new Size(rect.Width,rect.Height));
103

  
104
            size.Width = scale.Width * rect.Width;
105
            size.Height = scale.Height * rect.Height;
106
        
107
            var fontSize = (int)size.Height;
108
            float width = bf.GetWidthPoint(text, fontSize);
109
            float height = bf.GetAscentPoint(text, fontSize)
110
               - bf.GetDescentPoint(text, fontSize);
111

  
112

  
113
            PdfTemplate template = contentByte.CreateTemplate(width, height + 1);
114
            template.BeginText();
115

  
116
            try
117
            {
118
                template.SetFontAndSize(bf, fontSize);
119
                if (bf.GetDescentPoint(text, fontSize) < 0)
120
                {
121
                    template.SetTextMatrix(0, 1);
122
                }
123
                else
124
                {
125
                    template.SetTextMatrix(0, bf.GetDescentPoint(text, fontSize));
126
                }
127
                template.SetColorFill(bs);
128
                template.SetColorStroke(bs);
129
                template.ShowText(text);
130

  
131
                Image img = Image.GetInstance(template);
132
                //img.ScalePercent((float)65, (float)65); //실 면적 대비 계산식 , 구해진 Fontsize로 Fit하면 안됨.
133
                img.ScaleToFit((float)size.Width, (float)size.Height);
134

  
135
                img.SetAbsolutePosition(rect.Left + ((rect.Width - img.ScaledWidth) / 2), rect.Bottom + ((rect.Height - img.ScaledHeight) / 2));
136
                var x = rect.Left + ((rect.Width - img.ScaledWidth) / 2);
137
                var y = rect.Bottom + ((rect.Height - img.ScaledHeight) / 2);
138
                midP = MathSet.getMiddlePoint(new Point(x, y), new Point(x + img.ScaledWidth, y + img.ScaledHeight));
139
                System.Drawing.Drawing2D.Matrix mat2 = new System.Drawing.Drawing2D.Matrix();
140
                mat2.RotateAt((float)angle * -1, new System.Drawing.PointF((float)midP.X, (float)midP.Y));
141
                contentByte.Transform(mat2);
142
                PdfGState gs1 = new PdfGState();
143
                gs1.FillOpacity = (float)opac;
144
                contentByte.SetGState(gs1);
145
                contentByte.AddImage(img);
146
            }
147
            catch (Exception ex)
148
            {
149
                isError = true;
150
                contentByte.RestoreState();
151
                template.EndText();
152
            }
153
            if (!isError)
154
            {
155
                template.EndText();
156
                contentByte.RestoreState();
157
            }
158
        }
159

  
160
        public static void DrawDate_(Point sp, Point ep, List<Point> pointSet, PdfContentByte contentByte, System.Drawing.Color color, string text, double angle, double opac)
161
        {
162
            bool isError = false;
163
            BaseColor bs = new BaseColor(color);
164
            contentByte.SaveState();
165

  
166

  
167
            #region 폰트 지정
168
            //string ARIALUNI_TFF = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Fonts), "Arial Unicode MS.TTF");
78 169
            
79 170
            //인구 테스트
80 171
            //string ARIALUNI_TFF = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Fonts), "Arial Unicode MS.TTF");
......
100 191
            //var Ros = new System.Windows.Controls.TextBlock() { Text = text, FontFamily = new FontFamily("Arial") };
101 192

  
102 193
            UIElement Ros = new UIElement();
194
            
103 195
            Ros.Arrange(new Rect(rect.Left, rect.Top, rect.Width, rect.Height));
104 196

  
105 197
            Size scale = ComputeScaleFactor(new Size(rect.Width, rect.Height), Ros.RenderSize);
FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.cs
22 22
{
23 23
    public class MarkupToPDF : IDisposable
24 24
    {
25
        public MarkupToPDF()
26
        {
27
        }
25 28

  
26 29
        #region 초기 데이터
27 30
        private static iTextSharp.text.Rectangle mediaBox;
......
637 640
                            }
638 641

  
639 642
                            iTextSharp.text.Version.GetInstance();
643

  
640 644
                            using (PdfStamper pdfStamper = new PdfStamper(pdfReader, new FileStream(pdfFilePath, FileMode.Create)))
641 645
                            {
642 646
                                try
......
718 722
                                        string[] markedData = markupItem.DATA.Split(delimiterChars, StringSplitOptions.RemoveEmptyEntries);
719 723

  
720 724
                                        PdfContentByte contentByte = pdfStamper.GetOverContent(markupItem.PAGENUMBER);
721
                                        strLog.Append($"{markupItem.PAGENUMBER}/");
725
                                        strLog.Append($"p.{markupItem.PAGENUMBER}:{markupItem.DATA_TYPE}/");
722 726

  
723 727
                                        foreach (var data in markedData)
724 728
                                        {
......
1247 1251
                                            }
1248 1252
                                            finally
1249 1253
                                            {
1250
                                                if (ControlT?.Name != null)
1251
                                                {
1252
                                                    strLog.Append($"{ControlT.Name},");
1253
                                                }
1254
                                                //if (ControlT?.Name != null)
1255
                                                //{
1256
                                                //    strLog.Append($"{ControlT.Name},");
1257
                                                //}
1254 1258
                                            }
1255 1259
                                        }
1256 1260

  
FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.csproj
95 95
  </ItemGroup>
96 96
  <ItemGroup>
97 97
    <Compile Include="AddFinalPDFResult.cs" />
98
    <Compile Include="backgroudTest.cs" />
98 99
    <Compile Include="Common\CommentUserInfo.cs" />
99 100
    <Compile Include="Common\CommonFont.cs" />
100 101
    <Compile Include="Common\ConverterLineSize.cs" />
......
109 110
    <Compile Include="Controls\Common\HatchMake.cs" />
110 111
    <Compile Include="Controls\Common\IMarkupCommonData.cs" />
111 112
    <Compile Include="Controls\Common\InkToPath.cs" />
112
    <Compile Include="Controls\Common\PenMode.cs" />
113
    <Compile Include="Controls\Common\StringToPathConverter.cs" />
114
    <Compile Include="Controls\Common\ValueConverter\StringToColorConverter.cs" />
115
    <Compile Include="Controls\Etc\SignControl.cs" />
116
    <Compile Include="Controls\Etc\SymControl.cs" />
117
    <Compile Include="Controls\Etc\SymControlN.cs" />
118
    <Compile Include="Controls\Parsing\MarkupCopy.cs" />
119
    <Compile Include="Controls\Common\SelectControl.cs" />
120 113
    <Compile Include="Controls\Common\Interfaces.cs" />
121 114
    <Compile Include="Controls\Common\IPath.cs" />
122 115
    <Compile Include="Controls\Common\MarkupToPDF.cs" />
123 116
    <Compile Include="Controls\Common\MathSet.cs" />
124 117
    <Compile Include="Controls\Common\MouseMode.cs" />
125 118
    <Compile Include="Controls\Common\PaintSet.cs" />
119
    <Compile Include="Controls\Common\PenMode.cs" />
120
    <Compile Include="Controls\Common\SelectControl.cs" />
121
    <Compile Include="Controls\Common\StringToPathConverter.cs" />
122
    <Compile Include="Controls\Common\ValueConverter\StringToColorConverter.cs" />
123
    <Compile Include="Controls\Custom\CustomText.xaml.cs">
124
      <DependentUpon>CustomText.xaml</DependentUpon>
125
    </Compile>
126 126
    <Compile Include="Controls\Etc\DateControl.cs" />
127 127
    <Compile Include="Controls\Etc\ImgControl.cs" />
128
    <Compile Include="Controls\Etc\SignControl.cs" />
129
    <Compile Include="Controls\Etc\SymControl.cs" />
130
    <Compile Include="Controls\Etc\SymControlN.cs" />
128 131
    <Compile Include="Controls\Line\ArcControl.cs" />
129 132
    <Compile Include="Controls\Line\ArrowControl_Multi.cs" />
130 133
    <Compile Include="Controls\Line\LineControl.cs" />
134
    <Compile Include="Controls\Parsing\MarkupCopy.cs" />
131 135
    <Compile Include="Controls\Parsing\MarkupParse.cs" />
132 136
    <Compile Include="Controls\Polygon\CloudControl.cs" />
133 137
    <Compile Include="Controls\Polygon\PolygonControl.cs" />
......
175 179
    <Compile Include="Serialize\S_Control\Detail\S_TriControl.cs" />
176 180
  </ItemGroup>
177 181
  <ItemGroup>
182
    <Page Include="Controls\Custom\CustomText.xaml">
183
      <Generator>MSBuild:Compile</Generator>
184
      <SubType>Designer</SubType>
185
    </Page>
178 186
    <Page Include="Themes\generic.xaml">
179 187
      <Generator>MSBuild:Compile</Generator>
180 188
      <SubType>Designer</SubType>
......
202 210
    <None Include="App.Config">
203 211
      <SubType>Designer</SubType>
204 212
    </None>
213
    <None Include="Controls\Common\ControlType.cs.bak" />
214
    <None Include="Controls\Line\ArcControl.cs.bak" />
215
    <None Include="Controls\Line\ArrowControl_Multi.cs.bak" />
216
    <None Include="Controls\Line\LineControl.cs.bak" />
217
    <None Include="Controls\Parsing\MarkupCopy.cs.bak" />
218
    <None Include="Controls\Parsing\MarkupParse.cs.bak" />
219
    <None Include="Controls\Polygon\CloudControl.cs.bak" />
220
    <None Include="Controls\Polygon\PolygonControl.cs.bak" />
221
    <None Include="Controls\Shape\CircleControl.cs.bak" />
222
    <None Include="Controls\Shape\RectangleControl.cs.bak" />
223
    <None Include="Controls\Shape\RectCloudControl.cs.bak" />
224
    <None Include="Controls\Shape\TriControl.cs.bak" />
205 225
    <None Include="packages.config" />
206 226
  </ItemGroup>
207 227
  <ItemGroup>
208 228
    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
209 229
  </ItemGroup>
210
  <ItemGroup>
211
    <Folder Include="Controls\Custom\" />
212
  </ItemGroup>
230
  <ItemGroup />
213 231
  <ItemGroup>
214 232
    <WCFMetadata Include="Connected Services\" />
215 233
  </ItemGroup>
KCOM.sln
144 144
EndProject
145 145
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rhino.Licensing", "Rhino.Licensing\Rhino.Licensing.csproj", "{05EFD7EB-F0FB-4B65-8E4A-C8FF8DDC6A78}"
146 146
EndProject
147
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuidTest", "GuidTest\GuidTest.csproj", "{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}"
148
EndProject
149
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataBaseMarge", "DataBaseMerge\DataBaseMarge.csproj", "{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}"
150
EndProject
147 151
Global
148 152
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
149 153
		Daelim_RemoteTest|Any CPU = Daelim_RemoteTest|Any CPU
......
3273 3277
		{05EFD7EB-F0FB-4B65-8E4A-C8FF8DDC6A78}.Release|x64.Build.0 = Release|Any CPU
3274 3278
		{05EFD7EB-F0FB-4B65-8E4A-C8FF8DDC6A78}.Release|x86.ActiveCfg = Release|Any CPU
3275 3279
		{05EFD7EB-F0FB-4B65-8E4A-C8FF8DDC6A78}.Release|x86.Build.0 = Release|Any CPU
3280
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Daelim_RemoteTest|Any CPU.ActiveCfg = Debug|Any CPU
3281
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Daelim_RemoteTest|Any CPU.Build.0 = Debug|Any CPU
3282
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Daelim_RemoteTest|x64.ActiveCfg = Debug|Any CPU
3283
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Daelim_RemoteTest|x64.Build.0 = Debug|Any CPU
3284
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Daelim_RemoteTest|x86.ActiveCfg = Debug|Any CPU
3285
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Daelim_RemoteTest|x86.Build.0 = Debug|Any CPU
3286
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_CadExport|Any CPU.ActiveCfg = Debug|Any CPU
3287
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_CadExport|Any CPU.Build.0 = Debug|Any CPU
3288
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_CadExport|x64.ActiveCfg = Debug|Any CPU
3289
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_CadExport|x64.Build.0 = Debug|Any CPU
3290
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_CadExport|x86.ActiveCfg = Debug|Any CPU
3291
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_CadExport|x86.Build.0 = Debug|Any CPU
3292
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_Daelim|Any CPU.ActiveCfg = Debug|Any CPU
3293
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_Daelim|Any CPU.Build.0 = Debug|Any CPU
3294
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_Daelim|x64.ActiveCfg = Debug|Any CPU
3295
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_Daelim|x64.Build.0 = Debug|Any CPU
3296
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_Daelim|x86.ActiveCfg = Debug|Any CPU
3297
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_Daelim|x86.Build.0 = Debug|Any CPU
3298
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug|Any CPU
3299
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_DevDoftech|Any CPU.Build.0 = Debug|Any CPU
3300
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
3301
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_DevDoftech|x64.Build.0 = Debug|Any CPU
3302
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_DevDoftech|x86.ActiveCfg = Debug|Any CPU
3303
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_DevDoftech|x86.Build.0 = Debug|Any CPU
3304
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_HyoSung|Any CPU.ActiveCfg = Debug|Any CPU
3305
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_HyoSung|Any CPU.Build.0 = Debug|Any CPU
3306
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_HyoSung|x64.ActiveCfg = Debug|Any CPU
3307
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_HyoSung|x64.Build.0 = Debug|Any CPU
3308
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_HyoSung|x86.ActiveCfg = Debug|Any CPU
3309
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_HyoSung|x86.Build.0 = Debug|Any CPU
3310
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_SNI|Any CPU.ActiveCfg = Debug|Any CPU
3311
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_SNI|Any CPU.Build.0 = Debug|Any CPU
3312
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_SNI|x64.ActiveCfg = Debug|Any CPU
3313
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_SNI|x64.Build.0 = Debug|Any CPU
3314
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_SNI|x86.ActiveCfg = Debug|Any CPU
3315
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug_SNI|x86.Build.0 = Debug|Any CPU
3316
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3317
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug|Any CPU.Build.0 = Debug|Any CPU
3318
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug|x64.ActiveCfg = Debug|Any CPU
3319
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug|x64.Build.0 = Debug|Any CPU
3320
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug|x86.ActiveCfg = Debug|Any CPU
3321
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Debug|x86.Build.0 = Debug|Any CPU
3322
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_BSENG|Any CPU.ActiveCfg = Debug|Any CPU
3323
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_BSENG|Any CPU.Build.0 = Debug|Any CPU
3324
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_BSENG|x64.ActiveCfg = Debug|Any CPU
3325
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_BSENG|x64.Build.0 = Debug|Any CPU
3326
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_BSENG|x86.ActiveCfg = Debug|Any CPU
3327
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_BSENG|x86.Build.0 = Debug|Any CPU
3328
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Daelim|Any CPU.ActiveCfg = Debug|Any CPU
3329
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Daelim|Any CPU.Build.0 = Debug|Any CPU
3330
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Daelim|x64.ActiveCfg = Debug|Any CPU
3331
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Daelim|x64.Build.0 = Debug|Any CPU
3332
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Daelim|x86.ActiveCfg = Debug|Any CPU
3333
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Daelim|x86.Build.0 = Debug|Any CPU
3334
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Demo|Any CPU.ActiveCfg = Debug|Any CPU
3335
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Demo|Any CPU.Build.0 = Debug|Any CPU
3336
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Demo|x64.ActiveCfg = Debug|Any CPU
3337
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Demo|x64.Build.0 = Debug|Any CPU
3338
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Demo|x86.ActiveCfg = Debug|Any CPU
3339
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Demo|x86.Build.0 = Debug|Any CPU
3340
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Hyosung_X86|Any CPU.ActiveCfg = Debug|Any CPU
3341
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Hyosung_X86|Any CPU.Build.0 = Debug|Any CPU
3342
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Hyosung_X86|x64.ActiveCfg = Debug|Any CPU
3343
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Hyosung_X86|x64.Build.0 = Debug|Any CPU
3344
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Hyosung_X86|x86.ActiveCfg = Debug|Any CPU
3345
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Hyosung_X86|x86.Build.0 = Debug|Any CPU
3346
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Hyosung|Any CPU.ActiveCfg = Debug|Any CPU
3347
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Hyosung|Any CPU.Build.0 = Debug|Any CPU
3348
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Hyosung|x64.ActiveCfg = Debug|Any CPU
3349
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Hyosung|x64.Build.0 = Debug|Any CPU
3350
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Hyosung|x86.ActiveCfg = Debug|Any CPU
3351
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_Hyosung|x86.Build.0 = Debug|Any CPU
3352
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_SNI|Any CPU.ActiveCfg = Debug|Any CPU
3353
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_SNI|Any CPU.Build.0 = Debug|Any CPU
3354
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_SNI|x64.ActiveCfg = Debug|Any CPU
3355
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_SNI|x64.Build.0 = Debug|Any CPU
3356
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_SNI|x86.ActiveCfg = Debug|Any CPU
3357
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.DeployWeb_SNI|x86.Build.0 = Debug|Any CPU
3358
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release_Default|Any CPU.ActiveCfg = Release|Any CPU
3359
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release_Default|Any CPU.Build.0 = Release|Any CPU
3360
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release_Default|x64.ActiveCfg = Release|Any CPU
3361
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release_Default|x64.Build.0 = Release|Any CPU
3362
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release_Default|x86.ActiveCfg = Release|Any CPU
3363
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release_Default|x86.Build.0 = Release|Any CPU
3364
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release_PEMSS|Any CPU.ActiveCfg = Release|Any CPU
3365
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release_PEMSS|Any CPU.Build.0 = Release|Any CPU
3366
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release_PEMSS|x64.ActiveCfg = Release|Any CPU
3367
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release_PEMSS|x64.Build.0 = Release|Any CPU
3368
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release_PEMSS|x86.ActiveCfg = Release|Any CPU
3369
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release_PEMSS|x86.Build.0 = Release|Any CPU
3370
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release|Any CPU.ActiveCfg = Release|Any CPU
3371
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release|Any CPU.Build.0 = Release|Any CPU
3372
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release|x64.ActiveCfg = Release|Any CPU
3373
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release|x64.Build.0 = Release|Any CPU
3374
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release|x86.ActiveCfg = Release|Any CPU
3375
		{FCC53AB7-15FF-4432-8FD6-86C2EFC64A63}.Release|x86.Build.0 = Release|Any CPU
3376
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Daelim_RemoteTest|Any CPU.ActiveCfg = Debug|Any CPU
3377
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Daelim_RemoteTest|Any CPU.Build.0 = Debug|Any CPU
3378
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Daelim_RemoteTest|x64.ActiveCfg = Debug|Any CPU
3379
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Daelim_RemoteTest|x64.Build.0 = Debug|Any CPU
3380
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Daelim_RemoteTest|x86.ActiveCfg = Debug|Any CPU
3381
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Daelim_RemoteTest|x86.Build.0 = Debug|Any CPU
3382
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_CadExport|Any CPU.ActiveCfg = Debug|Any CPU
3383
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_CadExport|Any CPU.Build.0 = Debug|Any CPU
3384
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_CadExport|x64.ActiveCfg = Debug|Any CPU
3385
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_CadExport|x64.Build.0 = Debug|Any CPU
3386
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_CadExport|x86.ActiveCfg = Debug|Any CPU
3387
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_CadExport|x86.Build.0 = Debug|Any CPU
3388
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_Daelim|Any CPU.ActiveCfg = Debug|Any CPU
3389
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_Daelim|Any CPU.Build.0 = Debug|Any CPU
3390
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_Daelim|x64.ActiveCfg = Debug|Any CPU
3391
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_Daelim|x64.Build.0 = Debug|Any CPU
3392
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_Daelim|x86.ActiveCfg = Debug|Any CPU
3393
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_Daelim|x86.Build.0 = Debug|Any CPU
3394
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug|Any CPU
3395
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_DevDoftech|Any CPU.Build.0 = Debug|Any CPU
3396
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
3397
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_DevDoftech|x64.Build.0 = Debug|Any CPU
3398
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_DevDoftech|x86.ActiveCfg = Debug|Any CPU
3399
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_DevDoftech|x86.Build.0 = Debug|Any CPU
3400
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_HyoSung|Any CPU.ActiveCfg = Debug|Any CPU
3401
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_HyoSung|Any CPU.Build.0 = Debug|Any CPU
3402
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_HyoSung|x64.ActiveCfg = Debug|Any CPU
3403
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_HyoSung|x64.Build.0 = Debug|Any CPU
3404
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_HyoSung|x86.ActiveCfg = Debug|Any CPU
3405
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_HyoSung|x86.Build.0 = Debug|Any CPU
3406
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_SNI|Any CPU.ActiveCfg = Debug|Any CPU
3407
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_SNI|Any CPU.Build.0 = Debug|Any CPU
3408
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_SNI|x64.ActiveCfg = Debug|Any CPU
3409
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_SNI|x64.Build.0 = Debug|Any CPU
3410
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_SNI|x86.ActiveCfg = Debug|Any CPU
3411
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug_SNI|x86.Build.0 = Debug|Any CPU
3412
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3413
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
3414
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug|x64.ActiveCfg = Debug|Any CPU
3415
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug|x64.Build.0 = Debug|Any CPU
3416
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug|x86.ActiveCfg = Debug|Any CPU
3417
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Debug|x86.Build.0 = Debug|Any CPU
3418
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_BSENG|Any CPU.ActiveCfg = Debug|Any CPU
3419
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_BSENG|Any CPU.Build.0 = Debug|Any CPU
3420
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_BSENG|x64.ActiveCfg = Debug|Any CPU
3421
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_BSENG|x64.Build.0 = Debug|Any CPU
3422
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_BSENG|x86.ActiveCfg = Debug|Any CPU
3423
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_BSENG|x86.Build.0 = Debug|Any CPU
3424
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Daelim|Any CPU.ActiveCfg = Debug|Any CPU
3425
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Daelim|Any CPU.Build.0 = Debug|Any CPU
3426
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Daelim|x64.ActiveCfg = Debug|Any CPU
3427
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Daelim|x64.Build.0 = Debug|Any CPU
3428
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Daelim|x86.ActiveCfg = Debug|Any CPU
3429
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Daelim|x86.Build.0 = Debug|Any CPU
3430
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Demo|Any CPU.ActiveCfg = Debug|Any CPU
3431
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Demo|Any CPU.Build.0 = Debug|Any CPU
3432
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Demo|x64.ActiveCfg = Debug|Any CPU
3433
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Demo|x64.Build.0 = Debug|Any CPU
3434
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Demo|x86.ActiveCfg = Debug|Any CPU
3435
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Demo|x86.Build.0 = Debug|Any CPU
3436
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Hyosung_X86|Any CPU.ActiveCfg = Debug|Any CPU
3437
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Hyosung_X86|Any CPU.Build.0 = Debug|Any CPU
3438
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Hyosung_X86|x64.ActiveCfg = Debug|Any CPU
3439
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Hyosung_X86|x64.Build.0 = Debug|Any CPU
3440
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Hyosung_X86|x86.ActiveCfg = Debug|Any CPU
3441
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Hyosung_X86|x86.Build.0 = Debug|Any CPU
3442
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Hyosung|Any CPU.ActiveCfg = Debug|Any CPU
3443
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Hyosung|Any CPU.Build.0 = Debug|Any CPU
3444
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Hyosung|x64.ActiveCfg = Debug|Any CPU
3445
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Hyosung|x64.Build.0 = Debug|Any CPU
3446
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Hyosung|x86.ActiveCfg = Debug|Any CPU
3447
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_Hyosung|x86.Build.0 = Debug|Any CPU
3448
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_SNI|Any CPU.ActiveCfg = Debug|Any CPU
3449
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_SNI|Any CPU.Build.0 = Debug|Any CPU
3450
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_SNI|x64.ActiveCfg = Debug|Any CPU
3451
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_SNI|x64.Build.0 = Debug|Any CPU
3452
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_SNI|x86.ActiveCfg = Debug|Any CPU
3453
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.DeployWeb_SNI|x86.Build.0 = Debug|Any CPU
3454
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release_Default|Any CPU.ActiveCfg = Release|Any CPU
3455
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release_Default|Any CPU.Build.0 = Release|Any CPU
3456
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release_Default|x64.ActiveCfg = Release|Any CPU
3457
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release_Default|x64.Build.0 = Release|Any CPU
3458
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release_Default|x86.ActiveCfg = Release|Any CPU
3459
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release_Default|x86.Build.0 = Release|Any CPU
3460
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release_PEMSS|Any CPU.ActiveCfg = Release|Any CPU
3461
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release_PEMSS|Any CPU.Build.0 = Release|Any CPU
3462
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release_PEMSS|x64.ActiveCfg = Release|Any CPU
3463
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release_PEMSS|x64.Build.0 = Release|Any CPU
3464
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release_PEMSS|x86.ActiveCfg = Release|Any CPU
3465
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release_PEMSS|x86.Build.0 = Release|Any CPU
3466
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
3467
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release|Any CPU.Build.0 = Release|Any CPU
3468
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release|x64.ActiveCfg = Release|Any CPU
3469
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release|x64.Build.0 = Release|Any CPU
3470
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release|x86.ActiveCfg = Release|Any CPU
3471
		{2D0475BD-FC6A-4E18-A7DA-9650C5189CC7}.Release|x86.Build.0 = Release|Any CPU
3276 3472
	EndGlobalSection
3277 3473
	GlobalSection(SolutionProperties) = preSolution
3278 3474
		HideSolutionNode = FALSE
KCOM/Common/Commons.cs
1 1
using System;
2
using System.Text;
2 3

  
3 4
namespace KCOM.Common
4 5
{
5 6
    public class Commons
6 7
    {
7
        //GUID생성(최민수 사원 수정) //조장원 대리 다시 변경
8
     
8 9
        public static string shortGuid()
9 10
        {
11
            char[] chars = "ABCDEF1234567890".ToCharArray();
12
            byte[] data = new byte[1];
13
            System.Security.Cryptography.RNGCryptoServiceProvider crypto = new System.Security.Cryptography.RNGCryptoServiceProvider();
14
            crypto.GetNonZeroBytes(data);
15
            data = new byte[32];
16
            crypto.GetNonZeroBytes(data);
17
            StringBuilder result = new StringBuilder(32);
18

  
19
            foreach (byte b in data)
20
            {
21
                result.Append(chars[b % (chars.Length - 1)]);
22
            }
23

  
24
            return result.ToString();
25
        }
26

  
27

  
28
        //GUID생성(최민수 사원 수정) //조장원 대리 다시 변경
29
        public static string shortGuidold()
30
        {
10 31
            byte[] bytes = new byte[16];
11 32
            using (var provider = System.Security.Cryptography.RandomNumberGenerator.Create())
12 33
            {
KCOM/KCOM.csproj.user
14 14
    <VerifyUploadedFiles>false</VerifyUploadedFiles>
15 15
  </PropertyGroup>
16 16
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
17
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjMwMDAwMDc0IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJkb2Z0ZWNoIn0=</StartArguments>
17
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMDUiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6ImRvZnRlY2gifQ==</StartArguments>
18 18
  </PropertyGroup>
19 19
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
20 20
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments>

내보내기 Unified diff

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