修改demo的展示形式

zhaopeiym · Oct 19, 2019 · 8c40490 · 8c40490
1 parent a1bf132
commit 8c40490
Show file tree

Hide file tree

Showing 18 changed files with 1,909 additions and 211 deletions.
diff --git a/IoTClient.Demo/IndexForm.Designer.cs b/IoTClient.Demo/IndexForm.Designer.cs
diff --git a/IoTClient.Demo/IndexForm.cs b/IoTClient.Demo/IndexForm.cs
@@ -1,11 +1,4 @@
 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 IoTClient.Demo
@@ -20,20 +13,42 @@ public IndexForm()
 
         private void button1_Click(object sender, EventArgs e)
         {
-            Hide();
-            var form = new ModBusTcpForm();
-            form.StartPosition = FormStartPosition.CenterScreen;
-            form.ShowDialog();
-            Show();
+            //Hide();
+            //var form = new ModBusTcpForm();
+            //form.StartPosition = FormStartPosition.CenterScreen;
+            //form.ShowDialog();
+            //Show(); 
         }
 
         private void button2_Click(object sender, EventArgs e)
         {
-            Hide();
-            var form = new SiemensForm();
-            form.StartPosition = FormStartPosition.CenterScreen;
-            form.ShowDialog();
-            Show();
+            //Hide();
+            //var form = new SiemensForm();
+            //form.StartPosition = FormStartPosition.CenterScreen;
+            //form.ShowDialog();
+            //Show(); 
+        }
+
+        private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            var tab = (sender as TabControl).SelectedTab;
+            Text = tab.Name;
+            if (tab.Controls.Count <= 0)
+            {
+                switch (tab.Name)
+                {
+                    case "ModBusTcp":
+                        var modBusTcpControl = new ModBusTcpControl();
+                        modBusTcpControl.Dock = DockStyle.Fill;
+                        tab.Controls.Add(modBusTcpControl);
+                        break;
+                    case "Siemens":
+                        var siemensControl = new SiemensControl();
+                        siemensControl.Dock = DockStyle.Fill;
+                        tab.Controls.Add(siemensControl);
+                        break;
+                }
+            }
         }
     }
 }
diff --git a/IoTClient.Demo/IoTClient.Demo.csproj b/IoTClient.Demo/IoTClient.Demo.csproj
@@ -89,25 +89,25 @@
     <Compile Include="IndexForm.Designer.cs">
       <DependentUpon>IndexForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="ModBusTcpForm.cs">
-      <SubType>Form</SubType>
+    <Compile Include="ModBusTcpControl.cs">
+      <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="ModBusTcpForm.Designer.cs">
-      <DependentUpon>ModBusTcpForm.cs</DependentUpon>
+    <Compile Include="ModBusTcpControl.Designer.cs">
+      <DependentUpon>ModBusTcpControl.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SiemensForm.cs">
-      <SubType>Form</SubType>
+    <Compile Include="SiemensControl.cs">
+      <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="SiemensForm.Designer.cs">
-      <DependentUpon>SiemensForm.cs</DependentUpon>
+    <Compile Include="SiemensControl.Designer.cs">
+      <DependentUpon>SiemensControl.cs</DependentUpon>
     </Compile>
     <EmbeddedResource Include="IndexForm.resx">
       <DependentUpon>IndexForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ModBusTcpForm.resx">
-      <DependentUpon>ModBusTcpForm.cs</DependentUpon>
+    <EmbeddedResource Include="ModBusTcpControl.resx">
+      <DependentUpon>ModBusTcpControl.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -119,8 +119,8 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <EmbeddedResource Include="SiemensForm.resx">
-      <DependentUpon>SiemensForm.cs</DependentUpon>
+    <EmbeddedResource Include="SiemensControl.resx">
+      <DependentUpon>SiemensControl.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">