프로젝트

일반

사용자정보

개정판 e3e2d41f

IDe3e2d41f2391172f01f5b0e428ce2ef8715dc6ad
상위 a0c69b1c
하위 d19ae675

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

dev issue #000 : 프로젝트, 솔루션 정리

Change-Id: I65159931f58c1c057e4ebdc4b7d4ea225e628ae5

차이점 보기:

DTI_PID/DTI_PID.sln
7 7
EndProject
8 8
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PDF_TO_IMAGE", "PDF_TO_IMAGE\PDF_TO_IMAGE.csproj", "{B7B8B0AE-9F03-4543-BC05-813A25E9D584}"
9 9
EndProject
10
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaseModel", "BaseModel\BaseModel.csproj", "{BEEC4A21-BD63-40D2-B745-027B19241A70}"
11
EndProject
12 10
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPPIDConverter", "SPPIDConverter\SPPIDConverter.csproj", "{B6757E78-6B59-40A3-A7BB-E73E8F81B6C3}"
13 11
EndProject
14 12
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPPIDConverter_Wrapper", "SPPIDConverter_DialogBarWrapper\SPPIDConverter_Wrapper.csproj", "{50BEB77D-9842-4C35-8369-0B5BD5C69EFA}"
......
33 31
		{B7B8B0AE-9F03-4543-BC05-813A25E9D584}.Release|Any CPU.Build.0 = Release|Any CPU
34 32
		{B7B8B0AE-9F03-4543-BC05-813A25E9D584}.Release|x86.ActiveCfg = Release|x86
35 33
		{B7B8B0AE-9F03-4543-BC05-813A25E9D584}.Release|x86.Build.0 = Release|x86
36
		{BEEC4A21-BD63-40D2-B745-027B19241A70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37
		{BEEC4A21-BD63-40D2-B745-027B19241A70}.Debug|Any CPU.Build.0 = Debug|Any CPU
38
		{BEEC4A21-BD63-40D2-B745-027B19241A70}.Debug|x86.ActiveCfg = Debug|x86
39
		{BEEC4A21-BD63-40D2-B745-027B19241A70}.Debug|x86.Build.0 = Debug|x86
40
		{BEEC4A21-BD63-40D2-B745-027B19241A70}.Release|Any CPU.ActiveCfg = Release|Any CPU
41
		{BEEC4A21-BD63-40D2-B745-027B19241A70}.Release|Any CPU.Build.0 = Release|Any CPU
42
		{BEEC4A21-BD63-40D2-B745-027B19241A70}.Release|x86.ActiveCfg = Release|x86
43
		{BEEC4A21-BD63-40D2-B745-027B19241A70}.Release|x86.Build.0 = Release|x86
44 34
		{B6757E78-6B59-40A3-A7BB-E73E8F81B6C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45 35
		{B6757E78-6B59-40A3-A7BB-E73E8F81B6C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
46 36
		{B6757E78-6B59-40A3-A7BB-E73E8F81B6C3}.Debug|x86.ActiveCfg = Debug|x86
DTI_PID/SPPIDConverter/ConverterForm.cs
523 523

  
524 524
        private void btnRun_Click(object sender, EventArgs e)
525 525
        {
526
            this.Visible = false;
527 526
            _Documents.Clear();
528 527

  
529 528
            foreach (int rowHandle in gridViewConverter.GetSelectedRows())
......
547 546
                document.ETCSetting = ETCSetting.GetInstance();
548 547
                document.SetSPPIDInfo();
549 548

  
550
                _Documents.Add(document);
549
                if (document.SetSPPIDMapping() && document.Enable)
550
                    _Documents.Add(document);
551 551
            }
552 552

  
553 553
            foreach (var document in _Documents)
......
559 559
                    break;
560 560
                }
561 561
            }
562
            this.Visible = true;
563
            MessageBox.Show("End Modeling");
562

  
563
            Close();
564 564
        }
565 565

  
566 566
        private void btnSPPIDDB_Click(object sender, EventArgs e)
DTI_PID/SPPIDConverter_DialogBarWrapper/ConverterDocking.Designer.cs
28 28
        /// </summary>
29 29
        private void InitializeComponent()
30 30
        {
31
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConverterDocking));
31 32
            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
33
            this.btnSPPIDConverter = new DevExpress.XtraEditors.SimpleButton();
32 34
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
33
            this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
34 35
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
35 36
            this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
36 37
            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
......
42 43
            // 
43 44
            // layoutControl1
44 45
            // 
45
            this.layoutControl1.Controls.Add(this.simpleButton1);
46
            this.layoutControl1.Controls.Add(this.btnSPPIDConverter);
46 47
            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
47 48
            this.layoutControl1.Location = new System.Drawing.Point(0, 0);
48 49
            this.layoutControl1.Name = "layoutControl1";
......
51 52
            this.layoutControl1.TabIndex = 0;
52 53
            this.layoutControl1.Text = "layoutControl1";
53 54
            // 
55
            // btnSPPIDConverter
56
            // 
57
            this.btnSPPIDConverter.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("simpleButton1.ImageOptions.SvgImage")));
58
            this.btnSPPIDConverter.Location = new System.Drawing.Point(12, 12);
59
            this.btnSPPIDConverter.Name = "btnSPPIDConverter";
60
            this.btnSPPIDConverter.Size = new System.Drawing.Size(126, 36);
61
            this.btnSPPIDConverter.StyleController = this.layoutControl1;
62
            this.btnSPPIDConverter.TabIndex = 4;
63
            this.btnSPPIDConverter.Text = "Converter";
64
            this.btnSPPIDConverter.Click += new System.EventHandler(this.btnConverter_Click);
65
            // 
54 66
            // Root
55 67
            // 
56 68
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
......
62 74
            this.Root.Size = new System.Drawing.Size(150, 300);
63 75
            this.Root.TextVisible = false;
64 76
            // 
65
            // simpleButton1
66
            // 
67
            this.simpleButton1.Location = new System.Drawing.Point(12, 12);
68
            this.simpleButton1.Name = "simpleButton1";
69
            this.simpleButton1.Size = new System.Drawing.Size(126, 22);
70
            this.simpleButton1.StyleController = this.layoutControl1;
71
            this.simpleButton1.TabIndex = 4;
72
            this.simpleButton1.Text = "simpleButton1";
73
            this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
74
            // 
75 77
            // layoutControlItem1
76 78
            // 
77
            this.layoutControlItem1.Control = this.simpleButton1;
79
            this.layoutControlItem1.Control = this.btnSPPIDConverter;
78 80
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
79 81
            this.layoutControlItem1.Name = "layoutControlItem1";
80
            this.layoutControlItem1.Size = new System.Drawing.Size(130, 26);
82
            this.layoutControlItem1.Size = new System.Drawing.Size(130, 40);
81 83
            this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
82 84
            this.layoutControlItem1.TextVisible = false;
83 85
            // 
84 86
            // emptySpaceItem1
85 87
            // 
86 88
            this.emptySpaceItem1.AllowHotTrack = false;
87
            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 26);
89
            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 40);
88 90
            this.emptySpaceItem1.Name = "emptySpaceItem1";
89
            this.emptySpaceItem1.Size = new System.Drawing.Size(130, 254);
91
            this.emptySpaceItem1.Size = new System.Drawing.Size(130, 240);
90 92
            this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
91 93
            // 
92 94
            // ConverterDocking
......
109 111

  
110 112
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
111 113
        private DevExpress.XtraLayout.LayoutControlGroup Root;
112
        private DevExpress.XtraEditors.SimpleButton simpleButton1;
114
        private DevExpress.XtraEditors.SimpleButton btnSPPIDConverter;
113 115
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
114 116
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
115 117
    }
DTI_PID/SPPIDConverter_DialogBarWrapper/ConverterDocking.cs
9 9
using System.Windows.Forms;
10 10
using System.Threading;
11 11
using Microsoft.VisualBasic;
12
using Ingr.RAD2D;
12 13

  
13 14
namespace Converter.SPPID.Wrapper
14 15
{
15 16
    public partial class ConverterDocking : UserControl
16 17
    {
18
        Ingr.RAD2D.Application radApp;
17 19
        public ConverterDocking()
18 20
        {
19 21
            InitializeComponent();
22
            dynamic application = Interaction.GetObject("", "PIDAutomation.Application");
23
            WrapperApplication wApp = new WrapperApplication(application.Application);
24
            radApp = wApp.RADApplication;
20 25
        }
21 26

  
22
        private void simpleButton1_Click(object sender, EventArgs e)
27
        private void btnConverter_Click(object sender, EventArgs e)
23 28
        {
24 29
            try
25 30
            {
26
                //dynamic application = Interaction.GetObject("", "PIDAutomation.Application");
27
                //application.RunMacro(@"Z:\HanKyouHo\Source\DTIPID\DTI_PID\SPPIDConverterDll\SPPIDConverter_Wrapper.dll");
28
                //Ingr.RAD2D.Interop.RAD2D.Application app;
31
                radApp.RunManagedMacro(SPPIDConverterWrapper.autoModelingDllPath, "Converter.SPPID.SPPIDConverter_AutoModeling");
29 32
            }
30 33
            catch (Exception ex)
31 34
            {
32 35
                MessageBox.Show(ex.Message + "\r\n" + ex.StackTrace);
33 36
            }
34 37
        }
38

  
39

  
35 40
    }
36 41
}
DTI_PID/SPPIDConverter_DialogBarWrapper/ConverterDocking.resx
117 117
  <resheader name="writer">
118 118
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119 119
  </resheader>
120
  <assembly alias="DevExpress.Data.v18.2" name="DevExpress.Data.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
121
  <data name="simpleButton1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v18.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
122
    <value>
123
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE4LjIsIFZlcnNpb249MTguMi43
124
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
125
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFgCAAAC77u/
126
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
127
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
128
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiBlbmFibGUt
129
        YmFja2dyb3VuZD0ibmV3IDAgMCAzMiAzMiIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIgaWQ9IkxheWVyXzEi
130
        Pg0KICA8ZyAvPg0KICA8ZyBpZD0iQ29udmVydFRvIj4NCiAgICA8cGF0aCBkPSJNMjIsNmwtNi02djRD
131
        OS40LDQsNCw5LjQsNCwxNmMwLDMuNiwxLjYsNi44LDQuMSw5bDIuOC0yLjhjLTEuOC0xLjUtMy0zLjct
132
        My02LjJjMC00LjQsMy42LTgsOC04djRMMjIsNnoiIGZpbGw9IiMwMzlDMjMiIGNsYXNzPSJHcmVlbiIg
133
        Lz4NCiAgICA8cGF0aCBkPSJNMjMuOSw3TDIxLDkuOGMxLjgsMS41LDMsMy43LDMsNi4yYzAsNC40LTMu
134
        Niw4LTgsOHYtNGwtNiw2bDYsNnYtNGM2LjYsMCwxMi01LjQsMTItMTIgICBDMjgsMTIuNCwyNi40LDku
135
        MiwyMy45LDd6IiBmaWxsPSIjMTE3N0Q3IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
136
</value>
137
  </data>
120 138
</root>
DTI_PID/SPPIDConverter_DialogBarWrapper/SPPIDConverterWrapper.cs
43 43
    ///     Set Intergraph Command Control Done property to True, for example
44 44
    ///         commandControl.Done = True
45 45
    /// </summary>
46
    public partial class SPPIDConverterWrapper : Form
46
    public partial class SPPIDConverterWrapper : System.Windows.Forms.Form
47 47
    {
48 48
        const string DialogBarName = "Auto Converter";
49
        public static string wrapperDllPath = string.Empty;
50
        public static string autoModelingDllPath = string.Empty;
49 51

  
50 52
        /// <summary>
51 53
        /// Constructor for the form.
......
131 133
                    {
132 134
                        //string wrapperDllPath = @"C:\Program Files (x86)\SmartPlant\P&ID Workstation\bin\SPPIDConverter_Wrapper.dll";//ID2.GetValue("path") + @"Converter\SPPIDConverter_Wrapper.dll";
133 135
                        //string autoModelingDllPath = @"C:\Program Files (x86)\SmartPlant\P&ID Workstation\bin\SPPIDConverter.dll";//ID2.GetValue("path") + @"Converter\SPPIDConverter.dll";
134
                        string wrapperDllPath = ID2.GetValue("path") + @"Converter\SPPIDConverter_Wrapper.dll";
135
                        string autoModelingDllPath = ID2.GetValue("path") + @"Converter\SPPIDConverter.dll";
136
                        wrapperDllPath = ID2.GetValue("path") + @"Converter\SPPIDConverter_Wrapper.dll";
137
                        autoModelingDllPath = ID2.GetValue("path") + @"Converter\SPPIDConverter.dll";
136 138
#if DEBUG
137 139
                        wrapperDllPath = @"Z:\HanKyouHo\Source\DTIPID\DTI_PID\SPPIDConverterDll\SPPIDConverter_Wrapper.dll";
138 140
                        autoModelingDllPath = @"Z:\HanKyouHo\Source\DTIPID\DTI_PID\SPPIDConverterDll\SPPIDConverter.dll";
......
208 210
                        #endregion
209 211

  
210 212
                        #region Add Docking
211
                        //try
212
                        //{
213
                        //    bool bExist = false;
214
                        //    foreach (DialogBar dialogBar in application.DialogBars)
215
                        //    {
216
                        //        if (dialogBar.Name == DialogBarName)
217
                        //        {
218
                        //            bExist = true;
219
                        //            dialogBar.Delete();
220
                        //            break;
221
                        //        }
222
                        //    }
223
                        //    if (!bExist)
224
                        //    {
225
                        //        DialogBar dlgBar = application.DialogBars.Add(DialogBarName, DockingFlagsConstants.igDockableOnLeft, DockingLocationConstants.igDockOnLeft,
226
                        //             DialogBarStyleConstants.igDialogBarStyleShowCaption | DialogBarStyleConstants.igDialogBarStyleStretchToFitHorizontal | DialogBarStyleConstants.igDialogBarStyleStretchToFitVertical | DialogBarStyleConstants.igDialogBarStyleNoBorder, 0, 0);
227
                        //        DialogbarControl dialogBarControl_UserControl = dlgBar.Controls.AddManaged(wrapperDllPath, "Converter.SPPID.Wrapper.ConverterDocking", 150, 300);
228
                        //    }
229
                        //}
230
                        //catch (Exception ex)
231
                        //{
213
                        try
214
                        {
215
                            bool bExist = false;
216
                            foreach (DialogBar dialogBar in application.DialogBars)
217
                            {
218
                                if (dialogBar.Name == DialogBarName)
219
                                {
220
                                    bExist = true;
221
                                    dialogBar.Delete();
222
                                    break;
223
                                }
224
                            }
225
                            if (!bExist)
226
                            {
227
                                DialogBar dlgBar = application.DialogBars.Add(DialogBarName, DockingFlagsConstants.igDockableOnLeft, DockingLocationConstants.igDockOnLeft,
228
                                     DialogBarStyleConstants.igDialogBarStyleShowCaption | DialogBarStyleConstants.igDialogBarStyleStretchToFitHorizontal | DialogBarStyleConstants.igDialogBarStyleStretchToFitVertical | DialogBarStyleConstants.igDialogBarStyleNoBorder, 0, 0);
229
                                DialogbarControl dialogBarControl_UserControl = dlgBar.Controls.AddManaged(wrapperDllPath, "Converter.SPPID.Wrapper.ConverterDocking", 150, 300);
230
                            }
231
                        }
232
                        catch (Exception ex)
233
                        {
232 234

  
233
                        //}
235
                        }
234 236

  
235 237
                        #endregion
236 238
                        //bool test =commandControl.Application.RADApplication.AddManagedMacroCommand(15000, autoModelingDllPath, "Converter.SPPID.SPPIDConverter_AutoModeling", true, CommandTypeConstants.igCmdTypeAlways, "");
237
                        commandControl.Application.RADApplication.RunManagedMacro(autoModelingDllPath, "Converter.SPPID.SPPIDConverter_AutoModeling");
239
                        //commandControl.Application.RADApplication.RunManagedMacro(autoModelingDllPath, "Converter.SPPID.SPPIDConverter_AutoModeling");
238 240
                    }
239 241
                }
240 242
                else
DTI_PID/SPPIDConverter_DialogBarWrapper/SPPIDConverter_Wrapper.csproj
126 126
  <ItemGroup>
127 127
    <None Include="Resources\ToolbarImage.png" />
128 128
  </ItemGroup>
129
  <ItemGroup>
130
    <ProjectReference Include="..\SPPIDConverter\SPPIDConverter.csproj">
131
      <Project>{b6757e78-6b59-40a3-a7bb-e73e8f81b6c3}</Project>
132
      <Name>SPPIDConverter</Name>
133
    </ProjectReference>
134
  </ItemGroup>
129 135
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
130 136
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
131 137
       Other similar extension points exist, see Microsoft.Common.targets.
ID2.wxs
3756 3756
              <File Id="fil3ee9eb1d3be44d76939c23c72b050191" KeyPath="yes" Source=".\dist\App\bin64\DevExpress.XtraCharts.v18.2.dll" />
3757 3757
          </Component>
3758 3758
          
3759
          
3760
          <Component Id="cmp7c384ae675d947ca81d12321cd9e9ce2" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="0e2db62b-7227-4978-a0f4-9de151c64c5d">
3761
              <File Id="filfdb85c39e3364149a1dae95ea109f874" KeyPath="yes" Source=".\Setup\BaseModel.dll" />
3762
          </Component>
3759

  
3763 3760
          <Component Id="cmpb0f18af5beea4c0b9d697006a5dfed8c" Directory="dir29f34f29d6b749908abd3a0ac0890c11" Guid="eda18c1a-9e34-4483-b7d9-ac56cfadf77f">
3764 3761
              <File Id="fil3d250461968a4ed2a8f01f8e15b190cd" KeyPath="yes" Source=".\Setup\DevExpress.Data.v18.2.dll" />
3765 3762
          </Component>

내보내기 Unified diff

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