* more SAMM models

* CD sort order structured * box icons
admin-shell-io · Oct 29, 2023 · 977c780 · 977c780
1 parent 9f3703c
commit 977c780
Show file tree

Hide file tree

Showing 11 changed files with 970 additions and 155 deletions.
diff --git a/src/AasxCore.Samm2_2_0/SammClasses.cs b/src/AasxCore.Samm2_2_0/SammClasses.cs
diff --git a/src/AasxCsharpLibrary/AdminShellCollections.cs b/src/AasxCsharpLibrary/AdminShellCollections.cs
@@ -48,6 +48,8 @@ public IEnumerable<List<V>> Keys
                 return dict.Values;
             }
         }
+
+        public void Clear() => dict.Clear();
     }
 
     public class DoubleSidedDict<T1, T2>

diff --git a/src/AasxCsharpLibrary/Extensions/ExtendConceptDescription.cs b/src/AasxCsharpLibrary/Extensions/ExtendConceptDescription.cs
@@ -310,5 +310,45 @@ public static void AddIsCaseOf(this IConceptDescription cd,
                 cd.IsCaseOf = new List<IReference>();
             cd.IsCaseOf.Add(ico);
         }
-    }
+
+		/// <summary>
+		/// Returns false, if there is another element with same idShort in the list
+		/// </summary>
+		public static bool CheckIdShortIsUnique(this List<IConceptDescription> cds, string idShort)
+		{
+			idShort = idShort?.Trim();
+			if (idShort == null || idShort.Length < 1)
+				return false;
+
+			var res = true;
+			foreach (var smw in cds)
+				if (smw != null && smw.IdShort != null && smw.IdShort == idShort)
+				{
+					res = false;
+					break;
+				}
+
+			return res;
+		}
+
+        /// <summary>
+        /// Creates ids with numerical index according to template string, until a unique idShort is found
+        /// </summary>
+		public static string IterateIdShortTemplateToBeUnique(this List<IConceptDescription> cds, string idShortTemplate, int maxNum)
+		{
+			if (idShortTemplate == null || maxNum < 1 || !idShortTemplate.Contains("{0"))
+				return null;
+
+			int i = 1;
+			while (i < maxNum)
+			{
+				var ids = string.Format(idShortTemplate, i);
+				if (cds.CheckIdShortIsUnique(ids))
+					return ids;
+				i++;
+			}
+
+			return null;
+		}
+	}
 }
diff --git a/src/AasxPackageExplorer/options-debug.MIHO.json b/src/AasxPackageExplorer/options-debug.MIHO.json
@@ -18,14 +18,15 @@
   /* "AasxToLoad": "C:\\MIHO\\Develop\\Aasx\\repo\\Festo_SPAU_VR3.aasx", */
   // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\PxC_aasT_2900542_ELR_H3_I_SC__24DC_500AC_0_6.aasx",
   // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\Festo_SPAU-B2R-H-G18FD-L-PNLK-PNVBA-M8U_V3c.aasx",
-  "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\TempDesktop\\230619 Digi Twin Festo AASX Assessment\\231002_Feedback_1\\8001203_64be10f8-d4c8-4226-a56b-901b9fcbe29c_fb1.aasx",
+  // "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\TempDesktop\\230619 Digi Twin Festo AASX Assessment\\231002_Feedback_1\\8001203_64be10f8-d4c8-4226-a56b-901b9fcbe29c_fb1.aasx",
   // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\01_Festo_SPAU_VR3_DPPV2.aasx",
   // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\bomtest1.aasx",
   // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\leitungssatz_tier1.aasx",
   // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\IDTA 02006-2-1_Template_Digital Nameplate_V3_lang.aasx",
   // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\SMT_Sample_B.aasx",
   // "AuxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\SMT_Sample_A.aasx",
   // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\00_FestoDemoBox-Module-2-Kopie2.aasx",
+  "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\samm_spiel.aasx",
   "WindowLeft": 200,
   "WindowTop": -1,
   "WindowWidth": 900,

diff --git a/src/AasxPackageLogic/DispEditHelperBasics.cs b/src/AasxPackageLogic/DispEditHelperBasics.cs
@@ -300,15 +300,17 @@ public void AddKeyValueExRef(
             string[] auxButtonToolTips = null,
             AnyUiLambdaActionBase takeOverLambdaAction = null,
             bool limitToOneRowForNoEdit = false,
-            int comboBoxMinWidth = -1)
+            int comboBoxMinWidth = -1,
+			bool noFirstColumnWidth = false)
         {
             AddKeyValue(
                 view, key, value, nullValue, repo, setValue, comboBoxItems, comboBoxIsEditable,
                 auxButtonTitle, auxButtonLambda, auxButtonToolTip,
                 auxButtonTitles, auxButtonToolTips, takeOverLambdaAction,
                 (value == null) ? 0 : value.GetHashCode(), containingObject: containingObject,
                 limitToOneRowForNoEdit: limitToOneRowForNoEdit,
-                comboBoxMinWidth: comboBoxMinWidth);
+                comboBoxMinWidth: comboBoxMinWidth,
+                noFirstColumnWidth: noFirstColumnWidth);
         }
 
         /// <summary>
@@ -344,7 +346,8 @@ public void AddKeyValue(
             Nullable<int> valueHash = null,
             object containingObject = null,
             bool limitToOneRowForNoEdit = false,
-            int comboBoxMinWidth = -1)
+            int comboBoxMinWidth = -1,
+            bool noFirstColumnWidth = false)
         {
             // draw anyway?
             if (repo != null && value == null)
@@ -380,7 +383,8 @@ public void AddKeyValue(
             g.Margin = new AnyUiThickness(0, 1, 0, 1);
             var gc1 = new AnyUiColumnDefinition();
             gc1.Width = AnyUiGridLength.Auto;
-            gc1.MinWidth = this.GetWidth(FirstColumnWidth.Standard);
+            if (!noFirstColumnWidth)
+                gc1.MinWidth = this.GetWidth(FirstColumnWidth.Standard);
             g.ColumnDefinitions.Add(gc1);
             var gc2 = new AnyUiColumnDefinition();
             gc2.Width = new AnyUiGridLength(1.0, AnyUiGridUnitType.Star);

diff --git a/src/AasxPackageLogic/DispEditHelperEntities.cs b/src/AasxPackageLogic/DispEditHelperEntities.cs
@@ -859,7 +859,7 @@ public void DisplayOrEditAasEntityAasEnv(
                             minWidth: 250,
                             items: new[] {
                             "List index", "idShort", "Identification", "By AasSubmodel",
-                            "By SubmodelElements"
+                            "By SubmodelElements", "Structured"
                         }),
                         (o) =>
                         {

diff --git a/src/AasxPackageLogic/DispEditHelperMiniModules.cs b/src/AasxPackageLogic/DispEditHelperMiniModules.cs
@@ -981,7 +981,8 @@ public void ExtensionHelper(
                     padding: new AnyUiThickness(5, 0, 5, 0));
 
                 // special case: SAMM extension
-                if (Samm.Util.HasSammSemanticId(extension))
+                // TODO: enable
+                if (false && Samm.Util.HasSammSemanticId(extension))
                 {
                     substack.Add(new AnyUiLabel()
                     {