프로젝트

일반

사용자정보

개정판 f65e6c02

IDf65e6c0217de89d4653173b2f16417acc26d5e0a
상위 a1142a6b
하위 b4b23404

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

debug_SNI 추가

Change-Id: I46d431ca15362882a9ab7e8dd7600371f47471de

차이점 보기:

CommonLib/CommonLib.csproj
67 67
    <ErrorReport>prompt</ErrorReport>
68 68
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
69 69
  </PropertyGroup>
70
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_CadExport|AnyCPU'">
71
    <DebugSymbols>true</DebugSymbols>
72
    <OutputPath>bin\Debug_CadExport\</OutputPath>
73
    <DefineConstants>DEBUG;TRACE</DefineConstants>
74
    <DebugType>full</DebugType>
75
    <PlatformTarget>AnyCPU</PlatformTarget>
76
    <ErrorReport>prompt</ErrorReport>
77
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
78
  </PropertyGroup>
79
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_CadExport|x86'">
80
    <DebugSymbols>true</DebugSymbols>
81
    <OutputPath>bin\x86\Debug_CadExport\</OutputPath>
82
    <DefineConstants>DEBUG;TRACE</DefineConstants>
83
    <DebugType>full</DebugType>
84
    <PlatformTarget>x86</PlatformTarget>
85
    <ErrorReport>prompt</ErrorReport>
86
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
87
  </PropertyGroup>
88
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_SNI|AnyCPU'">
89
    <DebugSymbols>true</DebugSymbols>
90
    <OutputPath>bin\Debug_SNI\</OutputPath>
91
    <DefineConstants>DEBUG;TRACE</DefineConstants>
92
    <DebugType>full</DebugType>
93
    <PlatformTarget>AnyCPU</PlatformTarget>
94
    <ErrorReport>prompt</ErrorReport>
95
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
96
  </PropertyGroup>
97
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_SNI|x86'">
98
    <DebugSymbols>true</DebugSymbols>
99
    <OutputPath>bin\x86\Debug_SNI\</OutputPath>
100
    <DefineConstants>DEBUG;TRACE</DefineConstants>
101
    <DebugType>full</DebugType>
102
    <PlatformTarget>x86</PlatformTarget>
103
    <ErrorReport>prompt</ErrorReport>
104
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
105
  </PropertyGroup>
70 106
  <ItemGroup>
71 107
    <Reference Include="System" />
72 108
    <Reference Include="System.Core" />
CompareLib/CompareLib.csproj
69 69
    <ErrorReport>prompt</ErrorReport>
70 70
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
71 71
  </PropertyGroup>
72
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_CadExport|AnyCPU'">
73
    <DebugSymbols>true</DebugSymbols>
74
    <OutputPath>bin\Debug_CadExport\</OutputPath>
75
    <DefineConstants>DEBUG;TRACE</DefineConstants>
76
    <DebugType>full</DebugType>
77
    <PlatformTarget>x64</PlatformTarget>
78
    <ErrorReport>prompt</ErrorReport>
79
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
80
  </PropertyGroup>
81
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_CadExport|x86'">
82
    <DebugSymbols>true</DebugSymbols>
83
    <OutputPath>bin\x86\Debug_CadExport\</OutputPath>
84
    <DefineConstants>DEBUG;TRACE</DefineConstants>
85
    <DebugType>full</DebugType>
86
    <PlatformTarget>x86</PlatformTarget>
87
    <ErrorReport>prompt</ErrorReport>
88
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
89
  </PropertyGroup>
90
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_SNI|AnyCPU'">
91
    <DebugSymbols>true</DebugSymbols>
92
    <OutputPath>bin\Debug_SNI\</OutputPath>
93
    <DefineConstants>DEBUG;TRACE</DefineConstants>
94
    <DebugType>full</DebugType>
95
    <PlatformTarget>x64</PlatformTarget>
96
    <ErrorReport>prompt</ErrorReport>
97
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
98
  </PropertyGroup>
99
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_SNI|x86'">
100
    <DebugSymbols>true</DebugSymbols>
101
    <OutputPath>bin\x86\Debug_SNI\</OutputPath>
102
    <DefineConstants>DEBUG;TRACE</DefineConstants>
103
    <DebugType>full</DebugType>
104
    <PlatformTarget>x86</PlatformTarget>
105
    <ErrorReport>prompt</ErrorReport>
106
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
107
  </PropertyGroup>
72 108
  <ItemGroup>
73 109
    <Reference Include="Magick.NET-x64, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=AMD64">
74 110
      <HintPath>..\packages\Magick.NET-7.0.0.18-Q16-x64.1.0.0\lib\net40-client\Magick.NET-x64.dll</HintPath>
FinalService/KCOM_FinalService/IFinalPDF/IFinalPDF.csproj
65 65
    <ErrorReport>prompt</ErrorReport>
66 66
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
67 67
  </PropertyGroup>
68
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_CadExport|AnyCPU'">
69
    <DebugSymbols>true</DebugSymbols>
70
    <OutputPath>bin\Debug_CadExport\</OutputPath>
71
    <DefineConstants>DEBUG;TRACE</DefineConstants>
72
    <DebugType>full</DebugType>
73
    <PlatformTarget>AnyCPU</PlatformTarget>
74
    <ErrorReport>prompt</ErrorReport>
75
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
76
  </PropertyGroup>
77
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_CadExport|x86'">
78
    <DebugSymbols>true</DebugSymbols>
79
    <OutputPath>bin\x86\Debug_CadExport\</OutputPath>
80
    <DefineConstants>DEBUG;TRACE</DefineConstants>
81
    <DebugType>full</DebugType>
82
    <PlatformTarget>x86</PlatformTarget>
83
    <ErrorReport>prompt</ErrorReport>
84
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
85
  </PropertyGroup>
86
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_SNI|AnyCPU'">
87
    <DebugSymbols>true</DebugSymbols>
88
    <OutputPath>bin\Debug_SNI\</OutputPath>
89
    <DefineConstants>DEBUG;TRACE</DefineConstants>
90
    <DebugType>full</DebugType>
91
    <PlatformTarget>AnyCPU</PlatformTarget>
92
    <ErrorReport>prompt</ErrorReport>
93
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
94
  </PropertyGroup>
95
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_SNI|x86'">
96
    <DebugSymbols>true</DebugSymbols>
97
    <OutputPath>bin\x86\Debug_SNI\</OutputPath>
98
    <DefineConstants>DEBUG;TRACE</DefineConstants>
99
    <DebugType>full</DebugType>
100
    <PlatformTarget>x86</PlatformTarget>
101
    <ErrorReport>prompt</ErrorReport>
102
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
103
  </PropertyGroup>
68 104
  <ItemGroup>
69 105
    <Reference Include="System" />
70 106
    <Reference Include="System.Core" />
IKCOM/IKCOM.csproj
68 68
    <ErrorReport>prompt</ErrorReport>
69 69
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
70 70
  </PropertyGroup>
71
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_CadExport|AnyCPU'">
72
    <DebugSymbols>true</DebugSymbols>
73
    <OutputPath>bin\Debug_CadExport\</OutputPath>
74
    <DefineConstants>DEBUG;TRACE</DefineConstants>
75
    <DebugType>full</DebugType>
76
    <PlatformTarget>AnyCPU</PlatformTarget>
77
    <ErrorReport>prompt</ErrorReport>
78
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
79
  </PropertyGroup>
80
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_CadExport|x86'">
81
    <DebugSymbols>true</DebugSymbols>
82
    <OutputPath>bin\x86\Debug_CadExport\</OutputPath>
83
    <DefineConstants>DEBUG;TRACE</DefineConstants>
84
    <DebugType>full</DebugType>
85
    <PlatformTarget>x86</PlatformTarget>
86
    <ErrorReport>prompt</ErrorReport>
87
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
88
  </PropertyGroup>
89
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_SNI|AnyCPU'">
90
    <DebugSymbols>true</DebugSymbols>
91
    <OutputPath>bin\Debug_SNI\</OutputPath>
92
    <DefineConstants>DEBUG;TRACE</DefineConstants>
93
    <DebugType>full</DebugType>
94
    <PlatformTarget>AnyCPU</PlatformTarget>
95
    <ErrorReport>prompt</ErrorReport>
96
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
97
  </PropertyGroup>
98
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_SNI|x86'">
99
    <DebugSymbols>true</DebugSymbols>
100
    <OutputPath>bin\x86\Debug_SNI\</OutputPath>
101
    <DefineConstants>DEBUG;TRACE</DefineConstants>
102
    <DebugType>full</DebugType>
103
    <PlatformTarget>x86</PlatformTarget>
104
    <ErrorReport>prompt</ErrorReport>
105
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
106
  </PropertyGroup>
71 107
  <ItemGroup>
72 108
    <Reference Include="PresentationCore" />
73 109
    <Reference Include="PresentationFramework" />
INI/MARKUS_SNI.ini
1
[Internal]
2
IP=http://sdms.co.kr:8080/API
3
[External]
4
IP=http://sdms.co.kr:8080/API
5
[BaseClientAddress]
6
URL=http://sdms.co.kr:8080/API
7
[HubAddress]
8
URL=http://192.168.0.67:5100/
9
[UpdateVer64]
10
URL=http://localhost:8080/TileSource/Version/version_x64.xml
11
[UpdateVer86]
12
URL=http://localhost:8080/TileSource/Version/version_x86.xml
13
[excelFilePath]
14
URL=http://localhost:8080/TileSource/Check_Test/CheckList_T.xlsx
15
[KCOM_Get_FinalImage_Get_PdfImage]
16
URL=http://localhost:8080/Get_FInalImage/Get_PdfImage.asmx
17
[KCOM_kr_co_devdoftech_cloud_FileUpload]
18
URL=http://sdms.co.kr:8080/ImageUpload/FileUpload.asmx
19
[mainServerImageWebPath]
20
URL=http://sdms.co.kr:8080/TileSource/{0}_Tile/{1}/{2}/{3}.png
21
[subServerImageWebPath]
22
URL=http://sdms.co.kr:8080/TileSource/{0}_Tile/{1}/{2}/{3}.png
23
[Debug_BaseClientAddress]
24
URL=http://192.168.0.67:5979
25
[HOST_DOMAIN]
26
DOMAIN=
27
[GetConversionStateFailed]
28
MSG=VG9vIE1hbnkgVi9QIEZpbGVzIGFyZSB1cGxvYWRpbmcgaW5zdGFudGFuZW91c2x5LCBUaGlzIFYvUCBmaWxlIGNhbiBub3QgYmUgb3BlbiBub3cuIFBsZWFzZSBmZWVsIGZyZWUgdG8gcmUtb3BlbiB3YWl0IGEgbW9tZW50IGFnYWluIVxuXG7tmITsnqwg7J287Iuc7KCB7Jy866GcIOunjuydgCDslpHsnZggVi9Q6rCAIOuTseuhneuQmOqzoCDsnojslrQg7J20IOusuOyEnOulvCDsl7TrnoztlaAg7IiYIOyXhuyKteuLiOuLpC5cbuyeoOyLnOunjCDquLDri6TroKQg7KO87IugIO2bhCDri6Tsi5wg7Je0656M7ZWY7JesIOyjvOyLnOq4sCDrsJTrno3ri4jri6Q=
29
[SetFinalPDFError]
30
MSG=7LWc7KKFIO2MjOydvOydhCDrp4zrk5zripTrjbAg66y47KCc6rCAIOuwnOyDne2VmOyYgOyKteuLiOuLpA==
31
[SetFinalPDFSuccess]
32
MSG=7LWc7KKFIO2MjOydvCDsg53shLEg7KSR7J6F64uI64ukLiDrrLjshJzqtIDrpqzsi5zsiqTthZzsnYQg7ZmV7J247ZW07KO87IS47JqU
33
[SetThumbnail]
34
WIDTH=265
35
[Site]
36
NAME=DAELIM
37
[PortForwarding]
38
HUB=5100:5100
39
RESOURCE=5977:5977
40
BASE=8080:8080
41
[GetImageResourceFailed]
42
MSG=7ZW064u5IOusuOyEnOydmCB7MH0gUGFnZSBDb252ZXJ06rCAIOygleyDgeyggeydtOyngCDslYrsirXri4jri6QuIOq0gOumrOyekOyXkOqyjCDrrLjsnZjtlbQg7KO87IS47JqULg==
KCOM.sln
44 44
		INI\MARKUS_Doftech_Remote.ini = INI\MARKUS_Doftech_Remote.ini
45 45
		INI\MARKUS_Doftech_Remote_123port.ini = INI\MARKUS_Doftech_Remote_123port.ini
46 46
		INI\MARKUS_LOCAL.ini = INI\MARKUS_LOCAL.ini
47
		Site\SNI\MARKUS_SNI.ini = Site\SNI\MARKUS_SNI.ini
47 48
	EndProjectSection
48 49
EndProject
49 50
Global
50 51
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
52
		Debug_CadExport|Any CPU = Debug_CadExport|Any CPU
53
		Debug_CadExport|x64 = Debug_CadExport|x64
54
		Debug_CadExport|x86 = Debug_CadExport|x86
51 55
		Debug_DevDoftech|Any CPU = Debug_DevDoftech|Any CPU
52 56
		Debug_DevDoftech|x64 = Debug_DevDoftech|x64
53 57
		Debug_DevDoftech|x86 = Debug_DevDoftech|x86
54 58
		Debug_HyoSung|Any CPU = Debug_HyoSung|Any CPU
55 59
		Debug_HyoSung|x64 = Debug_HyoSung|x64
56 60
		Debug_HyoSung|x86 = Debug_HyoSung|x86
61
		Debug_SNI|Any CPU = Debug_SNI|Any CPU
62
		Debug_SNI|x64 = Debug_SNI|x64
63
		Debug_SNI|x86 = Debug_SNI|x86
57 64
		Debug|Any CPU = Debug|Any CPU
58 65
		Debug|x64 = Debug|x64
59 66
		Debug|x86 = Debug|x86
......
62 69
		Release|x86 = Release|x86
63 70
	EndGlobalSection
64 71
	GlobalSection(ProjectConfigurationPlatforms) = postSolution
72
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_CadExport|Any CPU.ActiveCfg = Debug_CadExport|Any CPU
73
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_CadExport|Any CPU.Build.0 = Debug_CadExport|Any CPU
74
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_CadExport|x64.ActiveCfg = Debug_CadExport|x64
75
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_CadExport|x64.Build.0 = Debug_CadExport|x64
76
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_CadExport|x86.ActiveCfg = Debug_CadExport|x86
77
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_CadExport|x86.Build.0 = Debug_CadExport|x86
65 78
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug_DevDoftech|Any CPU
66 79
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_DevDoftech|Any CPU.Build.0 = Debug_DevDoftech|Any CPU
67 80
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
......
74 87
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_HyoSung|x64.Build.0 = Debug_HyoSung|x64
75 88
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_HyoSung|x86.ActiveCfg = Debug_HyoSung|x86
76 89
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_HyoSung|x86.Build.0 = Debug_HyoSung|x86
90
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_SNI|Any CPU.ActiveCfg = Debug_SNI|Any CPU
91
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_SNI|Any CPU.Build.0 = Debug_SNI|Any CPU
92
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_SNI|x64.ActiveCfg = Debug_SNI|x64
93
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_SNI|x64.Build.0 = Debug_SNI|x64
94
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_SNI|x86.ActiveCfg = Debug_SNI|x86
95
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug_SNI|x86.Build.0 = Debug_SNI|x86
77 96
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78 97
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug|Any CPU.Build.0 = Debug|Any CPU
79 98
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Debug|x64.ActiveCfg = Debug|x64
......
86 105
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Release|x64.Build.0 = Debug|Any CPU
87 106
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Release|x86.ActiveCfg = Debug|Any CPU
88 107
		{9F7C22A1-065C-4203-A570-F9EEA08F2344}.Release|x86.Build.0 = Debug|Any CPU
108
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_CadExport|Any CPU.ActiveCfg = Debug_CadExport|Any CPU
109
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_CadExport|Any CPU.Build.0 = Debug_CadExport|Any CPU
110
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_CadExport|x64.ActiveCfg = Debug_CadExport|Any CPU
111
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_CadExport|x64.Build.0 = Debug_CadExport|Any CPU
112
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_CadExport|x86.ActiveCfg = Debug_CadExport|x86
113
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_CadExport|x86.Build.0 = Debug_CadExport|x86
89 114
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug|Any CPU
90 115
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_DevDoftech|Any CPU.Build.0 = Debug|Any CPU
91 116
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
......
98 123
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_HyoSung|x64.Build.0 = Debug_HyoSung|Any CPU
99 124
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_HyoSung|x86.ActiveCfg = Debug_HyoSung|x86
100 125
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_HyoSung|x86.Build.0 = Debug_HyoSung|x86
126
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_SNI|Any CPU.ActiveCfg = Debug_SNI|Any CPU
127
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_SNI|Any CPU.Build.0 = Debug_SNI|Any CPU
128
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_SNI|x64.ActiveCfg = Debug_SNI|Any CPU
129
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_SNI|x64.Build.0 = Debug_SNI|Any CPU
130
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_SNI|x86.ActiveCfg = Debug_SNI|x86
131
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug_SNI|x86.Build.0 = Debug_SNI|x86
101 132
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
102 133
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
103 134
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Debug|x64.ActiveCfg = Debug|Any CPU
......
110 141
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Release|x64.Build.0 = Debug|Any CPU
111 142
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Release|x86.ActiveCfg = Debug|Any CPU
112 143
		{2CE89D0E-F2F8-40B2-88CA-2496C0E48EB0}.Release|x86.Build.0 = Debug|Any CPU
144
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_CadExport|Any CPU.ActiveCfg = Debug_CadExport|Any CPU
145
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_CadExport|Any CPU.Build.0 = Debug_CadExport|Any CPU
146
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_CadExport|x64.ActiveCfg = Debug_CadExport|Any CPU
147
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_CadExport|x64.Build.0 = Debug_CadExport|Any CPU
148
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_CadExport|x86.ActiveCfg = Debug_CadExport|x86
149
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_CadExport|x86.Build.0 = Debug_CadExport|x86
113 150
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug|Any CPU
114 151
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_DevDoftech|Any CPU.Build.0 = Debug|Any CPU
115 152
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
......
122 159
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_HyoSung|x64.Build.0 = Debug_HyoSung|Any CPU
123 160
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_HyoSung|x86.ActiveCfg = Debug_HyoSung|x86
124 161
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_HyoSung|x86.Build.0 = Debug_HyoSung|x86
162
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_SNI|Any CPU.ActiveCfg = Debug_SNI|Any CPU
163
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_SNI|Any CPU.Build.0 = Debug_SNI|Any CPU
164
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_SNI|x64.ActiveCfg = Debug_SNI|Any CPU
165
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_SNI|x64.Build.0 = Debug_SNI|Any CPU
166
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_SNI|x86.ActiveCfg = Debug_SNI|x86
167
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug_SNI|x86.Build.0 = Debug_SNI|x86
125 168
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
126 169
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
127 170
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Debug|x64.ActiveCfg = Debug|Any CPU
......
134 177
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Release|x64.Build.0 = Debug|Any CPU
135 178
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Release|x86.ActiveCfg = Debug|Any CPU
136 179
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Release|x86.Build.0 = Debug|Any CPU
180
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_CadExport|Any CPU.ActiveCfg = Debug_CadExport|Any CPU
181
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_CadExport|Any CPU.Build.0 = Debug_CadExport|Any CPU
182
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_CadExport|x64.ActiveCfg = Debug_CadExport|x64
183
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_CadExport|x64.Build.0 = Debug_CadExport|x64
184
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_CadExport|x86.ActiveCfg = Debug_CadExport|x86
185
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_CadExport|x86.Build.0 = Debug_CadExport|x86
137 186
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug_DevDoftech|Any CPU
138 187
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DevDoftech|Any CPU.Build.0 = Debug_DevDoftech|Any CPU
139 188
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
......
146 195
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_HyoSung|x64.Build.0 = Debug_HyoSung|x64
147 196
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_HyoSung|x86.ActiveCfg = Debug_HyoSung|x86
148 197
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_HyoSung|x86.Build.0 = Debug_HyoSung|x86
198
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_SNI|Any CPU.ActiveCfg = Debug_SNI|Any CPU
199
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_SNI|Any CPU.Build.0 = Debug_SNI|Any CPU
200
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_SNI|x64.ActiveCfg = Debug_SNI|x64
201
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_SNI|x64.Build.0 = Debug_SNI|x64
202
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_SNI|x86.ActiveCfg = Debug_SNI|x86
203
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_SNI|x86.Build.0 = Debug_SNI|x86
149 204
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
150 205
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug|Any CPU.Build.0 = Debug|Any CPU
151 206
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug|x64.ActiveCfg = Debug|x64
......
158 213
		{F026B592-11B9-410C-B4FF-384E511A4666}.Release|x64.Build.0 = Debug|Any CPU
159 214
		{F026B592-11B9-410C-B4FF-384E511A4666}.Release|x86.ActiveCfg = Debug|Any CPU
160 215
		{F026B592-11B9-410C-B4FF-384E511A4666}.Release|x86.Build.0 = Debug|Any CPU
216
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_CadExport|Any CPU.ActiveCfg = Debug_CadExport|Any CPU
217
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_CadExport|Any CPU.Build.0 = Debug_CadExport|Any CPU
218
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_CadExport|x64.ActiveCfg = Debug_CadExport|Any CPU
219
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_CadExport|x64.Build.0 = Debug_CadExport|Any CPU
220
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_CadExport|x86.ActiveCfg = Debug_CadExport|x86
221
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_CadExport|x86.Build.0 = Debug_CadExport|x86
161 222
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug|Any CPU
162 223
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_DevDoftech|Any CPU.Build.0 = Debug|Any CPU
163 224
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
......
170 231
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_HyoSung|x64.Build.0 = Debug_HyoSung|Any CPU
171 232
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_HyoSung|x86.ActiveCfg = Debug_HyoSung|x86
172 233
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_HyoSung|x86.Build.0 = Debug_HyoSung|x86
234
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_SNI|Any CPU.ActiveCfg = Debug_SNI|Any CPU
235
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_SNI|Any CPU.Build.0 = Debug_SNI|Any CPU
236
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_SNI|x64.ActiveCfg = Debug_SNI|Any CPU
237
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_SNI|x64.Build.0 = Debug_SNI|Any CPU
238
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_SNI|x86.ActiveCfg = Debug_SNI|x86
239
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_SNI|x86.Build.0 = Debug_SNI|x86
173 240
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
174 241
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug|Any CPU.Build.0 = Debug|Any CPU
175 242
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug|x64.ActiveCfg = Debug|Any CPU
......
182 249
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Release|x64.Build.0 = Debug|Any CPU
183 250
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Release|x86.ActiveCfg = Debug|Any CPU
184 251
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Release|x86.Build.0 = Debug|Any CPU
252
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_CadExport|Any CPU.ActiveCfg = Debug_CadExport|Any CPU
253
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_CadExport|Any CPU.Build.0 = Debug_CadExport|Any CPU
254
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_CadExport|x64.ActiveCfg = Debug_CadExport|Any CPU
255
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_CadExport|x64.Build.0 = Debug_CadExport|Any CPU
256
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_CadExport|x86.ActiveCfg = Debug_CadExport|x86
257
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_CadExport|x86.Build.0 = Debug_CadExport|x86
185 258
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug|Any CPU
186 259
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_DevDoftech|Any CPU.Build.0 = Debug|Any CPU
187 260
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
......
194 267
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_HyoSung|x64.Build.0 = Debug_HyoSung|Any CPU
195 268
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_HyoSung|x86.ActiveCfg = Debug_HyoSung|x86
196 269
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_HyoSung|x86.Build.0 = Debug_HyoSung|x86
270
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_SNI|Any CPU.ActiveCfg = Debug_SNI|Any CPU
271
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_SNI|Any CPU.Build.0 = Debug_SNI|Any CPU
272
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_SNI|x64.ActiveCfg = Debug_SNI|Any CPU
273
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_SNI|x64.Build.0 = Debug_SNI|Any CPU
274
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_SNI|x86.ActiveCfg = Debug_SNI|x86
275
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug_SNI|x86.Build.0 = Debug_SNI|x86
197 276
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
198 277
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug|Any CPU.Build.0 = Debug|Any CPU
199 278
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Debug|x64.ActiveCfg = Debug|Any CPU
......
206 285
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Release|x64.Build.0 = Debug|Any CPU
207 286
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Release|x86.ActiveCfg = Debug|Any CPU
208 287
		{F236A005-12F4-406A-B9ED-0C3B5D994001}.Release|x86.Build.0 = Debug|Any CPU
288
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_CadExport|Any CPU.ActiveCfg = Debug_CadExport|Any CPU
289
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_CadExport|Any CPU.Build.0 = Debug_CadExport|Any CPU
290
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_CadExport|x64.ActiveCfg = Debug_CadExport|x64
291
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_CadExport|x64.Build.0 = Debug_CadExport|x64
292
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_CadExport|x86.ActiveCfg = Debug_CadExport|x86
293
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_CadExport|x86.Build.0 = Debug_CadExport|x86
209 294
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug|Any CPU
210 295
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_DevDoftech|Any CPU.Build.0 = Debug|Any CPU
211 296
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
......
218 303
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_HyoSung|x64.Build.0 = Debug_HyoSung|x64
219 304
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_HyoSung|x86.ActiveCfg = Debug_HyoSung|x86
220 305
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_HyoSung|x86.Build.0 = Debug_HyoSung|x86
306
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_SNI|Any CPU.ActiveCfg = Debug_SNI|Any CPU
307
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_SNI|Any CPU.Build.0 = Debug_SNI|Any CPU
308
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_SNI|x64.ActiveCfg = Debug_SNI|x64
309
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_SNI|x64.Build.0 = Debug_SNI|x64
310
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_SNI|x86.ActiveCfg = Debug_SNI|x86
311
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug_SNI|x86.Build.0 = Debug_SNI|x86
221 312
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
222 313
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug|Any CPU.Build.0 = Debug|Any CPU
223 314
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Debug|x64.ActiveCfg = Debug|x64
......
230 321
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Release|x64.Build.0 = Debug|Any CPU
231 322
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Release|x86.ActiveCfg = Debug|Any CPU
232 323
		{A714BD67-8AAC-4ED8-8ECF-7853C3549A68}.Release|x86.Build.0 = Debug|Any CPU
324
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_CadExport|Any CPU.ActiveCfg = Debug_CadExport|Any CPU
325
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_CadExport|Any CPU.Build.0 = Debug_CadExport|Any CPU
326
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_CadExport|x64.ActiveCfg = Debug_CadExport|Any CPU
327
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_CadExport|x64.Build.0 = Debug_CadExport|Any CPU
328
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_CadExport|x86.ActiveCfg = Debug_CadExport|x86
329
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_CadExport|x86.Build.0 = Debug_CadExport|x86
233 330
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug|Any CPU
234 331
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_DevDoftech|Any CPU.Build.0 = Debug|Any CPU
235 332
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
......
242 339
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_HyoSung|x64.Build.0 = Debug_HyoSung|Any CPU
243 340
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_HyoSung|x86.ActiveCfg = Debug_HyoSung|x86
244 341
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_HyoSung|x86.Build.0 = Debug_HyoSung|x86
342
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_SNI|Any CPU.ActiveCfg = Debug_SNI|Any CPU
343
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_SNI|Any CPU.Build.0 = Debug_SNI|Any CPU
344
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_SNI|x64.ActiveCfg = Debug_SNI|Any CPU
345
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_SNI|x64.Build.0 = Debug_SNI|Any CPU
346
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_SNI|x86.ActiveCfg = Debug_SNI|x86
347
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug_SNI|x86.Build.0 = Debug_SNI|x86
245 348
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
246 349
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug|Any CPU.Build.0 = Debug|Any CPU
247 350
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Debug|x64.ActiveCfg = Debug|Any CPU
......
254 357
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Release|x64.Build.0 = Debug|Any CPU
255 358
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Release|x86.ActiveCfg = Debug|Any CPU
256 359
		{AB53FC3B-606B-499E-B2A8-ACDB3BCC2C98}.Release|x86.Build.0 = Debug|Any CPU
360
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_CadExport|Any CPU.ActiveCfg = Debug_CadExport|Any CPU
361
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_CadExport|Any CPU.Build.0 = Debug_CadExport|Any CPU
362
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_CadExport|x64.ActiveCfg = Debug_CadExport|x64
363
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_CadExport|x64.Build.0 = Debug_CadExport|x64
364
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_CadExport|x86.ActiveCfg = Debug_CadExport|x86
365
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_CadExport|x86.Build.0 = Debug_CadExport|x86
257 366
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug|Any CPU
258 367
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_DevDoftech|Any CPU.Build.0 = Debug|Any CPU
259 368
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
......
266 375
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_HyoSung|x64.Build.0 = Debug_HyoSung|x64
267 376
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_HyoSung|x86.ActiveCfg = Debug_HyoSung|x86
268 377
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_HyoSung|x86.Build.0 = Debug_HyoSung|x86
378
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_SNI|Any CPU.ActiveCfg = Debug_SNI|Any CPU
379
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_SNI|Any CPU.Build.0 = Debug_SNI|Any CPU
380
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_SNI|x64.ActiveCfg = Debug_SNI|x64
381
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_SNI|x64.Build.0 = Debug_SNI|x64
382
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_SNI|x86.ActiveCfg = Debug_SNI|x86
383
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug_SNI|x86.Build.0 = Debug_SNI|x86
269 384
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
270 385
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug|Any CPU.Build.0 = Debug|Any CPU
271 386
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug|x64.ActiveCfg = Debug|x64
......
278 393
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Release|x64.Build.0 = Debug|Any CPU
279 394
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Release|x86.ActiveCfg = Debug|Any CPU
280 395
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Release|x86.Build.0 = Debug|Any CPU
396
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_CadExport|Any CPU.ActiveCfg = Debug_CadExport|Any CPU
397
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_CadExport|Any CPU.Build.0 = Debug_CadExport|Any CPU
398
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_CadExport|x64.ActiveCfg = Debug_CadExport|Any CPU
399
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_CadExport|x64.Build.0 = Debug_CadExport|Any CPU
400
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_CadExport|x86.ActiveCfg = Debug_CadExport|x86
401
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_CadExport|x86.Build.0 = Debug_CadExport|x86
281 402
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug|Any CPU
282 403
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_DevDoftech|Any CPU.Build.0 = Debug|Any CPU
283 404
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
......
290 411
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_HyoSung|x64.Build.0 = Debug_HyoSung|Any CPU
291 412
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_HyoSung|x86.ActiveCfg = Debug_HyoSung|x86
292 413
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_HyoSung|x86.Build.0 = Debug_HyoSung|x86
414
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_SNI|Any CPU.ActiveCfg = Debug_SNI|Any CPU
415
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_SNI|Any CPU.Build.0 = Debug_SNI|Any CPU
416
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_SNI|x64.ActiveCfg = Debug_SNI|Any CPU
417
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_SNI|x64.Build.0 = Debug_SNI|Any CPU
418
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_SNI|x86.ActiveCfg = Debug_SNI|x86
419
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug_SNI|x86.Build.0 = Debug_SNI|x86
293 420
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
294 421
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
295 422
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug|x64.ActiveCfg = Debug|Any CPU
......
302 429
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Release|x64.Build.0 = Debug|Any CPU
303 430
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Release|x86.ActiveCfg = Debug|Any CPU
304 431
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Release|x86.Build.0 = Debug|Any CPU
432
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_CadExport|Any CPU.ActiveCfg = Debug_CadExport|Any CPU
433
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_CadExport|Any CPU.Build.0 = Debug_CadExport|Any CPU
434
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_CadExport|x64.ActiveCfg = Debug_CadExport|Any CPU
435
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_CadExport|x64.Build.0 = Debug_CadExport|Any CPU
436
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_CadExport|x86.ActiveCfg = Debug_CadExport|x86
437
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_CadExport|x86.Build.0 = Debug_CadExport|x86
305 438
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug|Any CPU
306 439
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_DevDoftech|Any CPU.Build.0 = Debug|Any CPU
307 440
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
......
314 447
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_HyoSung|x64.Build.0 = Debug_HyoSung|Any CPU
315 448
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_HyoSung|x86.ActiveCfg = Debug_HyoSung|x86
316 449
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_HyoSung|x86.Build.0 = Debug_HyoSung|x86
450
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_SNI|Any CPU.ActiveCfg = Debug_SNI|Any CPU
451
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_SNI|Any CPU.Build.0 = Debug_SNI|Any CPU
452
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_SNI|x64.ActiveCfg = Debug_SNI|Any CPU
453
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_SNI|x64.Build.0 = Debug_SNI|Any CPU
454
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_SNI|x86.ActiveCfg = Debug_SNI|x86
455
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug_SNI|x86.Build.0 = Debug_SNI|x86
317 456
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
318 457
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug|Any CPU.Build.0 = Debug|Any CPU
319 458
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug|x64.ActiveCfg = Debug|Any CPU
......
326 465
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Release|x64.Build.0 = Debug|Any CPU
327 466
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Release|x86.ActiveCfg = Debug|Any CPU
328 467
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Release|x86.Build.0 = Debug|Any CPU
468
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_CadExport|Any CPU.ActiveCfg = Debug_CadExport
469
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_CadExport|Any CPU.Build.0 = Debug_CadExport
470
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_CadExport|x64.ActiveCfg = Debug_CadExport
471
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_CadExport|x64.Build.0 = Debug_CadExport
472
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_CadExport|x86.ActiveCfg = Debug_CadExport
473
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_CadExport|x86.Build.0 = Debug_CadExport
329 474
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug
330 475
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_DevDoftech|Any CPU.Build.0 = Debug
331 476
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_DevDoftech|x64.ActiveCfg = Debug
......
338 483
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_HyoSung|x64.Build.0 = Debug_HyoSung
339 484
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_HyoSung|x86.ActiveCfg = Debug_HyoSung
340 485
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_HyoSung|x86.Build.0 = Debug_HyoSung
486
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_SNI|Any CPU.ActiveCfg = Debug_SNI
487
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_SNI|Any CPU.Build.0 = Debug_SNI
488
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_SNI|x64.ActiveCfg = Debug_SNI
489
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_SNI|x64.Build.0 = Debug_SNI
490
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_SNI|x86.ActiveCfg = Debug_SNI
491
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_SNI|x86.Build.0 = Debug_SNI
341 492
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug|Any CPU.ActiveCfg = Debug
342 493
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug|Any CPU.Build.0 = Debug
343 494
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug|x64.ActiveCfg = Debug
......
350 501
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Release|x64.Build.0 = Debug
351 502
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Release|x86.ActiveCfg = Debug
352 503
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Release|x86.Build.0 = Debug
504
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_CadExport|Any CPU.ActiveCfg = Debug_CadExport|Any CPU
505
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_CadExport|Any CPU.Build.0 = Debug_CadExport|Any CPU
506
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_CadExport|x64.ActiveCfg = Debug_CadExport|Any CPU
507
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_CadExport|x64.Build.0 = Debug_CadExport|Any CPU
508
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_CadExport|x86.ActiveCfg = Debug_CadExport|Any CPU
509
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_CadExport|x86.Build.0 = Debug_CadExport|Any CPU
353 510
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug|Any CPU
354 511
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_DevDoftech|Any CPU.Build.0 = Debug|Any CPU
355 512
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
......
362 519
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_HyoSung|x64.Build.0 = Debug_HyoSung|Any CPU
363 520
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_HyoSung|x86.ActiveCfg = Debug_HyoSung|Any CPU
364 521
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_HyoSung|x86.Build.0 = Debug_HyoSung|Any CPU
522
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_SNI|Any CPU.ActiveCfg = Debug_SNI|Any CPU
523
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_SNI|Any CPU.Build.0 = Debug_SNI|Any CPU
524
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_SNI|x64.ActiveCfg = Debug_SNI|Any CPU
525
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_SNI|x64.Build.0 = Debug_SNI|Any CPU
526
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_SNI|x86.ActiveCfg = Debug_SNI|Any CPU
527
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_SNI|x86.Build.0 = Debug_SNI|Any CPU
365 528
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
366 529
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
367 530
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug|x64.ActiveCfg = Debug|Any CPU
KCOM/App.xaml
13 13
                <ResourceDictionary Source="Resources\Theme_CustomControl.xaml"/>
14 14
                <ResourceDictionary Source="Resources\SimpleLIstViewStyle.xaml"/>
15 15
                <ResourceDictionary Source="Resources\ClearTextBoxStyle.xaml"/>
16
                <ResourceDictionary Source="Resources\DragAndDropListBoxStyle.xaml"/>
17 16
                <ResourceDictionary Source="Assets\RadGridViewStyleResourceDictionary.xaml"/>
18 17
                <ResourceDictionary Source="Messenger\StyleDictionary.xaml"/>
19 18
                <ResourceDictionary Source="/MarkupToPDF;component/themes/generic.xaml"/>
......
29 28
                <ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.Input.xaml"/>
30 29
                <ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.Navigation.xaml"/>
31 30
                <ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.Docking.xaml"/>
31

  
32
                <ResourceDictionary Source="Resources\DragAndDropListBoxStyle.xaml"/>
32 33
                <!--<ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.RibbonView.xaml"/>-->
33 34
                <!--<ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.Docking.xaml"/>-->
34 35
            </ResourceDictionary.MergedDictionaries>
KCOM/Behaviors/RadListBoxDragVisualProvider.cs
1
using System;
2
using System.Collections.Generic;
3
using System.Linq;
4
using System.Text;
5
using System.Threading.Tasks;
6
using System.Windows;
7
using Telerik.Windows.DragDrop;
8
using Telerik.Windows.DragDrop.Behaviors;
9

  
10
namespace KCOM.Behaviors
11
{
12
    public class RadListBoxDragVisualProvider : DependencyObject, IDragVisualProvider
13
    {
14
        public static readonly DependencyProperty DraggedItemTemplateProperty =
15
            DependencyProperty.Register("DraggedItemTemplate",typeof(DataTemplate),
16
                typeof(RadListBoxDragVisualProvider),new PropertyMetadata(null));
17

  
18
        public DataTemplate DraggedItemTemplate
19
        {
20
            get { return (DataTemplate)GetValue(DraggedItemTemplateProperty); }
21
            set { SetValue(DraggedItemTemplateProperty, value); }
22
        }
23

  
24
        public static readonly DependencyProperty DragVisualStyleProperty =
25
         DependencyProperty.Register("DragVisualStyle", typeof(Style),
26
             typeof(RadListBoxDragVisualProvider), new PropertyMetadata(null));
27

  
28
        public Style DragVisualStyle
29
        {
30
            get { return (Style)GetValue(DragVisualStyleProperty); }
31
            set { SetValue(DragVisualStyleProperty, value); }
32
        }
33

  
34
        public FrameworkElement CreateDragVisual(DragVisualProviderState state)
35
        {
36
            var visual = new DragVisual {Style = DragVisualStyle };
37
            visual.Content = state.DraggedItems.OfType<object>().FirstOrDefault();
38
            visual.ContentTemplate = this.DraggedItemTemplate;
39
            return visual;
40
        }
41

  
42
        public Point GetDragVisualOffset(DragVisualProviderState state)
43
        {
44
            return new Point(state.RelativeStartPoint.X - 20, state.RelativeStartPoint.Y - 20);
45
        }
46

  
47
        public bool UseDefaultCursors { get; set; }
48
    }
49
}
KCOM/Common/Converter/SvgImageConverter.cs
12 12

  
13 13
namespace KCOM.Common.Converter
14 14
{
15
    class SvgImageConverter : IMultiValueConverter
15
    class SvgImageConverter : IValueConverter
16 16
    {
17
        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
17

  
18
        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
18 19
        {
20
            if(value == null)
21
            {
22
                return null;
23
            }
24

  
19 25
            //var uri = string.Format("pack://application:,,,/images/{0}{1}.png", values); // for example
20
            var uri = values[0].ToString();
26
            var uri = value.ToString();
21 27

  
22 28
            Image img = new Image();
23 29
            if (uri.Contains(".svg"))
......
41 47
            //return new BitmapImage(new Uri(uri));
42 48
            return img.Source;
43 49
        }
44
        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
50

  
51
        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
45 52
        {
46 53
            throw new NotImplementedException();
47 54
        }
KCOM/Common/ViewerDataModel.cs
505 505

  
506 506
        #endregion
507 507

  
508
        public event EventHandler<EventArgs> PageMarkupLoaded;
509

  
510
        /// <summary>
511
        /// 페이지 변경 후 페이지에 해당하는 마크업을 모두 읽었을때 이벤트를 보내도록 한다.
512
        /// </summary>
513
        public void LoadPageMarkup()
514
        {
515
            if(PageMarkupLoaded != null)
516
            {
517
                PageMarkupLoaded(this, new EventArgs());
518
            }
519
        }
520

  
521

  
508 522
        public ObservableCollection<CommentUserInfo> MarkupControls
509 523
        {
510 524
            get
KCOM/Controls/CAD/CustomImage1.xaml.cs
97 97
        public CustomImage1()
98 98
        {
99 99
            InitializeComponent();
100
     
100 101
            mTeighaD3DImage = new TeighaD3DImage();
101 102
        }
102 103

  
KCOM/Controls/Sample.xaml
1
<UserControl x:Class="KCOM.Controls.Sample" xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
1
<UserControl x:Name="userControl" x:Class="KCOM.Controls.Sample" xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
2 2
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3 3
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
4 4
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
......
542 542
                                </telerik:RadComboBox.ItemTemplate>
543 543
                            </telerik:RadComboBox>
544 544
                            <telerik:RadComboBox HorizontalAlignment="Stretch" Margin="5" DropDownWidth="*" Background="White" BorderBrush="#d6d6d6" x:Name="commentUser"
545
                                             FontSize="10" Grid.Column="1" DisplayMemberPath="UserName" ItemsSource="{Binding _markupUserList, Source={x:Static common:ViewerDataModel.Instance} ,  Mode=OneWay}"
545
                                             FontSize="10" Grid.Column="1" DisplayMemberPath="UserName" ItemsSource="{Binding UsersCommentPagesList, ElementName=userControl}"
546 546
                                             SelectionChanged="commentUser_SelectionChanged" ClearSelectionButtonVisibility="Visible" ClearSelectionButtonContent="Show All"
547 547
                                             EmptyText="USER">
548 548
                            </telerik:RadComboBox>
......
639 639
                                                          Width="60" Height="28" PathStyle="{StaticResource PathButtonStyle}" CornerRadius="3"
640 640
                                                           Margin="2" Foreground="White" Content="Move" x:Name="btnSearch" Click="btGotoMarkup_Click" Background="#FF0054B9"  CommandParameter="{Binding}">
641 641
                                                </telerik:RadPathButton>
642
                                                    <!--<telerik:RadButton Background="Transparent" Foreground="White" Content="Move" BorderThickness="0" Click="btGotoMarkup_Click" CommandParameter="{Binding}"/>-->
642
                                                <!--<telerik:RadButton Background="Transparent" Foreground="White" Content="Move" BorderThickness="0" Click="btGotoMarkup_Click" CommandParameter="{Binding}"/>-->
643 643
                                            </Grid>
644 644
                                        </Border>
645 645
                                    </StackPanel>
......
685 685
            </telerik:RadTabItem>
686 686
            <!--<telerik:RadTabItem HeaderForeground="{DynamicResource KCOMColor_MarkerBrush}" FontSize="9">
687 687
                <telerik:RadTabItem.Header>
688
                    --><!--<telerik:RadRibbonButton Content="Panorama" telerik:StyleManager.Theme="Office2016" FontSize="10" Margin="0,0,0,1" Background="#FF0054B9" Foreground="White"
689
                                       BorderThickness="0" CornerRadius="3" Padding="5" x:Name="btnPanorama" Click="btnPanorama_Click"/>--><!--
688
                    -->
689
            <!--<telerik:RadRibbonButton Content="Panorama" telerik:StyleManager.Theme="Office2016" FontSize="10" Margin="0,0,0,1" Background="#FF0054B9" Foreground="White"
690
                                       BorderThickness="0" CornerRadius="3" Padding="5" x:Name="btnPanorama" Click="btnPanorama_Click"/>-->
691
            <!--
690 692
                    <telerik:RadPathButton Grid.Column="1" ContentPlacement="Left" VerticalContentAlignment="Center" telerik:StyleManager.Theme="Office2016"
691 693
                                                            PathGeometry="{telerik:RadGlyph Glyph={StaticResource GlyphZoom}, Foreground=White}"
692 694
                                                       FontFamily="{StaticResource TelerikWebUI}" Width="80" PathStyle="{StaticResource PathButtonStyle}"
KCOM/Controls/Sample.xaml.cs
26 26
        public List<FAVORITE_DOC> _FavoriteSet { get; set; }
27 27
        public event PropertyChangedEventHandler PropertyChanged;
28 28
        public Sample()
29
        {   
30
            if(App.IsDesignMode)
29
        {
30
            InitializeComponent();
31

  
32
            if (App.IsDesignMode)
31 33
            {
32 34
                return;
33 35
            }
34 36

  
35
            App.splashString(ISplashMessage.SAMPLE);
37
            //App.splashString(ISplashMessage.SAMPLE);
36 38
            this.Loaded += Sample_Loaded;
37 39
        }
38 40

  
......
40 42
        {
41 43
            if(!_Initialize)
42 44
            {
43
                InitializeComponent();
44 45
                _Initialize = true;
46

  
45 47
                this.lstSelectComment.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(lstSelectComment_SelectionChanged);
46 48
                this.ImgListbox.SelectionChanged += new SelectionChangedEventHandler(ImgListbox_SelectionChanged);                
47 49
            }            
......
55 57
        private bool _Initialize;
56 58
        public event EventHandler<PageChangeEventArgs> PageChanged;
57 59
        public event EventHandler<PageChangeEventArgs> PageChanging;
58
        List<UsersCommentPagesMember> _UsersCommentPagesList = new List<UsersCommentPagesMember>();
60

  
61
        private List<UsersCommentPagesMember> _UsersCommentPagesList;
62

  
63
        public List<UsersCommentPagesMember> UsersCommentPagesList
64
        {
65
            get {
66
                if(_UsersCommentPagesList == null)
67
                {
68
                    _UsersCommentPagesList = new List<UsersCommentPagesMember>();
69
                }
70

  
71
                return _UsersCommentPagesList; }
72
            set { _UsersCommentPagesList = value; }
73
        }
74

  
59 75
        public class PageChangeEventArgs : EventArgs
60 76
        {
61 77
            public DOCPAGE CurrentPage { get; set; }
......
404 420
        public void SetCommentPages()
405 421
        {
406 422
            ThumbnailSet();
407
            SetCommentList(_UsersCommentPagesList.ToList());
423
            SetCommentList(UsersCommentPagesList.ToList());
408 424
        }
409 425

  
410 426
        public void SetCommentList(List<UsersCommentPagesMember> UsersCommentPagesList)
......
421 437
            Logger.sendCheckLog("SetCommentList_delItem select 및 remove", 1);
422 438
            List<UsersCommentPagesMember> _delItem = new List<UsersCommentPagesMember>();
423 439

  
424
            _UsersCommentPagesList.ToList().ForEach(item =>
440
            this.UsersCommentPagesList.ToList().ForEach(item =>
425 441
            {
426 442
                var _comm = UsersCommentPagesList.Where(a => a.MarkupInfoID == item.MarkupInfoID);
427 443

  
......
431 447
                }
432 448
            });
433 449

  
434
            _delItem.ForEach(f => _UsersCommentPagesList.Remove(f));
450
            _delItem.ForEach(f => this.UsersCommentPagesList.Remove(f));
435 451

  
436 452
            Logger.sendCheckLog("SetCommentList_UsersCommentPagesMember_PropertyChanged", 1);
437 453
            List<SetColorMarkupItem> setColorMarkupItems = new List<SetColorMarkupItem>();
......
441 457
                user.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(user_PropertyChanged);
442 458
                user.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(user_PropertyChanged);
443 459

  
444
                var _commLst = _UsersCommentPagesList.Where(o => o.MarkupInfoID == user.MarkupInfoID);
460
                var _commLst = this.UsersCommentPagesList.Where(o => o.MarkupInfoID == user.MarkupInfoID);
445 461

  
446 462
                if (_commLst.Count() == 0)
447 463
                {
448
                    _UsersCommentPagesList.Add(user);
464
                    this.UsersCommentPagesList.Add(user);
449 465
                }
450 466
                else
451 467
                {
......
472 488
            }
473 489
            
474 490
            Logger.sendCheckLog("SetCommentList_SelectComment.ItemsSource 설정", 1);
475
            var data = _UsersCommentPagesList.OrderByDescending(p => p.isConSolidation == Convert.ToInt32(true)).ToList();
491
            var data = UsersCommentPagesList.OrderByDescending(p => p.isConSolidation == Convert.ToInt32(true)).ToList();
476 492
            if (data.Count() != 0)
477 493
            {
478 494
                if (Convert.ToBoolean(data.First().isConSolidation))
......
483 499
                }
484 500
                else
485 501
                {
486
                    this.lstSelectComment.ItemsSource = _UsersCommentPagesList;  //섬네일   
502
                    this.lstSelectComment.ItemsSource = this.UsersCommentPagesList;  //섬네일   
487 503
                }
488 504
            }
489 505
            else
490 506
            {
491
                this.lstSelectComment.ItemsSource = _UsersCommentPagesList;  //섬네일   
507
                this.lstSelectComment.ItemsSource = this.UsersCommentPagesList;  //섬네일   
492 508
            }
493
            
509

  
494 510
            Logger.sendCheckLog("SetComme6ntList_ImgListbox 설정", 1);
495 511

  
496 512

  
......
679 695

  
680 696
            if (commentType.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.Data_Type == Convert.ToInt32(commentType.SelectedValue)).ToList(); }
681 697

  
682
            if (commentUser.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.UserName == ((MarkupUserInfo)commentUser.SelectedValue).UserName).ToList(); }
698
            if (commentUser.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.UserName == ((KCOM.Common.UsersCommentPagesMember)commentUser.SelectedValue).UserName).ToList(); }
683 699

  
684 700
            if (commentPage.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.PageNumber == Convert.ToInt32(commentPage.SelectedValue)).ToList(); }
685 701

  
......
1128 1144
            List<MarkupInfoItemSmall> TempMarkupInfoSmallList = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
1129 1145
            if (commentType.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.Data_Type == Convert.ToInt32(commentType.SelectedValue)).ToList(); }
1130 1146

  
1131
            if (commentUser.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.UserName == ((IKCOM.MarkupInfoItem)commentUser.SelectedValue).UserName).ToList();                 }            
1147
            if (commentUser.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.UserName == ((KCOM.Common.UsersCommentPagesMember)commentUser.SelectedValue).UserName).ToList();                 }            
1132 1148

  
1133 1149
            if (commentPage.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.PageNumber == Convert.ToInt32(commentPage.SelectedValue)).ToList(); }
1134 1150

  
KCOM/Controls/Symbol.xaml
2 2
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3 3
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4 4
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
5
             xmlns:common="clr-namespace:KCOM.Common"
5 6
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
6 7
             xmlns:WrapPanel ="clr-namespace:KCOM.WrapPanel"
7 8
             xmlns:local="clr-namespace:KCOM.Controls"
9
              xmlns:ZoomAndPan="clr-namespace:ZoomAndPan;assembly=ZoomAndPan"
10
      	     xmlns:telerikDragDrop="clr-namespace:Telerik.Windows.DragDrop;assembly=Telerik.Windows.Controls"
11
             	 xmlns:dragDrop="clr-namespace:Telerik.Windows.Controls.DragDrop;assembly=Telerik.Windows.Controls"
8 12
             xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
9 13
             xmlns:converter="clr-namespace:KCOM.Common.Converter"
14
             xmlns:Behaviors="clr-namespace:KCOM.Behaviors"
10 15
             mc:Ignorable="d" Background="#f5f5f5"
11 16
             d:DesignHeight="900" d:DesignWidth="300">
12

  
13 17
    <UserControl.Resources>
14 18
        <converter:SvgImageConverter x:Key="SvgImageConverter"/>
19
        <Style x:Key="CustomDragVisualStyle2" TargetType="telerik:DragVisual" BasedOn="{StaticResource DragVisualStyle}">
20
            <Setter Property="Background" Value="Transparent" />
21
            <Setter Property="BorderThickness" Value="0" />
22
            <Setter Property="Margin"  Value="0" />
23
            <Setter Property="Padding"  Value="0" />
24
        </Style>
25
        <Style TargetType="telerik:RadListBoxItem" BasedOn="{StaticResource RadListBoxItemStyle}">
26
            <Setter Property="telerik:DragDropManager.AllowCapturedDrag" Value="True"/>
27
            <!--<Setter Property="telerik:TouchManager.DragStartTrigger" Value="TapHoldAndMove"/>-->
28
        </Style>
15 29
        <DataTemplate x:Key="SymbolTemplate_Private">
16
            <StackPanel MouseLeftButtonDown="Move_Symbol" MouseLeave="StackPanel_MouseLeave" MouseUp="StackPanel_MouseUp" ToolTipService.ToolTip="{Binding Name}">
30
            <StackPanel MouseLeftButtonDown="Move_Symbol" AllowDrop="False" MouseLeave="StackPanel_MouseLeave" MouseUp="StackPanel_MouseUp" ToolTipService.ToolTip="{Binding Name}">
17 31
                <Grid>
18 32
                    <StackPanel>
19 33
                        <!--<Border Background="#FF1FA3EB">-->
......
32 46
                            Height="64"
33 47
                            Margin="3"
34 48
                            HorizontalAlignment="Center"
35
                            x:Name="symbolImage">
36
                            <!-- Source="{Binding ImageUri}" -->
37
                            <Image.Source>
38
                                <MultiBinding Converter="{StaticResource SvgImageConverter}" UpdateSourceTrigger="PropertyChanged">
39
                                    <Binding Path="ImageUri"/>
40
                                </MultiBinding>
41
                            </Image.Source>
42

  
43
                        </Image>
49
                               Source="{Binding ImageUri,Converter={StaticResource SvgImageConverter},UpdateSourceTrigger=PropertyChanged}"
50
                            x:Name="symbolImage"/>
44 51
                    </StackPanel>
45 52
                    <Rectangle Opacity="0.7"
46 53
                            Stroke="#ff6c6d6d"
......
48 55
                </Grid>
49 56
            </StackPanel>
50 57
        </DataTemplate>
51
        <Style TargetType="telerik:RadListBoxItem" BasedOn="{StaticResource RadListBoxItemStyle}">
52
            <Setter Property="telerik:DragDropManager.AllowCapturedDrag" Value="True" />
53
            <Setter Property="telerik:TouchManager.DragStartTrigger" Value="TapHoldAndMove"/>
54
        </Style>
55 58
    </UserControl.Resources>
56 59
    <Grid  Margin="10">
57 60
        <telerik:RadTabControl BorderThickness="0" x:Name="RadTab" telerik:StyleManager.Theme="Office2016"  HeaderBackground="#f5f5f5" FontSize="10" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"
......
88 91
                        </Grid>
89 92
                    </StackPanel>
90 93
                    <ScrollViewer x:Name="ScView" Grid.Row="2" >
91
                        <telerik:RadListBox x:Name="lstSymbolPrivate" Background="#f5f5f5" FontWeight="Normal" ItemTemplate="{StaticResource SymbolTemplate_Private}" 
92
                                 MouseDown="lstSymbolPrivate_MouseDown"
94
                        <telerik:RadListBox x:Name="lstSymbolPrivate" Background="#f5f5f5" FontWeight="Normal"
95
                                 ItemTemplate="{StaticResource SymbolTemplate_Private}" 
96
                                 MouseDown="lstSymbolPrivate_MouseDown" 
93 97
                                 PreviewMouseUp="lstSymbolPrivate_PreviewMouseUp"
94
                                 MouseLeave="lstSymbolPrivate_MouseLeave"
98
                                 MouseLeave="lstSymbolPrivate_MouseLeave" AllowDrop="False"
95 99
                                 PreviewMouseWheel ="lstSymbolPrivate_PreviewMouseWheel">
100
                            <telerik:RadListBox.DragDropBehavior>
101
                                <telerik:ListBoxDragDropBehavior AllowReorder="True" />
102
                            </telerik:RadListBox.DragDropBehavior>
96 103
                            <telerik:RadListBox.DragVisualProvider>
97
                                <telerik:ScreenshotDragVisualProvider />
104
                                <Behaviors:RadListBoxDragVisualProvider DragVisualStyle="{StaticResource CustomDragVisualStyle}">
105
                                    <Behaviors:RadListBoxDragVisualProvider.DraggedItemTemplate>
106
                                        <DataTemplate>
107
                                            <Grid Width="80">
108
                                                <Image
109
                                            Source="{Binding ImageUri,Converter={StaticResource SvgImageConverter}}"
110
                                            HorizontalAlignment="Left"/>
111
                                            </Grid>
112
                                        </DataTemplate>
113
                                    </Behaviors:RadListBoxDragVisualProvider.DraggedItemTemplate>
114
                                </Behaviors:RadListBoxDragVisualProvider>
98 115
                            </telerik:RadListBox.DragVisualProvider>
99
                            <telerik:ListBoxDragDrop.Behavior>
100
                                <telerik:ListBoxDragDropBehavior AllowReorder="True" telerik:TouchManager.DragStartTrigger="TapHoldAndMove"/>
101
                            </telerik:ListBoxDragDrop.Behavior>
102 116
                        </telerik:RadListBox>
103 117
                    </ScrollViewer>
104 118
                </Grid>
......
144 158
                            <TextBlock Text="[Tip : Double Click]" Grid.Column="0" FontSize="10" VerticalAlignment="Center" HorizontalAlignment="Right"/>
145 159
                        </Grid>
146 160
                    </StackPanel>
147

  
148 161
                    <ScrollViewer x:Name="ScView_Public" Grid.Row="2" >
149
                        <ListBox x:Name="lstSymbolPublic" Background="#f5f5f5" FontWeight="Normal" ItemTemplate="{StaticResource SymbolTemplate_Private}" 
162
                        <telerik:RadListBox x:Name="lstSymbolPublic" Background="#f5f5f5" FontWeight="Normal"
163
                                 ItemTemplate="{StaticResource SymbolTemplate_Private}"   AllowDrop="False"
150 164
                                 MouseDown="lstSymbolPrivate_MouseDown"
151 165
                                 PreviewMouseUp="lstSymbolPrivate_PreviewMouseUp"
152 166
                                 MouseLeave="lstSymbolPrivate_MouseLeave"
153 167
                                 PreviewMouseWheel ="lstSymbolPublic_PreviewMouseWheel">
154
                            <telerik:ListBoxDragDrop.Behavior>
168
                            <telerik:RadListBox.DragDropBehavior>
155 169
                                <telerik:ListBoxDragDropBehavior AllowReorder="True" />
156
                            </telerik:ListBoxDragDrop.Behavior>
157
                        </ListBox>
170
                            </telerik:RadListBox.DragDropBehavior>
171
                            <telerik:RadListBox.DragVisualProvider>
172
                                <Behaviors:RadListBoxDragVisualProvider>
173
                                    <Behaviors:RadListBoxDragVisualProvider.DraggedItemTemplate>
174
                                        <DataTemplate>
175
                                            <Grid>
176
                                                <Image Width="80" x:Name="SymbolImage" Source="{Binding ImageUri,Converter={StaticResource SvgImageConverter}}"/>
177
                                            </Grid>
178
                                        </DataTemplate>
179
                                    </Behaviors:RadListBoxDragVisualProvider.DraggedItemTemplate>
180
                                </Behaviors:RadListBoxDragVisualProvider>
181
                            </telerik:RadListBox.DragVisualProvider>
182
                        </telerik:RadListBox>
158 183
                    </ScrollViewer>
159 184
                </Grid>
160 185
            </telerik:RadTabItem>
KCOM/Controls/Symbol.xaml.cs
11 11
using System.ComponentModel;
12 12
using System.Linq;
13 13
using System.Text;
14
using System.Threading.Tasks;
14 15
using System.Windows;
15 16
using System.Windows.Controls;
16 17
using System.Windows.Data;
......
41 42
        bool IsMouseDown = false;
42 43
        string moveItem_id = "";
43 44
        public string filename { get; set; }
45
        bool _Initialize = false;
44 46

  
45 47
        public Symbol()
46 48
        {
47
            App.splashString(ISplashMessage.SYMBOL);
49
            //App.splashString(ISplashMessage.SYMBOL);
48 50
            InitializeComponent();
49 51

  
50 52
            //RadDragAndDropManager.AddDragInfoHandler(lstSymbolPrivate, OnDragPrivateInfo);
51 53
            //RadDragAndDropManager.AddDragQueryHandler(lstSymbolPrivate, OnDragPrivateQuery);
52 54
            //RadDragAndDropManager.SetAllowDrag(lstSymbolPrivate, true);
55
            this.Loaded += Symbol_Loaded;
56
 
57
        }
58

  
59
        
53 60

  
54
            DataBind();
61
        private async void Symbol_Loaded(object sender, RoutedEventArgs e)
62
        {
63
            if (!_Initialize)
64
            {
65
                _Initialize = true;
66
                await DataBindAsync();
67

  
68
            }
55 69
        }
56 70

  
57 71
        private void OnDragPrivateInfo(object sender, DragDropEventArgs e)
......
88 102
            e.Handled = true;
89 103
        }
90 104

  
91
        private void DataBind()
105
        private async Task DataBindAsync()
92 106
        {
93 107
            //lstSymbolPrivate.ItemsSource = null;
94 108
            //lstSymbolPublic.ItemsSource = null;
......
99 113
            try
100 114
            {
101 115

  
102
                var symbol_Private = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetSymbolList(App.ViewInfo.UserID);
103

  
116
                var symbol_Private = await ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseTaskClient.GetSymbolListAsync(App.ViewInfo.UserID);
104 117

  
105 118
                foreach (var item in symbol_Private)
106 119
                {
......
120 133
            Custom = new Symbol_Custom();
121 134
            Custom_List = new List<Symbol_Custom>();
122 135

  
123
            deptlist.ItemsSource = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetPublicSymbolDeptList();
136
            deptlist.ItemsSource = await ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseTaskClient.GetPublicSymbolDeptListAsync();
124 137

  
125 138
            List<SYMBOL_PUBLIC> symbol_Public;
126 139

  
127 140

  
128 141
            if (deptlist.SelectedValue != null)
129 142
            {
130
                symbol_Public = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetPublicSymbolList(deptlist.SelectedValue.ToString());
143
                symbol_Public = await ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseTaskClient.GetPublicSymbolListAsync(deptlist.SelectedValue.ToString());
131 144
            }
132 145
            else
133 146
            {
134
                symbol_Public = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetPublicSymbolList(null);
147
                symbol_Public = await ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseTaskClient.GetPublicSymbolListAsync(null);
135 148
            }
136 149
        
137 150
            foreach (var item in symbol_Public)
......
142 155
                Custom_List.Add(Custom);
143 156
                Custom = new Symbol_Custom();
144 157
            }
158

  
145 159
            lstSymbolPublic.ItemsSource = Custom_List;
146 160
        }
147 161

  
......
262 276
        #endregion
263 277

  
264 278
        #region Symbol Add Close Event 
265
        private void MarkupNamePromptClose(string data, WindowClosedEventArgs args)
279
        private async void MarkupNamePromptClose(string data, WindowClosedEventArgs args)
266 280
        {
267 281
            try
268 282
            {
......
290 304
                            SymbolSave_Public(args.PromptResult, filename, data, Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.userData.DEPARTMENT);
291 305
                        }
292 306

  
293
                        DataBind();
307
                        await DataBindAsync();
294 308
                    }
295 309
                }
296 310
            }
......
346 360
            }
347 361
        }
348 362

  
349
        private void BaseClient_AddPublicSymbolCompleted(object sender, ServiceDeepView.AddPublicSymbolCompletedEventArgs e)
363
        private async void BaseClient_AddPublicSymbolCompleted(object sender, ServiceDeepView.AddPublicSymbolCompletedEventArgs e)
350 364
        {
351 365
            Logger.sendResLog("AddPublicSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
352
            DataBind();
366
            await DataBindAsync();
353 367
        }
354 368

  
355
        private void BaseClient_SaveSymbolCompleted(object sender, ServiceDeepView.SaveSymbolCompletedEventArgs e)
369
        private async void BaseClient_SaveSymbolCompleted(object sender, ServiceDeepView.SaveSymbolCompletedEventArgs e)
356 370
        {
357 371
            Logger.sendResLog("RenameSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
358
            DataBind();
372
            await DataBindAsync();
359 373
        }
360 374

  
361 375
        #region Private Symbol Delete Event
......
388 402
            Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.DeleteSymbolAsync(delItem_ID, RadTab.SelectedIndex);
389 403
        }
390 404

  
391
        private void BaseClient_DeleteSymbolCompleted(object sender, ServiceDeepView.DeleteSymbolCompletedEventArgs e)
405
        private async void BaseClient_DeleteSymbolCompleted(object sender, ServiceDeepView.DeleteSymbolCompletedEventArgs e)
392 406
        {
393 407
            Logger.sendResLog("DeleteSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
394
            DataBind();
408
             await DataBindAsync();
395 409
        }
396 410
        #endregion
397 411

  
......
809 823
            }
810 824
        }
811 825

  
812
        private void BaseClient_RenameSymbolCompleted(object sender, ServiceDeepView.RenameSymbolCompletedEventArgs e)
826
        private async void BaseClient_RenameSymbolCompleted(object sender, ServiceDeepView.RenameSymbolCompletedEventArgs e)
813 827
        {
814 828
            Logger.sendResLog("RenameSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
815
            DataBind();
829
            await DataBindAsync();
816 830
        }
817 831
        #endregion
818 832

  
......
839 853
        #endregion
840 854

  
841 855
        #region Department Selection Event
842
        private void deptlist_SelectionChanged(object sender, SelectionChangedEventArgs e)
856
        private async void deptlist_SelectionChanged(object sender, SelectionChangedEventArgs e)
843 857
        {
844
            DataBind();
858
            await DataBindAsync();
845 859
        }
846 860
        #endregion
847 861

  
KCOM/Events/Implementation/TopMenuEvent.cs
289 289
        /// </summary>
290 290
        /// <param name="sender"></param>
291 291
        /// <param name="e"></param>
292
        public void SaveEventCallback(object sender, RoutedEventArgs e)
292
        public async void SaveEventCallback(object sender, RoutedEventArgs e)
293 293
        {
294
            if (this.ParentOfType<MainWindow>().dzMainMenu.busyIndicator.IsBusy == true) return;
294
            var mianMenu = this.ParentOfType<MainWindow>().dzMainMenu;
295 295

  
296
            this.ParentOfType<MainWindow>().dzMainMenu.busyIndicator.IsBusy = true;
297
            System.Threading.Tasks.Task SaveTask = System.Threading.Tasks.Task.Factory.StartNew(() =>
296
            if (mianMenu.busyIndicator.IsBusy == true)
298 297
            {
299
                Dispatcher.Invoke(System.Windows.Threading.DispatcherPriority.Normal, new Action<object, RoutedEventArgs>(_SaveEvent), sender, e);
300
            }).ContinueWith(task =>
298
                return;
299
            }
300

  
301
            var result = await Dispatcher.InvokeAsync<bool>(()=>
301 302
            {
302
                Dispatcher.Invoke(System.Windows.Threading.DispatcherPriority.Normal, new Action(delegate () { this.ParentOfType<MainWindow>().dzMainMenu.busyIndicator.IsBusy = false; }));
303
                this.ParentOfType<MainWindow>().dzMainMenu.busyIndicator.IsBusy = true;
304

  
305
                _SaveEvent(sender, e);
306

  
307
                mianMenu.busyIndicator.IsBusy = false;
308
                return true;
303 309
            });
310

  
311
            //System.Threading.Tasks.Task SaveTask = System.Threading.Tasks.Task.Factory.StartNew(() =>
312
            //{
313
            //    Dispatcher.Invoke(System.Windows.Threading.DispatcherPriority.Normal, new Action<object, RoutedEventArgs>(_SaveEvent), sender, e);
314
            //}).ContinueWith(task =>
315
            //{
316
            //    Dispatcher.Invoke(System.Windows.Threading.DispatcherPriority.Normal, new Action(delegate () { this.ParentOfType<MainWindow>().dzMainMenu.busyIndicator.IsBusy = false; }));
317
            //});
304 318
        }
305 319

  
306 320
        /// <summary>
......
311 325
        /// <param name="e"></param>
312 326
        public void _SaveEvent(object sender, RoutedEventArgs e)
313 327
        {
314
            var menu = this.ParentOfType<MainWindow>().dzMainMenu;
328
            var mainMenu = this.ParentOfType<MainWindow>().dzMainMenu;
315 329
            try
316 330
            {
317
                menu.ConvertInkControlToPolygon();
331
                mainMenu.ConvertInkControlToPolygon();
318 332

  
319 333
                SelectionSet.Instance.UnSelect(this.ParentOfType<MainWindow>().dzMainMenu);
320 334
                // update mylist and gridview
321
                menu.UpdateMyMarkupList();
335
                mainMenu.UpdateMyMarkupList();
322 336

  
323
                if (menu.gridViewMarkup.SelectedItems.Count == 0 && menu.gridViewMarkup.Items.Count > 0)
337
                if (mainMenu.gridViewMarkup.SelectedItems.Count == 0 && mainMenu.gridViewMarkup.Items.Count > 0)
324 338
                {
325 339
                    this.ParentOfType<MainWindow>().DialogMessage_Alert("Please Select Your Comment List Item", "Alert");
326 340
                }
327 341
                else
328 342
                {                    
329
                    foreach (var item in menu.gridViewMarkup.SelectedItems)
343
                    foreach (var item in mainMenu.gridViewMarkup.SelectedItems)
330 344
                    {
331 345
                        if ((item as IKCOM.MarkupInfoItem).UserID == App.ViewInfo.UserID)
332 346
                        {
333
                            this.ExecuteSaveCommand(menu);
347
                            this.ExecuteSaveCommand(mainMenu);
334 348
                            ViewerDataModel.Instance._markupInfoList.Where(data => data.MarkupInfoID == (item as IKCOM.MarkupInfoItem).MarkupInfoID).FirstOrDefault().UpdateTime = DateTime.Now;
335 349
                            if (!ViewerDataModel.Instance.IsConsolidate && (sender != null))
336 350
                            {
......
340 354
                    }
341 355
                }
342 356

  
357
                mainMenu.SetCommentPages();
358

  
343 359
                ViewerDataModel.Instance.UndoDataList.Clear();
344 360
            }
345 361
            catch (Exception ex)
......
2295 2311
                        (Application.Current.MainWindow as MainWindow).dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.Capture;
2296 2312
                        break;
2297 2313
                    #endregion
2298
                    //#region Cad
2299
                    //case "Inside":
2300
                    //    //instanceMain.dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.Drawing;
2301
                    //    //instanceMain.dzMainMenu.inkDrawingCanvas.IsEnabled = false;
2302
                    //    Common.ViewerDataModel.Instance.SelectedControl = "InsideWhite";
2303
                    //    instanceMain.dzMainMenu.controlType = MarkupToPDF.Controls.Common.ControlType.InsideWhite;
2304
                    //    break;
2305
                    //case "Overlap":
2306
                    //    //instanceMain.dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.Drawing;
2307
                    //    //instanceMain.dzMainMenu.inkDrawingCanvas.IsEnabled = false;
2308
                    //    Common.ViewerDataModel.Instance.SelectedControl = "OverlapWhite";
2309
                    //    instanceMain.dzMainMenu.controlType = MarkupToPDF.Controls.Common.ControlType.OverlapWhite;
2310
                    //    break;
2311
                    //case "Clip":
2312
                    //    //instanceMain.dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.Drawing;
2313
                    //    //instanceMain.dzMainMenu.inkDrawingCanvas.IsEnabled = false;
2314
                    //    Common.ViewerDataModel.Instance.SelectedControl = "ClipWhite";
2315
                    //    instanceMain.dzMainMenu.controlType = MarkupToPDF.Controls.Common.ControlType.ClipWhite;
2316
                    //    break;
2317
                    //case "CadExport":
2318
                    //    if (isClosed)
2319
                    //    {
2320
                    //        //토글 및 마우스 상태 초기화
2321
                    //        var toggleList = this.Parent.ChildrenOfType<RadRibbonToggleButton>();
2322
                    //        foreach (var togle in toggleList)
2323
                    //        {
2324
                    //            togle.IsChecked = false;
2325
                    //        }
2326
                    //        this.ParentOfType<MainWindow>().dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.None;
2327

  
2328
                    //        isClosed = false;
2329
                    //        //Control 파일 먼저 생성
2330
                    //        CollapsedButton_Click();
2331
                    //        CadViewer check = new CadViewer();
2332
                    //        check.WindowStartupLocation = WindowStartupLocation.CenterScreen;
2333
                    //        check.Title = "Export Viewer";
2334
                    //        //check.Topmost = true;
2335
                    //        check.Show();
2336
                    //        check.Closed += Check_Closed;
2337
                    //        instanceToggle.IsChecked = false;
2338
                    //    }
2339
                    //    break;
2340
                    //case "CadViewer":
2341
                    //    if (isClosed)
2342
                    //    {
2343
                    //        //토글 및 마우스 상태 초기화
2344
                    //        var toggleList = this.Parent.ChildrenOfType<RadRibbonToggleButton>();
2345
                    //        foreach (var togle in toggleList)
2346
                    //        {
2347
                    //            togle.IsChecked = false;
2348
                    //        }
2349
                    //        this.ParentOfType<MainWindow>().dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.None;
2350

  
2351
                    //        isClosed = false;
2352
                    //        CadResultViewer check = new CadResultViewer();
2353
                    //        check.WindowStartupLocation = WindowStartupLocation.CenterScreen;
2354
                    //        check.Title = "Viewer";
2355
                    //        check.Show();
2356

  
2357
                    //        check.Closed += Check_Closed;
2358

  
2359
                    //    }
2360
                    //    break;
2361
                    //#endregion
2314
                    #region Cad
2315
                    case "Inside":
2316
                        //instanceMain.dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.Drawing;
2317
                        //instanceMain.dzMainMenu.inkDrawingCanvas.IsEnabled = false;
2318
                        Common.ViewerDataModel.Instance.SelectedControl = "InsideWhite";
2319
                        instanceMain.dzMainMenu.controlType = MarkupToPDF.Controls.Common.ControlType.InsideWhite;
2320
                        break;
2321
                    case "Overlap":
2322
                        //instanceMain.dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.Drawing;
2323
                        //instanceMain.dzMainMenu.inkDrawingCanvas.IsEnabled = false;
2324
                        Common.ViewerDataModel.Instance.SelectedControl = "OverlapWhite";
2325
                        instanceMain.dzMainMenu.controlType = MarkupToPDF.Controls.Common.ControlType.OverlapWhite;
2326
                        break;
2327
                    case "Clip":
2328
                        //instanceMain.dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.Drawing;
2329
                        //instanceMain.dzMainMenu.inkDrawingCanvas.IsEnabled = false;
2330
                        Common.ViewerDataModel.Instance.SelectedControl = "ClipWhite";
2331
                        instanceMain.dzMainMenu.controlType = MarkupToPDF.Controls.Common.ControlType.ClipWhite;
2332
                        break;
2333
                    case "CadExport":
2334
                        //if (isClosed)
2335
                        //{
2336
                        //    //토글 및 마우스 상태 초기화
2337
                        //    var toggleList = this.Parent.ChildrenOfType<RadRibbonToggleButton>();
2338
                        //    foreach (var togle in toggleList)
2339
                        //    {
2340
                        //        togle.IsChecked = false;
2341
                        //    }
2342
                        //    this.ParentOfType<MainWindow>().dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.None;
2343

  
2344
                        //    isClosed = false;
2345
                        //    //Control 파일 먼저 생성
2346
                        //    CollapsedButton_Click();
2347
                        //    CadViewer check = new CadViewer();
2348
                        //    check.WindowStartupLocation = WindowStartupLocation.CenterScreen;
2349
                        //    check.Title = "Export Viewer";
2350
                        //    //check.Topmost = true;
2351
                        //    check.Show();
2352
                        //    check.Closed += Check_Closed;
2353
                        //    instanceToggle.IsChecked = false;
2354
                        //}
2355
                        //break;
2356
                    case "CadViewer":
2357
                        //if (isClosed)
2358
                        //{
2359
                        //    //토글 및 마우스 상태 초기화
2360
                        //    var toggleList = this.Parent.ChildrenOfType<RadRibbonToggleButton>();
2361
                        //    foreach (var togle in toggleList)
2362
                        //    {
2363
                        //        togle.IsChecked = false;
2364
                        //    }
2365
                        //    this.ParentOfType<MainWindow>().dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.None;
2366

  
2367
                        //    isClosed = false;
2368
                        //    CadResultViewer check = new CadResultViewer();
2369
                        //    check.WindowStartupLocation = WindowStartupLocation.CenterScreen;
2370
                        //    check.Title = "Viewer";
2371
                        //    check.Show();
2372

  
2373
                        //    check.Closed += Check_Closed;
2374

  
2375
                        //}
2376
                        break;
2377
                    #endregion
2362 2378
                    default:
2363 2379
                        break;
2364 2380
                }
KCOM/Extensions/MarkupVisitHelper.cs
51 51
                }
52 52
                else
53 53
                {
54
                    EventHandler<Sample.PageChangeEventArgs> handler = null;
54
                    EventHandler<EventArgs> handler = null;
55 55

  
56 56
                    handler = (snd, evt) =>
57 57
                    {
58 58
                        GotoSelectedMarkup(CommentIdList);
59
                        pageNavigator.PageChanged -= handler;
59
                        ViewerDataModel.Instance.PageMarkupLoaded -= handler;
60 60
                    };
61 61

  
62
                    pageNavigator.PageChanged += handler;
62
                    ViewerDataModel.Instance.PageMarkupLoaded += handler;
63 63

  
64 64
                    pageNavigator.GotoPage(commentList.First().PageNumber);
65 65
                }
......
101 101
                        foreach (var UserInfo in commentUserInfo)
102 102
                        {
103 103
                            rect = Rect.Union(rect, UserInfo.ItemRect);
104
                            UserInfo.OnMouseHover();
... 이 차이점은 표시할 수 있는 최대 줄수를 초과해서 이 차이점은 잘렸습니다.

내보내기 Unified diff