Jtikekar/GitHub issues 29

.gitignore

@@ -30,3 +30,5 @@ sample-aasx/
 /src/WpfMtpVisuViewer/Properties/AssemblyInfo.cs
 /src/WpfMtpControl/Properties/AssemblyInfo.cs
 /src/MsaglWpfControl/Properties/AssemblyInfo.cs
+/.vs/AASPE_Code/v17/.wsuo
+/.vs

src/AasxCsharpLibrary/AdminShellPackageEnv.cs

@@ -773,7 +773,7 @@ public bool SaveAs(string fn, bool writeFreshly = false, SerializationFormat pre
  System.Net.Mime.MediaTypeNames.Text.Plain, CompressionOption.Maximum);
  using (var s = originPart.GetStream(FileMode.Create))
  {
- var bytes = System.Text.Encoding.ASCII.GetBytes("Intentionally empty.");
+ var bytes = System.Text.Encoding.ASCII.GetBytes("Intentionally empty");
  s.Write(bytes, 0, bytes.Length);
  }
  package.CreateRelationship(
@@ -1086,8 +1086,11 @@ public void TemporarilySaveCloseAndReOpenPackage(
  finally
  {
  // even after failing of the lambda, the package shall be re-opened
- _openPackage = Package.Open(Filename, FileMode.OpenOrCreate);
- }
+ if (Filename.ToLower().EndsWith(".aasx"))
+ {
+ _openPackage = Package.Open(Filename, FileMode.OpenOrCreate);
+
+ } }
  }
 
  private int BackupIndex = 0;

src/AasxCsharpLibrary/Extensions/ExtendAssetAdministrationShell.cs

@@ -135,21 +135,24 @@ public static AssetAdministrationShell ConvertFromV10(this AssetAdministrationSh
  {
  foreach (var submodelRef in sourceAas.submodelRefs)
  {
- var keyList = new List<IKey>();
- foreach (var refKey in submodelRef.Keys)
+ if (!submodelRef.IsEmpty)
  {
- var keyType = Stringification.KeyTypesFromString(refKey.type);
- if (keyType != null)
+ var keyList = new List<IKey>();
+ foreach (var refKey in submodelRef.Keys)
  {
- keyList.Add(new Key((KeyTypes)keyType, refKey.value));
- }
- else
- {
- Console.WriteLine($"KeyType value {refKey.type} not found.");
+ var keyType = Stringification.KeyTypesFromString(refKey.type);
+ if (keyType != null)
+ {
+ keyList.Add(new Key((KeyTypes)keyType, refKey.value));
+ }
+ else
+ {
+ Console.WriteLine($"KeyType value {refKey.type} not found.");
+ }
  }
+ assetAdministrationShell.Submodels ??= new List<IReference>();
+ assetAdministrationShell.Submodels.Add(new Reference(ReferenceTypes.ModelReference, keyList)); 
  }
- assetAdministrationShell.Submodels ??= new List<IReference>();
- assetAdministrationShell.Submodels.Add(new Reference(ReferenceTypes.ModelReference, keyList));
  }
  }
 
@@ -220,21 +223,24 @@ public static AssetAdministrationShell ConvertFromV20(this AssetAdministrationSh
  {
  foreach (var submodelRef in sourceAas.submodelRefs)
  {
- var keyList = new List<IKey>();
- foreach (var refKey in submodelRef.Keys)
+ if (!submodelRef.IsEmpty)
  {
- var keyType = Stringification.KeyTypesFromString(refKey.type);
- if (keyType != null)
- {
- keyList.Add(new Key((KeyTypes)keyType, refKey.value));
- }
- else
+ var keyList = new List<IKey>();
+ foreach (var refKey in submodelRef.Keys)
  {
- Console.WriteLine($"KeyType value {refKey.type} not found.");
+ var keyType = Stringification.KeyTypesFromString(refKey.type);
+ if (keyType != null)
+ {
+ keyList.Add(new Key((KeyTypes)keyType, refKey.value));
+ }
+ else
+ {
+ Console.WriteLine($"KeyType value {refKey.type} not found.");
+ }
  }
+ assetAdministrationShell.Submodels ??= new List<IReference>();
+ assetAdministrationShell.Submodels.Add(new Reference(ReferenceTypes.ModelReference, keyList)); 
  }
- assetAdministrationShell.Submodels ??= new List<IReference>();
- assetAdministrationShell.Submodels.Add(new Reference(ReferenceTypes.ModelReference, keyList));
  }
  }
 

src/AasxCsharpLibrary/Extensions/ExtendEntity.cs

@@ -80,7 +80,10 @@ public static Entity ConvertFromV20(this Entity entity, AasxCompatibilityModels.
  {
  //TODO (jtikekar, 0000-00-00): whether to convert to Global or specific asset id
  var assetRef = ExtensionsUtil.ConvertReferenceFromV20(sourceEntity.assetRef, ReferenceTypes.ExternalReference);
- entity.GlobalAssetId = assetRef.GetAsIdentifier();
+ if (assetRef != null)
+ {
+ entity.GlobalAssetId = assetRef.GetAsIdentifier(); 
+ }
  }
 
  return entity;

src/AasxCsharpLibrary/Extensions/ExtendISubmodelElement.cs

@@ -261,8 +261,7 @@ public static ISubmodelElement ConvertFromV10(this ISubmodelElement submodelElem
  var newSecond = ExtensionsUtil.ConvertReferenceFromV10(sourceRelationshipElement.second, ReferenceTypes.ModelReference);
  outputSubmodelElement = new RelationshipElement(newFirst, newSecond);
  }
-
- if (sourceSubmodelElement is AdminShellV10.Operation sourceOperation)
+ else if (sourceSubmodelElement is AdminShellV10.Operation sourceOperation)
  {
  var newInputVariables = new List<IOperationVariable>();
  var newOutputVariables = new List<IOperationVariable>();
@@ -280,6 +279,7 @@ public static ISubmodelElement ConvertFromV10(this ISubmodelElement submodelElem
  }
  }
  }
+
  if (!sourceOperation.valueOut.IsNullOrEmpty())
  {
  foreach (var outputVariable in sourceOperation.valueOut)
@@ -297,8 +297,10 @@ public static ISubmodelElement ConvertFromV10(this ISubmodelElement submodelElem
  outputSubmodelElement = new Operation(inputVariables: newInputVariables, outputVariables: newOutputVariables);
  }
 
-
- outputSubmodelElement.BasicConversionFromV10(sourceSubmodelElement);
+ if (outputSubmodelElement != null)
+ {
+ outputSubmodelElement.BasicConversionFromV10(sourceSubmodelElement); 
+ }
  }
 
  return outputSubmodelElement;
@@ -496,7 +498,10 @@ public static ISubmodelElement ConvertFromV20(this ISubmodelElement submodelElem
  outputSubmodelElement = new Capability();
  }
 
- outputSubmodelElement.BasicConversionFromV20(sourceSubmodelElement);
+ if (outputSubmodelElement != null)
+ {
+ outputSubmodelElement.BasicConversionFromV20(sourceSubmodelElement); 
+ }
  }
 
  return outputSubmodelElement;

src/AasxPackageLogic/DispEditHelperEntities.cs

@@ -1307,7 +1307,8 @@ public void DisplayOrEditAasEntityAas(
  if (ks != null)
  {
  // create ref
- var smr = new Aas.Reference(Aas.ReferenceTypes.ExternalReference, new List<Aas.IKey>(ks));
+ //var smr = new Aas.Reference(Aas.ReferenceTypes.ExternalReference, new List<Aas.IKey>(ks));
+ var smr = new Aas.Reference(Aas.ReferenceTypes.ModelReference, new List<Aas.IKey>(ks));
  aas.Submodels.Add(smr);
 
  // event for AAS

src/AasxPluginDigitalNameplate/NameplateAnyUiControl.cs

@@ -990,7 +990,7 @@ public AnyUiFrameworkElement RenderAnyUiNameplateData(
  statement: ((plate.DateOfManufacture?.HasContent() == true)
  ? new IndexStatement(Quality.Good, statement: "Is given.")
  : new IndexStatement(Quality.Warn, statement: "Should be given."))
- .Set(description: "SerialNumber:\n" +
+ .Set(description: "DateOfManufacture:\n" +
  "Date from which the production and / or development process is completed or " +
  "from which a service is provided completely."));