armodel 1.7.0__py3-none-any.whl → 1.7.2__py3-none-any.whl

armodel/models/M2/MSR/DataDictionary/RecordLayout.py

@@ -1,6 +1,6 @@
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
-from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, RefType
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, Integer, RefType
 from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph
 
 class SwRecordLayoutV(ARObject):
@@ -16,29 +16,64 @@ class SwRecordLayoutV(ARObject):
         self.swRecordLayoutVIndex = None                # type: ARLiteral
         self.swRecordLayoutVProp = None                 # type: ARLiteral
 
-    def setShortLabel(self, short_label: ARLiteral):
-        self.shortLabel = short_label
+    def getBaseTypeRef(self):
+        return self.baseTypeRef
+
+    def setBaseTypeRef(self, value):
+        self.baseTypeRef = value
+        return self
+
+    def getDesc(self):
+        return self.desc
+
+    def setDesc(self, value):
+        self.desc = value
+        return self
+
+    def getShortLabel(self):
+        return self.shortLabel
+
+    def setShortLabel(self, value):
+        self.shortLabel = value
         return self
 
-    def setBaseTypeRef(self, ref: RefType):
-        self.baseTypeRef = ref
+    def getSwGenericAxisParamTypeRef(self):
+        return self.swGenericAxisParamTypeRef
+
+    def setSwGenericAxisParamTypeRef(self, value):
+        self.swGenericAxisParamTypeRef = value
         return self
 
-    def setSwRecordLayoutVAxis(self, axis: ARNumerical):
-        self.swRecordLayoutVAxis = axis
+    def getSwRecordLayoutVAxis(self):
+        return self.swRecordLayoutVAxis
+
+    def setSwRecordLayoutVAxis(self, value):
+        self.swRecordLayoutVAxis = value
         return self
 
-    def setSwRecordLayoutVFixValue(self, value: ARNumerical):
+    def getSwRecordLayoutVFixValue(self):
+        return self.swRecordLayoutVFixValue
+
+    def setSwRecordLayoutVFixValue(self, value):
         self.swRecordLayoutVFixValue = value
         return self
 
-    def setSwRecordLayoutVIndex(self, index: ARLiteral):
-        self.swRecordLayoutVIndex = index
+    def getSwRecordLayoutVIndex(self):
+        return self.swRecordLayoutVIndex
+
+    def setSwRecordLayoutVIndex(self, value):
+        self.swRecordLayoutVIndex = value
         return self
 
-    def setSwRecordLayoutVProp(self, prop: ARLiteral):
-        self.swRecordLayoutVProp = prop
+    def getSwRecordLayoutVProp(self):
+        return self.swRecordLayoutVProp
+
+    def setSwRecordLayoutVProp(self, value):
+        self.swRecordLayoutVProp = value
         return self
+
+
+    
     
 class SwRecordLayoutGroupContent(ARObject):
     def __init__(self):
@@ -48,6 +83,27 @@ class SwRecordLayoutGroupContent(ARObject):
         self.swRecordLayoutGroup = None                 # type: SwRecordLayoutGroup
         self.swRecordLayoutV = None                     # type: SwRecordLayoutV
 
+    def getSwRecordLayoutRef(self):
+        return self.swRecordLayoutRef
+
+    def setSwRecordLayoutRef(self, value):
+        self.swRecordLayoutRef = value
+        return self
+
+    def getSwRecordLayoutGroup(self):
+        return self.swRecordLayoutGroup
+
+    def setSwRecordLayoutGroup(self, value):
+        self.swRecordLayoutGroup = value
+        return self
+
+    def getSwRecordLayoutV(self):
+        return self.swRecordLayoutV
+
+    def setSwRecordLayoutV(self, value):
+        self.swRecordLayoutV = value
+        return self
+
 
 class SwRecordLayoutGroup(ARObject):
     def __init__(self):
@@ -60,53 +116,87 @@ class SwRecordLayoutGroup(ARObject):
         self.swRecordLayoutComponent = None             # type: ARLiteral
         self.swRecordLayoutGroupAxis = None             # type: ARNumerical
         self.swRecordLayoutGroupContentType = None      # type: SwRecordLayoutGroupContent
-        self.swRecordLayoutGroupIndex = None            # type: ARLiteral
         self.swRecordLayoutGroupFrom = None             # type: ARLiteral
+        self.swRecordLayoutGroupIndex = None            # type: ARLiteral
+        self.swRecordLayoutGroupStep = None             # type: Integer
         self.swRecordLayoutGroupTo = None               # type: ARLiteral 
 
+    def getCategory(self):
+        return self.category
 
-    def setCategory(self, category: ARLiteral):
-        self.category = category
+    def setCategory(self, value):
+        self.category = value
         return self
 
-    def setDesc(self, desc):
-        self.desc = desc
-        return self
+    def getDesc(self):
+        return self.desc
 
-    def setShortLabel(self, label: ARLiteral):
-        self.shortLabel = label
+    def setDesc(self, value):
+        self.desc = value
         return self
 
-    def setSwGenericAxisParamTypeRef(self, ref: RefType):
-        self.swGenericAxisParamTypeRef = ref
+    def getShortLabel(self):
+        return self.shortLabel
+
+    def setShortLabel(self, value):
+        self.shortLabel = value
         return self
 
-    def setSwRecordLayoutComponent(self, component: ARLiteral):
-        self.swRecordLayoutComponent = component
+    def getSwGenericAxisParamTypeRef(self):
+        return self.swGenericAxisParamTypeRef
+
+    def setSwGenericAxisParamTypeRef(self, value):
+        self.swGenericAxisParamTypeRef = value
         return self
 
-    def setSwRecordLayoutGroupAxis(self, axis: ARNumerical):
-        self.swRecordLayoutGroupAxis = axis
+    def getSwRecordLayoutComponent(self):
+        return self.swRecordLayoutComponent
+
+    def setSwRecordLayoutComponent(self, value):
+        self.swRecordLayoutComponent = value
         return self
 
-    def setSwRecordLayoutGroupIndex(self, index: ARLiteral):
-        self.swRecordLayoutGroupIndex = index
+    def getSwRecordLayoutGroupAxis(self):
+        return self.swRecordLayoutGroupAxis
+
+    def setSwRecordLayoutGroupAxis(self, value):
+        self.swRecordLayoutGroupAxis = value
         return self
 
-    def setSwRecordLayoutGroupFrom(self, from_value: ARLiteral):
-        self.swRecordLayoutGroupFrom = from_value
+    def getSwRecordLayoutGroupContentType(self):
+        return self.swRecordLayoutGroupContentType
+
+    def setSwRecordLayoutGroupContentType(self, value):
+        self.swRecordLayoutGroupContentType = value
         return self
 
-    def setSwRecordLayoutGroupTo(self, to_value: ARLiteral):
-        self.swRecordLayoutGroupTo = to_value
+    def getSwRecordLayoutGroupFrom(self):
+        return self.swRecordLayoutGroupFrom
+
+    def setSwRecordLayoutGroupFrom(self, value):
+        self.swRecordLayoutGroupFrom = value
         return self
 
-    def setSwRecordLayoutGroupContentType(self, content_type: SwRecordLayoutGroupContent):
-        self.swRecordLayoutGroupContentType = content_type
+    def getSwRecordLayoutGroupIndex(self):
+        return self.swRecordLayoutGroupIndex
+
+    def setSwRecordLayoutGroupIndex(self, value):
+        self.swRecordLayoutGroupIndex = value
         return self
 
+    def getSwRecordLayoutGroupStep(self):
+        return self.swRecordLayoutGroupStep
 
+    def setSwRecordLayoutGroupStep(self, value):
+        self.swRecordLayoutGroupStep = value
+        return self
 
+    def getSwRecordLayoutGroupTo(self):
+        return self.swRecordLayoutGroupTo
+
+    def setSwRecordLayoutGroupTo(self, value):
+        self.swRecordLayoutGroupTo = value
+        return self
 
 class SwRecordLayout(ARElement):
     def __init__(self, parent: ARObject, short_name: str):
@@ -114,6 +204,9 @@ class SwRecordLayout(ARElement):
 
         self.swRecordLayoutGroup = None                 # type: SwRecordLayoutGroup
 
-    def setSwRecordLayoutGroup(self, group: SwRecordLayoutGroup):
-        self.swRecordLayoutGroup = group
-        return self
+    def getSwRecordLayoutGroup(self):
+        return self.swRecordLayoutGroup
+
+    def setSwRecordLayoutGroup(self, value):
+        self.swRecordLayoutGroup = value
+        return self

armodel/models/M2/MSR/Documentation/Annotation.py

@@ -1,4 +1,4 @@
-from ....M2.MSR.Documentation.BlockElements import DocumentationBlock
+from .TextModel.BlockElements import DocumentationBlock
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
 from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultilanguageLongName

armodel/models/M2/MSR/Documentation/TextModel/BlockElements/ListElements.py

@@ -0,0 +1,54 @@
+from typing import List
+
+from ......M2.MSR.Documentation.TextModel.BlockElements.PaginationAndView import Paginateable
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import AREnum
+
+class ListEnum(AREnum):
+
+    NUMBER = 'number'
+    UNNUMBER = 'unnumber'
+
+    def __init__(self,):
+        super().__init__((
+            ListEnum.NUMBER,
+            ListEnum.UNNUMBER
+        ))
+
+class Item(Paginateable):
+    def __init__(self):
+        super().__init__()
+
+        self.itemContents = None                    
+
+    def getItemContents(self):
+        return self.itemContents
+
+    def setItemContents(self, value):
+        self.itemContents = value
+        return self
+
+class ListElement(Paginateable):
+    '''
+        This meta-class represents the ability to express a list. The kind of list is specified in the attribute.
+        In AUTOSAR standard class name shall be List, but it is conflict with Python List and renamed to ListElement
+    '''
+    def __init__(self):
+        super().__init__()
+
+        self.items = []                         # type: List[Item]
+        self.type = None                        # type: ListEnum
+
+    def getItems(self):
+        return self.items
+
+    def addItem(self, value: Item):
+        self.items.append(value)
+        return self
+
+    def getType(self):
+        return self.type
+
+    def setType(self, value):
+        self.type = value
+        return self
+

armodel/models/M2/MSR/Documentation/TextModel/BlockElements/PaginationAndView.py

@@ -0,0 +1,9 @@
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+
+class DocumentViewSelectable(ARObject):
+    def __init__(self):
+        super().__init__()
+
+class Paginateable(DocumentViewSelectable):
+    def __init__(self):
+        super().__init__()

armodel/models/M2/MSR/Documentation/TextModel/BlockElements/__init__.py

@@ -0,0 +1,25 @@
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ......M2.MSR.Documentation.TextModel.BlockElements.ListElements import ListElement
+from ......M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageParagraph
+from typing import List
+
+class DocumentationBlock(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.ps = []                                # type: List[MultiLanguageParagraph]
+        self.lists = []                             # type: List[ListElement]
+
+    def addP(self, p: MultiLanguageParagraph):
+        self.ps.append(p)
+        return self
+
+    def getPs(self) -> List[MultiLanguageParagraph]:
+        return self.ps
+    
+    def getLists(self):
+        return self.lists
+
+    def addList(self, value):
+        self.lists.append(value)
+        return self

armodel/models/M2/MSR/Documentation/TextModel/LanguageDataModel.py

@@ -1,16 +1,44 @@
+from abc import ABCMeta
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
-class LOverviewParagraph(ARObject):
+class LEnum (ARLiteral):
     def __init__(self):
         super().__init__()
 
-        self.l = ""
+class LanguageSpecific(ARObject, metaclass = ABCMeta):
+    def __init__(self):
+        super().__init__()
+
+        self.l = None                   # type: LEnum
         self.value = ""
 
+    def getL(self):
+        return self.l
+
+    def setL(self, value):
+        self.l = value
+        return self
 
-class LLongName(ARObject):
+    def getValue(self):
+        return self.value
+
+    def setValue(self, value):
+        self.value = value
+        return self
+
+class LOverviewParagraph(LanguageSpecific):
     def __init__(self):
         super().__init__()
 
-        self.l = ""
-        self.value = ""
+class LParagraph(LanguageSpecific):
+    def __init__(self):
+        super().__init__()
+
+class LLongName(LanguageSpecific):
+    def __init__(self):
+        super().__init__()
+
+class LPlainText(LanguageSpecific):
+    def __init__(self):
+        super().__init__()

armodel/models/M2/MSR/Documentation/TextModel/MultilanguageData.py

@@ -35,11 +35,24 @@ class MultilanguageLongName(ARObject):
     def __init__(self):
         super().__init__()
 
-        self.l4 = []        # type：List[LLongName]
+        self.l4 = []                            # type：List[LLongName]
 
     def addL4(self, l4: LLongName):
         self.l4.append(l4)
         return self
 
     def getL4s(self) -> List[LLongName]:
-        return self.l4
+        return self.l4
+    
+class MultiLanguagePlainText(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.l10s = []                       # type: List[LPlainText]
+
+    def getL10s(self):
+        return self.l10s
+
+    def addL10(self, value):
+        self.l10s.append(value)
+        return self

armodel/models/M2/MSR/Documentation/__init__.py

@@ -1,3 +1,3 @@
 from .Annotation import *
-from .BlockElements import *
+from .TextModel.BlockElements import *
 from .TextModel import *

armodel/models/__init__.py

@@ -8,8 +8,10 @@ from .M2.MSR.AsamHdo.Constraints.GlobalConstraints import *
 from .M2.MSR.DataDictionary import *
 from .M2.MSR.Documentation import *
 from .M2.MSR.Documentation.Annotation import *
-from .M2.MSR.Documentation.BlockElements import *
 from .M2.MSR.Documentation.TextModel import *
+from .M2.MSR.Documentation.TextModel.BlockElements import *
+from .M2.MSR.Documentation.TextModel.BlockElements.ListElements import *
+from .M2.MSR.Documentation.TextModel.BlockElements.PaginationAndView import *
 from .M2.MSR.Documentation.TextModel.LanguageDataModel import *
 from .M2.MSR.Documentation.TextModel.MultilanguageData import *
 from .M2.AUTOSARTemplates.AutosarTopLevelStructure import *
@@ -42,6 +44,7 @@ from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTy
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.InstanceRefsUsage import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ModeDeclarationGroup import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PerInstanceMemory import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.RTEEvents import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServerCall import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.Trigger import *

armodel/parser/abstract_arxml_parser.py

@@ -1,4 +1,3 @@
-
 from abc import ABCMeta
 from typing import List
 from colorama import Fore
@@ -8,15 +7,12 @@ import logging
 import xml.etree.ElementTree as ET
 
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical, Boolean, Integer, TimeValue
-
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import AREnum, ARFloat, ARLiteral, ARNumerical, Boolean, Integer, PositiveInteger, TimeValue
 from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Limit
 
-
 class AbstractARXMLParser:
     __metaclass__ = ABCMeta
      
@@ -49,6 +45,12 @@ class AbstractARXMLParser:
         else:
             raise ValueError(error_msg)
         
+    def notImplemented(self, error_msg):
+        if (self.options['warning'] == True):
+            self.logger.error(Fore.RED + error_msg + Fore.WHITE)
+        else:
+            raise NotImplementedError(error_msg)
+        
     def _raiseWarning(self, error_msg):
         self.logger.warning(error_msg)
         
@@ -76,7 +78,7 @@ class AbstractARXMLParser:
         child_element = self.find(element, key)
         if (child_element is not None):
             literal = ARLiteral()
-            self.readElementAttributes(child_element, literal)
+            self.readARObjectAttributes(child_element, literal)
             literal._value = child_element.text
             return literal
         self._raiseError("The attribute %s of <%s> has not been defined" % (key, short_name))
@@ -96,7 +98,7 @@ class AbstractARXMLParser:
         if (child_element is not None):
             self.logger.debug("getChildElementOptionalLiteral : %s" % child_element.text)
             literal = ARLiteral()
-            self.readElementAttributes(child_element, literal)
+            self.readARObjectAttributes(child_element, literal)
             # Patch for empty element <USED-CODE-GENERATOR></USED-CODE-GENERATOR>
             if child_element.text is None:      
                 literal.setValue("")
@@ -113,14 +115,14 @@ class AbstractARXMLParser:
             if not m:
                 raise ValueError("Invalid RevisionLabelString <%s>" % child_element.text)
             literal = ARLiteral()
-            self.readElementAttributes(child_element, literal)
+            self.readARObjectAttributes(child_element, literal)
             # Patch for empty element <USED-CODE-GENERATOR></USED-CODE-GENERATOR>
             if child_element.text is None:      
                 literal.setValue("")
             else:
                 literal.setValue(child_element.text)
         return literal
-
+    
     def _convertStringToBooleanValue(self, value: str) -> bool:
         if (value == "true"):
             return True
@@ -191,7 +193,7 @@ class AbstractARXMLParser:
         if child_element == None:
             return None
         numerical = ARNumerical()
-        self.readElementAttributes(child_element, numerical)
+        self.readARObjectAttributes(child_element, numerical)
         numerical.setValue(child_element.text)
         return numerical
     
@@ -200,8 +202,19 @@ class AbstractARXMLParser:
         if child_element == None:
             return None
         numerical = Integer()
-        self.readElementAttributes(child_element, numerical)
+        self.readARObjectAttributes(child_element, numerical)
+        numerical.setValue(child_element.text)
+        return numerical
+    
+    def getChildElementOptionalPositiveInteger(self, element: ET.Element, key: str) -> PositiveInteger:
+        child_element = self.find(element, key)
+        if child_element == None:
+            return None
+        numerical = PositiveInteger()
+        self.readARObjectAttributes(child_element, numerical)
         numerical.setValue(child_element.text)
+        if numerical.getValue() < 0:
+            raise ValueError("Invalid PositiveInteger <%s>" % child_element.text)
         return numerical
         
     def getChildElementNumericalValueList(self, element: ET.Element, key: str) -> List[ARNumerical]:
@@ -217,7 +230,7 @@ class AbstractARXMLParser:
         child_element = self.find(element, key)
         if (child_element is not None):
             limit = Limit()
-            self.readElementAttributes(child_element, limit)
+            self.readARObjectAttributes(child_element, limit)
             if ('INTERVAL-TYPE' in child_element.attrib):
                 limit.intervalType = child_element.attrib['INTERVAL-TYPE']
             else:
@@ -228,8 +241,11 @@ class AbstractARXMLParser:
     
     def _getChildElementRefTypeDestAndValue(self, element) -> RefType:
         ref = RefType()
-        ref.dest = element.attrib['DEST']
-        ref.value = element.text
+        if 'BASE' in element.attrib:
+            ref.setBase(element.attrib['BASE'])
+        if 'DEST' in element.attrib:
+            ref.setDest(element.attrib['DEST'])
+        ref.setValue(element.text)
         return ref
 
     def getChildElementRefType(self, short_name: str, element: ET.Element, key: str) -> RefType:
@@ -259,7 +275,7 @@ class AbstractARXMLParser:
             return element.attrib[key]
         return None
     
-    def readElementAttributes(self, element: ET.Element, ar_object: ARObject):
+    def readARObjectAttributes(self, element: ET.Element, ar_object: ARObject):
         ar_object.timestamp = self.readElementOptionalAttrib(element, "T")             # read the timestamp
         ar_object.uuid      = self.readElementOptionalAttrib(element, "UUID")          # read the uuid