프로젝트

일반

사용자정보

개정판 cbcc1a75

IDcbcc1a75f9e817c95be350401885068177327f25
상위 4d5fa501
하위 b1fc6833

김태성이(가) 약 한달 전에 추가함

issue #00000 markup 바로가기 페이지 변경시 포커스 안 가는 현상 수정/확대범위 수정

Change-Id: If4d9e7f2a2915f7c491bcd46277800b7f833f3d3

차이점 보기:

CommonLib/Common.cs
13 13
    public class Common
14 14
    {
15 15
        [DllImport("kernel32")]
16
        private static extern int GetPrivateProfileString(string section, string key, string def, StringBuilder retVal, int size, string filePath);
16
        public static extern int GetPrivateProfileString(string section, string key, string def, StringBuilder retVal, int size, string filePath);
17 17

  
18 18
        [DllImport("kernel32")]
19
        private static extern long WritePrivateProfileString(string section, string key, string val, string filePath);
19
        public static extern long WritePrivateProfileString(string section, string key, string val, string filePath);
20 20

  
21 21
        public static string AppStartFolder
22 22
        {
......
143 143
            return Decrypt(strbuilder.ToString(), "Doftech1073#");
144 144
        }
145 145

  
146
        private static string Decrypt(string textToDecrypt, string key)
146
        public static string Decrypt(string textToDecrypt, string key)
147 147
        {
148 148
            RijndaelManaged rijndaelCipher = new RijndaelManaged();
149 149
            rijndaelCipher.Mode = CipherMode.CBC;
CommonLib/CommonLib.csproj
22 22
    <DefineConstants>DEBUG;TRACE</DefineConstants>
23 23
    <ErrorReport>prompt</ErrorReport>
24 24
    <WarningLevel>4</WarningLevel>
25
    <PlatformTarget>x64</PlatformTarget>
25 26
  </PropertyGroup>
26 27
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27 28
    <DebugType>pdbonly</DebugType>
ConvertionWebServiceDefault/ConvertionWebServiceDefault.csproj
14 14
    <RootNamespace>ConvertionWebService</RootNamespace>
15 15
    <AssemblyName>ConvertionWebService</AssemblyName>
16 16
    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
17
    <UseIISExpress>false</UseIISExpress>
17
    <UseIISExpress>true</UseIISExpress>
18 18
    <FileUpgradeFlags>
19 19
    </FileUpgradeFlags>
20 20
    <UpgradeBackupLocation>
......
64 64
    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
65 65
      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
66 66
    </Reference>
67
    <Reference Include="SharpVectors.Converters.Wpf, Version=1.8.4.0, Culture=neutral, PublicKeyToken=b532964b8548be77, processorArchitecture=MSIL">
68
      <HintPath>..\packages\SharpVectors.Wpf.1.8.4\lib\net46\SharpVectors.Converters.Wpf.dll</HintPath>
69
    </Reference>
70
    <Reference Include="SharpVectors.Core, Version=1.8.4.0, Culture=neutral, PublicKeyToken=7407205e337c98ef, processorArchitecture=MSIL">
71
      <HintPath>..\packages\SharpVectors.Wpf.1.8.4\lib\net46\SharpVectors.Core.dll</HintPath>
72
    </Reference>
73
    <Reference Include="SharpVectors.Css, Version=1.8.4.0, Culture=neutral, PublicKeyToken=7a46e3f532fdb787, processorArchitecture=MSIL">
74
      <HintPath>..\packages\SharpVectors.Wpf.1.8.4\lib\net46\SharpVectors.Css.dll</HintPath>
75
    </Reference>
76
    <Reference Include="SharpVectors.Dom, Version=1.8.4.0, Culture=neutral, PublicKeyToken=517340b6277b1a7a, processorArchitecture=MSIL">
77
      <HintPath>..\packages\SharpVectors.Wpf.1.8.4\lib\net46\SharpVectors.Dom.dll</HintPath>
78
    </Reference>
79
    <Reference Include="SharpVectors.Model, Version=1.8.4.0, Culture=neutral, PublicKeyToken=2236cfc76b505845, processorArchitecture=MSIL">
80
      <HintPath>..\packages\SharpVectors.Wpf.1.8.4\lib\net46\SharpVectors.Model.dll</HintPath>
81
    </Reference>
82
    <Reference Include="SharpVectors.Rendering.Wpf, Version=1.8.4.0, Culture=neutral, PublicKeyToken=d0902381100df30e, processorArchitecture=MSIL">
83
      <HintPath>..\packages\SharpVectors.Wpf.1.8.4\lib\net46\SharpVectors.Rendering.Wpf.dll</HintPath>
84
    </Reference>
85
    <Reference Include="SharpVectors.Runtime.Wpf, Version=1.8.4.0, Culture=neutral, PublicKeyToken=d16e717f0a981fb9, processorArchitecture=MSIL">
86
      <HintPath>..\packages\SharpVectors.Wpf.1.8.4\lib\net46\SharpVectors.Runtime.Wpf.dll</HintPath>
87
    </Reference>
67 88
    <Reference Include="System.ComponentModel.DataAnnotations" />
68 89
    <Reference Include="System.Data.DataSetExtensions" />
69 90
    <Reference Include="System.Data.Entity" />
......
160 181
    <ErrorReport>prompt</ErrorReport>
161 182
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
162 183
    <Prefer32Bit>false</Prefer32Bit>
184
    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
163 185
  </PropertyGroup>
164 186
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
165 187
    <OutputPath>bin\</OutputPath>
......
180 202
    <VisualStudio>
181 203
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
182 204
        <WebProjectProperties>
183
          <UseIIS>False</UseIIS>
205
          <UseIIS>True</UseIIS>
184 206
          <AutoAssignPort>True</AutoAssignPort>
185 207
          <DevelopmentServerPort>5295</DevelopmentServerPort>
186 208
          <DevelopmentServerVPath>/</DevelopmentServerVPath>
187
          <IISUrl>
188
          </IISUrl>
209
          <IISUrl>http://localhost:9022/</IISUrl>
189 210
          <NTLMAuthentication>False</NTLMAuthentication>
190 211
          <UseCustomServer>False</UseCustomServer>
191 212
          <CustomServerUrl>
ConvertionWebServiceDefault/packages.config
5 5
  <package id="GemBox.Spreadsheet" version="39.3.30.1215" targetFramework="net452" />
6 6
  <package id="log4net" version="2.0.8" targetFramework="net452" />
7 7
  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net40" requireReinstallation="true" />
8
  <package id="SharpVectors.Wpf" version="1.8.4" targetFramework="net461" />
8 9
</packages>
FinalService/KCOM_FinalService/ConnectionStrEncrypt/Program.cs
11 11
    {
12 12
        static void Main(string[] args)
13 13
        {
14
            //args = new string[2];
15
            //args[0] = "-en";
14
            Restart:
16 15

  
17
            //Console.WriteLine("ex) data source=address;database=database;user id=userid;password=password");
18
            //Console.WriteLine("input Connection String :");
16
            string connection;
17
            string value;
18
            string key = "Doftech1073#";
19 19

  
20
            //args[1] = Console.ReadLine();
20
            Console.WriteLine("ex) data source=address;database=database;user id=userid;password=password");
21
            Console.Write("input Connection String : ");
21 22

  
22
            //args = new string[] { "-de", "oGKAXlIgXfRDRXGeHEn8EOYJBpEZdaR4TUqxSnjQeRQGAic7nOAFD0BzZ27j0u9NdhivuTsrcd+GXxxu0YVfH88OBZjEnWwEOO58gSOvKyw=" };
23
            connection = Console.ReadLine();
23 24

  
24
            if (args == null || args?.Count() == 0)
25
            {
26
                args = new[] { "-en", "data source=211.38.140.182;database=markus;user id=doftech;password=etecenc09!$" };
27
                //args = new[] { "-en", "data source=210.94.128.101;database=markus;user id=doftech;password=xpdhtm!1" };
28
                //args = new[] { "-en", "data source=10.11.142.77;database=markus;user id=doftech;password=dof1073#" };
29
            }
30 25

  
31
            String key = "Doftech1073#";
26
            SelectEncrypt:
27

  
28
            Console.WriteLine("1.Encrypt 2.Decrypt");
29
            Console.Write("Input 1 or 2 :");
30
            
31
            value = Console.ReadLine().Trim();
32 32

  
33
            if ((args.Length == 2) && (args[0] == "-en"))
33
            if(value != "1" && value != "2")
34 34
            {
35
                String en = Encrypt(args[1], key);
36
                Console.WriteLine("Encrypted Text is \"" + en + "\"");
35
                Console.WriteLine("Try again");
36
                goto SelectEncrypt;
37 37
            }
38
            else if ((args.Length == 2) && (args[0] == "-de"))
38
            else if(value == "1")
39 39
            {
40
                String de = Decrypt(args[1], key);
41
                Console.WriteLine("Decrypted Text is \"" + de + "\"");
40
                Console.WriteLine("Encrypt Connection String -");
41
                Console.WriteLine(Encrypt(connection, key));
42 42
            }
43 43
            else
44 44
            {
45
                Console.WriteLine("Usage : ConnectionStrEncrypt.exe -en|-de <input string>");
45
                Console.WriteLine("Decrypt Connection String -");
46
                Console.WriteLine(Decrypt(connection, key));
46 47
            }
47 48

  
48
            Console.ReadLine();
49
            goto Restart;
49 50
        }
50 51

  
51 52
        public static string Decrypt(string textToDecrypt, string key)
KCOM/Extensions/MarkupVisitHelper.cs
53 53
                    /// 페이지 변경 후 다시 호출
54 54
                    handler = (snd, evt) =>
55 55
                    {
56
                        ViewerDataModel.Instance.PageLoaded -= handler;
56
                            ViewerDataModel.Instance.SystemMain.dzMainMenu.MarkupLoadComplated -= handler;
57 57

  
58
                        Task.Delay(100).ConfigureAwait(true);
58
                            //Task.Delay(100).ConfigureAwait(true);
59 59

  
60
                        GotoMarkup(CommentIdList);
60
                            GotoSelectedMarkup(CommentIdList);
61 61
                    };
62 62

  
63
                    ViewerDataModel.Instance.PageLoaded += handler;
63
                    ViewerDataModel.Instance.SystemMain.dzMainMenu.MarkupLoadComplated += handler;
64 64

  
65 65
                    ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.GotoPage(commentList.First().PageNumber);
66 66
                }
......
176 176
                        main.zoomAndPanControl.ContentOffsetY = positionY;
177 177

  
178 178

  
179
                        var pageSize = new Size(main.pageNavigator.CurrentPage.Width, main.pageNavigator.CurrentPage.Height);
179
                        var pageSize = new Size(ViewerDataModel.Instance.ImageViewWidth,ViewerDataModel.Instance.ImageViewHeight);
180 180

  
181 181
                        double pageAngle = Common.ViewerDataModel.Instance.MarkupAngle;
182 182

  
......
198 198
                        }
199 199
                        else
200 200
                        {
201
                            rect.Inflate(rect.Width * 3, rect.Height * 3);
201
                            //rect.Inflate(rect.Width * 3, rect.Height * 3);
202 202

  
203 203
                            var matrix = MatrixHelper.Rotation(Common.ViewerDataModel.Instance.MarkupAngle);
204 204
                            rect.Transform(matrix);
205

  
206

  
207
                            main.zoomAndPanControl.ZoomTo(rect);
205
                            //main.zoomAndPanControl.ZoomTo(rect);
206
                            var centerP = new Point(rect.Left + rect.Width / 2, rect.Top + rect.Height / 2);
207
                            main.zoomAndPanControl.ZoomPointToViewportCenter(0.3, centerP);
208 208
                        }
209 209
                    }
210 210
                    catch (Exception ex)
KCOM/KCOM.csproj
1558 1558
 cd $(SolutionDir)
1559 1559
 call "PublishSign.bat"
1560 1560
 rem call "appCast_Daelim.bat" "@(VersionNumber)"
1561
call "appCast_DIG.bat" "@(VersionNumber)"
1562
call "appCast_ETECH.bat" "@(VersionNumber)"
1561
rem call "appCast_DIG.bat" "@(VersionNumber)"
1562
rem call "appCast_ETECH.bat" "@(VersionNumber)"
1563 1563
 rem call "appCast_DIG_DEBUG.bat" "@(VersionNumber)"
1564
rem call "appCast_SNI_SDMS.bat" "@(VersionNumber)"
1565
rem call "appCast_SNI_XICNA.bat" "@(VersionNumber)"
1564
call "appCast_SNI_SDMS.bat" "@(VersionNumber)"
1565
call "appCast_SNI_XICNA.bat" "@(VersionNumber)"
1566 1566
 rem call "appCast_doftech.bat" "@(VersionNumber)"
1567 1567
 rem call "appCast_HS.bat" "@(VersionNumber)"
1568 1568
 rem "appCast_bseng.bat" "@(VersionNumber)"
KCOM/Views/MainMenu.xaml.cs
152 152
        public string Filename_ { get; set; }
153 153
        public UndoData multi_UndoData;
154 154
        public string Symbol_ID = "";
155

  
155
        public event EventHandler<EventArgs> MarkupLoadComplated;
156 156
        /// <summary>
157 157
        /// Set to 'true' when the left mouse-button is down.
158 158
        /// </summary>
......
882 882
        /// </summary>
883 883
        /// <param name="sender"></param>
884 884
        /// <param name="e"></param>
885
        private async void PageNavigator_PageChanged(object sender, Sample.PageChangeEventArgs e)
885
        private void PageNavigator_PageChanged(object sender, Sample.PageChangeEventArgs e)
886 886
        {
887 887
            //if (zoomAndPanCanvas.Width.IsNaN())
888 888
            //{
......
998 998
            }
999 999

  
1000 1000
            SetCommentPages(cts);
1001

  
1002
            if(MarkupLoadComplated != null)
1003
            {
1004
                MarkupLoadComplated(this, new EventArgs());
1005
            }
1001 1006
        }
1002 1007

  
1003 1008
        public void SetCommentPages(CancellationToken? cts)
KCOM_API/Properties/PublishProfiles/FolderProfile.pubxml.user
7 7
  <PropertyGroup>
8 8
    <TimeStampOfAssociatedLegacyPublishXmlFile />
9 9
    <_PublishTargetUrl>D:\Source\Repos\MARKUS\publish\MarkusAPI</_PublishTargetUrl>
10
    <History>True|2024-09-02T13:30:25.2530981Z;True|2024-09-01T21:42:00.1859844+09:00;True|2024-08-30T16:41:30.1624565+09:00;True|2024-04-08T14:30:26.6088230+09:00;True|2024-03-28T16:09:53.6272860+09:00;True|2024-03-20T17:07:27.3327545+09:00;True|2024-03-20T16:06:18.5686998+09:00;True|2024-03-20T16:05:52.6835054+09:00;True|2024-03-20T15:43:58.3135951+09:00;True|2024-03-20T15:03:19.8255162+09:00;True|2024-03-20T14:42:26.2958970+09:00;True|2024-01-19T17:15:52.8649804+09:00;True|2024-01-19T09:35:44.7523623+09:00;True|2024-01-18T17:04:43.6538702+09:00;True|2024-01-12T10:31:11.4820004+09:00;True|2023-11-15T12:54:34.6710396+09:00;True|2023-08-05T17:11:18.9473506+09:00;True|2023-08-05T17:10:51.1260416+09:00;True|2023-08-05T17:10:15.6768362+09:00;True|2023-08-05T17:05:00.6983156+09:00;True|2023-08-05T17:03:52.8404213+09:00;True|2023-08-05T17:02:21.8070007+09:00;True|2023-08-05T16:59:21.4828422+09:00;True|2023-04-26T09:20:18.0086339+09:00;True|2023-04-07T16:43:58.8972257+09:00;True|2023-04-07T14:06:40.4572438+09:00;True|2023-04-07T09:30:34.5436846+09:00;True|2023-04-06T14:45:18.6746547+09:00;True|2022-11-08T17:24:41.4219984+09:00;True|2022-11-05T17:01:00.1307411+09:00;True|2022-11-05T16:59:58.7400279+09:00;</History>
10
    <History>True|2024-11-25T07:24:31.6507264Z;True|2024-09-02T22:30:25.2530981+09:00;True|2024-09-01T21:42:00.1859844+09:00;True|2024-08-30T16:41:30.1624565+09:00;True|2024-04-08T14:30:26.6088230+09:00;True|2024-03-28T16:09:53.6272860+09:00;True|2024-03-20T17:07:27.3327545+09:00;True|2024-03-20T16:06:18.5686998+09:00;True|2024-03-20T16:05:52.6835054+09:00;True|2024-03-20T15:43:58.3135951+09:00;True|2024-03-20T15:03:19.8255162+09:00;True|2024-03-20T14:42:26.2958970+09:00;True|2024-01-19T17:15:52.8649804+09:00;True|2024-01-19T09:35:44.7523623+09:00;True|2024-01-18T17:04:43.6538702+09:00;True|2024-01-12T10:31:11.4820004+09:00;True|2023-11-15T12:54:34.6710396+09:00;True|2023-08-05T17:11:18.9473506+09:00;True|2023-08-05T17:10:51.1260416+09:00;True|2023-08-05T17:10:15.6768362+09:00;True|2023-08-05T17:05:00.6983156+09:00;True|2023-08-05T17:03:52.8404213+09:00;True|2023-08-05T17:02:21.8070007+09:00;True|2023-08-05T16:59:21.4828422+09:00;True|2023-04-26T09:20:18.0086339+09:00;True|2023-04-07T16:43:58.8972257+09:00;True|2023-04-07T14:06:40.4572438+09:00;True|2023-04-07T09:30:34.5436846+09:00;True|2023-04-06T14:45:18.6746547+09:00;True|2022-11-08T17:24:41.4219984+09:00;True|2022-11-05T17:01:00.1307411+09:00;True|2022-11-05T16:59:58.7400279+09:00;</History>
11 11
  </PropertyGroup>
12 12
  <ItemGroup>
13 13
    <File Include="ActiveService.svc">
14 14
      <publishTime>06/22/2021 14:27:43</publishTime>
15 15
    </File>
16 16
    <File Include="bin/AddressModule.dll">
17
      <publishTime>09/02/2024 15:20:39</publishTime>
17
      <publishTime>10/07/2024 13:14:13</publishTime>
18 18
    </File>
19 19
    <File Include="bin/AddressModule.pdb">
20
      <publishTime>09/02/2024 15:20:39</publishTime>
20
      <publishTime>10/07/2024 13:14:13</publishTime>
21 21
    </File>
22 22
    <File Include="bin/CommonLib.dll">
23
      <publishTime>09/02/2024 15:44:32</publishTime>
23
      <publishTime>11/22/2024 08:29:05</publishTime>
24 24
    </File>
25 25
    <File Include="bin/CommonLib.pdb">
26
      <publishTime>09/02/2024 15:44:32</publishTime>
26
      <publishTime>11/22/2024 08:29:05</publishTime>
27 27
    </File>
28 28
    <File Include="bin/CompareLib.dll">
29 29
      <publishTime>03/27/2018 10:07:16</publishTime>
......
74 74
      <publishTime>09/19/2015 15:28:04</publishTime>
75 75
    </File>
76 76
    <File Include="bin/IFinalPDF.dll">
77
      <publishTime>09/02/2024 15:20:38</publishTime>
77
      <publishTime>10/07/2024 13:14:13</publishTime>
78 78
    </File>
79 79
    <File Include="bin/IFinalPDF.pdb">
80
      <publishTime>09/02/2024 15:20:38</publishTime>
80
      <publishTime>10/07/2024 13:14:13</publishTime>
81 81
    </File>
82 82
    <File Include="bin/IKCOM.dll">
83
      <publishTime>09/02/2024 16:46:19</publishTime>
83
      <publishTime>11/25/2024 13:18:08</publishTime>
84 84
    </File>
85 85
    <File Include="bin/IKCOM.pdb">
86
      <publishTime>09/02/2024 16:46:19</publishTime>
86
      <publishTime>11/25/2024 13:18:08</publishTime>
87 87
    </File>
88 88
    <File Include="bin/it/ZedGraph.resources.dll">
89 89
      <publishTime>09/19/2015 15:28:04</publishTime>
......
92 92
      <publishTime>09/19/2015 15:28:04</publishTime>
93 93
    </File>
94 94
    <File Include="bin/KCOMDataModel.dll">
95
      <publishTime>09/02/2024 15:44:32</publishTime>
95
      <publishTime>11/22/2024 08:29:06</publishTime>
96 96
    </File>
97 97
    <File Include="bin/KCOMDataModel.dll.config">
98 98
      <publishTime>06/08/2020 15:07:57</publishTime>
99 99
    </File>
100 100
    <File Include="bin/KCOMDataModel.pdb">
101
      <publishTime>09/02/2024 15:44:32</publishTime>
101
      <publishTime>11/22/2024 08:29:06</publishTime>
102 102
    </File>
103 103
    <File Include="bin/KCOM_API.dll">
104
      <publishTime>09/02/2024 17:15:52</publishTime>
104
      <publishTime>11/25/2024 16:24:25</publishTime>
105 105
    </File>
106 106
    <File Include="bin/KCOM_API.pdb">
107
      <publishTime>09/02/2024 17:15:52</publishTime>
107
      <publishTime>11/25/2024 16:24:25</publishTime>
108 108
    </File>
109 109
    <File Include="bin/Leadtools.Codecs.Cmp.dll">
110 110
      <publishTime>06/29/2017 11:38:22</publishTime>
......
146 146
      <publishTime>09/02/2024 15:20:40</publishTime>
147 147
    </File>
148 148
    <File Include="bin/Markus.ImageHandler.dll">
149
      <publishTime>09/02/2024 15:20:40</publishTime>
149
      <publishTime>10/07/2024 13:14:14</publishTime>
150 150
    </File>
151 151
    <File Include="bin/Markus.ImageHandler.pdb">
152
      <publishTime>09/02/2024 15:20:40</publishTime>
152
      <publishTime>10/07/2024 13:14:14</publishTime>
153 153
    </File>
154 154
    <File Include="bin/Microsoft.IdentityModel.Abstractions.dll">
155 155
      <publishTime>07/28/2023 11:14:36</publishTime>
......
299 299
      <publishTime>02/27/2024 17:30:25</publishTime>
300 300
    </File>
301 301
    <File Include="Web.config">
302
      <publishTime>09/02/2024 22:30:18</publishTime>
302
      <publishTime>11/25/2024 16:24:26</publishTime>
303 303
    </File>
304 304
  </ItemGroup>
305 305
</Project>

내보내기 Unified diff

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