프로젝트

일반

사용자정보

개정판 a342d378

IDa342d3784e4b92f2bc0bed6ff3c8e75648b2a70b
상위 233ef333
하위 902faaea

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

- KCOM_Blend.sln 추가

Change-Id: I1fd4703aa2ce4c5f73ac44e711d5d42ee5f350d1

차이점 보기:

ConvertService/ServiceBase/Markus.Service.WcfService/Markus.Service.IWcfService.csproj.user
1
<?xml version="1.0" encoding="utf-8"?>
2
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
  <ProjectExtensions>
4
    <VisualStudio>
5
      <FlavorProperties GUID="{3D9AD99F-2412-4246-B90B-4EAA41C64699}">
6
        <WcfProjectProperties>
7
          <PublishCopyOption>RunFiles</PublishCopyOption>
8
          <PublishTargetLocation>
9
          </PublishTargetLocation>
10
          <PublishDeleteAllFiles>False</PublishDeleteAllFiles>
11
        </WcfProjectProperties>
12
      </FlavorProperties>
13
    </VisualStudio>
14
  </ProjectExtensions>
15
</Project>
ConvertService/ServiceController/Markus.Service.StationController/Markus.Service.StationController.csproj
180 180
      <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2020\Binaries\WPF45\Telerik.Windows.Data.dll</HintPath>
181 181
    </Reference>
182 182
    <Reference Include="Telerik.Windows.Themes.VisualStudio2013">
183
      <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2020\Binaries.NoXaml\WPF45\Telerik.Windows.Themes.VisualStudio2013.dll</HintPath>
183
      <HintPath>..\..\..\packages\telerik\Telerik.Windows.Themes.VisualStudio2013.dll</HintPath>
184 184
    </Reference>
185 185
    <Reference Include="Telerik.Windows.Zip, Version=2019.3.903.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
186 186
      <SpecificVersion>False</SpecificVersion>
KCOM/Views/MainMenu.xaml.cs
2090 2090
            else if ((e.LeftButton == MouseButtonState.Released) && (e.MiddleButton == MouseButtonState.Released) &&
2091 2091
                (e.RightButton == MouseButtonState.Released) && ViewerDataModel.Instance.MarkupControls_USER.Count > 0)
2092 2092
            {
2093
                var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseOver).FirstOrDefault();
2093
                var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseEnter).FirstOrDefault();
2094 2094
                if (control != null)
2095 2095
                {
2096 2096
                    this.cursor = Cursors.Hand;
......
2779 2779
                    isLeftMouseButtonDownOnWindow = true;
2780 2780
                }
2781 2781

  
2782
                var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseOver).FirstOrDefault();
2782
                var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseEnter).FirstOrDefault();
2783 2783

  
2784 2784
                if (control == null)
2785 2785
                {
......
4404 4404

  
4405 4405
        private void RemoveLineStroke(Point P)
4406 4406
        {
4407
            var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseOver).FirstOrDefault();
4407
            var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseEnter).FirstOrDefault();
4408 4408
            if (control != null)
4409 4409
            {
4410 4410
                DeleteCommand.Instance.Execute(new List<CommentUserInfo>() { control });
KCOM_Blend.sln
1 1

2 2
Microsoft Visual Studio Solution File, Format Version 12.00
3
# Blend for Visual Studio 15
4
VisualStudioVersion = 15.0.27130.2027
3
# Blend for Visual Studio Version 16
4
VisualStudioVersion = 16.0.30204.135
5 5
MinimumVisualStudioVersion = 10.0.40219.1
6 6
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KCOM", "KCOM\KCOM.csproj", "{9F7C22A1-065C-4203-A570-F9EEA08F2344}"
7 7
	ProjectSection(ProjectDependencies) = postProject
8
		{F026B592-11B9-410C-B4FF-384E511A4666} = {F026B592-11B9-410C-B4FF-384E511A4666}
9 8
		{EA12FDC9-575E-471B-A691-3C31D03EA24C} = {EA12FDC9-575E-471B-A691-3C31D03EA24C}
10 9
	EndProjectSection
11 10
EndProject
......
13 12
EndProject
14 13
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KCOMDataModel", "KCOMDataModel\KCOMDataModel.csproj", "{629DC8CD-D458-47EF-8F02-CD12C7001C3E}"
15 14
EndProject
16
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KCOM_API", "KCOM_API\KCOM_API.csproj", "{F026B592-11B9-410C-B4FF-384E511A4666}"
17
EndProject
18 15
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZoomAndPan", "ZoomAndPan\ZoomAndPan.csproj", "{6C950AF4-04D2-4638-8B78-472E39F78B45}"
19 16
EndProject
20 17
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IKCOM", "IKCOM\IKCOM.csproj", "{F236A005-12F4-406A-B9ED-0C3B5D994001}"
......
29 26
EndProject
30 27
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonLib", "CommonLib\CommonLib.csproj", "{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}"
31 28
EndProject
32
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "MARKUSSETUP", "MARKUSSETUP\MARKUSSETUP.vdproj", "{64175E13-41C4-4A6E-B35E-EA14C76C57B0}"
33
EndProject
34 29
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Makrus_API_Test", "Makrus_API_Test\Makrus_API_Test.csproj", "{B6A34853-E5D4-460D-9451-EA64E537FDA9}"
35
	ProjectSection(ProjectDependencies) = postProject
36
		{F026B592-11B9-410C-B4FF-384E511A4666} = {F026B592-11B9-410C-B4FF-384E511A4666}
37
	EndProjectSection
38 30
EndProject
39 31
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "INI", "INI", "{01F177C4-03F9-41A7-8996-89D190BD3E10}"
40 32
	ProjectSection(SolutionItems) = preProject
......
134 126
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Release|x64.Build.0 = Debug|Any CPU
135 127
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Release|x86.ActiveCfg = Debug|Any CPU
136 128
		{629DC8CD-D458-47EF-8F02-CD12C7001C3E}.Release|x86.Build.0 = Debug|Any CPU
137
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug_DevDoftech|Any CPU
138
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DevDoftech|Any CPU.Build.0 = Debug_DevDoftech|Any CPU
139
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
140
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DevDoftech|x64.Build.0 = Debug|Any CPU
141
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DevDoftech|x86.ActiveCfg = Debug|Any CPU
142
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DevDoftech|x86.Build.0 = Debug|Any CPU
143
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_HyoSung|Any CPU.ActiveCfg = Debug_HyoSung|Any CPU
144
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_HyoSung|Any CPU.Build.0 = Debug_HyoSung|Any CPU
145
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_HyoSung|x64.ActiveCfg = Debug_HyoSung|x64
146
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_HyoSung|x64.Build.0 = Debug_HyoSung|x64
147
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_HyoSung|x86.ActiveCfg = Debug_HyoSung|x86
148
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_HyoSung|x86.Build.0 = Debug_HyoSung|x86
149
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
150
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug|Any CPU.Build.0 = Debug|Any CPU
151
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug|x64.ActiveCfg = Debug|x64
152
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug|x64.Build.0 = Debug|x64
153
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug|x86.ActiveCfg = Debug|x86
154
		{F026B592-11B9-410C-B4FF-384E511A4666}.Debug|x86.Build.0 = Debug|x86
155
		{F026B592-11B9-410C-B4FF-384E511A4666}.Release|Any CPU.ActiveCfg = Debug|Any CPU
156
		{F026B592-11B9-410C-B4FF-384E511A4666}.Release|Any CPU.Build.0 = Debug|Any CPU
157
		{F026B592-11B9-410C-B4FF-384E511A4666}.Release|x64.ActiveCfg = Debug|Any CPU
158
		{F026B592-11B9-410C-B4FF-384E511A4666}.Release|x64.Build.0 = Debug|Any CPU
159
		{F026B592-11B9-410C-B4FF-384E511A4666}.Release|x86.ActiveCfg = Debug|Any CPU
160
		{F026B592-11B9-410C-B4FF-384E511A4666}.Release|x86.Build.0 = Debug|Any CPU
161 129
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug|Any CPU
162 130
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_DevDoftech|Any CPU.Build.0 = Debug|Any CPU
163 131
		{6C950AF4-04D2-4638-8B78-472E39F78B45}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
......
326 294
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Release|x64.Build.0 = Debug|Any CPU
327 295
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Release|x86.ActiveCfg = Debug|Any CPU
328 296
		{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Release|x86.Build.0 = Debug|Any CPU
329
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug
330
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_DevDoftech|Any CPU.Build.0 = Debug
331
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_DevDoftech|x64.ActiveCfg = Debug
332
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_DevDoftech|x64.Build.0 = Debug
333
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_DevDoftech|x86.ActiveCfg = Debug
334
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_DevDoftech|x86.Build.0 = Debug
335
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_HyoSung|Any CPU.ActiveCfg = Debug_HyoSung
336
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_HyoSung|Any CPU.Build.0 = Debug_HyoSung
337
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_HyoSung|x64.ActiveCfg = Debug_HyoSung
338
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_HyoSung|x64.Build.0 = Debug_HyoSung
339
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_HyoSung|x86.ActiveCfg = Debug_HyoSung
340
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug_HyoSung|x86.Build.0 = Debug_HyoSung
341
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug|Any CPU.ActiveCfg = Debug
342
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug|Any CPU.Build.0 = Debug
343
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug|x64.ActiveCfg = Debug
344
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug|x64.Build.0 = Debug
345
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug|x86.ActiveCfg = Debug
346
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Debug|x86.Build.0 = Debug
347
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Release|Any CPU.ActiveCfg = Debug
348
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Release|Any CPU.Build.0 = Debug
349
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Release|x64.ActiveCfg = Debug
350
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Release|x64.Build.0 = Debug
351
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Release|x86.ActiveCfg = Debug
352
		{64175E13-41C4-4A6E-B35E-EA14C76C57B0}.Release|x86.Build.0 = Debug
353 297
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug|Any CPU
354 298
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_DevDoftech|Any CPU.Build.0 = Debug|Any CPU
355 299
		{B6A34853-E5D4-460D-9451-EA64E537FDA9}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
MarkupToPDF/Common/CommentUserInfo.cs
27 27

  
28 28
        public string Memo { get; set; }
29 29
        public string MarkupInfoID { get; set; }
30
        public bool IsMouseOver { get; set; }
30
        public bool IsMouseEnter { get; set; }
31 31
        public bool IsNew { get; set; }
32 32
        public string CommentID { get; set; }
33 33
        public string SymbolID { get; set; }
......
52 52

  
53 53
        private void CommentUserInfo_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
54 54
        {
55
            this.IsMouseOver = false;
55
            this.IsMouseEnter = false;
56 56
            if (this.StrokeColor != this._TempBorderBrush)
57 57
            {
58 58
                this.StrokeColor = this._TempBorderBrush;
......
62 62

  
63 63
        private void CommentUserInfo_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
64 64
        {
65
            this.IsMouseOver = true;
65
            this.IsMouseEnter = true;
66 66

  
67 67
            OnMouseHover();
68 68
        }
MarkupToPDF/Themes/generic.xaml
15 15
                    <Path x:Name="PART_RectPath"
16 16
                              Stroke="Black"
17 17
                              StrokeThickness="10"
18
                              Data="{TemplateBinding PathData}"
19 18
                              Fill="{TemplateBinding FillColor}"
20
                              RenderTransformOrigin="0.5,0.5">
19
                              RenderTransformOrigin="0.5,0.5" Data="{TemplateBinding PathData}">
21 20
                    </Path>
22 21
                </ControlTemplate>
23 22
            </Setter.Value>

내보내기 Unified diff

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