* improve BOM plugin

   functionality

Author: festo-i40

src/AasxCsharpLibrary/Extensions/ExtendIReferable.cs

@@ -607,5 +607,26 @@ public static void MigrateV20QualifiersToExtensions(this IReferable rf)
             }
         }
 
+        public static void FixReferences(IReferable rf, IEnumerable<ISubmodel> smToCheck)
+        {
+            if (rf == null || smToCheck == null)
+                return;
+            foreach (var x in rf.DescendOnce())
+                if (x is IReference xrf
+                    && xrf.Count() > 0
+                    && xrf.Keys.First()?.Type == KeyTypes.Submodel
+                    && xrf.Keys.First().Value?.HasContent() == true)
+                {
+                    foreach (var smtc in smToCheck)
+                        if (smtc.IdShort?.HasContent() == true
+                            && smtc.Id?.HasContent() == true
+                            && xrf.Keys.First().Value.Trim() == smtc.IdShort.Trim())
+                        {
+                            // found place to fix
+                            xrf.Keys.First().Value = smtc.Id;
+                        }
+                }
+        }
+
     }
 }

src/AasxPackageExplorer/debug.MIHO.script

@@ -23,4 +23,4 @@ Select("Submodel", "First");
 // Tool("submodelinstancefromsammaspect");
 // Tool("importtable", "Format", "Excel", "Preset", "Submodel templ. spec. import", "File", "C:\\HOMI\\Develop\\Aasx\\repo\\bugfix\\test-import.xlsx");
 // Tool("WinMaximize");
-Tool("ExportTable", "File", "C:\\HOMI\\Develop\\Aasx\\repo\\new.adoc", "Preset", "AsciiDoc");
+// Tool("ExportTable", "File", "C:\\HOMI\\Develop\\Aasx\\repo\\new.adoc", "Preset", "AsciiDoc");

src/AasxPackageExplorer/options-debug.MIHO.json

@@ -39,7 +39,8 @@
   // "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\SMT_TechData_Work\\IDTA 02003-1-2_SubmodelTemplate_TechnicalData_v1.2__with_Draft_1_3_and_AsciiDoc_v01.aasx",
   // "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\SMT_ProductChangeNotification\\IDTA_02036-1-0_SMT_ProductChangeNotification_Draft_v21.aasx",
   // "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\SMT_ProductChangeNotification\\SMT_ProductChangeNotification_Draft_v20_spiel.aasx",
-  "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\SMT_ProductChangeNotification\\IDTA_02036-1-0_SMT_ProductChangeNotification_Examples_v08.aasx",
+  // "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\SMT_ProductChangeNotification\\IDTA_02036-1-0_SMT_ProductChangeNotification_Examples_v08.aasx",
+  "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\tmp\\Syn2tecMachine_P2518_AAS__V3_DL2.aasx",
   // "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\tmp\\00_FestoDemoBox-Module-2-Kopie.aasx",
   // "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\tmp\\8001203_SPAU-P10R-T-R18M-L-PNLK-PNVBA-M8D_060ff64f-9fd2-422d-81ce-b17e49f007c5_work_spiel.aasx",
   // "AasxToLoad": "C:\\MIHO\\Develop\\Aasx\\repo\\SMT_and_SAMM_Showcase_v02.aasx",
@@ -207,10 +208,9 @@
     {
       "Path": "..\\..\\..\\..\\..\\..\\AasxPluginWebBrowser\\bin\\x64\\Debug\\AasxPluginWebBrowser.dll",
       "Args": []
-    }
+    },
 
     // Festo specific from here on
-    /*
     {
       "Path": "..\\..\\..\\..\\..\\..\\..\\..\\AasxFesto\\AasxFesto\\AasxPluginFluiddrawViewer\\bin\\Debug\\net6.0-windows\\AasxPluginFluiddrawViewer.dll",
       "Args": []
@@ -219,7 +219,6 @@
       "Path": "..\\..\\..\\..\\..\\..\\..\\..\\AasxFesto\\AasxFesto\\AasxPluginFluiddrawBom\\bin\\Debug\\net6.0-windows\\AasxPluginFluiddrawBom.dll",
       "Args": []
     } 
-    */
   ],
   "SecureConnectPresets": [
     {

src/AasxPackageLogic/DispEditHelperEntities.cs

@@ -1940,16 +1940,12 @@ public void DisplayOrEditAasEntitySubmodelOrRef(
                     ticketMenu: new AasxMenu()
                         .AddAction("upgrade-qualifiers", "Upgrade qualifiers",
                             "Upgrades particular qualifiers from V2.0 to V3.0 for selected element.")
-#if __moved_to_menu
-						.AddAction("SMT-qualifiers-convert", "Convert SMT qualifiers",
-							"Converts particular SMT qualifiers to SMT extension for selected element.")
-						.AddAction("SMT-set-organize", "Set SMT organize",
-							"Take over Submodel's element relationships to associated concepts.")
-#endif
 						.AddAction("remove-qualifiers", "Remove qualifiers",
                             "Removes all qualifiers for selected element.")
                         .AddAction("remove-extensions", "Remove extensions",
-                            "Removes all extensions for selected element."),
+                            "Removes all extensions for selected element.")
+                        .AddAction("fix-references", "Fix References",
+                            "Fix, if References first key to Identifiables use idShort instead of id."),
                     ticketAction: (buttonNdx, ticket) =>
                     {
                         if (buttonNdx == 0)
@@ -2151,6 +2147,42 @@ public void DisplayOrEditAasEntitySubmodelOrRef(
                             return new AnyUiLambdaActionRedrawAllElements(nextFocus: smref, isExpanded: true);
                         }
 
+                        if (buttonNdx == 3)
+                        {
+                            // confirm
+                            if (ticket?.ScriptMode != true
+                                && AnyUiMessageBoxResult.Yes != this.context.MessageBoxFlyoutShow(
+                                    "This operation will affect all References within " +
+                                    "the Submodel and all of its SubmodelElements. Do you want to proceed?",
+                                    "Fix References",
+                                    AnyUiMessageBoxButton.YesNo, AnyUiMessageBoxImage.Warning))
+                                return new AnyUiLambdaActionNone();
+
+                            // action
+                            try
+                            {
+                                ExtendIReferable.FixReferences(submodel, env?.AllSubmodels());
+                                submodel.RecurseOnSubmodelElements(null, (o, parents, sme) =>
+                                {
+                                    // upgrade
+                                    ExtendIReferable.FixReferences(sme, env?.AllSubmodels());
+
+                                    // recurse
+                                    return true;
+                                });
+
+                            }
+                            catch (Exception ex)
+                            {
+                                Log.Singleton.Error(
+                                    ex, $"While fixing References.");
+                            }
+
+                            // emit event for Submodel and children
+                            this.AddDiaryEntry(submodel, new DiaryEntryStructChange(), allChildrenAffected: true);
+
+                            return new AnyUiLambdaActionRedrawAllElements(nextFocus: smref, isExpanded: true);
+                        }
                         return new AnyUiLambdaActionNone();
                     });
 

src/AasxPluginBomStructure/AasxPluginBomStructure.Options.json

@@ -81,6 +81,7 @@
           "Width": 1.0,
           "Title": "isPartOf"
         },
+        // VWS4LS used "ConceptDescription"
         {
           "Match": {
             "type": "ConceptDescription",
@@ -113,9 +114,77 @@
           "Stroke": "Black",
           "Width": 1.0,
           "Title": "isPartOf"
+        },
+        // according IDTA 0211-1-1
+        {
+          "Match": {
+            "type": "GlobalReference",
+            "value": "https://admin-shell.io/idta/HierarchicalStructures/SameAs/1/0"
+          },
+          "Start": "Normal",
+          "End": "Normal",
+          "Stroke": "Black",
+          "Width": 1.0,
+          "Title": "sameAs"
+        },
+        {
+          "Match": {
+            "type": "GlobalReference",
+            "value": "https://admin-shell.io/idta/HierarchicalStructures/HasPart/1/0"
+          },
+          "Start": "None",
+          "End": "Normal",
+          "Stroke": "Black",
+          "Width": 1.0,
+          "Title": "hasPart"
+        },
+        {
+          "Match": {
+            "type": "GlobalReference",
+            "value": "https://admin-shell.io/idta/HierarchicalStructures/IsPartOf/1/0"
+          },
+          "Start": "None",
+          "End": "Normal",
+          "Stroke": "Black",
+          "Width": 1.0,
+          "Title": "isPartOf"
         }
       ],
       "NodeStyles": [
+        // according IDTA 0211-1-1
+        {
+          "Match": {
+            "type": "GlobalReference",
+            "value": "https://admin-shell.io/idta/HierarchicalStructures/EntryNode/1/0"
+          },
+          "Skip": false,
+          "Shape": "Circle",
+          "Background": "#7F99FF",
+          "Stroke": "#0128CB",
+          "LineWidth": 2.0,
+          "Radius": 0.0,
+          "FontSize": 8.0,
+          "Dashed": true,
+          "FontBold": false,
+          "Dotted": false
+        },
+        {
+          "Match": {
+            "type": "GlobalReference",
+            "value": "https://admin-shell.io/idta/HierarchicalStructures/Node/1/0"
+          },
+          "Skip": false,
+          "Shape": "Box",
+          "Background": "#DBE2FF",
+          "Stroke": "#0128CB",
+          "LineWidth": 1.0,
+          "Radius": 0.0,
+          "FontSize": 8.0,
+          "Dashed": true,
+          "FontBold": false,
+          "Dotted": false
+        },
+        // VWS4LS used "ConceptDescription"
         {
           "Match": {
             "type": "ConceptDescription",

src/AasxPluginBomStructure/GenericBomControl.cs

@@ -406,6 +406,7 @@ private Microsoft.Msagl.Drawing.Graph CreateGraph(
                 }
             }
 
+
             // make default or (already) preferred settings
             var settings = GivePresetSettings(options, graph.NodeCount);
             if (this.preferredPreset != null && sm != null
@@ -414,6 +415,8 @@ private Microsoft.Msagl.Drawing.Graph CreateGraph(
             if (settings != null)
                 graph.LayoutAlgorithmSettings = settings;
 
+            graph.Attr.LayerDirection = Microsoft.Msagl.Drawing.LayerDirection.LR;
+
 #endif
             return graph;
         }

src/AasxPluginBomStructure/GenericBomCreator.cs

@@ -607,6 +607,9 @@ public void RecurseOnLayout(
                         // includes AnnotatedRelationshipElement
                         x1 = this.FindReferableByReference(rel.First);
                         x2 = this.FindReferableByReference(rel.Second);
+
+                        if (x1 == null || x2 == null)
+                            ;
                     }
 
                     if (sme is Aas.IReferenceElement rfe)