프로젝트

일반

사용자정보

개정판 68e3cd94

ID68e3cd94c1c3247d3711664ef1367d509f510b6f
상위 c362d2a5
하위 d9c0cdb8

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

kcom_api 64bit build로 변경

Change-Id: Idb15b3ee5260b2452d52cbba843dd2e92822d691

차이점 보기:

FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/DrawSet_Line.cs
190 190
            //}           
191 191

  
192 192
            contentByte.Stroke();
193

  
194
            /// 주석 샘플
195
            //float x = (float)list.Select(p => p.X).Min();
196
            //float y = (float)list.Select(p => p.Y).Min();
197

  
198
            //float mX = (float)list.Select(p => p.X).Max();
199
            //float mY = (float)list.Select(p => p.Y).Max();
200

  
201
            //var rct = new iTextSharp.text.Rectangle(x,y,mX,mY);
202
            //PdfAnnotation annotation = PdfAnnotation.CreateText(contentByte.PdfWriter, rct,"","test Contents",false, "Comment");
203
            //annotation.Put(PdfName.CREATIONDATE, new PdfDate(DateTime.Now));
204
            //annotation.Put(PdfName.CREATOR,new PdfString("test User"));
205
            //annotation.Put(PdfName.IRT, annotation.GetAsIndirectObject(PdfName.TYPE));
206
            //contentByte.AddAnnotation(annotation, true);
207

  
193 208
            contentByte.RestoreState();
194 209
        }
195 210
    }
FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.cs
686 686

  
687 687
                                PdfContentByte contentByte = pdfStamper.GetOverContent(markupItem.PAGENUMBER);
688 688

  
689

  
690 689
                                foreach (var data in markedData)
691 690
                                {
692 691
                                    var item = JsonSerializerHelper.UnCompressString(data);
693 692
                                    var ControlT = JsonSerializerHelper.JsonDeserialize<S_BaseControl>(item);
694

  
693
                              
695 694
                                    try
696 695
                                    {
697 696
                                        switch (ControlT.Name)
......
1200 1199
                                                StatusChange($"{ControlT.Name} Not Support", 0);
1201 1200
                                                break;
1202 1201
                                        }
1202
                                        
1203 1203
                                    }
1204 1204
                                    catch (Exception ex)
1205 1205
                                    {
ImageComparer/Markus.ImageCompare/Markus.ImageCompare.csproj
24 24
    <DefineConstants>DEBUG;TRACE</DefineConstants>
25 25
    <ErrorReport>prompt</ErrorReport>
26 26
    <WarningLevel>4</WarningLevel>
27
    <PlatformTarget>x64</PlatformTarget>
27 28
  </PropertyGroup>
28 29
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29 30
    <DebugType>pdbonly</DebugType>
KCOM/Controls/Symbol.xaml.cs
217 217

  
218 218
        public void DialogMessage_Alert(string content, string header)
219 219
        {
220
            App.splashScreen.Close();
221

  
220 222
            DialogParameters parameters = new DialogParameters()
221 223
            {
222 224
                Owner = Application.Current.MainWindow,
KCOM/KCOM.csproj.user
28 28
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOmZhbHNlLCJOZXdDb21tZW50UGVybWlzc2lvbiI6dHJ1ZSwiUHJvamVjdE5PIjoiMDAwMDAwIiwiVXNlcklEIjoiZG9mdGVjaCIsIk1vZGUiOjB9</StartArguments>
29 29
  </PropertyGroup>
30 30
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_HyoSung|AnyCPU'">
31
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjgwMDA3IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiJKRVQiLCJVc2VySUQiOiJ0c3RsZTEifQ==</StartArguments>
31
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQzOTMzIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiJPTDEiLCJVc2VySUQiOiJkb2Z0ZWNoIn0=</StartArguments>
32 32
  </PropertyGroup>
33 33
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_HyoSung|x64'">
34 34
    <StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram>
......
56 56
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments>
57 57
  </PropertyGroup>
58 58
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_Hyosung|AnyCPU'">
59
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjE2MzgwIiwiYlBhcnRuZXIiOiJmYWxzZSIsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6ImZhbHNlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJmYWxzZSIsIlByb2plY3ROTyI6IkxQRyIsIlVzZXJJRCI6IlJFUE9JTlRcXHN5c3RlbSIsIk1vZGUiOjB9/</StartArguments>
59
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQzOTMzIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiJPTDEiLCJVc2VySUQiOiJkb2Z0ZWNoIn0=</StartArguments>
60 60
  </PropertyGroup>
61 61
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_Hyosung|x64'">
62 62
    <StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram>
KCOM/Views/MainMenu.xaml.cs
5476 5476

  
5477 5477
        public void DialogMessage_Alert(string content, string header)
5478 5478
        {
5479
            App.splashScreen.Close();
5480

  
5479 5481
            DialogParameters parameters = new DialogParameters()
5480 5482
            {
5481 5483
                Owner = this.ParentOfType<MainWindow>(),
KCOMDataModel/App.Release_Hyosung.Config
2 2
<!--For more information on using transformations see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
3 3
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
4 4
  <connectionStrings  xdt:Transform="Replace">
5
    <add name="KCOMEntities"
6
     connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;application name=EntityFramework&quot;"
7
     providerName="System.Data.EntityClient" />
8
    <add name="CIEntities"
9
         connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2;initial catalog=markus;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;MultipleActiveResultSets=True;App=EntityFramework&quot;"
10
         providerName="System.Data.EntityClient" />
5
	  <!--효성 Connection String-->
6
	  <add name="ConnectionString" connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"
7
			 xdt:Locator="Match(name)" xdt:Transform="SetAttributes"/>
8
	  <add name="CIConnectionString" connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"
9
		   xdt:Locator="Match(name)" xdt:Transform="SetAttributes"/>
11 10
  </connectionStrings>
12 11
  <applicationSettings  xdt:Transform="Replace">
13 12
    <KCOMDataModel.Properties.Settings>
KCOM_API/KCOM_API.csproj
40 40
    <PublishDatabases>false</PublishDatabases>
41 41
    <IncludeIisSettings>false</IncludeIisSettings>
42 42
    <ExcludeGeneratedDebugSymbol>true</ExcludeGeneratedDebugSymbol>
43
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
43 44
  </PropertyGroup>
44 45
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
45 46
    <DebugType>pdbonly</DebugType>
......
225 226
    <PlatformTarget>x64</PlatformTarget>
226 227
    <ErrorReport>prompt</ErrorReport>
227 228
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
229
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
230
    <Optimize>false</Optimize>
228 231
  </PropertyGroup>
229 232
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
230 233
    <OutputPath>bin\</OutputPath>
231 234
    <DefineConstants>TRACE</DefineConstants>
232
    <Optimize>true</Optimize>
235
    <Optimize>false</Optimize>
233 236
    <DebugType>pdbonly</DebugType>
234 237
    <PlatformTarget>x64</PlatformTarget>
235 238
    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
236 239
    <ErrorReport>prompt</ErrorReport>
237 240
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
241
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
238 242
  </PropertyGroup>
239 243
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_HyoSung|AnyCPU'">
240 244
    <DebugSymbols>true</DebugSymbols>
......
262 266
    <PlatformTarget>x64</PlatformTarget>
263 267
    <ErrorReport>prompt</ErrorReport>
264 268
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
269
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
270
    <Optimize>false</Optimize>
265 271
  </PropertyGroup>
266 272
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_DevDoftech|AnyCPU'">
267 273
    <DebugSymbols>true</DebugSymbols>
......
289 295
    <PlatformTarget>x64</PlatformTarget>
290 296
    <ErrorReport>prompt</ErrorReport>
291 297
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
298
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
299
    <Optimize>false</Optimize>
292 300
  </PropertyGroup>
293 301
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_CadExport|AnyCPU'">
294 302
    <DebugSymbols>true</DebugSymbols>
......
316 324
    <PlatformTarget>x64</PlatformTarget>
317 325
    <ErrorReport>prompt</ErrorReport>
318 326
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
327
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
328
    <Optimize>false</Optimize>
319 329
  </PropertyGroup>
320 330
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_SNI|AnyCPU'">
321 331
    <DebugSymbols>true</DebugSymbols>
......
343 353
    <PlatformTarget>x64</PlatformTarget>
344 354
    <ErrorReport>prompt</ErrorReport>
345 355
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
356
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
357
    <Optimize>false</Optimize>
346 358
  </PropertyGroup>
347 359
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Deploy_Hyosung|AnyCPU' ">
348 360
    <DebugSymbols>true</DebugSymbols>
......
370 382
    <PlatformTarget>x64</PlatformTarget>
371 383
    <ErrorReport>prompt</ErrorReport>
372 384
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
385
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
386
    <Optimize>false</Optimize>
373 387
  </PropertyGroup>
374 388
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_PEMSS|AnyCPU'">
375 389
    <DebugSymbols>true</DebugSymbols>
......
397 411
    <PlatformTarget>x64</PlatformTarget>
398 412
    <ErrorReport>prompt</ErrorReport>
399 413
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
414
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
415
    <Optimize>false</Optimize>
400 416
  </PropertyGroup>
401 417
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_Daelim|AnyCPU'">
402 418
    <DebugSymbols>true</DebugSymbols>
......
424 440
    <PlatformTarget>x64</PlatformTarget>
425 441
    <ErrorReport>prompt</ErrorReport>
426 442
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
443
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
444
    <Optimize>false</Optimize>
427 445
  </PropertyGroup>
428 446
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_Default|AnyCPU'">
429 447
    <DebugSymbols>true</DebugSymbols>
......
451 469
    <PlatformTarget>x64</PlatformTarget>
452 470
    <ErrorReport>prompt</ErrorReport>
453 471
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
472
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
473
    <Optimize>false</Optimize>
454 474
  </PropertyGroup>
455 475
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy_SNI|AnyCPU'">
456 476
    <DebugSymbols>true</DebugSymbols>
......
478 498
    <PlatformTarget>x64</PlatformTarget>
479 499
    <ErrorReport>prompt</ErrorReport>
480 500
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
501
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
502
    <Optimize>false</Optimize>
481 503
  </PropertyGroup>
482 504
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy_Daelim|AnyCPU'">
483 505
    <DebugSymbols>true</DebugSymbols>
......
506 528
    <PlatformTarget>x64</PlatformTarget>
507 529
    <ErrorReport>prompt</ErrorReport>
508 530
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
531
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
532
    <Optimize>false</Optimize>
509 533
  </PropertyGroup>
510 534
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
511 535
  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
KCOM_API/Web.Deploy_Hyosung.config
3 3
<!-- In case configuration is not the root element, replace it with root element in source configuration file -->
4 4
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
5 5
	<connectionStrings xdt:Transform="Replace">
6
		<add name="ConnectionString" connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"
7
			  xdt:Locator="Match(name)" xdt:Transform="SetAttributes"/>
8
		<add name="CIConnectionString" connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"
6
		<!--효성 Connection String-->
7
		<add name="ConnectionString" connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"
8
			   xdt:Locator="Match(name)" xdt:Transform="SetAttributes"/>
9
		<add name="CIConnectionString" connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"
9 10
			 xdt:Locator="Match(name)" xdt:Transform="SetAttributes"/>
10 11
	</connectionStrings>
11 12
	<applicationSettings  xdt:Transform="Replace">
KCOM_API/Web.config
10 10
    </sectionGroup>
11 11
  </configSections>
12 12
  <connectionStrings>
13
    <!--효성 Connection String-->
13 14
    <add name="ConnectionString"
14
      connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;"
15
      connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework&quot;"
15 16
      providerName="System.Data.EntityClient"/>
16 17
    <add name="CIConnectionString"
17
      connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;"
18
      connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework&quot;"
18 19
      providerName="System.Data.EntityClient"/>
19 20
  </connectionStrings>
20 21
  <!--
......
85 86
  <applicationSettings>
86 87
    <KCOM_API.Properties.Settings>
87 88
      <setting name="TileSoucePath" serializeAs="String">
88
        <value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
89
        <value>http://10.11.252.3:8975/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
89 90
      </setting>
90 91
      <setting name="TileSoucePath_SUB" serializeAs="String">
91
        <value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
92
        <value>http://10.11.252.3:8975/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
92 93
      </setting>
93 94
      <setting name="IsProjectNoPass" serializeAs="String">
94 95
        <value>True</value>

내보내기 Unified diff

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