Merge branch 'trojanobelix-xdd' into xdd

robincornelius · Oct 22, 2019 · be82983 · be82983
2 parents 878e2ad + bbf5a85
commit be82983
Show file tree

Hide file tree

Showing 10 changed files with 3,039 additions and 3,036 deletions.
diff --git a/EDSTest/DeviceInfoView.Designer.cs b/EDSTest/DeviceInfoView.Designer.cs
diff --git a/EDSTest/DeviceODView.cs b/EDSTest/DeviceODView.cs
@@ -220,7 +220,7 @@ private void button_save_changes_Click(object sender, EventArgs e)
                 // Propagate changes through sub objects
                 // We only really need to do this for PDOMapping to fix bug #13 see report
                 // on git hub for discussion why other parameters are not propagated here
-                // tl;dr; Limitations of CanOpenNode object dictionary perms for sub array objects
+                // tl;dr; Limitations of CANopenNode object dictionary perms for sub array objects
 
                 foreach (KeyValuePair<UInt16,ODentry>kvp in selectedobject.subobjects)
                 {
@@ -1112,7 +1112,7 @@ private void changeMaxSubIndexToolStripMenuItem_Click(object sender, EventArgs e
         {
             //Change the max subindex, it is allowed to have a different max subindex to the physical array size
             //as depending on implementation it might not be a simple array behind the scenes. Even 0x1010,0x1011 
-            //do this on their implementation in CanopenNode
+            //do this on their implementation in CANopenNode
 
             if (selecteditemsub.Tag != null)
             {

diff --git a/EDSTest/Form1.Designer.cs b/EDSTest/Form1.Designer.cs
diff --git a/EDSTest/Form1.cs b/EDSTest/Form1.cs
@@ -218,7 +218,7 @@ private void exportCanOpenNodeToolStripMenuItem_Click(object sender, EventArgs e
                     Warnings.warning_list.Clear();
 
                     CanOpenNodeExporter cone = new CanOpenNodeExporter();
-                    cone.export(savePath, this.gitVersion, dv.eds);
+                    cone.export(savePath, Path.GetFileNameWithoutExtension(sfd.FileName), this.gitVersion, dv.eds);
 
                     if (Warnings.warning_list.Count != 0)
                     {
@@ -236,7 +236,7 @@ private void openCanOpenNodeXMLToolStripMenuItem_Click(object sender, EventArgs
         {
 
             OpenFileDialog odf = new OpenFileDialog();
-            odf.Filter = "All supported files (*.eds;*.xml;*.xdd;*.dcf)|*.eds;*.xml;*.xdd;*.dcf|Electronic Data Sheets (*.eds)|*.eds|Device Configuration Files (*.dcf)|*.dcf|CanOpen Xml Data sheet (*.xdd)|*.xdd|CanOpenNode XML (*.xml)|*.xml";
+            odf.Filter = "All supported files (*.eds;*.xml;*.xdd;*.dcf)|*.eds;*.xml;*.xdd;*.dcf|Electronic Data Sheets (*.eds)|*.eds|Device Configuration Files (*.dcf)|*.dcf|CANopen Xml Data sheet (*.xdd)|*.xdd|CANopenNode XML (*.xml)|*.xml";
             if (odf.ShowDialog() == DialogResult.OK)
             {
 
@@ -484,7 +484,7 @@ private void exportDeviceFileToolStripMenuItem_Click(object sender, EventArgs e)
                 DeviceView dv = (DeviceView)tabControl1.SelectedTab.Controls[0];
                 SaveFileDialog sfd = new SaveFileDialog();
 
-                sfd.Filter = "Canopen Node XML (*.xml)|*.xml|Electronic Data Sheets (*.eds)|*.eds|Device Configuration Files (*.dcf)|*.dcf";
+                sfd.Filter = "CANopen Node XML (*.xml)|*.xml|Electronic Data Sheets (*.eds)|*.eds|Device Configuration Files (*.dcf)|*.dcf";
 
                 sfd.InitialDirectory = Path.GetDirectoryName(dv.eds.xmlfilename);
                 sfd.RestoreDirectory = true;
@@ -522,7 +522,7 @@ private void saveAsToolStripMenuItem_Click(object sender, EventArgs e)
                 DeviceView dv = (DeviceView)tabControl1.SelectedTab.Controls[0];
                 SaveFileDialog sfd = new SaveFileDialog();
 
-                sfd.Filter = "CanOpen XDD (*.xdd)|*.xdd";
+                sfd.Filter = "CANopen XDD (*.xdd)|*.xdd";
 
                 sfd.InitialDirectory = Path.GetDirectoryName(dv.eds.xmlfilename);
                 sfd.RestoreDirectory = true;
@@ -733,7 +733,7 @@ private void saveNetworkXmlToolStripMenuItem_Click(object sender, EventArgs e)
         {
             SaveFileDialog sfd = new SaveFileDialog();
 
-            sfd.Filter = "CanOpen Network XDD (*.nxdd)|*.nxdd|CanOpen network XML (*.nxml)|*.nxml";
+            sfd.Filter = "CANopen Network XDD (*.nxdd)|*.nxdd|CANopen network XML (*.nxml)|*.nxml";
 
             sfd.InitialDirectory = Path.GetDirectoryName(networkfilename);
             sfd.RestoreDirectory = true;
@@ -765,7 +765,7 @@ private void loadNetworkXmlToolStripMenuItem_Click(object sender, EventArgs e)
         {
 
             OpenFileDialog odf = new OpenFileDialog();
-            odf.Filter = "CanOpen Network XDD (*.nxdd)|*.nxdd|CanOpen network XML (*.nxml)|*.nxml";
+            odf.Filter = "CANopen Network XDD (*.nxdd)|*.nxdd|CANopen network XML (*.nxml)|*.nxml";
             if (odf.ShowDialog() == DialogResult.OK)
             {
                 switch (Path.GetExtension(odf.FileName).ToLower())
@@ -967,7 +967,7 @@ private void documentationToolStripMenuItem_Click(object sender, EventArgs e)
         private void saveExportAllToolStripMenuItem_Click(object sender, EventArgs e)
         {
             string temp;
-            //Attempt to save EDS,XML and export the CanOpen dictionary
+            //Attempt to save EDS,XML and export the CANopen dictionary
 
             if (tabControl1.SelectedTab != null)
             {
@@ -1036,7 +1036,7 @@ private void saveExportAllToolStripMenuItem_Click(object sender, EventArgs e)
 
                 try
                 {
-                    cone.export(dv.eds.fi.exportFolder, this.gitVersion, dv.eds);
+                    cone.export(dv.eds.fi.exportFolder, "", this.gitVersion, dv.eds);
                 }
                 catch(Exception ex)
                 {