Minor feature update

EDSEditorGUI/DeviceInfoView.cs

@@ -23,6 +23,7 @@ You should have received a copy of the GNU General Public License
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Drawing;
+using System.Linq;
 
 namespace ODEditor
 {
@@ -44,6 +45,7 @@ public void populatedeviceinfo()
             textBox_productnumber.Text = eds.di.ProductNumber;
             textBox_vendorname.Text = eds.di.VendorName;
             textBox_vendornumber.Text = eds.di.VendorNumber;
+            textBox_revisionnumber.Text = eds.di.RevisionNumber.ToString();
 
             textBox_fileversion.Text = eds.fi.FileVersion;
             textBox_di_description.Text = eds.fi.Description;
@@ -140,6 +142,7 @@ private void update_devfile_info()
                 eds.di.ProductNumber = textBox_productnumber.Text;
                 eds.di.VendorName = textBox_vendorname.Text;
                 eds.di.VendorNumber = textBox_vendornumber.Text;
+                uint.TryParse(textBox_revisionnumber.Text, out eds.di.RevisionNumber);
 
                 eds.fi.FileVersion = textBox_fileversion.Text;
                 eds.fi.Description = textBox_di_description.Text;

EDSEditorGUI/DeviceODView.cs

@@ -220,6 +220,10 @@ public void PopulateObjectLists(EDSsharp eds_target)
                 });
 
                 lvi.Tag = od;
+                if ((index == 0x100C) || (index == 0x100D))
+                {
+                    od.prop.CO_disabled = !eds.di.NG_Slave;
+                }
                 if (selectedObject != null && index == selectedObject.Index)
                     lvi.Selected = true;
                 if (od.prop.CO_disabled == true)

EDSEditorGUI/EDSEditorGUI.csproj

@@ -99,9 +99,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="SourceGrid" Version="4.4.0" Condition="'$(TargetFramework)' == 'net481'"/>
-    <PackageReference Include="SourceGrid-huanlin" Version="6.0.10" Condition="'$(TargetFramework)' == 'net8.0-windows'"/>
-    <PackageReference Include="System.Resources.Extensions" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0-windows'"/>
+    <PackageReference Include="SourceGrid" Version="4.4.0" Condition="'$(TargetFramework)' == 'net481'" />
+    <PackageReference Include="SourceGrid-huanlin" Version="6.1.1" Condition="'$(TargetFramework)' == 'net8.0-windows'" />
+    <PackageReference Include="System.Resources.Extensions" Version="10.0.0" Condition="'$(TargetFramework)' == 'net8.0-windows'" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
   <PropertyGroup>

EDSEditorGUI/Form1.cs

@@ -26,7 +26,6 @@ You should have received a copy of the GNU General Public License
 using System.Windows.Forms;
 using System.IO;
 using libEDSsharp;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 namespace ODEditor
 {
@@ -189,6 +188,12 @@ private void openEDSfile(string path,InfoSection.Filetype ft)
             {
                 EDSsharp eds = new EDSsharp();
 
+                if (!File.Exists(path))
+                {
+                    MessageBox.Show("File " +path + "\ndoes not exist.");
+                    return;
+                }
+
                 eds.Loadfile(path);
 
                 DeviceView device = new DeviceView(eds, network);
@@ -327,6 +332,11 @@ private void openToolStripMenuItem_Click(object sender, EventArgs e)
 
         private void openXDDfile(string path)
         {
+            if (!File.Exists(path))
+            {
+                MessageBox.Show("File " + path + "\ndoes not exist.");
+                return;
+            }
             try
             {
                 EDSsharp eds;
@@ -1329,34 +1339,52 @@ private void preferencesToolStripMenuItem_Click(object sender, EventArgs e)
 
         private void tabControl1_MouseClick(object sender, MouseEventArgs e)
         {
-            TabPage tp;
             if (e.Button == MouseButtons.Right)
             {
                 for (int i = 0; i <= tabControl1.TabCount - 1; i++)
                 {
                     if (tabControl1.GetTabRect(i).Contains(e.Location))
                     {
-                        tp = tabControl1.TabPages[i];
-
                         DialogResult dialogResult = MessageBox.Show(tabControl1.TabPages[i].Text, "Close file?", MessageBoxButtons.YesNo);
                         if (dialogResult == DialogResult.Yes)
                         {
-
-                                DeviceView device = (DeviceView)tabControl1.TabPages[i].Controls[0];
-
-                                if (device.eds.Dirty == true)
-                                {
-                                    if (MessageBox.Show("All unsaved changes will be lost\n continue?", "Unsaved changes", MessageBoxButtons.YesNo) == DialogResult.No)
-                                        return;
-                                }
-
-                                network.Remove(device.eds);
-
-                                tabControl1.TabPages.Remove(tabControl1.TabPages[i]);
+                            DeviceView device = (DeviceView)tabControl1.TabPages[i].Controls[0];
+                            if (device.eds.Dirty == true)
+                            {
+                                if (MessageBox.Show("All unsaved changes will be lost\n continue?", "Unsaved changes", MessageBoxButtons.YesNo) == DialogResult.No)
+                                    return;
+                            }
+                            network.Remove(device.eds);
+                            tabControl1.TabPages.Remove(tabControl1.TabPages[i]);
                         }                        
                     }
                 }
             }
         }
+        private void tabControl1_MouseHover(object sender, EventArgs e)
+        {
+
+            TabControl tabControl = sender as TabControl;
+            Point mousePosition = tabControl.PointToClient(Cursor.Position);
+            for (int i = 0; i < tabControl.TabCount; i++)
+            {
+                Rectangle tabRect = tabControl.GetTabRect(i);
+                if (tabRect.Contains(mousePosition))
+                {
+                    ToolTip toolTip = new ToolTip();
+                    // Set up the delays for the ToolTip.
+
+                    toolTip.AutoPopDelay = 5000;
+                    toolTip.InitialDelay = 1000;
+                    toolTip.ReshowDelay = 500;
+                    // Force the ToolTip text to be displayed whether or not the form is active.
+                    toolTip.ShowAlways = true;
+                    DeviceView device = (DeviceView)tabControl1.TabPages[i].Controls[0];
+                    toolTip.SetToolTip(tabControl, device.eds.projectFilename);
+                    break;
+                }
+            }
+        }
+
     }
 }

EDSEditorGUI/InsertObjects.cs

@@ -159,24 +159,29 @@ private bool Verify(bool InitiallyDisableIfError = false)
             int j = 1;
             foreach (ODentry od in srcObjects.Values)
             {
-                String numpattern = @"(\w*\d+\Z)";
                 string newname;
+                string numpattern = @"^(.*?)(\d+)$";
+                Regex regex = new Regex(numpattern);
+                Match match = regex.Match(od.parameter_name);
 
-                string[] words = Regex.Split(od.parameter_name, numpattern);
-                // MatchCollection nummatches = System.Text.RegularExpressions.Regex.Matches(od.parameter_name, numpattern);
-                if (words.Length > 1)
+                if (match.Success)
                 {
+                    // Extract the string part and the number part
+                    string stringPart = match.Groups[1].Value;
+                    int numberPart = int.Parse(match.Groups[2].Value);
 
-                    // value1 = Int32.Parse(m.Groups[1].Value);
-                    int nameidx = Int32.Parse(words[1]) + j++;
-
-                    newname = words[0] + nameidx;// nameidx.ToString  ;
+                    // Increment the number by 1
+                    numberPart++;
 
+                    // Reassemble the string with the incremented number
+                    newname = stringPart + numberPart.ToString();
                 }
-                else {
-                     newname = od.parameter_name;
+                else
+                {
+                    newname = od.parameter_name;
                 }
-                    int rowIdx = dataGridView.Rows.Add(enabled[odIdx], $"0x{od.Index:X4} - {newname}");
+
+                int rowIdx = dataGridView.Rows.Add(enabled[odIdx], $"0x{od.Index:X4} - {newname}");
                 int cellIdx = dataGridView_InitialColumnCount;
 
                 foreach (int o in offsets)
@@ -235,17 +240,23 @@ private void Button_create_Click(object sender, EventArgs e)
                             UInt16 newIndex = (UInt16)(od.Index + o);
                             ODentry newObject = od.Clone();
 
-                            String pattern = @"(\w*\d+\Z)";
+                            string pattern = @"^(.*?)(\d+)$";
 
-                            string[] words = Regex.Split(od.parameter_name, pattern);
-                            // MatchCollection nummatches = System.Text.RegularExpressions.Regex.Matches(od.parameter_name, numpattern);
-                            if (words.Length > 1)
+                            Regex regex = new Regex(pattern);
+                            Match match = regex.Match(od.parameter_name);
+
+                            if (match.Success)
                             {
-                                int nameidx = Int32.Parse(words[1]) + i++;
-                                newObject.parameter_name = words[0] + nameidx;// nameidx.ToString  ;
+                                // Extract the string part and the number part
+                                string stringPart = match.Groups[1].Value;
+                                int numberPart = int.Parse(match.Groups[2].Value);
 
-                            }
+                                // Increment the number by 1
+                                numberPart++;
 
+                                // Reassemble the string with the incremented number
+                                newObject.parameter_name = stringPart + numberPart.ToString();
+                            }
                             newObject.Index = newIndex;
 
                             eds.ods.Add(newIndex, newObject);

EDSEditorGUI2/EDSEditorGUI2.csproj

@@ -15,16 +15,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.1.5" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.1.5" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.5" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.5" />
+    <PackageReference Include="Avalonia" Version="11.3.9" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.9" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.9" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.9" />
     <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.1.5" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.9" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.5" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
-    <PackageReference Include="DialogHost.Avalonia" Version="0.8.1" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.9" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+    <PackageReference Include="DialogHost.Avalonia" Version="0.10.0" />
     <PackageReference Include="AutoMapper" Version="13.0.1" />
   </ItemGroup>
 </Project>