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

armodel/models/{record_layout.py → M2/MSR/DataDictionary/RecordLayout.py}

@@ -1,8 +1,7 @@
-
-from .multilanguage_data import MultiLanguageOverviewParagraph
-from .ar_ref import RefType
-from .ar_object import ARLiteral, ARNumerical, ARObject
-from .general_structure import ARElement
+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.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph
 
 class SwRecordLayoutV(ARObject):
     def __init__(self):
@@ -20,27 +19,27 @@ class SwRecordLayoutV(ARObject):
     def setShortLabel(self, short_label: ARLiteral):
         self.shortLabel = short_label
         return self
-    
+
     def setBaseTypeRef(self, ref: RefType):
         self.baseTypeRef = ref
         return self
-    
+
     def setSwRecordLayoutVAxis(self, axis: ARNumerical):
         self.swRecordLayoutVAxis = axis
         return self
-    
+
     def setSwRecordLayoutVFixValue(self, value: ARNumerical):
         self.swRecordLayoutVFixValue = value
         return self
-    
+
     def setSwRecordLayoutVIndex(self, index: ARLiteral):
         self.swRecordLayoutVIndex = index
         return self
-    
+
     def setSwRecordLayoutVProp(self, prop: ARLiteral):
         self.swRecordLayoutVProp = prop
         return self
-
+    
 class SwRecordLayoutGroupContent(ARObject):
     def __init__(self):
         super().__init__()
@@ -49,6 +48,7 @@ class SwRecordLayoutGroupContent(ARObject):
         self.swRecordLayoutGroup = None                 # type: SwRecordLayoutGroup
         self.swRecordLayoutV = None                     # type: SwRecordLayoutV
 
+
 class SwRecordLayoutGroup(ARObject):
     def __init__(self):
         super().__init__()
@@ -63,49 +63,51 @@ class SwRecordLayoutGroup(ARObject):
         self.swRecordLayoutGroupIndex = None            # type: ARLiteral
         self.swRecordLayoutGroupFrom = None             # type: ARLiteral
         self.swRecordLayoutGroupTo = None               # type: ARLiteral 
-        
-        
+
+
     def setCategory(self, category: ARLiteral):
         self.category = category
         return self
-    
+
     def setDesc(self, desc):
         self.desc = desc
         return self
-    
+
     def setShortLabel(self, label: ARLiteral):
         self.shortLabel = label
         return self
-    
+
     def setSwGenericAxisParamTypeRef(self, ref: RefType):
         self.swGenericAxisParamTypeRef = ref
         return self
-    
+
     def setSwRecordLayoutComponent(self, component: ARLiteral):
         self.swRecordLayoutComponent = component
         return self
-    
+
     def setSwRecordLayoutGroupAxis(self, axis: ARNumerical):
         self.swRecordLayoutGroupAxis = axis
         return self
-    
+
     def setSwRecordLayoutGroupIndex(self, index: ARLiteral):
         self.swRecordLayoutGroupIndex = index
         return self
-    
+
     def setSwRecordLayoutGroupFrom(self, from_value: ARLiteral):
         self.swRecordLayoutGroupFrom = from_value
         return self
-    
+
     def setSwRecordLayoutGroupTo(self, to_value: ARLiteral):
         self.swRecordLayoutGroupTo = to_value
         return self
-    
+
     def setSwRecordLayoutGroupContentType(self, content_type: SwRecordLayoutGroupContent):
         self.swRecordLayoutGroupContentType = content_type
         return self
 
-    
+
+
+
 class SwRecordLayout(ARElement):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -114,5 +116,4 @@ class SwRecordLayout(ARElement):
 
     def setSwRecordLayoutGroup(self, group: SwRecordLayoutGroup):
         self.swRecordLayoutGroup = group
-        return self
-    
+        return self

armodel/models/{annotation.py → M2/MSR/Documentation/Annotation.py}

@@ -1,16 +1,14 @@
-
+from ....M2.MSR.Documentation.BlockElements import DocumentationBlock
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
+from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultilanguageLongName
 from abc import ABCMeta
 
-from .m2.msr.documentation.block_elements import DocumentationBlock
-from .multilanguage_data import MultilanguageLongName
-from .ar_object import ARLiteral, ARObject
-
-
 class GeneralAnnotation(ARObject, metaclass=ABCMeta):
     def __init__(self):
         if type(self) == ARObject:
             raise NotImplementedError("GeneralAnnotation is an abstract class.")
-        
+
         super().__init__()
 
         self.annotationOrigin = None        # type: ARLiteral
@@ -23,7 +21,7 @@ class GeneralAnnotation(ARObject, metaclass=ABCMeta):
     def setAnnotationOrigin(self, value: ARLiteral):
         self.annotationOrigin = value
         return self
-    
+
     def getAnnotationText(self) -> DocumentationBlock:
         return self.annotationText
 
@@ -38,7 +36,7 @@ class GeneralAnnotation(ARObject, metaclass=ABCMeta):
         self.label = value
         return  self
 
+
 class Annotation(GeneralAnnotation):
     def __init__(self):
-        super().__init__()
-
+        super().__init__()

armodel/models/{m2/msr/documentation/block_elements.py → M2/MSR/Documentation/BlockElements.py}

@@ -1,6 +1,6 @@
 from typing import List
-from .....models.multilanguage_data import MultiLanguageParagraph
-from .....models.ar_object import ARObject
+from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageParagraph
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
 class DocumentationBlock(ARObject):
     def __init__(self):

armodel/models/M2/MSR/Documentation/TextModel/LanguageDataModel.py

@@ -0,0 +1,16 @@
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+
+class LOverviewParagraph(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.l = ""
+        self.value = ""
+
+
+class LLongName(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.l = ""
+        self.value = ""

armodel/models/{multilanguage_data.py → M2/MSR/Documentation/TextModel/MultilanguageData.py}

@@ -1,35 +1,8 @@
-
 from typing import List
-from .ar_object import ARObject
-
-
-class LLongName(ARObject):
-    def __init__(self):
-        super().__init__()
-
-        self.l = ""
-        self.value = ""
-
-class LOverviewParagraph(ARObject):
-    def __init__(self):
-        super().__init__()
-
-        self.l = ""
-        self.value = ""
-
-class MultilanguageLongName(ARObject):
-    def __init__(self):
-        super().__init__()
-
-        self.l4 = []        # type：List[LLongName]
-
-    def addL4(self, l4: LLongName):
-        self.l4.append(l4)
-        return self
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.MSR.Documentation.TextModel.LanguageDataModel import LOverviewParagraph
+from .....M2.MSR.Documentation.TextModel.LanguageDataModel import LLongName
 
-    def getL4s(self) -> List[LLongName]:
-        return self.l4
-    
 class MultiLanguageParagraph(ARObject):
     def __init__(self):
         super().__init__()
@@ -39,10 +12,11 @@ class MultiLanguageParagraph(ARObject):
     def addL1(self, l1: LLongName):
         self.l1.append(l1)
         return self
-    
+
     def getL1s(self) -> List[LLongName]:
         return self.l1
 
+
 class MultiLanguageOverviewParagraph(ARObject):
     def __init__(self):
         super().__init__()
@@ -54,4 +28,18 @@ class MultiLanguageOverviewParagraph(ARObject):
         return self
 
     def getL2s(self) -> List[LOverviewParagraph]:
-        return self.l2
+        return self.l2
+
+
+class MultilanguageLongName(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.l4 = []        # type：List[LLongName]
+
+    def addL4(self, l4: LLongName):
+        self.l4.append(l4)
+        return self
+
+    def getL4s(self) -> List[LLongName]:
+        return self.l4

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

@@ -0,0 +1,3 @@
+from .Annotation import *
+from .BlockElements import *
+from .TextModel import *

armodel/models/M2/MSR/__init__.py

@@ -0,0 +1 @@
+ 

armodel/models/__init__.py

@@ -1,24 +1,50 @@
-from .annotation import *
-from .ar_object import *
-from .general_structure import *
-from .common_structure import *
-from .sw_component import *
-from .m2.autosar_templates.autosar_top_level_structure import *
-from .ar_ref import *
-from .datatype import *
-from .port_prototype import * 
-from .m2.autosar_templates.sw_component_template.data_type.data_prototypes import *
-from .m2.msr.asam_hdo.units import *
-from .m2.msr.data_dictionary.data_def_properties import *
-from .m2.msr.data_dictionary.auxillary_objects import *
-from .m2.autosar_templates.sw_component_template.port_interface import *
-from .m2_msr import *
-from .implementation import *
-from .bsw_module_template import *
-from .communication import *
-from .calibration import *
-from .global_constraints import *
-from .m2.msr.asam_hdo.units import *
-from .m2.autosar_templates.sw_component_template import *
-from .m2.autosar_templates.sw_component_template.components import *
-from .m2.autosar_templates.sw_component_template.composition import *
+from .M2.MSR.AsamHdo import *
+from .M2.MSR.AsamHdo.AdminData import *
+from .M2.MSR.AsamHdo.BaseTypes import *
+from .M2.MSR.AsamHdo.ComputationMethod import *
+from .M2.MSR.AsamHdo.SpecialData import *
+from .M2.MSR.AsamHdo.Units import *
+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.LanguageDataModel import *
+from .M2.MSR.Documentation.TextModel.MultilanguageData import *
+from .M2.AUTOSARTemplates.AutosarTopLevelStructure import *
+from .M2.AUTOSARTemplates.BswModuleTemplate import *
+from .M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import *
+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.Implementation import *
+from .M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import *
+from .M2.AUTOSARTemplates.CommonStructure.InternalBehavior import *
+from .M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import *
+from .M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import *
+from .M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import *
+from .M2.AUTOSARTemplates.CommonStructure.TriggerDeclaration import *
+from .M2.AUTOSARTemplates.SWComponentTemplate import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.Communication import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.Components import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.Composition import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.RPTScenario import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcImplementation import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.DataElements import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.AccessCount import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import *
+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.ServerCall import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.Trigger import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication 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 *

armodel/parser/abstract_arxml_parser.py

@@ -7,10 +7,14 @@ import re
 import logging
 import xml.etree.ElementTree as ET
 
-from ..models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
-from ..models.ar_ref import RefType
-from ..models.ar_object import ARBoolean, ARFloat, ARLiteral, ARNumerical, ARObject
-from ..models.general_structure import Limit
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical
+
+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: