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

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 *

armodel/parser/abstract_arxml_parser.py

@@ -228,8 +228,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:

armodel/parser/arxml_parser.py

@@ -2,10 +2,6 @@ from typing import List
 import xml.etree.ElementTree as ET
 import os
 
-
-
-
-
 from ..models.M2.MSR.AsamHdo.AdminData import AdminData
 from ..models.M2.MSR.AsamHdo.BaseTypes import BaseTypeDirectDefinition
 from ..models.M2.MSR.AsamHdo.Constraints.GlobalConstraints import DataConstrRule, InternalConstrs, PhysConstrs, DataConstr
@@ -20,9 +16,10 @@ from ..models.M2.MSR.DataDictionary.DataDefProperties import ValueList
 from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayoutGroup
 from ..models.M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxisSet
 from ..models.M2.MSR.Documentation.Annotation import Annotation, GeneralAnnotation
-from ..models.M2.MSR.Documentation.BlockElements import DocumentationBlock
-from ..models.M2.MSR.Documentation.TextModel.LanguageDataModel import LLongName, LOverviewParagraph
-from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph, MultiLanguageParagraph, MultilanguageLongName
+from ..models.M2.MSR.Documentation.TextModel.BlockElements import DocumentationBlock
+from ..models.M2.MSR.Documentation.TextModel.BlockElements.ListElements import ListElement
+from ..models.M2.MSR.Documentation.TextModel.LanguageDataModel import LLongName, LOverviewParagraph, LParagraph, LanguageSpecific
+from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph, MultiLanguageParagraph, MultiLanguagePlainText, MultilanguageLongName
 
 from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswInternalBehavior, BswModuleEntity, BswScheduleEvent, BswModeSenderPolicy
@@ -45,7 +42,7 @@ from ..models.M2.AUTOSARTemplates.ECUCDescriptionTemplate import EcucAbstractRef
 from ..models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AnyInstanceRef
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, MultilanguageReferrable
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.EngineeringObject import AutosarEngineeringObject, EngineeringObject
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage, ReferenceBase
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType, ARLiteral
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PortAPIOptions import PortAPIOption, PortDefinedArgumentValue
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.RTEEvents import DataReceivedEvent, OperationInvokedEvent, RTEEvent, SwcModeSwitchEvent
@@ -117,13 +114,17 @@ class ARXMLParser(AbstractARXMLParser):
         for child_element in self.findall(element, "./SDGS/SDG"):
             admin_data.addSdg(self.getSdg(child_element))
     
-    def readAdminData(self, element: ET.Element, identifiable: Identifiable):
-        child_element = self.find(element, "./ADMIN-DATA")
+    def getAdminData(self, element: ET.Element, key: str) -> AdminData:
+        admin_data = None
+        child_element = self.find(element, key)
         if child_element is not None:
             self.logger.debug("readAdminData")
             admin_data = AdminData()
+            admin_data.setLanguage(self.getChildElementOptionalLiteral(child_element, "LANGUAGE")) \
+                      .setUsedLanguages(self.getMultiLanguagePlainText(child_element, "USED-LANGUAGES"))
+
             self.readSdgs(child_element, admin_data)
-            identifiable.setAdminData(admin_data)
+        return admin_data
 
     def readMultilanguageReferrable(self, element: ET.Element, referrable: MultilanguageReferrable):
         self.readElementAttributes(element, referrable)
@@ -136,9 +137,10 @@ class ARXMLParser(AbstractARXMLParser):
             identifiable.addAnnotation(annotation)
 
         identifiable.setCategory(self.getChildElementOptionalLiteral(element, "CATEGORY")) \
-                    .setDesc(self.getMultiLanguageOverviewParagraph(element, "DESC"))
+                    .setDesc(self.getMultiLanguageOverviewParagraph(element, "DESC")) \
+                    .setIntroduction(self.getDocumentationBlock(element, "INTRODUCTION"))
         
-        self.readAdminData(element, identifiable)
+        identifiable.setAdminData(self.getAdminData(element, "ADMIN-DATA"))
     
     def readLLongName(self, element: ET.Element, long_name: MultilanguageLongName):
         for child_element in self.findall(element, "./L-4"):
@@ -933,33 +935,84 @@ class ARXMLParser(AbstractARXMLParser):
             sw_pointer_target_props.sw_data_def_props = self.getSwDataDefProps(child_element, "SW-DATA-DEF-PROPS")
             parent.swPointerTargetProps = sw_pointer_target_props
 
-    def readLParagraph(self, element: ET.Element, paragraph: MultiLanguageParagraph):
-        for child_element in self.findall(element, "./L-1"):
-            l1 = LOverviewParagraph()
-            self.readElementAttributes(child_element, l1)
-            l1.value = child_element.text
-            if 'L' in child_element.attrib:
-                l1.l = child_element.attrib['L']
-            paragraph.addL1(l1)
+    def readLanguageSpecific(self, element: ET.Element, specific: LanguageSpecific):
+        self.readElementAttributes(element, specific)
+        specific.value = element.text
+        if 'L' in element.attrib:
+            specific.l = element.attrib['L']
+
+    def getLParagraphs(self, element: ET.Element, key: str) -> List[LParagraph]:
+        results = []
+        for child_element in self.findall(element, key):
+            l1 = LParagraph()
+            self.readLanguageSpecific(child_element, l1)
+            results.append(l1)
+        return results
     
     def getMultiLanguageParagraphs(self, element: ET.Element, key: str) -> List[MultiLanguageParagraph]:
         paragraphs = []
         for child_element in self.findall(element, key):
             paragraph = MultiLanguageParagraph()
             self.readElementAttributes(child_element, paragraph)
-            self.readLParagraph(child_element, paragraph)
+            for l1 in self.getLParagraphs(child_element, "L-1"):
+                paragraph.addL1(l1)
             paragraphs.append(paragraph)
         return paragraphs
+    
+    def getLPlainTexts(self, element: ET.Element, key: str) -> List[LParagraph]:
+        results = []
+        for child_element in self.findall(element, key):
+            l1 = LParagraph()
+            self.readLanguageSpecific(child_element, l1)
+            results.append(l1)
+        return results
+    
+    def getListElements(self, element: ET.Element, key: str) -> List[ListElement]:
+        '''
+            Read the DocumentationBlock List
+        '''
+        result = []
+        for child_element in self.findall(element, key):
+            list = ListElement()
+            if 'TYPE' in child_element.attrib:
+                list.setType(child_element.attrib['TYPE'])
+            for block in self.getDocumentationBlockList(child_element, "ITEM"):
+                list.addItem(block)
+            result.append(list)
+        return result       
+    
+    def getMultiLanguagePlainText(self, element: ET.Element, key: str) -> MultiLanguagePlainText:
+        paragraph = None
+        child_element = self.find(element, key)
+        if child_element is not None:
+            paragraph = MultiLanguagePlainText()
+            self.readElementAttributes(child_element, paragraph)
+            for l10 in self.getLPlainTexts(child_element, "L-10"):
+                paragraph.addL10(l10)
+        return paragraph
+    
+    def readDocumentationBlock(self, element: ET.Element, block: DocumentationBlock):
+        self.readElementAttributes(element, block)
+        for paragraph in self.getMultiLanguageParagraphs(element, "P"):
+            block.addP(paragraph)
+        for list in self.getListElements(element, "LIST"):
+            block.addList(list)
 
     def getDocumentationBlock(self, element: ET.Element, key: str) -> DocumentationBlock:
         block = None
         child_element = self.find(element, key)
         if child_element is not None:
             block = DocumentationBlock()
-            self.readElementAttributes(child_element, block)
-            for paragraph in self.getMultiLanguageParagraphs(child_element, "P"):
-                block.addP(paragraph)
+            self.readDocumentationBlock(child_element, block)
         return block
+    
+    def getDocumentationBlockList(self, element: ET.Element, key: str) -> List[DocumentationBlock]:
+        blocks = []
+        for child_element in self.findall(element, key):
+            block = DocumentationBlock()
+            self.readDocumentationBlock(child_element, block)
+            blocks.append(block)
+        return blocks
 
     def readGeneralAnnotation(self, element: ET.Element, annotation: GeneralAnnotation):
         annotation.setAnnotationOrigin(self.getChildElementOptionalLiteral(element, 'ANNOTATION-ORIGIN')) \
@@ -1031,6 +1084,7 @@ class ARXMLParser(AbstractARXMLParser):
                                  .setDataConstrRef(self.getChildElementOptionalRefType(conditional_tag, "DATA-CONSTR-REF")) \
                                  .setCompuMethodRef(self.getChildElementOptionalRefType(conditional_tag, "COMPU-METHOD-REF")) \
                                  .setSwImplPolicy(self.getChildElementOptionalLiteral(conditional_tag, "SW-IMPL-POLICY")) \
+                                 .setSwIntendedResolution(self.getChildElementOptionalNumericalValue(conditional_tag, "SW-INTENDED-RESOLUTION")) \
                                  .setImplementationDataTypeRef(self.getChildElementOptionalRefType(conditional_tag, "IMPLEMENTATION-DATA-TYPE-REF")) \
                                  .setSwCalibrationAccess(self.getChildElementOptionalLiteral(conditional_tag, "SW-CALIBRATION-ACCESS")) \
                                  .setSwCalprmAxisSet(self.getSwCalprmAxisSet(conditional_tag, "SW-CALPRM-AXIS-SET")) \
@@ -2827,6 +2881,12 @@ class ARXMLParser(AbstractARXMLParser):
         frame = parent.createGenericEthernetFrame(short_name)
         self.readFrame(element, frame)
 
+    def readLifeCycleInfoSet(self, element: ET.Element, parent: ARPackage):
+        short_name = self.getShortName(element)
+        self.logger.debug("Read LifeCycleInfoSet %s" % short_name)
+        frame = parent.createLifeCycleInfoSet(short_name)
+        self.readIdentifiable(element, frame)
+
     def readARPackageElements(self, element: ET.Element, parent: ARPackage):
         for child_element in self.findall(element, "./ELEMENTS/*"):
             tag_name = self.getTagName(child_element.tag)
@@ -2940,9 +3000,22 @@ class ARXMLParser(AbstractARXMLParser):
                 self.readParameterInterface(child_element, parent)
             elif tag_name == "ETHERNET-FRAME":
                 self.readGenericEthernetFrame(child_element, parent)
+            elif tag_name == "LIFE-CYCLE-INFO-SET":
+                self.readLifeCycleInfoSet(child_element, parent)
             else:
                 self._raiseError("Unsupported element type of ARPackage <%s>" % tag_name)
 
+    def readReferenceBases(self, element: ET.Element, parent: ARPackage):
+        self.logger.debug("Read ReferenceBases")
+        for child_element in self.findall(element, "REFERENCE-BASES/REFERENCE-BASE"):
+            base = ReferenceBase()
+            base.setShortLabel(self.getChildElementOptionalLiteral(child_element, "SHORT-LABEL")) \
+                .setIsDefault(self.getChildElementOptionalBooleanValue(child_element, "IS-DEFAULT")) \
+                .setIsGlobal(self.getChildElementOptionalBooleanValue(child_element, "IS-GLOBAL")) \
+                .setBaseIsThisPackage(self.getChildElementOptionalBooleanValue(child_element, "BASE-IS-THIS-PACKAGE")) \
+                .setPackageRef(self.getChildElementOptionalRefType(child_element, "PACKAGE-REF"))
+            parent.addReferenceBase(base)
+
     def readARPackages(self, element: ET.Element, parent: ARPackage):
         for child_element in element.findall("./xmlns:AR-PACKAGES/xmlns:AR-PACKAGE", self.nsmap):
             short_name = self.getShortName(child_element)
@@ -2951,9 +3024,9 @@ class ARXMLParser(AbstractARXMLParser):
             self.logger.debug("readARPackages %s" % ar_package.full_name)
 
             self.readIdentifiable(child_element, ar_package)
-            self.readARPackageElements(child_element, ar_package)
             self.readARPackages(child_element, ar_package)
-
+            self.readARPackageElements(child_element, ar_package)
+            self.readReferenceBases(child_element, ar_package)
 
     def load(self, filename, document: AUTOSAR):
         self.logger.info("Load %s ..." % os.path.realpath(filename))
@@ -2964,6 +3037,7 @@ class ARXMLParser(AbstractARXMLParser):
             self._raiseError("Invalid ARXML file <%s>" % filename)
 
         self.getAUTOSARInfo(root, document)
+        document.setAdminData(self.getAdminData(root, "ADMIN-DATA")) 
         self.readARPackages(root, document)
 
         document.reload()

armodel/tests/test_armodel/models/test_ar_ref.py

@@ -14,13 +14,16 @@ from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArOb
 class TestARRef:
     def test_RefType(self):
         ref_type = RefType()
-        assert(ref_type.value == "")
-        assert(ref_type.dest == "")
+        assert(ref_type.getBase() == None)
+        assert(ref_type.getValue() == None)
+        assert(ref_type.getDest() == None)
 
     def test_TRefType(self):
         ref_type = TRefType()
-        assert(ref_type.value == "")
-        assert(ref_type.dest == "")
+        assert(ref_type.getBase() == None)
+        assert(ref_type.getValue() == None)
+        assert(ref_type.getDest() == None)
+
 
     def test_AutosarVariableRef(self):
         ref_type = AutosarVariableRef()

armodel/tests/test_armodel/parser/test_sw_components.py

@@ -64,7 +64,16 @@ class TestSWComponents:
 
         assert(filecmp.cmp("src/armodel/tests/test_files/BswMMode.arxml", "data/generated_AUTOSAR_Datatypes.arxml", shallow = False) == True)
 
-        
+    def test_bswm_mode_arxml_loading_and_saving(self):
+        document = AUTOSAR.getInstance()
+        document.clear()
+        parser = ARXMLParser()
+        parser.load("test_files/AUTOSAR_MOD_AISpecification_ApplicationDataType_Blueprint.arxml", document)
+
+        writer = ARXMLWriter()
+        writer.save("data/generated_AUTOSAR_MOD_AISpecification_ApplicationDataType_Blueprint.arxml", document)
+
+        assert(filecmp.cmp("test_files/AUTOSAR_MOD_AISpecification_ApplicationDataType_Blueprint.arxml", "data/generated_AUTOSAR_MOD_AISpecification_ApplicationDataType_Blueprint.arxml", shallow = False) == True)
 
     
         

armodel/writer/abstract_arxml_writer.py

@@ -8,11 +8,7 @@ import logging
 import xml.etree.cElementTree as ET
 
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical, Integer, TimeValue
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import TRefType
-
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical, Integer, TimeValue, RefType, ARBoolean
 
 class AbstractARXMLWriter:
     __metaclass__ = ABCMeta
@@ -84,11 +80,15 @@ class AbstractARXMLWriter:
     def setChildElementOptionalRevisionLabelString(self, element: ET.Element, key: str, literal: ARLiteral):
         self.setChildElementOptionalLiteral(element, key, literal)
 
-    def setChildElementOptionalRefType(self, parent: ET.Element, child_tag_name: str, ref: TRefType):
+    def setChildElementOptionalRefType(self, parent: ET.Element, child_tag_name: str, ref: RefType):
         if ref is not None:
             child_tag = ET.SubElement(parent, child_tag_name)
-            if ref.dest is not None:
-                child_tag.attrib['DEST'] = ref.dest
+            base = ref.getBase()
+            if base is not None:
+                child_tag.attrib['BASE'] = base
+            dest = ref.getDest()
+            if dest is not None:
+                child_tag.attrib['DEST'] = dest
             if ref.value is not None:
                 child_tag.text = ref.value
 

armodel/writer/arxml_writer.py

@@ -2,6 +2,7 @@ import xml.etree.cElementTree as ET
 
 from typing import List
 
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.LifeCycles import LifeCycleInfoSet
 
 
 
@@ -19,8 +20,10 @@ from ..models.M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxis, Sw
 from ..models.M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps, ValueList
 from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayout, SwRecordLayoutGroup, SwRecordLayoutV
 from ..models.M2.MSR.Documentation.Annotation import Annotation
-from ..models.M2.MSR.Documentation.BlockElements import DocumentationBlock
-from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph, MultiLanguageParagraph, MultilanguageLongName
+from ..models.M2.MSR.Documentation.TextModel.BlockElements import DocumentationBlock
+from ..models.M2.MSR.Documentation.TextModel.BlockElements.ListElements import ListElement
+from ..models.M2.MSR.Documentation.TextModel.LanguageDataModel import LLongName, LPlainText, LanguageSpecific
+from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph, MultiLanguageParagraph, MultiLanguagePlainText, MultilanguageLongName
 
 from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import BswModuleDescription
@@ -44,7 +47,7 @@ from ..models.M2.AUTOSARTemplates.ECUCDescriptionTemplate import EcucAbstractRef
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.EngineeringObject import AutosarEngineeringObject, EngineeringObject
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable, MultilanguageReferrable, Referrable
 from ..models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AnyInstanceRef
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage, ReferenceBase
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType, ARLiteral, Limit
 
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PortAPIOptions import PortAPIOption
@@ -138,44 +141,62 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setARObjectAttributes(element, referrable)
         self.setShortName(element, referrable.short_name)
 
+    def setLanguageSpecific(self, element: ET.Element, key: str, specific: LanguageSpecific):
+        child_element = ET.SubElement(element, key)
+        self.setARObjectAttributes(child_element, specific)
+        if specific.l is not None:
+            child_element.attrib['L'] = specific.l
+        child_element.text = specific.value
+
+    def setLLongName(self, element: ET.Element, name: LLongName):
+        self.setLanguageSpecific(element, "L-4", name)
+
     def setMultiLongName(self, element: ET.Element, key: str, long_name: MultilanguageLongName):
         if long_name is not None:
-            long_name_tag = ET.SubElement(element, key)
-            self.setARObjectAttributes(long_name_tag, long_name)
+            child_element = ET.SubElement(element, key)
+            self.setARObjectAttributes(child_element, long_name)
             for l4 in long_name.getL4s():
-                l4_tag = ET.SubElement(long_name_tag, "L-4")
-                self.setARObjectAttributes(l4_tag, l4)
-                if l4.l is not None:
-                    l4_tag.attrib['L'] = l4.l
-                l4_tag.text = l4.value
+                self.setLLongName(child_element, l4)
+
+    def setLOverviewParagraph(self, element: ET.Element, name: LLongName):
+        self.setLanguageSpecific(element, "L-2", name)
 
     def setMultiLanguageOverviewParagraph(self, element: ET.Element, key: str, paragraph: MultiLanguageOverviewParagraph):
         if paragraph is not None:
-            long_name_tag = ET.SubElement(element, key)
-            self.setARObjectAttributes(long_name_tag, paragraph)
+            child_element = ET.SubElement(element, key)
+            self.setARObjectAttributes(child_element, paragraph)
             for l2 in paragraph.getL2s():
-                l2_tag = ET.SubElement(long_name_tag, "L-2")
-                self.setARObjectAttributes(l2_tag, l2)
-                if l2.l is not None:
-                    l2_tag.attrib['L'] = l2.l
-                l2_tag.text = l2.value
+                self.setLOverviewParagraph(child_element, l2)
 
     def setMultilanguageReferrable(self, element: ET.Element, referrable: MultilanguageReferrable):
         self.setReferable(element, referrable)
         if referrable.longName is not None:
             self.setMultiLongName(element, "LONG-NAME", referrable.longName)
 
+    def setLPlainText(self, element: ET.Element, text: LPlainText):
+        self.setLanguageSpecific(element, "L-10", text)
+
+    def setMultiLanguagePlainText(self, element: ET.Element, key: str, paragraph: MultiLanguagePlainText):
+        if paragraph is not None:
+            child_element = ET.SubElement(element, key)
+            self.setARObjectAttributes(child_element, paragraph)
+            for l10 in paragraph.getL10s():
+                self.setLPlainText(child_element, l10)
+
     def setAdminData(self, element: ET.Element, admin_data: AdminData):
-        element = ET.SubElement(element, "ADMIN-DATA")
-        self.writeSdgs(element, admin_data)
+        if admin_data is not None:
+            child_element = ET.SubElement(element, "ADMIN-DATA")
+            self.setChildElementOptionalLiteral(child_element, "LANGUAGE", admin_data.getLanguage())
+            self.setMultiLanguagePlainText(child_element, "USED-LANGUAGES", admin_data.getUsedLanguages())
+            self.writeSdgs(child_element, admin_data)
 
     def setIdentifiable(self, element: ET.Element, identifiable: Identifiable):
         self.setMultilanguageReferrable(element, identifiable)
         self.setAnnotations(element, identifiable.getAnnotations())
         self.setMultiLanguageOverviewParagraph(element, "DESC", identifiable.getDesc())
         self.setChildElementOptionalLiteral(element, "CATEGORY", identifiable.getCategory())
-        if identifiable.getAdminData() is not None:
-            self.setAdminData(element, identifiable.getAdminData())
+        self.setDocumentationBlock(element, "INTRODUCTION", identifiable.getIntroduction())
+        self.setAdminData(element, identifiable.getAdminData())
 
     def setARElement(self, parent: ET.Element, ar_element: ARElement):
         self.setIdentifiable(parent, ar_element)
@@ -573,12 +594,23 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.setARObjectAttributes(child_element, paragraph)
             self.writeLParagraphs(child_element, paragraph)
         return paragraphs
+    
+    def setListElement(self, element: ET.Element, key: str, list: ListElement):
+        if list is not None:
+            child_element = ET.SubElement(element, key)
+            type = list.getType()
+            if type is not None:
+                child_element.attrib['TYPE'] = type
+            for item in list.getItems():
+                self.setDocumentationBlock(child_element, "ITEM", item)
 
     def setDocumentationBlock(self, element: ET.Element, key: str, block: DocumentationBlock):
         if block is not None:
             child_element = ET.SubElement(element, key)
             self.setARObjectAttributes(child_element, block)
             self.setMultiLanguageParagraphs(child_element, "P", block.getPs())
+            for list in block.getLists():
+                self.setListElement(child_element, "LIST", list)
 
     def writeGeneralAnnotation(self, element: ET.Element, annotation: Annotation):
         self.setMultiLongName(element, "LABEL", annotation.getLabel())
@@ -644,9 +676,10 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.setChildElementOptionalLiteral(sw_data_def_props_conditional_tag, "SW-CALIBRATION-ACCESS", sw_data_def_props.getSwCalibrationAccess())
             self.setSwCalprmAxisSet(sw_data_def_props_conditional_tag, "SW-CALPRM-AXIS-SET", sw_data_def_props.getSwCalprmAxisSet())
             self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "COMPU-METHOD-REF", sw_data_def_props.getCompuMethodRef())
+            self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "DATA-CONSTR-REF", sw_data_def_props.getDataConstrRef())
             self.setChildElementOptionalLiteral(sw_data_def_props_conditional_tag, "SW-IMPL-POLICY", sw_data_def_props.getSwImplPolicy())
+            self.setChildElementOptionalNumericalValue(sw_data_def_props_conditional_tag, "SW-INTENDED-RESOLUTION", sw_data_def_props.getSwIntendedResolution())
             self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "IMPLEMENTATION-DATA-TYPE-REF", sw_data_def_props.getImplementationDataTypeRef())
-            self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "DATA-CONSTR-REF", sw_data_def_props.getDataConstrRef())
             self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "SW-RECORD-LAYOUT-REF", sw_data_def_props.getSwRecordLayoutRef())
             self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "VALUE-AXIS-DATA-TYPE-REF", sw_data_def_props.getValueAxisDataTypeRef())
             self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "UNIT-REF", sw_data_def_props.getUnitRef())
@@ -2632,11 +2665,16 @@ class ARXMLWriter(AbstractARXMLWriter):
         child_element = ET.SubElement(element, "PARAMETER-INTERFACE")
         self.setIdentifiable(child_element, signal)
 
-    def writeGenericEthernetFrame(self, element: ET.Element, signal: SystemSignal):
+    def writeGenericEthernetFrame(self, element: ET.Element, signal: GenericEthernetFrame):
         self.logger.debug("Write GenericEthernetFrame %s" % signal.short_name)
         child_element = ET.SubElement(element, "ETHERNET-FRAME")
         self.writeFrame(child_element, signal)
 
+    def writeLifeCycleInfoSet(self, element: ET.Element, set: LifeCycleInfoSet):
+        self.logger.debug("Write LifeCycleInfoSet %s" % set.short_name)
+        child_element = ET.SubElement(element, "LIFE-CYCLE-INFO-SET")
+        self.setIdentifiable(child_element, set)
+
     def writeISignalToPduMappings(self, element: ET.Element, parent: ISignalIPdu):
         mappings = parent.getISignalToPduMappings()
         if len(mappings) > 0:
@@ -2797,9 +2835,23 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.writeParameterInterface(element, ar_element)
         elif isinstance(ar_element, GenericEthernetFrame):
             self.writeGenericEthernetFrame(element, ar_element)
+        elif isinstance(ar_element, LifeCycleInfoSet):
+            self.writeLifeCycleInfoSet(element, ar_element)
         else:
             raise NotImplementedError("Unsupported Elements of ARPackage <%s>" % type(ar_element))
         
+    def writeReferenceBases(self, element: ET.Element, bases: List[ReferenceBase]):
+        self.logger.debug("Write ReferenceBases")
+        if len(bases) > 0:
+            bases_tag = ET.SubElement(element, "REFERENCE-BASES")
+            for base in bases:
+                child_element = ET.SubElement(bases_tag, "REFERENCE-BASE")
+                self.setChildElementOptionalLiteral(child_element, "SHORT-LABEL", base.getShortLabel())
+                self.setChildElementOptionalBooleanValue(child_element, "IS-DEFAULT", base.getIsDefault())
+                self.setChildElementOptionalBooleanValue(child_element, "IS-GLOBAL", base.getIsDefault())
+                self.setChildElementOptionalBooleanValue(child_element,  "BASE-IS-THIS-PACKAGE", base.getBaseIsThisPackage())
+                self.setChildElementOptionalRefType(child_element, "PACKAGE-REF", base.getPackageRef())
+        
     def writeARPackages(self, element: ET.Element, pkgs: List[ARPackage]):
         if len(pkgs) > 0:
             pkgs_tag = ET.SubElement(element, "AR-PACKAGES")
@@ -2810,6 +2862,8 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setIdentifiable(pkg_tag, pkg)
                 self.logger.debug("writeARPackage %s" % pkg.full_name)
 
+                self.writeReferenceBases(pkg_tag, pkg.getReferenceBases())
+
                 if pkg.getTotalElement() > 0:
                     elements_tag = ET.SubElement(pkg_tag, "ELEMENTS")
 
@@ -2818,6 +2872,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                             self.writeARPackageElement(elements_tag, ar_element)
 
                 self.writeARPackages(pkg_tag, pkg.getARPackages())
+                
 
     def save(self, filename, document: AUTOSAR):
         self.logger.info("Save %s ..." % filename)
@@ -2826,6 +2881,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         root.attrib["xmlns:xsi"] = "http://www.w3.org/2001/XMLSchema-instance"
         root.attrib["xsi:schemaLocation"] = document.schema_location
         
+        self.setAdminData(root, document.getAdminData())
         self.writeARPackages(root, document.getARPackages())
 
         self.saveToFile(filename, root)

{armodel-1.7.0.dist-info → armodel-1.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: armodel
-Version: 1.7.0
+Version: 1.7.1
 Summary: the python arxml parser
 Home-page: http://github.com/melodypapa/py-armodel
 Author: melodypapa
@@ -383,3 +383,11 @@ Fix the attribute intervalType of **Limit** is empty issue.
    * DATA-FILTER
    * EVENT-CONTROLLED-TIMING
 
+**Version 1.7.1**
+
+1. To support the following AR Element:
+   * INTRODUCTION
+   * LIST
+   * SW-INTENDED-RESOLUTION
+   * REFERENCE-BASE
+