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

armodel/models/M2/AUTOSARTemplates/SystemTemplate/__init__.py

@@ -1,5 +1,9 @@
 from typing import List
+
+
+from ....M2.AUTOSARTemplates.SystemTemplate.ECUResourceMapping import ECUMapping
 from ....M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import ComponentInSystemInstanceRef
+from ....M2.AUTOSARTemplates.SystemTemplate.SWmapping import SwcToImplMapping
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import PositiveInteger, RefType, TRefType
@@ -51,7 +55,7 @@ class SystemMapping(Identifiable):
         self.cryptoServiceMappings = []
         self.dataMappings = []
         self.ddsISignalToTopicMappings = []
-        self.ecuResourceMappings = []
+        self.ecuResourceMappings = []                                                   # type: List[ECUMapping]
         self.j1939ControllerApplicationToJ1939NmNodeMappings = []
         self.mappingConstraints = []
         self.pncMappings = []
@@ -65,8 +69,8 @@ class SystemMapping(Identifiable):
         self.softwareClusterToResourceMappings = []
         self.swClusterMappings = []
         self.swcToApplicationPartitionMappings = []
-        self.swImplMappings = []
-        self.swMappings = []                                                        # type: List[SwcToEcuMapping]
+        self.swImplMappings = []                                                        # type: List[SwcToImplMapping]
+        self.swMappings = []                                                            # type: List[SwcToEcuMapping]
         self.systemSignalGroupToComResourceMappings = []
         self.systemSignalToComResourceMappings = []
 
@@ -115,9 +119,12 @@ class SystemMapping(Identifiable):
     def getEcuResourceMappings(self):
         return self.ecuResourceMappings
 
-    def addEcuResourceMapping(self, value):
-        self.ecuResourceMappings.append(value)
-        return self
+    def createECUMapping(self, short_name: str) -> ECUMapping:
+        if short_name not in self.elements:
+            mapping = ECUMapping(self, short_name)
+            self.addElement(mapping)
+            self.ecuResourceMappings.append(mapping)
+        return self.getElement(short_name)
 
     def getJ1939ControllerApplicationToJ1939NmNodeMappings(self):
         return self.j1939ControllerApplicationToJ1939NmNodeMappings
@@ -210,12 +217,15 @@ class SystemMapping(Identifiable):
         self.swcToApplicationPartitionMappings.append(value)
         return self
 
-    def getSwImplMapping(self):
+    def getSwImplMappings(self):
         return self.swImplMappings
 
-    def addSwImplMappings(self, value):
-        self.swImplMappings.append(value)
-        return self
+    def createSwcToImplMapping(self, short_name: str) -> SwcToImplMapping:
+        if short_name not in self.elements:
+            mapping = SwcToImplMapping(self, short_name)
+            self.addElement(mapping)
+            self.swImplMappings.append(mapping)
+        return self.getElement(short_name)
 
     def getSwMappings(self):
         return self.swMappings
@@ -310,7 +320,8 @@ class System(ARElement):
         return self
 
     def getFibexElementRefs(self):
-        return sorted(self.fibexElements, key= lambda i: i.getShortValue())
+        #return sorted(self.fibexElements, key= lambda i: i.getShortValue())
+        return self.fibexElements
 
     def addFibexElementRef(self, value):
         if value is not None:

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

@@ -1,7 +1,6 @@
 from ....M2.MSR.Documentation.TextModel.LanguageDataModel import LEnum
 from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguagePlainText
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ....M2.MSR.AsamHdo.SpecialData import Sdg
 from typing import List
 
 class AdminData(ARObject):
@@ -10,7 +9,7 @@ class AdminData(ARObject):
 
         self.DocRevisions = []                              # type: List[DocRevision]
         self.language = None                                # type: LEnum
-        self.sdgs = []                                      # type: List[Sdg]
+        self.sdgs = []                                      # type: List                       ## Sdg will cause the circular import
         self.usedLanguages = None                           # type: MultiLanguagePlainText
 
     def getDocRevisions(self):

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

@@ -1,7 +1,9 @@
 from typing import List
 from abc import ABCMeta
+
+from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
-from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, CIdentifier, Identifier, PositiveUnlimitedInteger, String
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import 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

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

@@ -1,3 +1,6 @@
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import MultilanguageReferrable
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from typing import List
 
@@ -22,15 +25,30 @@ class Sd(ARObject):
         self.value = value
         return self
 
+class SdgCaption(MultilanguageReferrable):
+    def __init__(self, parent, short_name):
+        super().__init__(parent, short_name)
+
+        self.desc = None                                    # type: MultiLanguageOverviewParagraph
+
+    def getDesc(self):
+        return self.desc
+
+    def setDesc(self, value):
+        if value is not None:
+            self.desc = value
+        return self
+
 
 class Sdg(ARObject):
     def __init__(self):
         super().__init__()
 
         self.gid = ""
-        self.sd = []                        # type: List[Sd]
-        self.sdgCaption = None
-        self.sdgContentsTypes = []          # type: List[Sdg]
+        self.sd = []                                        # type: List[Sd]
+        self.sdgCaption = None                              # type: SdgCaption
+        self.sdgContentsTypes = []                          # type: List[Sdg]
+        self.sdxRefs = []                                   # type: List[RefType]
 
     def getGID(self):
         return self.gid
@@ -49,12 +67,21 @@ class Sdg(ARObject):
     def getSdgCaption(self):
         return self.sdgCaption
 
-    def setSdgCaption(self, value):
-        self.sdgCaption = value
-        return self
+    def createSdgCaption(self, short_name: str) -> SdgCaption:
+        caption = SdgCaption(self, short_name)
+        self.sdgCaption = caption
+        return caption
 
+    def getSdgContentsTypes(self):
+        return self.sdgContentsTypes
+    
     def addSdgContentsType(self, sdg):
         self.sdgContentsTypes.append(sdg)
+    
+    def getSdxRefs(self):
+        return self.sdxRefs
 
-    def getSdgContentsTypes(self):
-        return self.sdgContentsTypes
+    def addSdxRef(self, value):
+        if value is not None:
+            self.sdxRefs.append(value)
+        return self

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

@@ -72,9 +72,6 @@ class SwRecordLayoutV(ARObject):
         self.swRecordLayoutVProp = value
         return self
 
-
-    
-    
 class SwRecordLayoutGroupContent(ARObject):
     def __init__(self):
         super().__init__()

armodel/models/__init__.py

@@ -52,11 +52,15 @@ from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.RTEEvents impo
 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 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.InstanceRefs import *
 from .M2.AUTOSARTemplates.SystemTemplate.NetworkManagement import *
 from .M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import *
+from .M2.AUTOSARTemplates.SystemTemplate.SWmapping import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Multiplatform import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanTopology import *

armodel/parser/abstract_arxml_parser.py

@@ -32,14 +32,14 @@ class AbstractARXMLParser:
             tag = tag.tag
         if isinstance(tag, str):
             return tag.replace("{%s}" % self.nsmap["xmlns"], "")
-        raise ValueError("Invalid Tag type <%s>" % type(tag))
+        self.raiseError("Invalid Tag type <%s>" % type(tag))
 
     def _processOptions(self, options):
         if options:
             if 'warning' in options:
                 self.options['warning'] = options['warning']
 
-    def _raiseError(self, error_msg):
+    def raiseError(self, error_msg):
         if (self.options['warning'] == True):
             self.logger.error(Fore.RED + error_msg + Fore.WHITE)
         else:
@@ -51,7 +51,7 @@ class AbstractARXMLParser:
         else:
             raise NotImplementedError(error_msg)
         
-    def _raiseWarning(self, error_msg):
+    def raiseWarning(self, error_msg):
         self.logger.warning(error_msg)
         
     def getPureTagName(self, tag):
@@ -81,7 +81,7 @@ class AbstractARXMLParser:
             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))
+        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 = self.findall(element, key)
@@ -244,7 +244,7 @@ class AbstractARXMLParser:
         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))
+        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 = self.find(element, key)
@@ -296,6 +296,9 @@ class AbstractARXMLParser:
                 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:
         return parent.find(self.convert_find_key(key), self.nsmap)