프로젝트

일반

사용자정보

개정판 712860bb

ID712860bbaaa0628f13c620e4ec2981fefb602312
상위 6121029c
하위 04201a99

gaqhf 이(가) 5년 이상 전에 추가함

dev issue #000 : fix wxs

Change-Id: Ia9948aeaa7944e1409d8db1414c3365cbaeb26d0

차이점 보기:

DTI_PID/SPPIDConverter/App.config
3 3
  <configSections>
4 4
    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5 5
    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6
    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
6
    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
7 7
      <section name="Converter.SPPID.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
8 8
    </sectionGroup>
9 9
  </configSections>
DTI_PID/SPPIDConverter/ConverterForm.cs
537 537
                document.Template = _Template;
538 538
                document.DrawingNumber = _DrawingNumber;
539 539
                document.DrawingName = _DrawingName;
540

  
541
                document.SymbolMappings = symbolMappings;
542
                document.ChildSymbolMappings = childSymbolMappings;
543
                document.LineMappings = lineMappings;
544
                document.LineNumberMappings = lineNumberMappings;
545
                document.AttributeMappings = attributeMappings;
546
                document.ETCSetting = ETCSetting.GetInstance();
547
                document.SetSPPIDInfo();
548

  
540 549
                _Documents.Add(document);
541 550
            }
542 551

  
......
549 558
                }
550 559
            }
551 560

  
561
            MessageBox.Show("End Modeling");
552 562
        }
553 563

  
554 564
        private void btnSPPIDDB_Click(object sender, EventArgs e)
DTI_PID/SPPIDConverter/SPPIDConverter.csproj
73 73
    <Reference Include="DevExpress.XtraLayout.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
74 74
    <Reference Include="DevExpress.XtraPrinting.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
75 75
    <Reference Include="DevExpress.XtraTreeList.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
76
    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
77
      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
78
    </Reference>
79
    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
80
      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
81
    </Reference>
82 76
    <Reference Include="Interop.RAD2D, Version=1.0.0.0, Culture=neutral, PublicKeyToken=46d4e6504b436e2e, processorArchitecture=MSIL">
83 77
      <SpecificVersion>False</SpecificVersion>
84 78
      <EmbedInteropTypes>True</EmbedInteropTypes>
DTI_PID/SPPIDConverter/packages.config
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<packages>
3
  <package id="EntityFramework" version="6.2.0" targetFramework="net46" />
4 3
  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net46" />
5 4
  <package id="Oracle.ManagedDataAccess" version="18.3.0" targetFramework="net46" />
6 5
</packages>
DTI_PID/SPPIDConverter_DialogBarWrapper/SPPIDConverterWrapper.cs
129 129
                    RegistryKey ID2 = DOFTECH.OpenSubKey("ID2");
130 130
                    if (ID2 != null)
131 131
                    {
132
                        string wrapperDllPath = ID2.GetValue("path") + @"Converter\SPPIDConverter_Wrapper.dll";
133
                        string autoModelingDllPath = ID2.GetValue("path") + @"Converter\SPPIDConverter.dll";
134
#if DEBUG
135
                        wrapperDllPath = @"Z:\HanKyouHo\Source\DTIPID\DTI_PID\SPPIDConverterDll\SPPIDConverter_Wrapper.dll";
136
                        autoModelingDllPath = @"Z:\HanKyouHo\Source\DTIPID\DTI_PID\SPPIDConverterDll\SPPIDConverter.dll";
137
#endif
132
                        string wrapperDllPath = @"C:\Program Files (x86)\SmartPlant\P&ID Workstation\bin\SPPIDConverter_Wrapper.dll";//ID2.GetValue("path") + @"Converter\SPPIDConverter_Wrapper.dll";
133
                        string autoModelingDllPath = @"C:\Program Files (x86)\SmartPlant\P&ID Workstation\bin\SPPIDConverter.dll";//ID2.GetValue("path") + @"Converter\SPPIDConverter.dll";
138 134

  
139 135
                        #region Set ToolBar and Menu
140 136
                        ToolBars toolBars = application.ToolBars;
ID2.wxs
3712 3712
              <File Id="fil3ee9eb1d3be44d76939c23c72b050191" KeyPath="yes" Source=".\dist\App\bin64\DevExpress.XtraCharts.v18.1.dll" />
3713 3713
          </Component>
3714 3714
          
3715
          <Component Id="cmp6ddf321c3fa64e4085148de138c590c2" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="30dbc9c9-95e0-4531-bbdf-c93ed1a3e39d">
3716
              <File Id="fil03e470ebdab3484d9f7a09a9d67d62ae" KeyPath="yes" Source=".\Setup\LoggingSwitch.exe" />
3717
          </Component>
3718
          <Component Id="cmpae26f07a6c5e4ce999ef5b892ec83f55" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="e368c3a8-6bfa-49c4-a9c4-32684a33416b">
3719
              <File Id="fil325e623fdf584af0849d2fe83625f169" KeyPath="yes" Source=".\Setup\DevExpress.Office.v18.2.Core.dll" />
3720
          </Component>
3721
          <Component Id="cmp7092e1a1b5b34557a12a49247b111e70" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="0970d5dd-c675-4987-bfed-5b954a33b265">
3722
              <File Id="fil7974c159fb9c4bafa7e1b095c4725291" KeyPath="yes" Source=".\Setup\DevExpress.Pdf.v18.2.Core.dll" />
3723
          </Component>
3724
          <Component Id="cmpfc82ab5f097f40cebca832b65fab998a" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="3da44402-8ee8-4cc9-bc9e-84bb36f25e04">
3725
              <File Id="fila0bce191435740f09909c2ab24766657" KeyPath="yes" Source=".\Setup\EntityFramework.dll" />
3726
          </Component>
3727
          <Component Id="cmp27335a126fbb473b8ffef448a186bdfd" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="dabe597b-8ea2-4f97-93da-491f18a32482">
3728
              <File Id="fil27fec705a0ca473a9da60933a47a3c01" KeyPath="yes" Source=".\Setup\EntityFramework.SqlServer.dll" />
3729
          </Component>
3730
          <Component Id="cmp046461b2db91475da0cda4e2c4e492bc" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="f387a6ee-0896-4982-9c13-d2320fe70130">
3731
              <File Id="fil4389a623885c4f81b78f34455c49ef6f" KeyPath="yes" Source=".\Setup\Interop.I2dcmctl.dll" />
3732
          </Component>
3733
          <Component Id="cmp904bef5d868545ab90be7310d4ec1136" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="ba47f517-d9c6-4a4d-9688-ff591057b4c5">
3734
              <File Id="fil636af00a0c964b57a9f0964acd3adba3" KeyPath="yes" Source=".\Setup\Interop.RADNetBridge.dll" />
3735
          </Component>
3736
          <Component Id="cmpf9a03b3be5e542329ca07243baae7bc7" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="b479a9d5-e55b-43ca-8f99-95c5d544c486">
3737
              <File Id="fil9afdbb5ad2eb431db7f7e8c7aa345b80" KeyPath="yes" Source=".\Setup\Newtonsoft.Json.dll" />
3738
          </Component>
3739
          <Component Id="cmp4c1a845d954c42cbbc1b07232d34df50" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="ffad6eb1-339a-479a-947d-8988f9ac3042">
3740
              <File Id="fil86699e3d30ad4b129771404887b8af1c" KeyPath="yes" Source=".\Setup\RadNetAutomation.dll" />
3741
          </Component>
3742
          <Component Id="cmp74b8bf8f4b2545bc94e4e39ed9966abd" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="ec78d469-5222-4630-a710-8c40e84e8386">
3743
              <File Id="filc719320d5e1b4c37b4f0e5503fc8eb09" KeyPath="yes" Source=".\Setup\RadNetCmdCtrl.dll" />
3744
          </Component>
3745
          <Component Id="cmpc9665f57176646fa9bfb4d6a9cf0c83c" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="c4365a3a-9766-4094-9ff4-38af28a120e6">
3746
              <File Id="file1105b83e3fb4ce09259ab703cac7ed2" KeyPath="yes" Source=".\Setup\RADNetInterop.dll" />
3747
          </Component>
3748
          <Component Id="cmp213a3e12e78b424392e62f8d7a134a18" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="3ea7170f-a5bb-4e51-9913-6770e6c0673f">
3749
              <File Id="filaa888e83121740d7b4c32a85d777f376" KeyPath="yes" Source=".\Setup\RadNetLogger.dll" />
3750
          </Component>
3751
          <Component Id="cmp18fb8073904e4cbc807eb9e6849dc66f" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="168d7756-d9f8-43f7-ba8d-e802d3e00aac">
3752
              <File Id="fil61f50df57ab848b09feb7b213baabe66" KeyPath="yes" Source=".\Setup\stdole.dll" />
3753
          </Component>
3754 3715
          
3755
          <Component Id="cmp5A1230CBBABA430793944CC2C9BE0888" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="E5E7027E-FECF-4E7F-9971-1B47EE80901A">
3756
              <File Id="filE3CE51DDDE974544B1719045C2DE13F8" KeyPath="yes" Source=".\Setup\SPPIDConverter_Wrapper.dll" />
3757
          </Component>
3758
          <Component Id="cmpd947dcfcd3ad4846811fe561ce80b6d9" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="8026542a-0d0f-4802-b7bd-8681c8a7649b">
3759
              <File Id="fil81854b9c71354b5e9e68e060b9f2074b" KeyPath="yes" Source=".\Setup\SPPIDConverter.dll" />
3760
          </Component>
3761 3716
          <Component Id="cmp7c384ae675d947ca81d12321cd9e9ce2" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="0e2db62b-7227-4978-a0f4-9de151c64c5d">
3762 3717
              <File Id="filfdb85c39e3364149a1dae95ea109f874" KeyPath="yes" Source=".\Setup\BaseModel.dll" />
3763 3718
          </Component>
......
3770 3725
          <Component Id="cmp9ade784107c34bbf8e785bcea86a51d8" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="46329d51-ae2b-4654-965a-a5f52de035c2">
3771 3726
              <File Id="fil337f757a1ebb440fa18eeeab2537f51c" KeyPath="yes" Source=".\Setup\DevExpress.Images.v18.2.dll" />
3772 3727
          </Component>
3728
          <Component Id="cmpae26f07a6c5e4ce999ef5b892ec83f55" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="e368c3a8-6bfa-49c4-a9c4-32684a33416b">
3729
              <File Id="fil325e623fdf584af0849d2fe83625f169" KeyPath="yes" Source=".\Setup\DevExpress.Office.v18.2.Core.dll" />
3730
          </Component>
3731
          <Component Id="cmp7092e1a1b5b34557a12a49247b111e70" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="0970d5dd-c675-4987-bfed-5b954a33b265">
3732
              <File Id="fil7974c159fb9c4bafa7e1b095c4725291" KeyPath="yes" Source=".\Setup\DevExpress.Pdf.v18.2.Core.dll" />
3733
          </Component>
3773 3734
          <Component Id="cmp0c9e788dae074744b289cb8867fc0e80" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="a32136f2-062b-4698-b55d-9ba0e5e71bbc">
3774 3735
              <File Id="filca33c37c1eb54828a18349da78c1f1ed" KeyPath="yes" Source=".\Setup\DevExpress.Printing.v18.2.Core.dll" />
3775 3736
          </Component>
......
3803 3764
          <Component Id="cmpdbe57bf91e794a6c8c0e5d23a16d383a" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="3a0d08d8-fd15-476e-9abc-b2268da75cc3">
3804 3765
              <File Id="fil4ca70f6a689e437f994e75e7aced92cd" KeyPath="yes" Source=".\Setup\DevExpress.XtraTreeList.v18.2.dll" />
3805 3766
          </Component>
3767
          <Component Id="cmpf9a03b3be5e542329ca07243baae7bc7" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="b479a9d5-e55b-43ca-8f99-95c5d544c486">
3768
              <File Id="fil9afdbb5ad2eb431db7f7e8c7aa345b80" KeyPath="yes" Source=".\Setup\Newtonsoft.Json.dll" />
3769
          </Component>
3806 3770
          <Component Id="cmp05ee1fef7c4540dfac00137be1a34024" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="5345e4ce-3d70-42aa-a227-a8612a8e7cf9">
3807 3771
              <File Id="fild6052a08f7e142a2b754840f45f7ff06" KeyPath="yes" Source=".\Setup\Oracle.ManagedDataAccess.dll" />
3808 3772
          </Component>
3773
          <Component Id="cmp5A1230CBBABA430793944CC2C9BE0888" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="E5E7027E-FECF-4E7F-9971-1B47EE80901A">
3774
              <File Id="filE3CE51DDDE974544B1719045C2DE13F8" KeyPath="yes" Source=".\Setup\SPPIDConverter_Wrapper.dll" />
3775
          </Component>
3776
          <Component Id="cmpd947dcfcd3ad4846811fe561ce80b6d9" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="8026542a-0d0f-4802-b7bd-8681c8a7649b">
3777
              <File Id="fil81854b9c71354b5e9e68e060b9f2074b" KeyPath="yes" Source=".\Setup\SPPIDConverter.dll" />
3778
          </Component>
3809 3779
          <Component Id="cmp3fd818fef0c94e79b70a8bfd4216e5e1" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="915e5e36-f50d-475c-8052-1d4405834edf">
3810 3780
              <File Id="fil2d092ef8be324b7391c24e2278018e38" KeyPath="yes" Source=".\Setup\System.Data.SQLite.dll" />
3811 3781
          </Component>
......
3816 3786
              <File Id="fil578d74cc5e9f4e1baeb376a26ea9e8a8" KeyPath="yes" Source=".\Setup\System.Data.SQLite.Linq.dll" />
3817 3787
          </Component>
3818 3788
          
3789
               
3790
          
3791
          
3792
          
3793
          
3819 3794
      </ComponentGroup>
3820 3795
  </Fragment>
3821 3796
  <Fragment>

내보내기 Unified diff

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