armodel 1.7.7__py3-none-any.whl → 1.7.9__py3-none-any.whl

armodel/models/M2/MSR/Documentation/BlockElements/Figure.py

@@ -0,0 +1,163 @@
+from typing import List
+
+from .....M2.MSR.Documentation.TextModel.LanguageDataModel import LanguageSpecific
+from .....M2.MSR.Documentation.TextModel.BlockElements.PaginationAndView import Paginateable
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.EngineeringObject import EngineeringObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import AREnum, String
+
+
+class GraphicFitEnum(AREnum):
+    def __init__(self, enum_values):
+        super().__init__([
+
+        ])
+
+
+class Graphic(EngineeringObject):
+    def __init__(self):
+        super().__init__()
+
+        self.editfit = None                                     # type: GraphicFitEnum
+        self.editHeight = None                                  # type: String
+        self.editscale = None                                   # type: String
+        self.editWidth = None                                   # type: String
+        self.filename = None                                    # type: String
+        self.fit = None                                         # type: GraphicFitEnum
+
+    def getEditfit(self):
+        return self.editfit
+
+    def setEditfit(self, value):
+        if value is not None:
+            self.editfit = value
+        return self
+
+    def getEditHeight(self):
+        return self.editHeight
+
+    def setEditHeight(self, value):
+        if value is not None:
+            self.editHeight = value
+        return self
+
+    def getEditscale(self):
+        return self.editscale
+
+    def setEditscale(self, value):
+        if value is not None:
+            self.editscale = value
+        return self
+
+    def getEditWidth(self):
+        return self.editWidth
+
+    def setEditWidth(self, value):
+        if value is not None:
+            self.editWidth = value
+        return self
+
+    def getFilename(self):
+        return self.filename
+
+    def setFilename(self, value):
+        if value is not None:
+            self.filename = value
+        return self
+
+    def getFit(self):
+        return self.fit
+
+    def setFit(self, value):
+        if value is not None:
+            self.fit = value
+        return self
+    
+
+class Map(ARObject):
+    def __init__(self):
+        super().__init__()
+    
+
+class LGraphic(LanguageSpecific):
+    def __init__(self):
+        super().__init__()
+
+        self.l = None                                           # type: str                         # noqa E741
+        self.graphic = None                                     # type: Graphic
+        self.map = None                                         # type: Map
+
+    def getL(self):
+        return self.l
+
+    def setL(self, value):
+        if value is not None:
+            self.l = value                                                                          # noqa E741
+        return self
+
+    def getGraphic(self):
+        return self.graphic
+
+    def setGraphic(self, value):
+        if value is not None:
+            self.graphic = value
+        return self
+
+    def getMap(self):
+        return self.map
+
+    def setMap(self, value):
+        if value is not None:
+            self.map = value
+        return self
+
+
+class MlFigure(Paginateable):
+    def __init__(self):
+        super().__init__()
+
+        self.figureCaption = None                               # type: Caption
+        self.helpEntry = None                                   # type: String
+        self.lGraphics = []                                     # type: List[LGraphic]
+        self.pgwide = None                                      # type: PgwideEnum
+        self.verbatim = None                                    # type: MultiLanguageVerbatim
+
+    def getFigureCaption(self):
+        return self.figureCaption
+
+    def setFigureCaption(self, value):
+        if value is not None:
+            self.figureCaption = value
+        return self
+
+    def getHelpEntry(self):
+        return self.helpEntry
+
+    def setHelpEntry(self, value):
+        if value is not None:
+            self.helpEntry = value
+        return self
+
+    def getLGraphics(self):
+        return self.lGraphics
+
+    def addLGraphics(self, value):
+        if value is not None:
+            self.lGraphics.append(value)
+        return self
+
+    def getPgwide(self):
+        return self.pgwide
+
+    def setPgwide(self, value):
+        if value is not None:
+            self.pgwide = value
+        return self
+
+    def getVerbatim(self):
+        return self.verbatim
+
+    def setVerbatim(self, value):
+        if value is not None:
+            self.verbatim = value
+        return self

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

@@ -3,6 +3,7 @@ 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'
@@ -14,6 +15,7 @@ class ListEnum(AREnum):
             ListEnum.UNNUMBER
         ))
 
+
 class Item(Paginateable):
     def __init__(self):
         super().__init__()
@@ -27,10 +29,11 @@ class Item(Paginateable):
         self.itemContents = value
         return self
 
-class ListElement(Paginateable):
+
+class ARList(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
+        In AUTOSAR standard class name shall be List, but it is conflict with Python List and renamed to ARList
     '''
     def __init__(self):
         super().__init__()
@@ -51,4 +54,3 @@ class ListElement(Paginateable):
     def setType(self, value):
         self.type = value
         return self
-

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

@@ -1,9 +1,30 @@
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
+
 class DocumentViewSelectable(ARObject):
     def __init__(self):
         super().__init__()
 
+
 class Paginateable(DocumentViewSelectable):
     def __init__(self):
-        super().__init__()
+        super().__init__()
+
+        self.chapterBreak = None                                # type: ChapterEnumBreak
+        self.keepWithPrevious = None                            # type: KeepWithPreviousEnum
+
+    def getBreak(self):
+        return self.chapterBreak
+
+    def setBreak(self, value):
+        if value is not None:
+            self.chapterBreak = value
+        return self
+
+    def getKeepWithPrevious(self):
+        return self.keepWithPrevious
+
+    def setKeepWithPrevious(self, value):
+        if value is not None:
+            self.keepWithPrevious = value
+        return self

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

@@ -1,25 +1,110 @@
-from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ......M2.MSR.Documentation.TextModel.BlockElements.ListElements import ListElement
+from ......M2.MSR.Documentation.BlockElements.Figure import MlFigure
+from ......M2.MSR.Documentation.TextModel.BlockElements.ListElements import ARList
 from ......M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageParagraph
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from typing import List
 
+
 class DocumentationBlock(ARObject):
     def __init__(self):
         super().__init__()
 
+        self.defList = None                         # type: DefList
+        self.figures = []                           # type: List[MlFigure]
+        self.formula = None                         # type：MlFormula
+        self.labeledList = None                     # type: LabeledList
+        self.lists = []                             # type: List[ARList]
+        self.msrQueryP2 = None                      # type: MsrQueryP2
+        self.note = None                            # type: Note
         self.ps = []                                # type: List[MultiLanguageParagraph]
-        self.lists = []                             # type: List[ListElement]
+        self.structuredReq = None                   # type: StructuredReq
+        self.trace = None                           # type: TraceableText
+        self.verbatim = None                        # type: MultiLanguageVerbatim
 
-    def addP(self, p: MultiLanguageParagraph):
-        self.ps.append(p)
+    def getDefList(self):
+        return self.defList
+
+    def setDefList(self, value):
+        if value is not None:
+            self.defList = value
+        return self
+
+    def getFigures(self):
+        return self.figures
+
+    def addFigure(self, value):
+        if value is not None:
+            self.figures.append(value)  
+        return self
+
+    def getFormula(self):
+        return self.formula
+
+    def setFormula(self, value):
+        if value is not None:
+            self.formula = value
+        return self
+
+    def getLabeledList(self):
+        return self.labeledList
+
+    def setLabeledList(self, value):
+        if value is not None:
+            self.labeledList = value
         return self
 
-    def getPs(self) -> List[MultiLanguageParagraph]:
-        return self.ps
-    
     def getLists(self):
         return self.lists
 
     def addList(self, value):
-        self.lists.append(value)
+        if value is not None:
+            self.lists.append(value)
+        return self
+
+    def getMsrQueryP2(self):
+        return self.msrQueryP2
+
+    def setMsrQueryP2(self, value):
+        if value is not None:
+            self.msrQueryP2 = value
+        return self
+
+    def getNote(self):
+        return self.note
+
+    def setNote(self, value):
+        if value is not None:
+            self.note = value
+        return self
+
+    def getPs(self) -> List[MultiLanguageParagraph]:
+        return self.ps
+
+    def addP(self, value):
+        if value is not None:
+            self.ps.append(value)
+        return self
+
+    def getStructuredReq(self):
+        return self.structuredReq
+
+    def setStructuredReq(self, value):
+        if value is not None:
+            self.structuredReq = value
+        return self
+
+    def getTrace(self):
+        return self.trace
+
+    def setTrace(self, value):
+        if value is not None:
+            self.trace = value
+        return self
+
+    def getVerbatim(self):
+        return self.verbatim
+
+    def setVerbatim(self, value):
+        if value is not None:
+            self.verbatim = value
         return self

armodel/models/__init__.py

@@ -15,6 +15,9 @@ 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 *
+from .M2.AUTOSARTemplates.ECUCDescriptionTemplate import *
+from .M2.AUTOSARTemplates.EcuResourceTemplate import *
+from .M2.AUTOSARTemplates.EcuResourceTemplate.HwElementCategory import *
 from .M2.AUTOSARTemplates.BswModuleTemplate import *
 from .M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import *
 from .M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import *
@@ -33,6 +36,8 @@ from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.StackUsage import
 from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.MemorySectionUsage import *
 from .M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import *
 from .M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import *
+from .M2.AUTOSARTemplates.CommonStructure.StandardizationTemplate.Keyword import *
+from .M2.AUTOSARTemplates.CommonStructure.StandardizationTemplate.BlueprintDedicated.PortPrototypeBlueprint import *
 from .M2.AUTOSARTemplates.CommonStructure.TriggerDeclaration import *
 from .M2.AUTOSARTemplates.DiagnosticExtract.DiagnosticContribution import *
 from .M2.AUTOSARTemplates.SWComponentTemplate import *
@@ -56,7 +61,7 @@ from .M2.AUTOSARTemplates.SystemTemplate import *
 from .M2.AUTOSARTemplates.SystemTemplate.DoIp import *
 from .M2.AUTOSARTemplates.SystemTemplate.DataMapping import *
 from .M2.AUTOSARTemplates.SystemTemplate.DiagnosticConnection import *
-from .M2.AUTOSARTemplates.SystemTemplate.ECUResourceMapping import *
+from .M2.AUTOSARTemplates.SystemTemplate.EcuResourceMapping import *
 from .M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import *
 from .M2.AUTOSARTemplates.SystemTemplate.NetworkManagement import *
 from .M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import *
@@ -71,6 +76,7 @@ from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetTopology i
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.NetworkEndpoint import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetCommunication import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.ServiceInstances import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Flexray.FlexrayCommunication import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.EcuInstance import *

armodel/parser/abstract_arxml_parser.py

@@ -6,18 +6,19 @@ import re
 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 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
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical, Boolean
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Integer, PositiveInteger, TimeValue
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType, Limit
+
 
 class AbstractARXMLParser:
     __metaclass__ = ABCMeta
      
-    def __init__(self, options = None) -> None:
-        if type(self) == AbstractARXMLParser:
+    def __init__(self, options=None) -> None:
+        if type(self) is AbstractARXMLParser:
             raise NotImplementedError("AbstractArxmlParser is an abstract class.")
         
         self.nsmap = {"xmlns": "http://autosar.org/schema/r4.0"}
@@ -40,13 +41,13 @@ class AbstractARXMLParser:
                 self.options['warning'] = options['warning']
 
     def raiseError(self, error_msg):
-        if (self.options['warning'] == True):
+        if (self.options['warning'] is True):
             self.logger.error(Fore.RED + error_msg + Fore.WHITE)
         else:
             raise ValueError(error_msg)
         
     def notImplemented(self, error_msg):
-        if (self.options['warning'] == True):
+        if (self.options['warning'] is True):
             self.logger.error(Fore.RED + error_msg + Fore.WHITE)
         else:
             raise NotImplementedError(error_msg)
@@ -96,11 +97,11 @@ class AbstractARXMLParser:
         child_element = self.find(element, key)
         literal = None
         if (child_element is not None):
-            self.logger.debug("getChildElementOptionalLiteral : %s" % child_element.text)
+            # self.logger.debug("getChildElementOptionalLiteral : %s" % child_element.text)
             literal = ARLiteral()
             self.readARObjectAttributes(child_element, literal)
             # Patch for empty element <USED-CODE-GENERATOR></USED-CODE-GENERATOR>
-            if child_element.text is None:      
+            if child_element.text is None:
                 literal.setValue("")
             else:
                 literal.setValue(child_element.text)
@@ -110,14 +111,14 @@ class AbstractARXMLParser:
         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)
+            # 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.readARObjectAttributes(child_element, literal)
             # Patch for empty element <USED-CODE-GENERATOR></USED-CODE-GENERATOR>
-            if child_element.text is None:      
+            if child_element.text is None:
                 literal.setValue("")
             else:
                 literal.setValue(child_element.text)
@@ -165,7 +166,7 @@ class AbstractARXMLParser:
 
     def getChildElementOptionalBooleanValue(self, element: ET.Element, key: str) -> Boolean:
         literal = self.getChildElementOptionalLiteral(element, key)
-        if literal == None:
+        if literal is None:
             return None
         if literal.getText() == "":
             return None
@@ -182,7 +183,7 @@ class AbstractARXMLParser:
 
     def getChildElementOptionalNumericalValue(self, element: ET.Element, key: str) -> ARNumerical:
         child_element = self.find(element, key)
-        if child_element == None:
+        if child_element is None:
             return None
         numerical = ARNumerical()
         self.readARObjectAttributes(child_element, numerical)
@@ -191,7 +192,7 @@ class AbstractARXMLParser:
     
     def getChildElementOptionalIntegerValue(self, element: ET.Element, key: str) -> Integer:
         child_element = self.find(element, key)
-        if child_element == None:
+        if child_element is None:
             return None
         numerical = Integer()
         self.readARObjectAttributes(child_element, numerical)
@@ -200,7 +201,7 @@ class AbstractARXMLParser:
     
     def getChildElementOptionalPositiveInteger(self, element: ET.Element, key: str) -> PositiveInteger:
         child_element = self.find(element, key)
-        if child_element == None:
+        if child_element is None:
             return None
         numerical = PositiveInteger()
         self.readARObjectAttributes(child_element, numerical)
@@ -231,7 +232,7 @@ class AbstractARXMLParser:
             return limit
         return None
     
-    def _getChildElementRefTypeDestAndValue(self, element) -> RefType:
+    def _getChildElementRefTypeDestAndValue(self, element: ET.Element) -> RefType:
         ref = RefType()
         if 'BASE' in element.attrib:
             ref.setBase(element.attrib['BASE'])
@@ -246,7 +247,7 @@ class AbstractARXMLParser:
             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:
+    def getChildElementOptionalRefType(self, element: ET.Element, key: str) -> RefType:
         child_element = self.find(element, key)
         if (child_element is not None):
             return self._getChildElementRefTypeDestAndValue(child_element)
@@ -257,8 +258,11 @@ class AbstractARXMLParser:
         results = []
         for child_element in child_elements:
             ref = RefType()
-            ref.dest = child_element.attrib['DEST']
-            ref.value = child_element.text
+            if 'BASE' in child_element.attrib:
+                ref.setBase(child_element.attrib['BASE'])
+            if 'DEST' in child_element.attrib:
+                ref.setDest(child_element.attrib['DEST'])
+            ref.setValue(child_element.text)
             results.append(ref)
         return results
     
@@ -268,13 +272,19 @@ class AbstractARXMLParser:
         return None
     
     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
+        ar_object.timestamp = self.readElementOptionalAttrib(element, "T")              # read the timestamp
+        ar_object.uuid = self.readElementOptionalAttrib(element, "UUID")                # read the uuid
 
-        if ar_object.timestamp is not None:
-            self.logger.debug("Timestamp: %s" % ar_object.timestamp)
+        # if ar_object.timestamp is not None:
+        #    self.logger.debug("Timestamp: %s" % ar_object.timestamp)
         if ar_object.uuid is not None:
-            self.logger.debug("UUID: %s" % ar_object.uuid)
+            instance = AUTOSAR.getInstance()
+            old_ar_object = instance.getARObjectByUUID(ar_object.uuid)
+            if old_ar_object is not None:
+                self.logger.warning(Fore.YELLOW + "Duplicate UUID <%s> / type <%s>" % (ar_object.uuid, type(old_ar_object)) + Fore.WHITE)
+            else:
+                instance.addARObject(ar_object)
+            # self.logger.debug("UUID: %s" % ar_object.uuid)
     
     def getAUTOSARInfo(self, element: ET.Element, document: AUTOSAR):
         key = "{http://www.w3.org/2001/XMLSchema-instance}schemaLocation"
@@ -295,12 +305,9 @@ class AbstractARXMLParser:
             if item != "*" and item != ".":
                 keys[idx] = "xmlns:%s" % item
         return "/".join(keys)
-    
-    def findChild(self, parent:ET.Element, key: str) -> ET.Element:
-        return parent.find("xmlns:./child::%s" % key, self.nsmap)
-    
-    def find(self, parent:ET.Element, key: str) -> ET.Element:
+       
+    def find(self, parent: ET.Element, key: str) -> ET.Element:
         return parent.find(self.convert_find_key(key), self.nsmap)
     
     def findall(self, parent: ET.Element, key: str) -> List[ET.Element]:
-        return parent.findall(self.convert_find_key(key), self.nsmap)
+        return parent.findall(self.convert_find_key(key), self.nsmap)