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

armodel/models/M2/MSR/AsamHdo/ComputationMethod.py

@@ -1,7 +1,7 @@
 from typing import List
 from abc import ABCMeta
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
-from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, CIdentifier, Identifier, PositiveUnlimitedInteger, String
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Limit
@@ -23,18 +23,35 @@ class CompuConst(ARObject):
     def __init__(self):
         super().__init__()
 
-        self.compu_const_content_type = None    # type: CompuConstContent
+        self.compuConstContentType = None           # type: CompuConstContent
 
+    def getCompuConstContentType(self):
+        return self.compuConstContentType
+
+    def setCompuConstContentType(self, value):
+        self.compuConstContentType = value
+        return self
 
 class Compu(ARObject):
     def __init__(self):
         super().__init__()
 
-        '''required'''
-        self.compu_content = None           # type: CompuContent
+        self.compuContent = None                    # type: CompuContent
+        self.compuDefaultValue = None               # type: CompuConst
+
+    def getCompuContent(self):
+        return self.compuContent
+
+    def setCompuContent(self, value):
+        self.compuContent = value
+        return self
 
-        '''optional'''
-        self.compu_default_value = None     # type: CompuConst
+    def getCompuDefaultValue(self):
+        return self.compuDefaultValue
+
+    def setCompuDefaultValue(self, value):
+        self.compuDefaultValue = value
+        return self
 
 
 class CompuConstContent(ARObject, metaclass=ABCMeta):
@@ -62,6 +79,12 @@ class CompuConstTextContent(CompuConstContent):
 
         self.vt = None
 
+    def getVt(self):
+        return self.vt
+
+    def setVt(self, value):
+        self.vt = value
+        return self
 
 class CompuConstNumericContent(CompuConstContent):
 
@@ -70,6 +93,12 @@ class CompuConstNumericContent(CompuConstContent):
 
         self.v = None
 
+    def getV(self):
+        return self.v
+
+    def setV(self, value):
+        self.v = value
+        return self
 
 class CompuScaleContents(ARObject, metaclass=ABCMeta):
     def __init__(self):
@@ -83,8 +112,14 @@ class CompuScaleConstantContents(CompuScaleContents):
     def __init__(self):
         super().__init__()
 
-        self.compu_const = None     # type: CompuConst
+        self.compuConst = None     # type: CompuConst
+
+    def getCompuConst(self):
+        return self.compuConst
 
+    def setCompuConst(self, value):
+        self.compuConst = value
+        return self
 
 class CompuRationalCoeffs(ARObject):
     '''
@@ -95,9 +130,22 @@ class CompuRationalCoeffs(ARObject):
     def __init__(self):
         super().__init__()
 
-        self.compu_denominator = None   # type: CompuNominatorDenominator
-        self.compu_numerator = None     # type: CompuNominatorDenominator
+        self.compuDenominator = None   # type: CompuNominatorDenominator
+        self.compuNumerator = None     # type: CompuNominatorDenominator
+
+    def getCompuDenominator(self):
+        return self.compuDenominator
+
+    def setCompuDenominator(self, value):
+        self.compuDenominator = value
+        return self
 
+    def getCompuNumerator(self):
+        return self.compuNumerator
+
+    def setCompuNumerator(self, value):
+        self.compuNumerator = value
+        return self
 
 class CompuScaleRationalFormula(CompuScaleContents):
     '''
@@ -106,8 +154,14 @@ class CompuScaleRationalFormula(CompuScaleContents):
     def __init__(self):
         super().__init__()
 
-        self.compu_rational_coeffs = None   # type: CompuRationalCoeffs
+        self.compuRationalCoeffs = None         # type: CompuRationalCoeffs
+
+    def getCompuRationalCoeffs(self):
+        return self.compuRationalCoeffs
 
+    def setCompuRationalCoeffs(self, value):
+        self.compuRationalCoeffs = value
+        return self
 
 class CompuNominatorDenominator(ARObject):
     '''
@@ -131,25 +185,90 @@ class CompuScale(Compu):
     def __init__(self):
         super().__init__()
 
-        self.symbol = None                      # type: ARLiteral
-        self.lowerLimit = None                  # type: Limit
-        self.upperLimit = None                  # type: Limit
-        self.compuInverseValue = None           # type: CompuConst
-        self.compuScaleContents = None          # type: CompuScaleContents
-        self.short_label = None                 # type: ARLiteral
+        self.a2lDisplayText = None                              # type: String
+        self.compuInverseValue = None                           # type: CompuConst
+        self.compuScaleContents = None                          # type: CompuScaleContents
+        self.desc = None                                        # type: MultiLanguageOverviewParagraph
+        self.lowerLimit = None                                  # type: Limit
+        self.mask = None                                        # type: PositiveUnlimitedInteger
+        self.shortLabel = None                                  # type: Identifier
+        self.symbol = None                                      # type: CIdentifier
+        self.upperLimit = None                                  # type: Limit
+
+    def getA2lDisplayText(self):
+        return self.a2lDisplayText
+
+    def setA2lDisplayText(self, value):
+        self.a2lDisplayText = value
+        return self
+
+    def getCompuInverseValue(self):
+        return self.compuInverseValue
+
+    def setCompuInverseValue(self, value):
+        self.compuInverseValue = value
+        return self
+
+    def getCompuScaleContents(self):
+        return self.compuScaleContents
+
+    def setCompuScaleContents(self, value):
+        self.compuScaleContents = value
+        return self
+
+    def getDesc(self):
+        return self.desc
 
+    def setDesc(self, value):
+        self.desc = value
+        return self
+
+    def getLowerLimit(self):
+        return self.lowerLimit
+
+    def setLowerLimit(self, value):
+        self.lowerLimit = value
+        return self
+
+    def getMask(self):
+        return self.mask
+
+    def setMask(self, value):
+        self.mask = value
+        return self
+
+    def getShortLabel(self):
+        return self.shortLabel
+
+    def setShortLabel(self, value):
+        self.shortLabel = value
+        return self
+
+    def getSymbol(self):
+        return self.symbol
+
+    def setSymbol(self, value):
+        self.symbol = value
+        return self
+
+    def getUpperLimit(self):
+        return self.upperLimit
+
+    def setUpperLimit(self, value):
+        self.upperLimit = value
+        return self
 
 class CompuScales(CompuContent):
     def __init__(self):
         super().__init__()
 
-        self.compu_scales = []              # type: List[CompuScale]
+        self.compuScales = []              # type: List[CompuScale]
 
     def addCompuScale(self, compu_scale: CompuScale):
-        self.compu_scales.append(compu_scale)
+        self.compuScales.append(compu_scale)
 
     def getCompuScales(self) -> List[CompuScale]:
-        return self.compu_scales
+        return self.compuScales
 
 
 class CompuMethod(ARElement):
@@ -158,7 +277,35 @@ class CompuMethod(ARElement):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.compu_internal_to_phys = None  # type: Compu
-        self.compu_phys_to_internal = None  # type: Compu
-        self.display_format = None          # type: DisplayFormatString
-        self.unit_ref = None                # type: RefType
+        self.compuInternalToPhys = None     # type: Compu
+        self.compuPhysToInternal = None     # type: Compu
+        self.displayFormat = None           # type: DisplayFormatString
+        self.unitRef = None                 # type: RefType
+
+    def getCompuInternalToPhys(self):
+        return self.compuInternalToPhys
+
+    def setCompuInternalToPhys(self, value):
+        self.compuInternalToPhys = value
+        return self
+
+    def getCompuPhysToInternal(self):
+        return self.compuPhysToInternal
+
+    def setCompuPhysToInternal(self, value):
+        self.compuPhysToInternal = value
+        return self
+
+    def getDisplayFormat(self):
+        return self.displayFormat
+
+    def setDisplayFormat(self, value):
+        self.displayFormat = value
+        return self
+
+    def getUnitRef(self):
+        return self.unitRef
+
+    def setUnitRef(self, value):
+        self.unitRef = value
+        return self

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

@@ -8,7 +8,7 @@ class SwAddrMethod(Identifiable):
         super().__init__(parent, short_name)
 
         self.memoryAllocationKeywordPolicy = None   # type: ARLiteral
-        self.option = []                            # type: List[ARLiteral]
+        self.options = []                            # type: List[ARLiteral]
         self.sectionInitializationPolicy = None     # type: ARLiteral
         self.sectionType = None                     # type: ARLiteral
 
@@ -19,11 +19,11 @@ class SwAddrMethod(Identifiable):
         self.memoryAllocationKeywordPolicy = value
         return self
 
-    def getOption(self):
-        return self.option
+    def getOptions(self):
+        return self.options
 
     def addOption(self, value):
-        self.option.append(value)
+        self.options.append(value)
         return self
 
     def getSectionInitializationPolicy(self):

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/__init__.py

@@ -44,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:
@@ -262,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