Minor feature update

EDSEditorGUI/EDSEditorGUI.csproj

@@ -99,11 +99,15 @@
   </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" />
+    <PackageReference Include="System.Resources.Extensions" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0-windows'" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
+    <PackageReference Include="SourceGrid-mehmetulukaya">
+      <Version>8.0.11</Version>
+    </PackageReference>
+  </ItemGroup>
   <PropertyGroup>
     <PreBuildEvent>git describe --tags --long --dirty &gt; "$(MSBuildProjectDirectory)$([System.IO.Path]::DirectorySeparatorChar)version.txt" || exit 0</PreBuildEvent>
   </PropertyGroup>

EDSEditorGUI/Form1.cs

@@ -26,7 +26,9 @@ 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;
+//using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+//using SourceGrid.Cells.Controllers;
+//using ToolTip = System.Windows.Forms.ToolTip;
 
 namespace ODEditor
 {
@@ -189,6 +191,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 +335,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 +1342,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/Form1.resx

@@ -130,7 +130,7 @@
         gqUTTxJHNd2gfCHts8Z5i7NeLLN6n/yF4ayxvMR1qkHEsYBFyBChoowNFOEgRrtBio0knUst/AOeXyaX
         Sq4NMHLMowQdiucH/4Pfs7VzE+N+UlgC2l9c92MYCO0CtYrrfh+7bu0ECD4DV0bDX6oC05+kVxpa9Ajo
         2QYurhuaugdc7gD9T6ZiKZ4UpBJyOeD9jL4pA/TeAp2r/tzq5zh9AFI0q8QNcHAIjOQpe63Fuzua5/bn
-        HW9+kH4AMgFyjcd8GS4AAAAJcEhZcwAACw4AAAsOAUC+4UEAAAAHdElNRQfkCwILIglO4xvLAAAAD3RF
+        HW9+kH4AMgFyjcd8GS4AAAAJcEhZcwAACwwAAAsMAT9AIsgAAAAHdElNRQfkCwILIglO4xvLAAAAD3RF
         WHRDb21tZW50AENBTm9wZW7cllV1AAAC8UlEQVRYR9WWz2sTQRTHkx6SQy5RxFv1JDGHogiVIkqFEqLE
         QigetKY3iSUpPYh/gD8uoQiJIEKJ0UNNRZKjTaQiHozePAk21eagCC20NdW1plTa8X3f7mw3cZNuzSr6
         hQ+8zn6/M29nZts6/hWdIu4T4xZJE2cJ23QvGAyKRCJhCXgp80CN2qNxTAyVP5QZZVXhn6H5mRlGCl5k

libEDSsharp/CanOpenEDS.cs

@@ -28,7 +28,7 @@
 {
     public partial class InfoSection
     {
         public virtual void Parse(Dictionary<string, string> section, string sectionname)
         {
             this.section = section;
 
@@ -84,7 +84,7 @@
         }
     }
 
     public partial class MandatoryObjects : SupportedObjects
     {
         public MandatoryObjects(Dictionary<string, string> section)
         : this()
@@ -825,8 +825,13 @@
             int lineno = 1;
             foreach (string linex in System.IO.File.ReadLines(filename))
             {
-                Parseline(linex, lineno);
-                lineno++;
+                try
+                {
+                    Parseline(linex, lineno);
+                    lineno++;
+                }
+                catch (Exception) { Warnings.warning_list.Add("Failed to open file \n" + filename);}
+
             }
 
             di = new DeviceInfo(eds["DeviceInfo"]);

libEDSsharp/CanOpenNodeExporter.cs

@@ -461,7 +461,22 @@ This file was automatically generated by CANopenEditor {0}
     https://github.com/CANopenNode/CANopenEditor
 
     DON'T EDIT THIS FILE MANUALLY !!!!
-*******************************************************************************/", this.gitVersion));
+*******************************************************************************", this.gitVersion));
+            file.WriteLine("   FILE INFO:");
+            file.WriteLine(string.Format("      FileName:     {0}", Path.GetFileName(eds.projectFilename)));
+            file.WriteLine(string.Format("      FileVersion:  {0}", eds.fi.FileVersion));
+            file.WriteLine(string.Format("      CreationTime: {0}", eds.fi.CreationTime));
+            file.WriteLine(string.Format("      CreationDate: {0}", eds.fi.CreationDate));
+            file.WriteLine(string.Format("      CreatedBy:    {0}", eds.fi.CreatedBy));
+
+            file.WriteLine("");
+            file.WriteLine("   DEVICE INFO:");
+            file.WriteLine(string.Format("      VendorName:     {0}", eds.di.VendorName));
+            file.WriteLine(string.Format("      VendorNumber:   {0}", eds.di.VendorNumber));
+            file.WriteLine(string.Format("      ProductName:    {0}", eds.di.ProductName));
+            file.WriteLine(string.Format("      ProductNumber:  {0}", eds.di.ProductNumber));
+            file.WriteLine("*******************************************************************************/");
+            file.WriteLine("");
         }
 
         private void export_h(string filename)
@@ -503,28 +518,9 @@ CANopen DATA TYPES
 
 ");
 
-            file.WriteLine("/*******************************************************************************");
-            file.WriteLine("   FILE INFO:");
-            file.WriteLine(string.Format("      FileName:     {0}", Path.GetFileName(eds.projectFilename)));
-            file.WriteLine(string.Format("      FileVersion:  {0}", eds.fi.FileVersion));
-            file.WriteLine(string.Format("      CreationTime: {0}", eds.fi.CreationTime));
-            file.WriteLine(string.Format("      CreationDate: {0}", eds.fi.CreationDate));
-            file.WriteLine(string.Format("      CreatedBy:    {0}", eds.fi.CreatedBy));
-            file.WriteLine("*******************************************************************************/");
-            file.WriteLine("");
-            file.WriteLine("");
 
-            file.WriteLine("/*******************************************************************************");
-            file.WriteLine("   DEVICE INFO:");
-            file.WriteLine(string.Format("      VendorName:     {0}", eds.di.VendorName));
-            file.WriteLine(string.Format("      VendorNumber:   {0}", eds.di.VendorNumber));
-            file.WriteLine(string.Format("      ProductName:    {0}", eds.di.ProductName));
-            file.WriteLine(string.Format("      ProductNumber:  {0}", eds.di.ProductNumber));
-            file.WriteLine("*******************************************************************************/");
-            file.WriteLine("");
-            file.WriteLine("");
 
-            file.WriteLine(@"/*******************************************************************************
+file.WriteLine(@"/*******************************************************************************
    FEATURES
 *******************************************************************************/");
 

libEDSsharp/CanOpenNodeExporter_V4.cs

@@ -602,8 +602,33 @@ This file was automatically generated by CANopenEditor {0}
     https://github.com/CANopenNode/CANopenEditor
 
     DON'T EDIT THIS FILE MANUALLY, UNLESS YOU KNOW WHAT YOU ARE DOING !!!!
-*******************************************************************************/
+*******************************************************************************
+
+    File info:
+        File Names:   {1}.h; {1}.c
+        Project File: {2}
+        File Version: {3}
+
+        Created:      {4}
+        Created By:   {5}
+        Modified:     {6}
+        Modified By:  {7}
+
+    Device Info:
+        Vendor Name:  {8}
+        Vendor ID:    {9}
+        Product Name: {10}
+        Product ID:   {11}
 
+        Description:  {12}
+*******************************************************************************/",
+            gitVersion, odname,
+            Path.GetFileName(eds.projectFilename), eds.fi.FileVersion,
+            eds.fi.CreationDateTime, eds.fi.CreatedBy, eds.fi.ModificationDateTime, eds.fi.ModifiedBy,
+            eds.di.VendorName, eds.di.VendorNumber, eds.di.ProductName, eds.di.ProductNumber,
+            eds.fi.Description));
+
+            file.WriteLine(string.Format(@"
 #define OD_DEFINITION
 #include ""301/CO_ODinterface.h""
 #include ""{1}.h""

libEDSsharp/CanOpenXDD_1_1.cs

@@ -100,8 +100,16 @@ public EDSsharp ReadXML(string file)
                 dev = (ISO15745ProfileContainer)serializer.Deserialize(reader);
                 reader.Close();
             }
-            catch (Exception)
+            catch (Exception e)
             {
+                if (e is System.InvalidOperationException)
+                {
+                    Warnings.warning_list.Add(String.Format("{0} {1} Action aborted!", e.Message, e.InnerException.Message));
+                }
+                else
+                {
+                    Warnings.warning_list.Add(String.Format("{0} Action aborted!", e.ToString()));
+                }
                 return null;
             }