프로젝트

일반

사용자정보

개정판 e13b43de

IDe13b43de7a8f393b358546f4af05291bf3a653e2
상위 3dcc7c99
하위 04d21859

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

markup navigation 수정

Change-Id: Ia3230abdc901e17cc0ca467f45d028d0c726f46d

차이점 보기:

INI/MARKUS_DAELIM_REMOTE.ini
3 3
[External]
4 4
IP=172.20.120.142
5 5
[BaseClientAddress]
6
URL=http://172.20.120.142
6
URL=http://172.20.120.142:5979
7 7
[HubAddress]
8 8
URL=http://172.20.120.142:5100/
9 9
[UpdateVer64]
10
URL=http://172.20.120.142/TileSource/Version/version_x64.xml
10
URL=http://172.20.120.142:5977/TileSource/Version/version_x64.xml
11 11
[UpdateVer86]
12
URL=http://172.20.120.142/TileSource/Version/version_x86.xml
12
URL=http://172.20.120.142:5977/TileSource/Version/version_x86.xml
13 13
[excelFilePath]
14
URL=http://172.20.120.142/TileSource/Check_Test/CheckList_T.xlsx
14
URL=http://172.20.120.142:5977/TileSource/Check_Test/CheckList_T.xlsx
15 15
[KCOM_Get_FinalImage_Get_PdfImage]
16
URL=http://172.20.120.142/Get_FInalImage/Get_PdfImage.asmx
16
URL=http://172.20.120.142:5977/Get_FInalImage/Get_PdfImage.asmx
17 17
[KCOM_kr_co_devdoftech_cloud_FileUpload]
18
URL=http://172.20.120.142/ImageUpload/FileUpload.asmx
18
URL=http://172.20.120.142:5977/ImageUpload/FileUpload.asmx
19 19
[mainServerImageWebPath]
20
URL=http://172.20.120.142/TileSource/{0}_Tile/{1}/{2}/{3}.png
20
URL=http://172.20.120.142:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
21 21
[subServerImageWebPath]
22 22
URL=https://ensembleitf.daelim.co.kr/TileSource/{0}_Tile/{1}/{2}/{3}.png
23 23
[Debug_BaseClientAddress]
24
URL=http://172.20.120.142
24
URL=http://172.20.120.142:5979
25 25
[HOST_DOMAIN]
26 26
DOMAIN=DAELIM.COM
27 27
[GetConversionStateFailed]
......
37 37
[PortForwarding]
38 38
HUB=5100:5100
39 39
RESOURCE=5977:5977
40
BASE=5978
40
BASE=5979:5979
41 41
[GetImageResourceFailed]
42 42
MSG=7ZW064u5IOusuOyEnOydmCB7MH0gUGFnZSBDb252ZXJ06rCAIOygleyDgeyggeydtOyngCDslYrsirXri4jri6QuIOq0gOumrOyekOyXkOqyjCDrrLjsnZjtlbQg7KO87IS47JqULg==
KCOM/Common/ViewerDataModel.cs
1062 1062
            }
1063 1063
            set
1064 1064
            {
1065
                _PageNumber = value;
1066
                OnPropertyChanged("PageNumber");
1065
                if (_PageNumber != value)
1066
                {
1067
                    _PageNumber = value;
1068
                    OnPropertyChanged("PageNumber");
1069
                }
1067 1070
            }
1068 1071
        }
1069 1072

  
KCOM/Controls/Sample.xaml
446 446
    <Grid x:Name="grid" VerticalAlignment="Stretch">
447 447
        <!--<TextBlock Text="Sort By:"  Foreground="{DynamicResource KCOMColor_MarkerBrush}"/>-->
448 448
        <telerik:RadTabControl Margin="0,6,0,0" BorderThickness="0" telerik:StyleManager.Theme="VisualStudio2013"  HeaderBackground="#f5f5f5" FontSize="10" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"
449
                               ScrollViewer.HorizontalScrollBarVisibility ="Disabled" SelectedIndex="0" >
449
                               ScrollViewer.HorizontalScrollBarVisibility ="Disabled" SelectedIndex="0" Name="navigationTab" >
450 450

  
451 451
            <telerik:RadTabItem Header="Thumbnail"  HeaderForeground="{DynamicResource KCOMColor_MarkerBrush}" FontSize="12">
452 452
                <Grid>
......
479 479
                                        ItemContainerStyle="{StaticResource ItemContainerStyle}"
480 480
                                        BorderBrush="#FFC2C2C2" BorderThickness="0"  
481 481
                                        SelectedIndex="0"
482

  
483 482
                                        ScrollViewer.HorizontalScrollBarVisibility="Disabled"
484 483
                                        ScrollViewer.VerticalScrollBarVisibility="Auto"
485 484
                                        ScrollViewer.CanContentScroll="True"
KCOM/Controls/Sample.xaml.cs
308 308

  
309 309
                            ImgListbox.Dispatcher.InvokeAsync(() => {  
310 310
                                var _itemIndex = this._thumbnailItems.IndexOf(thumbnailitem);
311

  
311 312
                                ImgListbox.SelectedItem = thumbnailitem;
313

  
314

  
315
                                if (navigationTab.SelectedIndex != 0)
316
                                {
317
                                    PageChange(thumbnailitem);
318
                                }
319

  
312 320
                            });
313 321
                            //ImgListbox.Items.MoveCurrentTo(thumbnailitem);
314 322
                            //if (_itemIndex < _thumbnailItems.Count() - 1)
......
318 326
                        }
319 327
                    }
320 328

  
321
                }).ConfigureAwait(true);
329
                }).ConfigureAwait(false);
322 330
            }
323 331
            catch(Exception ex)
324 332
            {
KCOM/Extensions/MarkupVisitHelper.cs
28 28

  
29 29
            if (commentList.Count() > 0)
30 30
            {
31
                if (ViewerDataModel.Instance.PageNumber != commentList.First().PageNumber)
32
                {
33
                    ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.GotoPage(commentList.First().PageNumber);
34
                }
35

  
31 36
                //하단 그리드의 markup list에서 commentid가 포함된 markupinfo를 선택되게 한다.
32 37
                #region markup list grid select items
33 38

  
KCOM/KCOM.csproj
1419 1419
xcopy $(ProjectDir)..\publish\Downloader\*.* $(TargetDir)Plugin\*.* /I /E /S /Y /F 
1420 1420

  
1421 1421
if $(ConfigurationName) == Debug (
1422
     xcopy /s "$(ProjectDir)..\INI\MARKUS.ini" "$(TargetDir)MARKUS.ini" /Y /F
1422
     xcopy /s "$(ProjectDir)..\INI\MARKUS.ini" "$(TargetDir)MARKUS.*" /Y /F
1423 1423
)
1424 1424

  
1425
rem if $(ConfigurationName) == Release_Default (
1426
rem     xcopy /s "$(ProjectDir)..\INI\MARKUS.ini" "$(TargetDir)MARKUS.ini" /Y /F
1427
rem )
1425
 if $(ConfigurationName) == Release_Default (
1426
     xcopy /s "$(ProjectDir)..\INI\MARKUS.ini" "$(TargetDir)MARKUS.*" /Y /F
1427
)
1428 1428

  
1429 1429
if $(ConfigurationName) == Debug_Daelim (
1430
      xcopy /s "$(ProjectDir)..\INI\MARKUS_Daelim.ini" "$(TargetDir)MARKUS.ini" /Y /F
1430
      xcopy /s "$(ProjectDir)..\INI\MARKUS_Daelim.ini" "$(TargetDir)MARKUS.*" /Y /F
1431 1431
)
1432 1432

  
1433 1433
if $(ConfigurationName) == Daelim_RemoteTest (
1434
      xcopy /s "$(ProjectDir)..\INI\MARKUS_DAELIM_REMOTE.ini" "$(TargetDir)MARKUS.ini" /Y /F
1434
      xcopy /s "$(ProjectDir)..\INI\MARKUS_DAELIM_REMOTE.ini" "$(TargetDir)MARKUS.*" /Y /F
1435 1435
)
1436 1436

  
1437 1437
if $(ConfigurationName) == Debug_DevDoftech (
1438
     xcopy /s "$(ProjectDir)..\INI\MARKUS_Doftech.ini" "$(TargetDir)MARKUS.ini" /Y /F
1438
     xcopy /s "$(ProjectDir)..\INI\MARKUS_Doftech.ini" "$(TargetDir)MARKUS.*" /Y /F
1439 1439
)
1440 1440

  
1441 1441
if $(ConfigurationName) == Debug_HyoSung (
1442
     xcopy /s "$(ProjectDir)..\INI\MARKUS_HyoSung_Debug.ini" "$(TargetDir)MARKUS.ini" /Y /F
1442
     xcopy /s "$(ProjectDir)..\INI\MARKUS_HyoSung_Debug.ini" "$(TargetDir)MARKUS.*" /Y /F
1443 1443
 )
1444 1444

  
1445 1445
 if $(ConfigurationName) == Release_HyoSung (
1446
     xcopy /s "$(ProjectDir)..\INI\MARKUS_HyoSung.ini" "$(TargetDir)MARKUS.ini" /Y /F
1446
     xcopy /s "$(ProjectDir)..\INI\MARKUS_HyoSung.ini" "$(TargetDir)MARKUS.*" /Y /F
1447 1447
)
1448 1448
 if $(ConfigurationName) == Release_PEMSS (
1449
     xcopy /s "$(ProjectDir)..\INI\MARKUS_PEMSS.ini" "$(TargetDir)MARKUS.ini" /Y /F
1449
     xcopy /s "$(ProjectDir)..\INI\MARKUS_PEMSS.ini" "$(TargetDir)MARKUS.*" /Y /F
1450 1450
)
1451 1451
if $(ConfigurationName) == Debug_SNI (
1452
     xcopy /s "$(ProjectDir)..\INI\MARKUS_SNI.ini" "$(TargetDir)MARKUS.ini" /Y /F
1452
     xcopy /s "$(ProjectDir)..\INI\MARKUS_SNI.ini" "$(TargetDir)MARKUS.*" /Y /F
1453 1453
)</PreBuildEvent>
1454 1454
  </PropertyGroup>
1455 1455
  <Target Name="app_Release_config_AfterBuild" AfterTargets="AfterBuild" Condition="Exists('app.Release.$(Configuration).config')">
KCOM/KCOM.csproj.user
86 86
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjExMDAwMTAyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOiJ0cnVlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJ0cnVlIiwiUHJvamVjdE5PIjoiMDAwMDAwIiwiVXNlcklEIjoiSmFtZXMiLCJNb2RlIjowfQ==/</StartArguments>
87 87
  </PropertyGroup>
88 88
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Daelim_RemoteTest|AnyCPU'">
89
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjIyNTE0MzA1NiIsImJQYXJ0bmVyIjpmYWxzZSwiQ3JlYXRlRmluYWxQREZQZXJtaXNzaW9uIjp0cnVlLCJOZXdDb21tZW50UGVybWlzc2lvbiI6dHJ1ZSwiUHJvamVjdE5PIjoiMTgwMjIwIiwiVXNlcklEIjoiYWRtaW4ifQ==</StartArguments>
89
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjMzODA4LjYxOTI1LjQ2MzM4LjM1NjU1IiwiYlBhcnRuZXIiOiJmYWxzZSIsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6ImZhbHNlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJmYWxzZSIsIlByb2plY3ROTyI6IjE3MDA2MiIsIlVzZXJJRCI6ImFkbWluX3BsYXRmb3JtIiwiTW9kZSI6IjAifQ==/</StartArguments>
90 90
  </PropertyGroup>
91 91
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Daelim_RemoteTest|x64'">
92 92
    <StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram>
KCOM/PageManager/PageStorage.cs
195 195
                    //var takePageNoList = Enumerable.Range(PageNo + 1, _TakeCount);
196 196

  
197 197

  
198

  
198 199
                }
199 200

  
200 201
                result = pageItem.LocalUri;

내보내기 Unified diff

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