프로젝트

일반

사용자정보

개정판 d5096d58

IDd5096d5898f27ba3e195fd2474e405fe945ba4c1
상위 abc8de9b
하위 ff665e73

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

페이지 이동시 fit 수정

Change-Id: I54ac0c4ce02173900369aa37771e6125cf0c9134

차이점 보기:

ConvertService/ServiceBase/ConnectionStringBuild/ConnectionStringBuild.csproj
119 119 
      <Project>{400736fb-92c9-4bc0-b447-e8274103d813}</Project>
120 120 
      <Name>Markus.Service.DataBase</Name>
121 121 
    </ProjectReference>
122 
    <ProjectReference Include="..\Markus.Service.Extensions\Markus.Service.Extensions.csproj">
123 
      <Project>{5f983789-3e8f-4f9a-a601-138c3a83ca5f}</Project>
124 
      <Name>Markus.Service.Extensions</Name>
125 
    </ProjectReference>
122 126 
  </ItemGroup>
123 127 
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
124 128 
</Project>
ConvertService/ServiceBase/ConnectionStringBuild/MainWindow.xaml
33 33 
        <Button Grid.Row="2" Content="변환" Width="100" Margin="10" Click="Button_Click"/>
34 34 
        <Button Grid.Row="3" Content="테스트" Width="100" Margin="10" Click="ButtonTest_Click"/>
35 35 
        <TextBox x:Name="txtLog" Grid.Row="4" Margin="10"/>
36 
        <Button Grid.Row="4" Content="테스트" Width="100" Margin="29,122,663,-104" Click="ButtonTest2_Click"/>
36 37 
    </Grid>
37 38 
</Window>
ConvertService/ServiceBase/ConnectionStringBuild/MainWindow.xaml.cs
12 12 
using System.Windows.Media.Imaging;
13 13 
using System.Windows.Navigation;
14 14 
using System.Windows.Shapes;
15 
using Markus.Service;
15 16 
using Markus.Service.Extensions;
17 
using Markus.Service.Helper;
18 
using static Markus.Service.Extensions.Encrypt;
16 19 

  		




  17
  20
  
    
namespace ConnectionStringBuild


  		




  18
  21
  
    
{


  		




  ......




  55
  58
  
    
                txtLog.Text += ex.ToString();


  		




  56
  59
  
    
            }


  		




  57
  60
  
    
        }


  		




  
  61
  
    

  		




  
  62
  
    
        private void ButtonTest2_Click(object sender, RoutedEventArgs e)


  		




  
  63
  
    
        {


  		




  
  64
  
    
           var  convetContext = ObjectToBytesStringConvert.BytesStringToObject<ProcessContext>(AESEncrypter.Decrypt(txtEncrypt.Text));


  		




  
  65
  
    
            System.Diagnostics.Debug.WriteLine(convetContext.OriginFilePath);


  		




  
  66
  
    
        }


  		




  58
  67
  
    
    }


  		




  59
  68
  
    
}


  		












  

    
      KCOM/Common/ViewerDataModel.cs
    
  





  574
  574
  
    
        /// <summary>


  		




  575
  575
  
    
        /// 페이지 변경 후 페이지에 해당하는 마크업을 모두 읽었을때 이벤트를 보내도록 한다.


  		




  576
  576
  
    
        /// </summary>


  		




  577
  
  
    
        public void LoadPageMarkupFinish()


  		




  
  577
  
    
        public void LoadPageMarkupFinish(Rect rect)


  		




  578
  578
  
    
        {


  		




  579
  579
  
    
            if(PageLoaded != null)


  		




  580
  580
  
    
            {


  		




  581
  581
  
    
                PageLoaded(this, new EventArgs());


  		




  582
  582
  
    
            }


  		




  
  583
  
    
            else


  		




  
  584
  
    
            {


  		




  
  585
  
    
                this.SystemMain.dzMainMenu.zoomAndPanControl.ZoomTo(rect);


  		




  
  586
  
    
            }


  		




  583
  587
  
    
        }


  		




  584
  588
  
    

  		




  585
  589
  
    
        public void SetAngleVisible(Visibility visibility)


  		












  

    
      KCOM/Views/MainMenu.xaml.cs
    
  





  810
  810
  
    
        {


  		




  811
  811
  
    
            //if (zoomAndPanCanvas.Width.IsNaN())


  		




  812
  812
  
    
            //{


  		




  813
  
  
    
            await zoomAndPanControl.Dispatcher.InvokeAsync(() =>


  		




  814
  
  
    
                zoomAndPanControl.ZoomTo(new Rect { X = 0, Y = 0, Width = zoomAndPanCanvas.Width, Height = zoomAndPanCanvas.Height })


  		




  815
  
  
    
                );


  		




  
  813
  
    
            //await zoomAndPanControl.Dispatcher.InvokeAsync(() =>


  		




  
  814
  
    
            //    zoomAndPanControl.ZoomTo(new Rect { X = 0, Y = 0, Width = zoomAndPanCanvas.Width, Height = zoomAndPanCanvas.Height })


  		




  
  815
  
    
            //    );


  		




  816
  816
  
    
            //}


  		




  817
  817
  
    

  		




  818
  818
  
    
            var instanceMain = ViewerDataModel.Instance.SystemMain;


  		




  ......




  828
  828
  
    

  		




  829
  829
  
    
            /// 페이지의 모든 마크업을 로드한 후 호출


  		




  830
  830
  
    
            /// 좌측 마크업 list의 아이템을 클릭하는 경우 MarkupControls_USER가 0으로 나와서 추가함.


  		




  831
  
  
    
            ViewerDataModel.Instance.LoadPageMarkupFinish();


  		




  
  831
  
    
            ViewerDataModel.Instance.LoadPageMarkupFinish(new Rect { X = 0, Y = 0, Width = zoomAndPanCanvas.Width, Height = zoomAndPanCanvas.Height });


  		




  832
  832
  
    

  		




  833
  833
  
    
            //Point startPoint = new Point(15, 15);


  		




  834
  834
  
    

  		












  

    
      KCOM_API/Web.config
    
  





  10
  10
  
    
    </sectionGroup>


  		




  11
  11
  
    
  </configSections>


  		




  12
  12
  
    
  <connectionStrings>


  		




  13
  
  
    
    <!--효성 Connection String-->


  		




  14
  13
  
    
    <add name="ConnectionString"


  		




  15
  
  
    
      connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework&quot;"


  		




  
  14
  
    
      connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;"


  		




  16
  15
  
    
      providerName="System.Data.EntityClient"/>


  		




  17
  16
  
    
    <add name="CIConnectionString"


  		




  18
  
  
    
      connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework&quot;"


  		




  
  17
  
    
      connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;"


  		




  19
  18
  
    
      providerName="System.Data.EntityClient"/>


  		




  20
  19
  
    
  </connectionStrings>


  		




  21
  20
  
    
  <!--


  		




  ......




  86
  85
  
    
  <applicationSettings>


  		




  87
  86
  
    
    <KCOM_API.Properties.Settings>


  		




  88
  87
  
    
      <setting name="TileSoucePath" serializeAs="String">


  		




  89
  
  
    
        <value>http://10.11.252.3:8975/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>


  		




  
  88
  
    
        <value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>


  		




  90
  89
  
    
      </setting>


  		




  91
  90
  
    
      <setting name="TileSoucePath_SUB" serializeAs="String">


  		




  92
  
  
    
        <value>http://10.11.252.3:8975/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>


  		




  
  91
  
    
        <value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>


  		




  93
  92
  
    
      </setting>


  		




  94
  93
  
    
      <setting name="IsProjectNoPass" serializeAs="String">


  		




  95
  94
  
    
        <value>True</value>


  		












내보내기  Unified diff




         
        

    















   



  

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