소스 검색

修改C++升级到C#的代码错误。

sunyi 5 년 전
부모
커밋
d9539a33a0

+ 23 - 20
OTS/OTSModelSharp/Measure/GetStageInfo/DlgStageRename.cs

@@ -1,13 +1,16 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace OTSModelSharp
+namespace OTSModelSharp.Measure.GetStageInfo
 {
-    class CDlgStageRename
+    public partial class DlgStageRename : Form
     {
         //stage rename
         String m_sStageName;
@@ -15,27 +18,20 @@ namespace OTSModelSharp
         // rename value
         String m_sEditName;
 
-
-        public  void OnChangeEditName()
+        public DlgStageRename()
         {
-            UpdateStageName();
+            InitializeComponent();
         }
 
-       public void UpdateStageName()
+        private void OnChangeEditName(object sender, EventArgs e)
         {
-            UpdateData();
-            m_sStageName = m_sEditName;
-        }
-
-        public bool UpdateData(bool bSaveAndValidate = true) {
-
-            return false;
+            UpdateStageName();
         }
 
-       public  void OnBnClickedOk()
+        private void OnBnClickedOk(object sender, EventArgs e)
         {
             UpdateStageName();
-            
+
             OpenFileDialog openFileDialog = new OpenFileDialog();
             if (openFileDialog.ShowDialog() != DialogResult.OK)
             {
@@ -44,22 +40,29 @@ namespace OTSModelSharp
 
         }
 
-       public  void OnBnClickedCancel()
+        private void OnBnClickedCancel(object sender, EventArgs e)
         {
-            
             OpenFileDialog openFileDialog = new OpenFileDialog();
             if (openFileDialog.ShowDialog() != DialogResult.OK)
-            {                
+            {
 
             }
         }
 
-       public  void SetControlData()
+       public void UpdateStageName()
+        {
+            UpdateData();
+            m_sStageName = m_sEditName;
+        }
+
+       public  bool UpdateData(bool bSaveAndValidate = true) { return true; }
+
+        public void SetControlData()
         {
             m_sEditName = m_sStageName;
             UpdateData(false);
         }
 
-
+       
     }
 }

+ 2 - 0
OTS/OTSModelSharp/MeasureControl/IMeasureHardware.cs

@@ -23,6 +23,8 @@ namespace OTSIncAMeasureApp.OTSMeasureControl
         void BErode3(string source, string target, int wDegree, int rows, int columns);
         bool InsertBlobData(string szSql, uint[] pBlobData, int iBlobDataLen);
 
+        bool SendEmail(string a_strEmailAddress, string a_strTitle, string a_strBody);
+
     }
     public interface ISemController
     {

+ 21 - 1
OTS/OTSModelSharp/OTSModelSharp.csproj

@@ -67,6 +67,7 @@
     <Reference Include="System.Diagnostics.Tracing" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Transactions" />
@@ -137,6 +138,12 @@
     <Compile Include="Measure\GetParticle\SmallParticles\SmallParticleInfoTable.cs" />
     <Compile Include="Measure\GetParticle\XRayDataDB.cs" />
     <Compile Include="Measure\GetParticle\XRayDataTable.cs" />
+    <Compile Include="Measure\GetStageInfo\DlgLicenseInfo.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Measure\GetStageInfo\DlgLicenseInfo.Designer.cs">
+      <DependentUpon>DlgLicenseInfo.cs</DependentUpon>
+    </Compile>
     <Compile Include="Measure\GetStageInfo\DlgStageMgr.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -144,7 +151,13 @@
       <DependentUpon>DlgStageMgr.cs</DependentUpon>
     </Compile>
     <Compile Include="Measure\GetStageInfo\DlgStageMgr2.cs" />
-    <Compile Include="Measure\GetStageInfo\DlgStageRename.cs" />
+    <Compile Include="Measure\GetStageInfo\DlgStageRename.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Measure\GetStageInfo\DlgStageRename.Designer.cs">
+      <DependentUpon>DlgStageRename.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Measure\GetStageInfo\DlgStageRename2.cs" />
     <Compile Include="Measure\GetStageInfo\StageFile.cs" />
     <Compile Include="Measure\GetXrayInfo\PosXrayFileMgr.cs" />
     <Compile Include="OTSControl\EBrukerErrorCode.cs" />
@@ -181,6 +194,7 @@
     <Compile Include="OTSDataType\SEMStageData.cs" />
     <Compile Include="OTSDataType\stage.cs" />
     <Compile Include="OTSDataType\XMLSerialization.cs" />
+    <Compile Include="OTSLicMgr.cs" />
     <Compile Include="OTSModelresource.cs" />
     <Compile Include="DTLBase\SqlHelper.cs" />
     <Compile Include="MeasureControl\FileHelper.cs" />
@@ -192,9 +206,15 @@
     <EmbeddedResource Include="Measure\GetParam\DIALOG_CHECK_PARAM_RESULT.resx">
       <DependentUpon>DIALOG_CHECK_PARAM_RESULT.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Measure\GetStageInfo\DlgLicenseInfo.resx">
+      <DependentUpon>DlgLicenseInfo.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Measure\GetStageInfo\DlgStageMgr.resx">
       <DependentUpon>DlgStageMgr.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Measure\GetStageInfo\DlgStageRename.resx">
+      <DependentUpon>DlgStageRename.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">