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

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 *
@@ -19,10 +21,13 @@ from .M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import *
 from .M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import *
 from .M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import *
 from .M2.AUTOSARTemplates.CommonStructure import *
+from .M2.AUTOSARTemplates.CommonStructure.Filter import *
 from .M2.AUTOSARTemplates.CommonStructure.Implementation import *
 from .M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import *
 from .M2.AUTOSARTemplates.CommonStructure.InternalBehavior import *
 from .M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import *
+from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption import *
+from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.MemorySectionUsage import *
 from .M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import *
 from .M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import *
 from .M2.AUTOSARTemplates.CommonStructure.TriggerDeclaration import *
@@ -42,9 +47,17 @@ from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PerInstanceMem
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServerCall import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.Trigger import *
+from .M2.AUTOSARTemplates.SystemTemplate.DataMapping import *
+from .M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import *
+from .M2.AUTOSARTemplates.SystemTemplate.NetworkManagement import *
+from .M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Multiplatform import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanTopology import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinCommunication import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetFrame import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.ServiceInstances import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import *
-from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.EcuInstance import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.Timing import *

armodel/parser/abstract_arxml_parser.py

@@ -9,7 +9,7 @@ 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
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical, Boolean, Integer, TimeValue
 
 from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
@@ -73,7 +73,7 @@ class AbstractARXMLParser:
     '''
     
     def getChildElementLiteral(self, short_name: str, element: ET.Element, key: str) -> ARLiteral:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         if (child_element is not None):
             literal = ARLiteral()
             self.readElementAttributes(child_element, literal)
@@ -82,7 +82,7 @@ class AbstractARXMLParser:
         self._raiseError("The attribute %s of <%s> has not been defined" % (key, short_name))
         
     def getChildElementLiteralValueList(self, element: ET.Element, key: str) -> ARFloat:
-        child_elements = element.findall("./xmlns:%s" % key, self.nsmap)
+        child_elements = self.findall(element, key)
         results = []
         for child_element in child_elements:
             literal = ARLiteral()
@@ -91,10 +91,27 @@ class AbstractARXMLParser:
         return results
 
     def getChildElementOptionalLiteral(self, element: ET.Element, key: str) -> ARLiteral:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         literal = None
         if (child_element is not None):
-            self.logger.debug("readChildOptionalElementLiteral : %s" % child_element.text)
+            self.logger.debug("getChildElementOptionalLiteral : %s" % child_element.text)
+            literal = ARLiteral()
+            self.readElementAttributes(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 getChildElementOptionalRevisionLabelString(self, element: ET.Element, key: str) -> ARLiteral:
+        child_element = self.find(element, key)
+        literal = None
+        if (child_element is not None) and (child_element.text is not None):
+            self.logger.debug("getChildElementOptionalRevisionLabelString : %s" % child_element.text)
+            m = re.match(r'[0-9]+\.[0-9]+\.[0-9]+([\._;].*)?', child_element.text)
+            if not m:
+                raise ValueError("Invalid RevisionLabelString <%s>" % child_element.text)
             literal = ARLiteral()
             self.readElementAttributes(child_element, literal)
             # Patch for empty element <USED-CODE-GENERATOR></USED-CODE-GENERATOR>
@@ -110,7 +127,7 @@ class AbstractARXMLParser:
         return False
     
     def getChildElementOptionalFloatValue(self, element: ET.Element, key: str) -> ARFloat:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         float_value = None
         if (child_element is not None) and (child_element.text is not None):
             float_value = ARFloat()
@@ -118,26 +135,34 @@ class AbstractARXMLParser:
         return float_value
     
     def getChildElementFloatValueList(self, element: ET.Element, key: str) -> ARFloat:
-        child_elements = element.findall("./xmlns:%s" % key, self.nsmap)
+        child_elements = self.findall(element, key)
         results = []
         for child_element in child_elements:
             float_value = ARFloat()
             float_value.setValue(child_element.text)
             results.append(float_value)
         return results
+    
+    def getChildElementOptionalTimeValue(self, element: ET.Element, key: str) -> TimeValue:
+        child_element = self.find(element, key)
+        time_value = None
+        if (child_element is not None) and (child_element.text is not None):
+            time_value = TimeValue()
+            time_value.setValue(child_element.text)
+        return time_value
 
-    def getChildElementBooleanValue(self, short_name: str, element: ET.Element, key: str) -> ARBoolean:
+    def getChildElementBooleanValue(self, short_name: str, element: ET.Element, key: str) -> Boolean:
         literal = self.getChildElementLiteral(short_name, element, key)
-        bool_value = ARBoolean()
+        bool_value = Boolean()
         bool_value.timestamp = literal.timestamp
         bool_value.value = self._convertStringToBooleanValue(literal._value)
         return bool_value
 
-    def getChildElementOptionalBooleanValue(self, element: ET.Element, key: str) -> ARBoolean:
+    def getChildElementOptionalBooleanValue(self, element: ET.Element, key: str) -> Boolean:
         literal = self.getChildElementOptionalLiteral(element, key)
         if (literal == None):
             return None
-        bool_value = ARBoolean()
+        bool_value = Boolean()
         bool_value.timestamp = literal.timestamp
         bool_value.setValue(literal.getValue())
         return bool_value
@@ -162,16 +187,25 @@ class AbstractARXMLParser:
     '''
     
     def getChildElementOptionalNumericalValue(self, element: ET.Element, key: str) -> ARNumerical:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         if child_element == None:
             return None
         numerical = ARNumerical()
         self.readElementAttributes(child_element, numerical)
         numerical.setValue(child_element.text)
         return numerical
+    
+    def getChildElementOptionalIntegerValue(self, element: ET.Element, key: str) -> Integer:
+        child_element = self.find(element, key)
+        if child_element == None:
+            return None
+        numerical = Integer()
+        self.readElementAttributes(child_element, numerical)
+        numerical.setValue(child_element.text)
+        return numerical
         
     def getChildElementNumericalValueList(self, element: ET.Element, key: str) -> List[ARNumerical]:
-        child_elements = element.findall("./xmlns:%s" % key, self.nsmap)
+        child_elements = self.findall(element, key)
         results = []
         for child_element in child_elements:
             numerical = ARNumerical()
@@ -180,7 +214,7 @@ class AbstractARXMLParser:
         return results
     
     def getChildLimitElement(self, element: ET.Element, key: str) -> Limit:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         if (child_element is not None):
             limit = Limit()
             self.readElementAttributes(child_element, limit)
@@ -194,18 +228,21 @@ 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:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         if (child_element is not None):
             return self._getChildElementRefTypeDestAndValue(child_element)
         self._raiseError("The attribute %s of <%s> has not been defined" % (key, short_name))
 
     def getChildElementOptionalRefType(self, element:ET.Element, key: str) -> RefType:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         if (child_element is not None):
             return self._getChildElementRefTypeDestAndValue(child_element)
         return None