makecoder
diff --git a/‎SCADA/Example/TagConfig.exe
512 Bytes b/‎SCADA/Example/TagConfig.exe
512 Bytes
diff --git a/‎SCADA/Program/ModbusDriver/ModbusTCPDriver.cs
Lines changed: 2 additions & 3 deletions b/‎SCADA/Program/ModbusDriver/ModbusTCPDriver.cs
Lines changed: 2 additions & 3 deletions
diff --git a/‎SCADA/Program/TagConfig/TagConfig/Form1.Designer.cs
Lines changed: 15 additions & 15 deletions b/‎SCADA/Program/TagConfig/TagConfig/Form1.Designer.cs
Lines changed: 15 additions & 15 deletions
diff --git a/‎SCADA/Program/TagConfig/TagConfig/Form1.cs
Lines changed: 12 additions & 25 deletions b/‎SCADA/Program/TagConfig/TagConfig/Form1.cs
Lines changed: 12 additions & 25 deletions
diff --git a/‎SCADA/Program/TagConfig/TagConfig/Form1.resx
Lines changed: 1 addition & 1 deletion b/‎SCADA/Program/TagConfig/TagConfig/Form1.resx
Lines changed: 1 addition & 1 deletion
diff --git a/‎SCADA/dll/ModbusDriver.dll
0 Bytes b/‎SCADA/dll/ModbusDriver.dll
0 Bytes
@@ -464,8 +464,7 @@ public unsafe ItemData<float> ReadFloat(DeviceAddress address)
                 return new ItemData<float>(0.0f, 0, QUALITIES.QUALITY_BAD);
             else
             {
-                int value = IPAddress.HostToNetworkOrder(BitConverter.ToInt32(data, 0));
-                return new ItemData<float>(*(((float*)&value)), 0, QUALITIES.QUALITY_GOOD);
+                return new ItemData<float>(IPAddress.HostToNetworkOrder(BitConverter.ToInt32(data, 0)), 0, QUALITIES.QUALITY_GOOD);
             }
         }
 
@@ -541,7 +540,7 @@ public int WriteInt32(DeviceAddress address, int value)
 
         public int WriteFloat(DeviceAddress address, float value)
         {
-            var data = WriteMultipleRegister(address.Area, address.Start, BitConverter.GetBytes(value));
+            var data = WriteMultipleRegister(address.Area, address.Start, BitConverter.GetBytes((int)value));
             return data == null ? -1 : 0;
         }
 
 
@@ -788,14 +788,21 @@ private void treeView1_AfterLabelEdit(object sender, NodeLabelEditEventArgs e)
                 }
                 else
                 {
-                    foreach (Group grp in groups)
+                    if (!groups.Exists(x => x.Name == e.Label))
                     {
-                        if (grp.ID.ToString() == e.Node.Name)
+                        foreach (Group grp in groups)
                         {
-                            grp.Name = e.Label;
-                            break;
+                            if (grp.ID.ToString() == e.Node.Name)
+                            {
+                                grp.Name = e.Label;
+                                break;
+                            }
                         }
                     }
+                    else
+                    {
+                        MessageBox.Show("组名不能重复!");
+                    }
                 }
             }
         }
@@ -932,26 +939,6 @@ private void toolStrip2_ItemClicked(object sender, ToolStripItemClickedEventArgs
         {
             switch (e.ClickedItem.Text)
             {
-                case "配方":
-                    {
-
-                    }
-                    break;
-                case "设备":
-                    {
-
-                    }
-                    break;
-                case "仓容":
-                    {
-
-                    }
-                    break;
-                case "路径":
-                    {
-
-                    }
-                    break;
                 case "导入变量":
                     openFileDialog1.Filter = "xml文件 (*.xml)|*.xml|excel文件 (*.xlsx)|*.xlsx|kepserver文件 (*.csv)|*.csv|All files (*.*)|*.*";
                     openFileDialog1.DefaultExt = "xml";
@@ -1095,7 +1082,7 @@ private void contextMenuStrip1_ItemClicked(object sender, ToolStripItemClickedEv
                 case "删除":
                     RemoveNode();
                     break;
-                case "修改":
+                case "重命名":
                     UpdateNode();
                     break;
                 case "参数设置":
 
@@ -128,7 +128,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC6
-        CAAAAk1TRnQBSQFMAgEBAwEAARgBAgEYAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAwEAASABAgEgAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
Original file line number	Diff line number	Diff line change
`@@ -464,8 +464,7 @@ public unsafe ItemData<float> ReadFloat(DeviceAddress address)`
`464`	`464`	`return new ItemData<float>(0.0f, 0, QUALITIES.QUALITY_BAD);`
`465`	`465`	`else`
`466`	`466`	`{`
`467`		`- int value = IPAddress.HostToNetworkOrder(BitConverter.ToInt32(data, 0));`
`468`		`- return new ItemData<float>((((float)&value)), 0, QUALITIES.QUALITY_GOOD);`
	`467`	`+ return new ItemData<float>(IPAddress.HostToNetworkOrder(BitConverter.ToInt32(data, 0)), 0, QUALITIES.QUALITY_GOOD);`
`469`	`468`	`}`
`470`	`469`	`}`
`471`	`470`
`@@ -541,7 +540,7 @@ public int WriteInt32(DeviceAddress address, int value)`
`541`	`540`
`542`	`541`	`public int WriteFloat(DeviceAddress address, float value)`
`543`	`542`	`{`
`544`		`- var data = WriteMultipleRegister(address.Area, address.Start, BitConverter.GetBytes(value));`
	`543`	`+ var data = WriteMultipleRegister(address.Area, address.Start, BitConverter.GetBytes((int)value));`
`545`	`544`	`return data == null ? -1 : 0;`
`546`	`545`	`}`
`547`	`546`