프로젝트

일반

사용자정보

개정판 a874198d

IDa874198d9c7379927424ee81d30d42d222a94813
상위 999c9e40
하위 814116a9

humkyung 이(가) 6년 이상 전에 추가함

효성 수정 사항 반영

차이점 보기:

KCOM/Properties/Settings.settings
14 14 
    <Setting Name="mainServerImageWebPath" Type="System.String" Scope="Application">
15 15 
      <Value Profile="(Default)">http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</Value>
16 16 
    </Setting>
17 
    <Setting Name="subServerImageWebPath" Type="System.String" Scope="Application">
18 
      <Value Profile="(Default)">http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</Value>
19 
    </Setting>
20 
    <Setting Name="excelFilePath" Type="System.String" Scope="Application">
21 
      <Value Profile="(Default)">http://cloud.devdoftech.co.kr:5977/TileSource/Check_Test/CheckList_T.xlsx</Value>
22 
    </Setting>
17 23 
  </Settings>
18 24 
</SettingsFile>
KCOM/Views/MainMenu.xaml.cs
488 488 

  		




  489
  489
  
    
            ViewerDataModel.Instance.PageNumber = BalancePoint;


  		




  490
  490
  
    

  		




  491
  
  
    

  		




  492
  
  
    
            var uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToInt32(_ViewInfo.DocumentItemID) / 100).ToString(), _ViewInfo.DocumentItemID, e.PageNumber);


  		




  
  491
  
    
            string uri = "";


  		




  
  492
  
    
            if (userData.COMPANY !="EXT")


  		




  
  493
  
    
            {


  		




  
  494
  
    
                uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToInt32(_ViewInfo.DocumentItemID) / 100).ToString(), _ViewInfo.DocumentItemID, e.PageNumber);


  		




  
  495
  
    
            }


  		




  
  496
  
    
            else


  		




  
  497
  
    
            {


  		




  
  498
  
    
                uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, _ViewInfo.DocumentItemID, e.PageNumber);


  		




  
  499
  
    
            }


  		




  493
  500
  
    

  		




  494
  501
  
    
            var defaultBitmapImage = new BitmapImage(new Uri(uri));


  		




  495
  502
  
    

  		




  ......




  548
  555
  
    
                }


  		




  549
  556
  
    
                else


  		




  550
  557
  
    
                {


  		




  551
  
  
    
                    var uri2 = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, BalancePoint);


  		




  
  558
  
    
                    string uri2 = "";


  		




  
  559
  
    
                    if (userData.COMPANY !="EXT")


  		




  
  560
  
    
                    {


  		




  
  561
  
    
                        uri2 = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, BalancePoint);


  		




  
  562
  
    
                    }


  		




  
  563
  
    
                    else


  		




  
  564
  
    
                    {


  		




  
  565
  
    
                        uri2 = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, BalancePoint);


  		




  
  566
  
    
                    }


  		




  
  567
  
    
                    


  		




  552
  568
  
    

  		




  553
  569
  
    
                    var defaultBitmapImage_Compare = new BitmapImage(new Uri(uri2));


  		




  554
  570
  
    

  		




  ......




  2487
  2503
  
    
                dragCaptureBorder.Height = height;


  		




  2488
  2504
  
    
            }


  		




  2489
  2505
  
    
            //선택 중


  		




  2490
  
  
    
            else if (mouseHandlingMode == MouseHandlingMode.Selecting)


  		




  
  2506
  
    
            else if(mouseHandlingMode == MouseHandlingMode.Selecting)


  		




  2491
  2507
  
    
            {


  		




  2492
  2508
  
    
                Canvas.SetLeft(dragSelectionBorder, x);


  		




  2493
  2509
  
    
                Canvas.SetTop(dragSelectionBorder, y);


  		




  ......




  2590
  2606
  
    
            var text_item = ViewerDataModel.Instance.MarkupControls_USER.Where(data =>


  		




  2591
  2607
  
    
            (data as TextControl) != null && (data as TextControl).Text == "" || (data as ArrowTextControl) != null && (data as ArrowTextControl).ArrowText == "").FirstOrDefault();


  		




  2592
  2608
  
    

  		




  2593
  
  
    
            if (text_item != null && (currentControl as ArrowTextControl) == null)


  		




  
  2609
  
    
            if(text_item != null && (currentControl as ArrowTextControl) == null)


  		




  2594
  2610
  
    
            {


  		




  2595
  2611
  
    
                ViewerDataModel.Instance.MarkupControls_USER.Remove(text_item);


  		




  2596
  2612
  
    
            }


  		




  ......




  4406
  4422
  
    
                    ViewerDataModel.Instance.PageNumber = 1;


  		




  4407
  4423
  
    
                }


  		




  4408
  4424
  
    

  		




  4409
  
  
    
                BaseClient.GetCompareRectAsync(_ViewInfo.ProjectNO, _ViewInfo.DocumentItemID, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber.ToString(), ViewerDataModel.Instance.PageNumber.ToString());


  		




  
  4425
  
    
                BaseClient.GetCompareRectAsync(_ViewInfo.ProjectNO, _ViewInfo.DocumentItemID, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber.ToString(), ViewerDataModel.Instance.PageNumber.ToString(), userData.COMPANY !="EXT" ? true :false);


  		




  4410
  4426
  
    
            }


  		




  4411
  4427
  
    
            else


  		




  4412
  4428
  
    
            {


  		




  ......




  4519
  4535
  
    
                    }


  		




  4520
  4536
  
    
                    else


  		




  4521
  4537
  
    
                    {


  		




  4522
  
  
    
                        var uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, ViewerDataModel.Instance.PageNumber);


  		




  
  4538
  
    
                        string uri = "";


  		




  
  4539
  
    

  		




  
  4540
  
    
                        if (userData.COMPANY != "EXT")


  		




  
  4541
  
    
                        {


  		




  
  4542
  
    
                            uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, ViewerDataModel.Instance.PageNumber);


  		




  
  4543
  
    
                        }


  		




  
  4544
  
    
                        else


  		




  
  4545
  
    
                        {


  		




  
  4546
  
    
                            uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, ViewerDataModel.Instance.PageNumber);


  		




  
  4547
  
    
                        }


  		




  4523
  4548
  
    

  		




  4524
  4549
  
    
                        var defaultBitmapImage_Compare = new BitmapImage(new Uri(uri));


  		




  4525
  4550
  
    

  		




  ......




  4612
  4637
  
    
            else


  		




  4613
  4638
  
    
            {


  		




  4614
  4639
  
    
                IsSyncPDFMode = false;


  		




  4615
  
  
    
                var uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);


  		




  
  4640
  
    
                string uri = "";


  		




  
  4641
  
    
                if (userData.COMPANY != "EXT")


  		




  
  4642
  
    
                {


  		




  
  4643
  
    
                    uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);


  		




  
  4644
  
    
                }


  		




  
  4645
  
    
                else


  		




  
  4646
  
    
                {


  		




  
  4647
  
    
                    uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);


  		




  
  4648
  
    
                }


  		




  4616
  4649
  
    

  		




  4617
  4650
  
    
                var defaultBitmapImage_Compare = new BitmapImage(new Uri(uri));


  		




  4618
  4651
  
    

  		




  ......




  4653
  4686
  
    
                        ViewerDataModel.Instance._markupInfoRevList = SetDisplayColor(ea.Result, _ViewInfo.UserID);


  		




  4654
  4687
  
    
                        gridViewRevMarkup.ItemsSource = ViewerDataModel.Instance._markupInfoRevList;


  		




  4655
  4688
  
    

  		




  4656
  
  
    
                        var uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);


  		




  
  4689
  
    
                        string uri = "";


  		




  
  4690
  
    
                        if (userData.COMPANY != "EXT")


  		




  
  4691
  
    
                        {


  		




  
  4692
  
    
                            uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);


  		




  
  4693
  
    
                        }


  		




  
  4694
  
    
                        else


  		




  
  4695
  
    
                        {


  		




  
  4696
  
    
                            uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);


  		




  
  4697
  
    
                        }


  		




  4657
  4698
  
    

  		




  4658
  4699
  
    
                        Sync_Offset_Point = new Point(zoomAndPanControl.ContentOffsetX, zoomAndPanControl.ContentOffsetY);


  		




  4659
  4700
  
    

  		




  ......




  4707
  4748
  
    
                    ViewerDataModel.Instance._markupInfoRevList = SetDisplayColor(ea.Result, _ViewInfo.UserID);


  		




  4708
  4749
  
    
                    gridViewRevMarkup.ItemsSource = ViewerDataModel.Instance._markupInfoRevList;


  		




  4709
  4750
  
    

  		




  4710
  
  
    
                    var uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);


  		




  
  4751
  
    
                    string uri = "";


  		




  
  4752
  
    
                    if (userData.COMPANY !="EXT")


  		




  
  4753
  
    
                    {


  		




  
  4754
  
    
                        uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);


  		




  
  4755
  
    
                    }


  		




  
  4756
  
    
                    else


  		




  
  4757
  
    
                    {


  		




  
  4758
  
    
                        uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);


  		




  
  4759
  
    
                    }


  		




  4711
  4760
  
    

  		




  4712
  4761
  
    
                    Sync_Offset_Point = new Point(zoomAndPanControl.ContentOffsetX, zoomAndPanControl.ContentOffsetY);


  		




  4713
  4762
  
    

  		




  ......




  5308
  5357
  
    
                            {


  		




  5309
  5358
  
    
                                (item.Markup as IDashControl).DashSize = redo.DashSize;


  		




  5310
  5359
  
    
                            }


  		




  5311
  
  
    
                            else if (redo.Interval != 0 && item.Markup as LineControl != null)


  		




  
  5360
  
    
                            else if(redo.Interval != 0 && item.Markup as LineControl != null)


  		




  5312
  5361
  
    
                            {


  		




  5313
  5362
  
    
                                (item.Markup as LineControl).Interval = redo.Interval;


  		




  5314
  5363
  
    
                            }


  		












  

    
      KCOM/app.config
    
  





  83
  83
  
    
      <setting name="mainServerImageWebPath" serializeAs="String">


  		




  84
  84
  
    
        <value>http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>


  		




  85
  85
  
    
      </setting>


  		




  
  86
  
    
      <setting name="subServerImageWebPath" serializeAs="String">


  		




  
  87
  
    
        <value>http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>


  		




  
  88
  
    
      </setting>


  		




  
  89
  
    
      <setting name="excelFilePath" serializeAs="String">


  		




  
  90
  
    
        <value>http://cloud.devdoftech.co.kr:5977/TileSource/Check_Test/CheckList_T.xlsx</value>


  		




  
  91
  
    
      </setting>


  		




  86
  92
  
    
    </KCOM.Properties.Settings>


  		




  87
  93
  
    
  </applicationSettings>


  		




  88
  94
  
    
  <entityFramework>


  		












  

    
      KCOM_API/KCOM_API.csproj
    
  





  76
  76
  
    
  </ItemGroup>


  		




  77
  77
  
    
  <ItemGroup>


  		




  78
  78
  
    
    <Compile Include="Properties\AssemblyInfo.cs" />


  		




  
  79
  
    
    <Compile Include="Properties\Settings.Designer.cs">


  		




  
  80
  
    
      <AutoGen>True</AutoGen>


  		




  
  81
  
    
      <DesignTimeSharedInput>True</DesignTimeSharedInput>


  		




  
  82
  
    
      <DependentUpon>Settings.settings</DependentUpon>


  		




  
  83
  
    
    </Compile>


  		




  79
  84
  
    
    <Compile Include="ServiceDeepView.svc.cs">


  		




  80
  85
  
    
      <DependentUpon>ServiceDeepView.svc</DependentUpon>


  		




  81
  86
  
    
      <SubType>Component</SubType>


  		




  ......




  83
  88
  
    
  </ItemGroup>


  		




  84
  89
  
    
  <ItemGroup>


  		




  85
  90
  
    
    <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />


  		




  
  91
  
    
    <None Include="Properties\Settings.settings">


  		




  
  92
  
    
      <Generator>SettingsSingleFileGenerator</Generator>


  		




  
  93
  
    
      <LastGenOutput>Settings.Designer.cs</LastGenOutput>


  		




  
  94
  
    
    </None>


  		




  86
  95
  
    
    <None Include="Web.Debug.config">


  		




  87
  96
  
    
      <DependentUpon>Web.config</DependentUpon>


  		




  88
  97
  
    
    </None>


  		












  

    
      KCOM_API/ServiceDeepView.svc.cs
    
  





  167
  167
  
    

  		




  168
  168
  
    

  		




  169
  169
  
    
        [OperationContract]


  		




  170
  
  
    
        public List<Rect> GetCompareRect(string projectNo, string originDocItem_ID, string targetDocItem_ID, string originPageNo, string targetPageNo)


  		




  
  170
  
    
        public List<Rect> GetCompareRect(string projectNo, string originDocItem_ID, string targetDocItem_ID, string originPageNo, string targetPageNo, bool isInternalAddress)


  		




  171
  171
  
    
        {


  		




  172
  172
  
    
            //string originFile = String.Format(@"http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.cmp", projectNo, (Convert.ToInt32(originDocItem_ID) / 100).ToString(), originDocItem_ID, originPageNo);


  		




  173
  173
  
    
            //string targetFile = String.Format(@"http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.cmp", projectNo, (Convert.ToInt32(targetDocItem_ID) / 100).ToString(), targetDocItem_ID, targetPageNo);


  		




  174
  
  
    
            string originFile = String.Format(@"http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png", projectNo, (Convert.ToInt32(originDocItem_ID) / 100).ToString(), originDocItem_ID, originPageNo);


  		




  175
  
  
    
            string targetFile = String.Format(@"http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png", projectNo, (Convert.ToInt32(targetDocItem_ID) / 100).ToString(), targetDocItem_ID, targetPageNo);


  		




  
  174
  
    

  		




  
  175
  
    
            string originFile = "";


  		




  
  176
  
    
            string targetFile = "";


  		




  
  177
  
    

  		




  
  178
  
    
            if (isInternalAddress)


  		




  
  179
  
    
            {


  		




  
  180
  
    
                originFile = String.Format(KCOM_API.Properties.Settings.Default.TileSoucePath, projectNo, (Convert.ToInt32(originDocItem_ID) / 100).ToString(), originDocItem_ID, originPageNo);


  		




  
  181
  
    
                targetFile = String.Format(KCOM_API.Properties.Settings.Default.TileSoucePath, projectNo, (Convert.ToInt32(targetDocItem_ID) / 100).ToString(), targetDocItem_ID, targetPageNo);


  		




  
  182
  
    
            }


  		




  
  183
  
    
            else


  		




  
  184
  
    
            {


  		




  
  185
  
    
                originFile = String.Format(KCOM_API.Properties.Settings.Default.TileSoucePath_SUB, projectNo,  originDocItem_ID, originPageNo);


  		




  
  186
  
    
                targetFile = String.Format(KCOM_API.Properties.Settings.Default.TileSoucePath_SUB, projectNo,  targetDocItem_ID, targetPageNo);


  		




  
  187
  
    
            }


  		




  176
  188
  
    

  		




  177
  189
  
    
            CompareLib compareLib = new CompareLib();


  		




  178
  190
  
    
            //System.IO.Stream resultOrigin = compareLib.ChangeCmpUrlToPng(originFile);


  		












  

    
      KCOM_API/Web.config
    
  





  4
  4
  
    
  https://go.microsoft.com/fwlink/?LinkId=169433


  		




  5
  5
  
    
  -->


  		




  6
  6
  
    
<configuration>


  		




  
  7
  
    
  <configSections>


  		




  
  8
  
    
    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >


  		




  
  9
  
    
      <section name="KCOM_API.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />


  		




  
  10
  
    
    </sectionGroup>


  		




  
  11
  
    
  </configSections>


  		




  7
  12
  
    
  <system.web>


  		




  8
  13
  
    
    <compilation debug="true" targetFramework="4.0"/>


  		




  9
  14
  
    
    <pages controlRenderingCompatibilityVersion="4.0"/>


  		




  ......




  53
  58
  
    
  <system.webServer>


  		




  54
  59
  
    
    <validation validateIntegratedModeConfiguration="false"/>


  		




  55
  60
  
    
  </system.webServer>


  		




  56
  
  
    
</configuration>


  		




  
  61
  
    
  <applicationSettings>


  		




  
  62
  
    
    <KCOM_API.Properties.Settings>


  		




  
  63
  
    
      <setting name="TileSoucePath" serializeAs="String">


  		




  
  64
  
    
        <value>http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>


  		




  
  65
  
    
      </setting>


  		




  
  66
  
    
      <setting name="TileSoucePath_SUB" serializeAs="String">


  		




  
  67
  
    
        <value>http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>


  		




  
  68
  
    
      </setting>


  		




  
  69
  
    
    </KCOM_API.Properties.Settings>


  		




  
  70
  
    
  </applicationSettings>


  		




  
  71
  
    
</configuration>


  		












내보내기  Unified diff




         
        

    















   



  

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