프로젝트

일반

사용자정보

개정판 1edefbdf

ID1edefbdfeff4e9e5dbce0dc41eac16c11dadc42d
상위 8de0cf00
하위 8f86cf42

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

- 최초 썸네일이 최상단으로 안가는 현상 수정
- numpad 4~8 페이지 이동 제거
-

Change-Id: Id881ce934f2bc0d1b80b6e9c993fd3e9315d49b3

차이점 보기:

DownloadManager/PageStorage.cs
81 81
                    }
82 82
                }
83 83

  
84
                System.Threading.Thread.Sleep(10);
84
                System.Threading.Thread.Sleep(100);
85 85

  
86 86
            }
87 87

  
INI/MARKUS_Doftech.ini
2 2
[Internal]
3 3
IP=192.168.0.67
4 4
[External]
5
IP=125.129.196.207
5
IP=192.168.0.67
6 6
[BaseClientAddress]
7
URL=https://192.168.0.67:5978
7
URL=http://192.168.0.67:5979
8 8
[HubAddress]
9 9
URL=http://192.168.0.67:5100/
10 10
[UpdateVer64]
KCOM/App.xaml.cs
276 276

  
277 277
                await SplashScreenAsnyc();
278 278
                base.OnStartup(e);
279

  
280
                System.Windows.Input.Keyboard.AddKeyDownHandler(this.MainWindow, KeyDownEvent);
279
                System.Windows.Input.Keyboard.AddPreviewKeyDownHandler(this.MainWindow, KeyDownEvent);
280
                //System.Windows.Input.Keyboard.AddKeyDownHandler(this.MainWindow, KeyDownEvent);
281 281
            }
282 282
            catch (Exception ex)
283 283
            {
KCOM/Controls/Sample.xaml.cs
200 200
            DownloadProcess.ProcessMonitor(ViewerDataModel.Instance.IsAdmin, tempStoragePath, App.PageStorage.LocalStorage,Common.ViewerDataModel.Instance.OriginalTempFile);
201 201

  
202 202
            App.splashScreen.Close();
203

  
203 204
        }
204 205

  
205 206
        private void WcfServer_IpcThumbnailReceived(object sender, IpcThumbnailEventArgs e)
......
210 211
            {
211 212
                //Dispatcher.BeginInvoke((Action)delegate ()
212 213
                //{
213
                    items.First().ImageUri = new Uri(e.Path, UriKind.Absolute);
214
                items.First().ImageUri = new Uri(e.Path, UriKind.Absolute);
215

  
216
                
217
                if (e.PageNo > 2 && ImgListbox.Items.Count > 0)
218
                {
219
                    ImgListbox.IsScrollIntoViewEnabled = true;
220
                    //ImgListbox.BringIntoView();
221
                    ImgListbox.ScrollIntoView(0);
222
                }
223

  
214 224
                //});
215 225
            }
216 226
        }
......
318 328
        {
319 329
            try
320 330
            {
321
                System.Threading.Tasks.Task.Factory.StartNew(() => { 
331
                //System.Threading.Tasks.Task.Factory.StartNew(() => { 
322 332

  
323 333
                    var _page = _thumbnailItems.Where(item => item.PageNumber == _pageNumber);
324 334
                    if (_page.Count() > 0)
......
347 357
                        }
348 358
                    }
349 359

  
350
                }).ConfigureAwait(false);
360
                //}).ConfigureAwait(false);
351 361
            }
352 362
            catch(Exception ex)
353 363
            {
......
629 639
            }
630 640

  
631 641
            this.lstSelectComment.ItemsSource = this.UsersCommentPagesList;  //섬네일   
632

  
633 642
            Logger.sendCheckLog("SetComme6ntList_ImgListbox 설정", 1);
634 643

  
635 644

  
KCOM/Controls/Symbol.xaml
97 97
                                 PreviewMouseUp="lstSymbolPrivate_PreviewMouseUp"
98 98
                                 MouseLeave="lstSymbolPrivate_MouseLeave" AllowDrop="False"
99 99
                                 PreviewMouseWheel ="lstSymbolPrivate_PreviewMouseWheel">
100
                            <telerik:RadListBox.DragDropBehavior>
100
                            <!--<telerik:RadListBox.DragDropBehavior>
101 101
                                <telerik:ListBoxDragDropBehavior AllowReorder="True" />
102
                            </telerik:RadListBox.DragDropBehavior>
102
                            </telerik:RadListBox.DragDropBehavior>-->
103 103
                            <telerik:RadListBox.DragVisualProvider>
104 104
                                <Behaviors:RadListBoxDragVisualProvider DragVisualStyle="{StaticResource CustomDragVisualStyle}">
105 105
                                    <Behaviors:RadListBoxDragVisualProvider.DraggedItemTemplate>
KCOM/Events/Event_KeyEvent.cs
280 280

  
281 281
                //강인구 추가
282 282
                #region Control Move
283
                case Key.NumPad4:
284
                case Key.NumPad5:
285
                case Key.NumPad6:
286
                case Key.NumPad8:
283
                //case Key.NumPad4:
284
                //case Key.NumPad5:
285
                //case Key.NumPad6:
286
                //case Key.NumPad8:
287 287
                case Key.Right:
288 288
                case Key.Left:
289 289
                case Key.Up:
KCOM/Extensions/MarkupVisitHelper.cs
24 24

  
25 25
            SelectionSet.Instance.UnSelect(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu);
26 26

  
27
            var commentList = instance._markupInfoList.Where(x => x.MarkupList != null).SelectMany(x => x.MarkupList).Where(f => f.ID == CommentIdList.First());
27
            List<IKCOM.MarkupItem> commentList = new List<IKCOM.MarkupItem>();
28

  
29
            foreach (var markupInfo in instance._markupInfoList)
30
            {
31
                var comments = markupInfo.MarkupList.Where(f => f.ID == CommentIdList.First());
32

  
33
                if (comments.Count() > 0)
34
                {
35
                    instance.SystemMain.dzMainMenu.gridViewMarkup.SelectedItem = markupInfo;
36
                    commentList.AddRange(comments);
37
                }
38
            }
28 39

  
29 40
            if (commentList.Count() > 0)
30 41
            {
......
54 65
                {
55 66
                    //하단 그리드의 markup list에서 commentid가 포함된 markupinfo를 선택되게 한다.
56 67
                    #region markup list grid select items
68
                    /// 이전에 선택하도록 수정함
69
                    //var infoItem = instance._markupInfoList.Where(x => x.MarkupList != null).Where(f => f.MarkupList.Count(y => y == commentList.First()) > 0);
57 70

  
58
                    var infoItem = instance._markupInfoList.Where(x => x.MarkupList != null).Where(f => f.MarkupList.Count(y => y == commentList.First()) > 0);
59

  
60
                    if (infoItem.Count() > 0)
61
                    {
71
                    //if (infoItem.Count() > 0)
72
                    //{
62 73

  
63
                        var gridMarkup = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.gridViewMarkup;
64
                        gridMarkup.SelectedItems.Clear();
65
                        gridMarkup.SelectedItems.Add(infoItem.First());
66
                    }
74
                    //    var gridMarkup = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.gridViewMarkup;
75
                    //    gridMarkup.SelectedItems.Clear();
76
                    //    gridMarkup.SelectedItems.Add(infoItem.First());
77
                    //}
67 78

  
68 79
                    #endregion
69 80

  
KCOM/KCOM.csproj.user
14 14
    <VerifyUploadedFiles>false</VerifyUploadedFiles>
15 15
  </PropertyGroup>
16 16
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
17
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjUwMDAwMDEzIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJkb2Z0ZWNoIn0=</StartArguments>
17
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjMwMDAwMTMxIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJkb2Z0ZWNoIn0=</StartArguments>
18 18
  </PropertyGroup>
19 19
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
20 20
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments>
......
35 35
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments>
36 36
  </PropertyGroup>
37 37
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_DevDoftech|AnyCPU'">
38
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjExMDAwMTAyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOiJ0cnVlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJ0cnVlIiwiUHJvamVjdE5PIjoiMDAwMDAwIiwiVXNlcklEIjoiYWRtaW4iLCJNb2RlIjowfQ==</StartArguments>
38
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjMwMDAwMTMxIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJkb2Z0ZWNoIn0=</StartArguments>
39 39
  </PropertyGroup>
40 40
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_DevDoftech|x64'">
41 41
    <StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram>
KCOM/MARKUS.ini
2 2
[Internal]
3 3
IP=192.168.0.67
4 4
[External]
5
IP=125.129.196.207
5
IP=192.168.0.67
6 6
[BaseClientAddress]
7
URL=https://192.168.0.67:5978
7
URL=https://192.168.0.67:5979
8 8
[HubAddress]
9 9
URL=http://192.168.0.67:5100/
10 10
[UpdateVer64]
KCOM_API/Properties/PublishProfiles/FolderProfile.pubxml.user
10 10
  </PropertyGroup>
11 11
  <ItemGroup>
12 12
    <File Include="bin/CommonLib.dll">
13
      <publishTime>02/18/2021 15:35:03</publishTime>
13
      <publishTime>03/03/2021 14:53:10</publishTime>
14 14
    </File>
15 15
    <File Include="bin/CommonLib.pdb">
16
      <publishTime>02/18/2021 15:35:03</publishTime>
16
      <publishTime>03/03/2021 14:53:10</publishTime>
17 17
    </File>
18 18
    <File Include="bin/CompareLib.dll">
19 19
      <publishTime>03/27/2018 10:07:16</publishTime>
......
58 58
      <publishTime>09/19/2015 15:28:04</publishTime>
59 59
    </File>
60 60
    <File Include="bin/IFinalPDF.dll">
61
      <publishTime>02/18/2021 15:35:03</publishTime>
61
      <publishTime>03/03/2021 14:53:10</publishTime>
62 62
    </File>
63 63
    <File Include="bin/IFinalPDF.pdb">
64
      <publishTime>02/18/2021 15:35:03</publishTime>
64
      <publishTime>03/03/2021 14:53:10</publishTime>
65 65
    </File>
66 66
    <File Include="bin/IKCOM.dll">
67
      <publishTime>02/18/2021 15:35:07</publishTime>
67
      <publishTime>03/03/2021 14:53:22</publishTime>
68 68
    </File>
69 69
    <File Include="bin/IKCOM.pdb">
70
      <publishTime>02/18/2021 15:35:07</publishTime>
70
      <publishTime>03/03/2021 14:53:22</publishTime>
71 71
    </File>
72 72
    <File Include="bin/it/ZedGraph.resources.dll">
73 73
      <publishTime>09/19/2015 15:28:04</publishTime>
......
76 76
      <publishTime>09/19/2015 15:28:04</publishTime>
77 77
    </File>
78 78
    <File Include="bin/KCOMDataModel.dll">
79
      <publishTime>02/18/2021 15:35:04</publishTime>
79
      <publishTime>03/03/2021 14:53:15</publishTime>
80 80
    </File>
81 81
    <File Include="bin/KCOMDataModel.dll.config">
82 82
      <publishTime>06/08/2020 15:07:57</publishTime>
83 83
    </File>
84 84
    <File Include="bin/KCOMDataModel.pdb">
85
      <publishTime>02/18/2021 15:35:04</publishTime>
85
      <publishTime>03/03/2021 14:53:15</publishTime>
86 86
    </File>
87 87
    <File Include="bin/KCOM_API.dll">
88
      <publishTime>02/18/2021 15:35:08</publishTime>
88
      <publishTime>03/03/2021 14:53:23</publishTime>
89 89
    </File>
90 90
    <File Include="bin/KCOM_API.pdb">
91
      <publishTime>02/18/2021 15:35:08</publishTime>
91
      <publishTime>03/03/2021 14:53:23</publishTime>
92 92
    </File>
93 93
    <File Include="bin/Leadtools.Codecs.Cmp.dll">
94 94
      <publishTime>06/29/2017 11:38:22</publishTime>
......
220 220
      <publishTime>07/10/2019 14:11:36</publishTime>
221 221
    </File>
222 222
    <File Include="Web.config">
223
      <publishTime>02/18/2021 15:35:08</publishTime>
223
      <publishTime>03/03/2021 15:50:50</publishTime>
224 224
    </File>
225 225
  </ItemGroup>
226 226
</Project>
KCOM_API/Web.config
104 104
  <applicationSettings>
105 105
    <KCOM_API.Properties.Settings>
106 106
      <setting name="TileSoucePath" serializeAs="String">
107
        <value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
107
        <value>http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
108 108
      </setting>
109 109
      <setting name="TileSoucePath_SUB" serializeAs="String">
110
        <value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
110
        <value>http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
111 111
      </setting>
112 112
      <setting name="IsProjectNoPass" serializeAs="String">
113 113
        <value>True</value>
114 114
      </setting>
115 115
      <setting name="FinalService" serializeAs="String">
116
        <value>tcp://localhost:9093/remFinalPDF</value>
116
        <value>tcp://localhost:9092/remFinalPDF</value>
117 117
      </setting>
118 118
    </KCOM_API.Properties.Settings>
119 119
  </applicationSettings>
MarkupToPDF/Controls/Parsing/MarkupParse.cs
291 291
                foreach (var dataPease in data)
292 292
                {
293 293
                    string item = "";
294

  
295
                    if (cts == null)
296
                    {
297
                        item = await JsonSerializerHelper.UnCompressStringAsync(dataPease, null); //언패킹작업
298
                    }
299
                    else
300
                    {
301
                        if(cts.Value.IsCancellationRequested)
302
                        {
303
                            return null;
304
                        }
305

  
306
                        item = await JsonSerializerHelper.UnCompressStringAsync(dataPease, cts); //언패킹작업
307
                    }
294
                    item = await JsonSerializerHelper.UnCompressStringAsync(dataPease, null); //언패킹작업
295
                    //if (cts == null)
296
                    //{
297
                    //    item = await JsonSerializerHelper.UnCompressStringAsync(dataPease, null); //언패킹작업
298
                    //}
299
                    //else
300
                    //{
301
                    //    if(cts.Value.IsCancellationRequested)
302
                    //    {
303
                    //        return null;
304
                    //    }
305

  
306
                    //    item = await JsonSerializerHelper.UnCompressStringAsync(dataPease, cts); //언패킹작업
307
                    //}
308 308

  
309 309
                    CommentUserInfo control = MarkupParser.FromString(item, _SetColor, sProjectNo, PageAngle);
310 310

  
MarkupToPDF/Serialize/Core/JsonSerializerHelper.cs
108 108
            {
109 109
                if (cts != null)
110 110
                {
111
                    await gzipStream.CopyToAsync(outStream, 81920, cts.Value);
111
                    await gzipStream.CopyToAsync(outStream,(int)inStream.Length, cts.Value);
112 112
                }
113 113
                else
114 114
                {
115
                    await gzipStream.CopyToAsync(outStream, 81920);
115
                    gzipStream.CopyTo(outStream, (int)inStream.Length);
116 116
                }
117 117
                //return Encoding.ASCII.GetString(outStream.ToArray());
118 118
                return Encoding.UTF8.GetString(outStream.ToArray());

내보내기 Unified diff

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