Merge branch 'pr/n60_inserting_target' into bugfix

# Conflicts:
#	EDSEditorGUI/DeviceODView.cs
#	EDSEditorGUI/Form1.cs

Author: trojanobelix

EDSEditorGUI/DeviceODView.cs

@@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License
 */
 
 using System;
+using System.Collections.Generic;
 using System.Windows.Forms;
 using libEDSsharp;
 
@@ -27,13 +28,20 @@ public partial class DeviceView : MyTabUserControl
     {
 
         readonly public EDSsharp eds;
+        readonly private List<EDSsharp> network;
 
-        public DeviceView(EDSsharp eds_target)
+        public event EventHandler<UpdateODViewEventArgs> UpdateODViewForEDS;
+
+        public DeviceView(EDSsharp eds_target, List<EDSsharp> network)
         {
             eds = eds_target;
+            this.network = network;
 
             InitializeComponent();
 
+            this.deviceODView1.network = network;
+            this.deviceODView1.UpdateODViewForEDS += DeviceODView1_UpdateODView;
+
             foreach (TabPage tp in tabControl1.TabPages)
             {
                 foreach(Object o in tp.Controls)
@@ -54,6 +62,15 @@ public DeviceView(EDSsharp eds_target)
 
         }
 
+        private void DeviceODView1_UpdateODView(object sender, UpdateODViewEventArgs e)
+        {
+            EventHandler<UpdateODViewEventArgs> handler = UpdateODViewForEDS;
+            if(handler != null)
+            {
+                handler(this, e);  
+            }
+        }
+
         #region UpdateDispatchEvents
 
         // This region handles update requests that are dispatched to the various user controls on the tabs

EDSEditorGUI/DeviceView.Designer.cs

@@ -152,6 +152,7 @@
     <Compile Include="TableLayoutDB.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="UpdateODViewEventArgs.cs" />
     <Compile Include="Warnings.cs">
       <SubType>Form</SubType>
     </Compile>

EDSEditorGUI/DeviceView.cs

@@ -26,6 +26,7 @@ You should have received a copy of the GNU General Public License
 using System.IO;
 using libEDSsharp;
 using Xml2CSharp;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 namespace ODEditor
 {
@@ -154,17 +155,37 @@ void ProfileAddClick(object sender, EventArgs e)
                     return;
                 }
 
-                InsertObjects insObjForm = new InsertObjects(dv.eds, eds.ods, "0");
+                InsertObjects insObjForm = new InsertObjects(dv.eds, network, eds.ods, "0");
 
                 if (insObjForm.ShowDialog() == DialogResult.OK)
                 {
-                    dv.eds.Dirty = true;
+                    EDSsharp modifiedEds = insObjForm.GetModifiedEDS();
+                    modifiedEds.Dirty = true;
+
+                    if(modifiedEds == dv.eds)
+                    {
                     dv.dispatch_updateOD();
                     dv.dispatch_updatePDOinfo();
 
                     dv.eds.UpdatePDOcount();
                     dv.dispatch_updatedevice();
                 }
+                    else
+                    {
+                        foreach(TabPage page in tabControl1.TabPages)
+                        {
+                            DeviceView devView = (DeviceView)page.Controls[0];
+                            if(devView.eds == modifiedEds)
+                            {
+                                devView.dispatch_updateOD();
+                                devView.dispatch_updatePDOinfo();
+
+                                devView.eds.UpdatePDOcount();
+                                devView.dispatch_updatedevice();
+                            }
+                        }
+                    }
+                }
             }
         }
 
@@ -181,8 +202,9 @@ private void openEDSfile(string path,InfoSection.Filetype ft)
                 Bridge bridge = new Bridge(); //tell me again why bridge is not static?
                 dev = bridge.convert(eds);
 
-                DeviceView device = new DeviceView(eds);
+                DeviceView device = new DeviceView(eds, network);
 
+                device.UpdateODViewForEDS += Device_UpdateODViewForEDS;
                 eds.OnDataDirty += Eds_onDataDirty;
 
                 tabControl1.TabPages.Add(eds.di.ProductName);
@@ -335,8 +357,9 @@ private void openXDDfile(string path)
 
                 tabControl1.TabPages.Add(eds.di.ProductName);
 
-                DeviceView device = new DeviceView(eds);
+                DeviceView device = new DeviceView(eds, network);
 
+                device.UpdateODViewForEDS += Device_UpdateODViewForEDS;
                 eds.OnDataDirty += Eds_onDataDirty;
 
                 tabControl1.TabPages[tabControl1.TabPages.Count - 1].Controls.Add(device);
@@ -381,8 +404,8 @@ private void openXMLfile(string path)
 
                 tabControl1.TabPages.Add(eds.di.ProductName);
 
-                DeviceView device = new DeviceView(eds);
-
+                DeviceView device = new DeviceView(eds, network);
+                device.UpdateODViewForEDS += Device_UpdateODViewForEDS;
                 eds.OnDataDirty += Eds_onDataDirty;
 
                 tabControl1.TabPages[tabControl1.TabPages.Count - 1].Controls.Add(device);
@@ -405,6 +428,26 @@ private void openXMLfile(string path)
 
         }
 
+        private void Device_UpdateODViewForEDS(object sender, UpdateODViewEventArgs e)
+        {
+            foreach (TabPage page in tabControl1.TabPages)
+            {
+                foreach (Control c in page.Controls)
+                {
+                    if (c.GetType() == typeof(DeviceView))
+                    {
+                        DeviceView d = (DeviceView)c;
+                        if (d.eds == e.EDS)
+                        {
+                            d.dispatch_updateOD();
+                        }
+                    }
+
+                }
+            }
+        }
+
+
         private void Eds_onDataDirty(bool dirty, EDSsharp sender)
         {
             foreach(TabPage page in tabControl1.TabPages)
@@ -534,7 +577,6 @@ private void saveProjectToolStripMenuItem_Click(object sender, EventArgs e)
                 }
                 dv.eds.Dirty = false;
             }
-            
         }
 
         private void saveAsToolStripMenuItem_Click(object sender, EventArgs e)
@@ -634,7 +676,7 @@ void dosave(DeviceView dv, string FileName, bool xddfileVersion_1_1, bool stripp
                     }
                     break;
             }
-            
+
             dv.dispatch_updateOD();
 
         }
@@ -649,7 +691,8 @@ private void newToolStripMenuItem_Click(object sender, EventArgs e)
 
             tabControl1.TabPages.Add(eds.di.ProductName);
 
-            DeviceView device = new DeviceView(eds);
+            DeviceView device = new DeviceView(eds, network);
+            device.UpdateODViewForEDS += Device_UpdateODViewForEDS;
 
             eds.OnDataDirty += Eds_onDataDirty;
 
@@ -892,12 +935,13 @@ private void openXDDNetworkfile(string file)
 
                 tabControl1.TabPages.Add(eds.di.ProductName);
 
-                DeviceView device = new DeviceView(eds);
+                DeviceView device = new DeviceView(eds, network);
 
                 tabControl1.TabPages[tabControl1.TabPages.Count - 1].Controls.Add(device);
                 device.Dock = DockStyle.Fill;
 
                 network.Add(eds);
+                device.UpdateODViewForEDS += Device_UpdateODViewForEDS;
                 eds.OnDataDirty += Eds_onDataDirty;
 
                 device.dispatch_updateOD();
@@ -923,12 +967,13 @@ private void openNetworkfile(string file)
                 tabControl1.TabPages.Add(eds.di.ProductName);
 
 
-                DeviceView device = new DeviceView(eds);
+                DeviceView device = new DeviceView(eds, network);
 
                 tabControl1.TabPages[tabControl1.TabPages.Count - 1].Controls.Add(device);
                 device.Dock = DockStyle.Fill;
 
                 network.Add(eds);
+                device.UpdateODViewForEDS += Device_UpdateODViewForEDS;
                 eds.OnDataDirty += Eds_onDataDirty;
 
                 device.dispatch_updateOD();