@@ -328,7 +328,7 @@ public object FillWithWpfControls(
328328 dp . ContextMenu = new ContextMenu ( ) ;
329329 dp . ContextMenu . Items . Add ( new MenuItem ( ) { Header = "Jump to selected .." , Tag = "JUMP" } ) ;
330330 dp . ContextMenu . Items . Add ( new Separator ( ) ) ;
331- dp . ContextMenu . Items . Add ( new MenuItem ( ) { Header = "Edit Node .." , Tag = "EDIT" } ) ;
331+ dp . ContextMenu . Items . Add ( new MenuItem ( ) { Header = "Edit Node / Edge .." , Tag = "EDIT" } ) ;
332332 dp . ContextMenu . Items . Add ( new MenuItem ( ) { Header = "Create Node (to selected) .." , Tag = "CREATE" } ) ;
333333 dp . ContextMenu . Items . Add ( new MenuItem ( ) { Header = "Delete (selected) Node(s) .." , Tag = "DELETE" } ) ;
334334
@@ -507,6 +507,33 @@ protected void AdjustNodeInBom(
507507 } ) ;
508508 }
509509
510+ protected void AdjustEdgeInBom (
511+ Aas . ISubmodelElement edgeSme ,
512+ string edgeIdShort ,
513+ string edgeSemId ,
514+ string edgeSuppSemId )
515+ {
516+ // access
517+ if ( _submodel == null || edgeSme == null )
518+ return ;
519+
520+ // write back new values
521+ edgeSme . IdShort = edgeIdShort ;
522+ if ( edgeSemId ? . HasContent ( ) == true )
523+ edgeSme . SemanticId = new Aas . Reference ( Aas . ReferenceTypes . ExternalReference ,
524+ ( new Aas . IKey [ ] { new Aas . Key ( Aas . KeyTypes . GlobalReference , edgeSemId ) } ) . ToList ( ) ) ;
525+ else
526+ edgeSme . SemanticId = null ;
527+
528+ if ( edgeSuppSemId ? . HasContent ( ) == true )
529+ edgeSme . SupplementalSemanticIds = ( new Aas . IReference [ ] {
530+ new Aas . Reference ( Aas . ReferenceTypes . ExternalReference ,
531+ ( new Aas . IKey [ ] { new Aas . Key ( Aas . KeyTypes . GlobalReference , edgeSuppSemId ) } ) . ToList ( ) )
532+ } ) . ToList ( ) ;
533+ else
534+ edgeSme . SupplementalSemanticIds = null ;
535+ }
536+
510537#if cdscsd
511538 ///// <summary>
512539 /////
@@ -609,12 +636,12 @@ protected void ContextMenu_Click(object sender, RoutedEventArgs e)
609636 if ( action != "OK" || ! ( st . AasElem is Aas . ISubmodelElement nodeSme ) )
610637 return ;
611638
612- // modidfy
639+ // modify
613640 AdjustNodeInBom (
614641 nodeSme ,
615642 nodeIdShort : st . TextBoxIdShort . Text ,
616- nodeSuppSemId : st . ComboBoxNodeSupplSemId . Text ,
617- nodeSemId : st . ComboBoxNodeSemId . Text ) ;
643+ nodeSemId : st . ComboBoxNodeSemId . Text ,
644+ nodeSuppSemId : st . ComboBoxNodeSupplSemId . Text ) ;
618645
619646 // refresh
620647 SetNeedsFinalize ( true ) ;
@@ -629,7 +656,9 @@ protected void ContextMenu_Click(object sender, RoutedEventArgs e)
629656 && edge . Edge ? . UserData is Aas . ISubmodelElement edgeSme )
630657 {
631658 // create job
632- var stat = new DialogueStatus ( ) { Type = DialogueType . EditEdge , AasElem = edgeSme } ;
659+ var stat = new DialogueStatus ( ) {
660+ Type = DialogueType . EditEdge , AasElem = edgeSme
661+ } ;
633662
634663 // set the action
635664 stat . Action = ( st , action ) =>
@@ -638,8 +667,12 @@ protected void ContextMenu_Click(object sender, RoutedEventArgs e)
638667 if ( action != "OK" || ! ( st . AasElem is Aas . ISubmodelElement esme ) )
639668 return ;
640669
641- // modidfy
642- esme . IdShort = st . TextBoxIdShort . Text ;
670+ // modify
671+ AdjustEdgeInBom (
672+ esme ,
673+ edgeIdShort : st . TextBoxIdShort . Text ,
674+ edgeSemId : st . ComboBoxRelSemId . Text ,
675+ edgeSuppSemId : st . ComboBoxRelSupplSemId . Text ) ;
643676
644677 // refresh
645678 SetNeedsFinalize ( true ) ;
@@ -1263,7 +1296,7 @@ protected Panel CreateDialoguePanel(DialogueStatus stat)
12631296 Content = editEdge ? "Rel.idShort:" : "Node.idShort:"
12641297 } ) ;
12651298 AddToGrid ( grid , 0 , 1 , colSpan : 1 , fe : stat . TextBoxIdShort = new TextBox ( ) {
1266- Text = editNode ? stat . AasElem ? . IdShort : "" ,
1299+ Text = ( editNode || editEdge ) ? stat . AasElem ? . IdShort : "" ,
12671300 VerticalContentAlignment = VerticalAlignment . Center ,
12681301 Padding = new Thickness ( 0 , - 1 , 0 , - 1 ) ,
12691302 Margin = new Thickness ( 0 , 2 , 0 , 2 ) ,
@@ -1294,7 +1327,8 @@ protected Panel CreateDialoguePanel(DialogueStatus stat)
12941327 }
12951328 else
12961329 {
1297- stat . ComboBoxNodeSemId . Text = "" + ( stat . AasElem as Aas . IHasSemantics ) . SemanticId . Keys ? . FirstOrDefault ( ) ? . Value ;
1330+ stat . ComboBoxNodeSemId . Text = "" + ( stat . AasElem as Aas . IHasSemantics ) .
1331+ SemanticId . Keys ? . FirstOrDefault ( ) ? . Value ;
12981332 }
12991333
13001334 AddToGrid ( grid , 1 , 1 , colSpan : 3 , fe : stat . ComboBoxNodeSemId ) ;
@@ -1309,6 +1343,13 @@ protected Panel CreateDialoguePanel(DialogueStatus stat)
13091343 VerticalContentAlignment = VerticalAlignment . Center
13101344 } ;
13111345
1346+ if ( _bomRecords != null )
1347+ foreach ( var br in _bomRecords )
1348+ if ( br . NodeSupplSemIds != null )
1349+ foreach ( var nss in br . NodeSupplSemIds )
1350+ if ( ! stat . ComboBoxNodeSupplSemId . Items . Contains ( nss ) )
1351+ stat . ComboBoxNodeSupplSemId . Items . Add ( nss ) ;
1352+
13121353 if ( ! editNode )
13131354 {
13141355 stat . ComboBoxNodeSupplSemId . Text = "" ;
@@ -1338,10 +1379,18 @@ protected Panel CreateDialoguePanel(DialogueStatus stat)
13381379
13391380 stat . ComboBoxRelSemId . Items . Add ( prefHS . CD_HasPart ? . GetSingleKey ( ) ? . Value ) ;
13401381 stat . ComboBoxRelSemId . Items . Add ( prefHS . CD_IsPartOf ? . GetSingleKey ( ) ? . Value ) ;
1341- if ( stat . ReverseDir )
1342- stat . ComboBoxRelSemId . Text = stat . ComboBoxRelSemId . Items [ 1 ] . ToString ( ) ;
1343- else
1344- stat . ComboBoxRelSemId . Text = stat . ComboBoxRelSemId . Items [ 0 ] . ToString ( ) ;
1382+
1383+ if ( ! editEdge )
1384+ {
1385+ if ( stat . ReverseDir )
1386+ stat . ComboBoxRelSemId . Text = stat . ComboBoxRelSemId . Items [ 1 ] . ToString ( ) ;
1387+ else
1388+ stat . ComboBoxRelSemId . Text = stat . ComboBoxRelSemId . Items [ 0 ] . ToString ( ) ;
1389+ } else
1390+ {
1391+ stat . ComboBoxRelSemId . Text = "" + ( stat . AasElem as Aas . IHasSemantics )
1392+ . SemanticId . Keys ? . FirstOrDefault ( ) ? . Value ;
1393+ }
13451394
13461395 AddToGrid ( grid , 3 , 1 , colSpan : 3 , fe : stat . ComboBoxRelSemId ) ;
13471396
@@ -1355,6 +1404,24 @@ protected Panel CreateDialoguePanel(DialogueStatus stat)
13551404 VerticalContentAlignment = VerticalAlignment . Center
13561405 } ;
13571406
1407+ if ( _bomRecords != null )
1408+ foreach ( var br in _bomRecords )
1409+ if ( br . EdgeSupplSemIds != null )
1410+ foreach ( var nss in br . EdgeSupplSemIds )
1411+ if ( ! stat . ComboBoxRelSupplSemId . Items . Contains ( nss ) )
1412+ stat . ComboBoxRelSupplSemId . Items . Add ( nss ) ;
1413+
1414+ if ( ! editEdge )
1415+ {
1416+ stat . ComboBoxRelSupplSemId . Text = "" ;
1417+ }
1418+ else
1419+ {
1420+ stat . ComboBoxRelSupplSemId . Text =
1421+ "" + ( stat . AasElem as Aas . IHasSemantics ) ? . SupplementalSemanticIds ?
1422+ . FirstOrDefault ( ) ? . Keys ? . FirstOrDefault ( ) ? . Value ;
1423+ }
1424+
13581425 AddToGrid ( grid , 4 , 1 , colSpan : 3 , fe : stat . ComboBoxRelSupplSemId ) ;
13591426 }
13601427
0 commit comments