Skip to content

Commit 65b295f

Browse files
romanettromanett
committed
update
1 parent e1f8dfd commit 65b295f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+182
-171
lines changed

‎Samples/ClientControls.Net4/Common/Client/EditComplexValueCtrl.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -661,10 +661,7 @@ private void ShowValue(AccessInfo parent)
661661
{
662662
ShowValueNoNotify(parent);
663663

664-
if (m_ValueChanged != null)
665-
{
666-
m_ValueChanged(this, null);
667-
}
664+
m_ValueChanged?.Invoke(this, null);
668665
}
669666

670667
/// <summary>

‎Samples/ClientControls.Net4/Common/Client/EditMonitoredItemDlg.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ public override string ToString()
104104
/// <summary>
105105
/// Prompts the user to edit the monitored item.
106106
/// </summary>
107-
public async Task<bool> ShowDialogAsync(ISession session, MonitoredItem monitoredItem, bool isEvent, CancellationToken ct = default)
107+
public async Task<bool> ShowDialogAsync(ISession session, MonitoredItem monitoredItem, bool isEvent, ITelemetryContext telemetry, CancellationToken ct = default)
108108
{
109109
if (!monitoredItem.Created)
110110
{
111-
NodeBTN.Session = session;
111+
NodeBTN.ChangeSession(session, telemetry);
112112
await NodeBTN.SetSelectedNodeIdAsync(monitoredItem.StartNodeId, ct);
113113
}
114114

‎Samples/ClientControls.Net4/Common/Client/EditValueCtrl.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,7 @@ private void BrowseBTN_Click(object sender, EventArgs e)
117117

118118
Value = new Variant(value);
119119

120-
if (m_ValueChanged != null)
121-
{
122-
m_ValueChanged(this, e);
123-
}
120+
m_ValueChanged?.Invoke(this, e);
124121
}
125122
#endregion
126123
}

‎Samples/ClientControls.Net4/Common/Client/EditWriteValueDlg.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ public EditWriteValueDlg()
6767
/// <summary>
6868
/// Prompts the user to edit the write request parameters for the set of nodes provided.
6969
/// </summary>
70-
public async Task<WriteValue> ShowDialogAsync(ISession session, WriteValue nodeToWrite, CancellationToken ct = default)
70+
public async Task<WriteValue> ShowDialogAsync(ISession session, WriteValue nodeToWrite, ITelemetryContext telemetry, CancellationToken ct = default)
7171
{
72-
NodeBTN.Session = session;
72+
NodeBTN.ChangeSession(session, telemetry);
7373
NodeBTN.SelectedReference = null;
7474

7575
// fill in the control.

‎Samples/ClientControls.Net4/Common/Client/GdsDiscoverServersDlg.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -436,14 +436,14 @@ private async void ServerCTRL_ConnectCompleteAsync(object sender, EventArgs e)
436436
NodeId[] referenceTypeIds = new NodeId[] { Opc.Ua.ReferenceTypeIds.Organizes, Opc.Ua.ReferenceTypeIds.HasChild };
437437

438438
await BrowseCTRL.InitializeAsync(session, rootId, m_telemetry, default, referenceTypeIds);
439-
SystemElementBTN.Session = session;
439+
SystemElementBTN.ChangeSession(session, m_telemetry);
440440
SystemElementBTN.RootId = rootId;
441441
SystemElementBTN.ReferenceTypeIds = referenceTypeIds;
442442
}
443443
else
444444
{
445445
await BrowseCTRL.ChangeSessionAsync(session);
446-
SystemElementBTN.Session = session;
446+
SystemElementBTN.ChangeSession(session, m_telemetry);
447447
}
448448
}
449449
catch (Exception exception)
@@ -458,7 +458,7 @@ private async void ServerCTRL_ReconnectCompleteAsync(object sender, EventArgs e)
458458
{
459459
ISession session = ServerCTRL.Session;
460460
await BrowseCTRL.ChangeSessionAsync(session);
461-
SystemElementBTN.Session = session;
461+
SystemElementBTN.ChangeSession(session, m_telemetry);
462462
}
463463
catch (Exception exception)
464464
{

‎Samples/ClientControls.Net4/Common/Client/SelectNodeCtrl.cs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public SelectNodeCtrl()
6060
#region Private Fields
6161
private event EventHandler m_NodeSelected;
6262
private ReferenceDescription m_selectedNode;
63+
private ITelemetryContext m_telemetry;
6364
#endregion
6465

6566
#region Public Interface
@@ -102,6 +103,12 @@ public NodeId SelectedNode
102103
}
103104
}
104105

106+
public void ChangeSession(ISession session, ITelemetryContext telemetry)
107+
{
108+
Session = session;
109+
m_telemetry = telemetry;
110+
}
111+
105112
public void ClearSelectedNode()
106113
{
107114
m_selectedNode = new ReferenceDescription();
@@ -199,10 +206,7 @@ private async void BrowseBTN_ClickAsync(object sender, EventArgs e)
199206
{
200207
SelectedReference = reference;
201208

202-
if (m_NodeSelected != null)
203-
{
204-
m_NodeSelected(this, new EventArgs());
205-
}
209+
m_NodeSelected?.Invoke(this, new EventArgs());
206210
}
207211
}
208212
#endregion

‎Samples/ClientControls.Net4/Common/Client/SubscribeDataDlg.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public SubscribeDataDlg()
6666
/// </summary>
6767
public Task ChangeSessionAsync(ISession session, ITelemetryContext telemetry, CancellationToken ct = default)
6868
{
69-
SubscribeRequestCTRL.ChangeSession(session);
69+
SubscribeRequestCTRL.ChangeSession(session, telemetry);
7070
m_session = session;
7171
return Task.CompletedTask;
7272
}

‎Samples/ClientControls.Net4/Common/Client/SubscribeDataListViewCtrl.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public SubscribeDataListViewCtrl()
8585
#region Private Fields
8686
private DataSet m_dataset;
8787
private ISession m_session;
88+
private ITelemetryContext m_telemetry;
8889
private Subscription m_subscription;
8990
private DisplayState m_state;
9091
private EditComplexValueDlg m_EditComplexValueDlg;
@@ -107,8 +108,9 @@ private enum DisplayState
107108
/// <summary>
108109
/// Changes the session used.
109110
/// </summary>
110-
public void ChangeSession(ISession session)
111+
public void ChangeSession(ISession session, ITelemetryContext telemetry)
111112
{
113+
m_telemetry = telemetry;
112114
if (!Object.ReferenceEquals(session, m_session))
113115
{
114116
m_session = session;
@@ -564,7 +566,7 @@ private async void NewMI_ClickAsync(object sender, EventArgs e)
564566
monitoredItem = new MonitoredItem(monitoredItem);
565567
}
566568

567-
if (await new EditMonitoredItemDlg().ShowDialogAsync(m_session, monitoredItem, false))
569+
if (await new EditMonitoredItemDlg().ShowDialogAsync(m_session, monitoredItem, false, m_telemetry))
568570
{
569571
m_subscription.AddItem(monitoredItem);
570572
DataRow row = m_dataset.Tables[0].NewRow();
@@ -597,7 +599,7 @@ private async void EditMI_ClickAsync(object sender, EventArgs e)
597599
return;
598600
}
599601

600-
if (await new EditMonitoredItemDlg().ShowDialogAsync(m_session, monitoredItem, false))
602+
if (await new EditMonitoredItemDlg().ShowDialogAsync(m_session, monitoredItem, false, m_telemetry))
601603
{
602604
DataRow row = (DataRow)monitoredItem.Handle;
603605
await UpdateRowAsync(row, monitoredItem);

‎Samples/ClientControls.Net4/Common/Client/SubscribeEventsDlg.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ private async void NewMI_ClickAsync(object sender, EventArgs e)
852852
monitoredItem = new MonitoredItem(monitoredItem);
853853
}
854854

855-
if (await new EditMonitoredItemDlg().ShowDialogAsync(m_session, monitoredItem, true))
855+
if (await new EditMonitoredItemDlg().ShowDialogAsync(m_session, monitoredItem, true, m_telemetry))
856856
{
857857
m_subscription.AddItem(monitoredItem);
858858
DataRow row = m_dataset.Tables[0].NewRow();
@@ -890,7 +890,7 @@ private async void EditMI_ClickAsync(object sender, EventArgs e)
890890
return;
891891
}
892892

893-
if (await new EditMonitoredItemDlg().ShowDialogAsync(m_session, monitoredItem, true))
893+
if (await new EditMonitoredItemDlg().ShowDialogAsync(m_session, monitoredItem, true, m_telemetry))
894894
{
895895
DataRow row = (DataRow)monitoredItem.Handle;
896896
await UpdateRowAsync(row, monitoredItem);

‎Samples/ClientControls.Net4/Common/Client/WriteRequestDlg.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public WriteRequestDlg()
6565
/// </summary>
6666
public Task ChangeSessionAsync(ISession session, ITelemetryContext telemetry, CancellationToken ct = default)
6767
{
68-
WriteRequestCTRL.ChangeSession(session);
68+
WriteRequestCTRL.ChangeSession(session, telemetry);
6969
return Task.CompletedTask;
7070
}
7171

0 commit comments

Comments
 (0)