Merge pull request #220 from INTO-CPS-Association/182-error-in-loadin…

…g-fmus-with-enumeration-type 182 Error in loading fmus with enumeration type
INTO-CPS-Association · Jul 9, 2023 · 7e87917 · 7e87917
2 parents decbd95 + a548ab7
commit 7e87917
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/angular2-app/coe/models/Fmu.ts b/src/angular2-app/coe/models/Fmu.ts
@@ -203,7 +203,12 @@ export class Fmu {
                         tNode = document.evaluate('String', thisNode, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue as Element;
                         if (tNode != null) {
                             type = ScalarVariableType.String;
-                    }
+                        } else {
+                            tNode = document.evaluate('Enumeration', thisNode, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue as Element;
+                            if(tNode != null) {
+                                type = ScalarVariableType.Enumeration;
+                            }
+                        }
                     }
                 }
             }
@@ -326,7 +331,7 @@ export class ScalarVariable {
     }
 }
 
-export enum ScalarVariableType { Real, Bool, Int, String, Unknown }
+export enum ScalarVariableType { Real, Bool, Int, String, Enumeration, Unknown }
 export function typeToString(type: ScalarVariableType) {
     switch (type) {
         case ScalarVariableType.Real:
@@ -337,6 +342,8 @@ export function typeToString(type: ScalarVariableType) {
             return "Integer";
         case ScalarVariableType.String:
             return "String";
+        case ScalarVariableType.Enumeration:
+            return "Enumeration";
         case ScalarVariableType.Unknown:
             return "unknown";
     }