From 3cde098ec45b972935d445e9ec51c3938a1e496b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Steinhagen?= Date: Mon, 18 Oct 2021 14:15:13 +0200 Subject: [PATCH 1/4] First Commit WIP - Work in Progress! --- RFEM/firstFreeNumber.py | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 RFEM/firstFreeNumber.py diff --git a/RFEM/firstFreeNumber.py b/RFEM/firstFreeNumber.py new file mode 100644 index 00000000..e0df261b --- /dev/null +++ b/RFEM/firstFreeNumber.py @@ -0,0 +1,7 @@ +from RFEM.initModel import * +from RFEM.enums import ObjectTypes + +def FirstFreeNumber(type = ObjectTypes.E_OBJECT_TYPE_MEMBER, + parent_no: int = 0): + + return clientModel.service.get_first_free_number(type.name, parent_no) \ No newline at end of file From 2ae988bf9a23db0da12288b317c29c86954e0ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Steinhagen?= Date: Fri, 22 Oct 2021 14:02:35 +0200 Subject: [PATCH 2/4] Functoin to init Model --- RFEM/firstFreeNumber.py | 7 ------- RFEM/initModel.py | 7 ++++++- 2 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 RFEM/firstFreeNumber.py diff --git a/RFEM/firstFreeNumber.py b/RFEM/firstFreeNumber.py deleted file mode 100644 index e0df261b..00000000 --- a/RFEM/firstFreeNumber.py +++ /dev/null @@ -1,7 +0,0 @@ -from RFEM.initModel import * -from RFEM.enums import ObjectTypes - -def FirstFreeNumber(type = ObjectTypes.E_OBJECT_TYPE_MEMBER, - parent_no: int = 0): - - return clientModel.service.get_first_free_number(type.name, parent_no) \ No newline at end of file diff --git a/RFEM/initModel.py b/RFEM/initModel.py index f1829628..7179a55e 100644 --- a/RFEM/initModel.py +++ b/RFEM/initModel.py @@ -297,4 +297,9 @@ def ParseCSVResultsFromSelectedFileToDict(filePath: str): def ParseXMLResultsFromSelectedFileToDict(filePath: str): - return __parseXMLAsDictionary(filePath) \ No newline at end of file + return __parseXMLAsDictionary(filePath) + +def FirstFreeNumber(type = ObjectTypes.E_OBJECT_TYPE_MEMBER, + parent_no: int = 0): + + return clientModel.service.get_first_free_number(type.name, parent_no) \ No newline at end of file From b5992f94026df8b5e4cb0f43ac931d3d87630251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Steinhagen?= Date: Mon, 25 Oct 2021 09:24:23 +0200 Subject: [PATCH 3/4] Comments incorporated Function name changed Docstrings added --- RFEM/initModel.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/RFEM/initModel.py b/RFEM/initModel.py index 7179a55e..20f81408 100644 --- a/RFEM/initModel.py +++ b/RFEM/initModel.py @@ -299,7 +299,18 @@ def ParseXMLResultsFromSelectedFileToDict(filePath: str): return __parseXMLAsDictionary(filePath) -def FirstFreeNumber(type = ObjectTypes.E_OBJECT_TYPE_MEMBER, +def FirstFreeIdNumber(type = ObjectTypes.E_OBJECT_TYPE_MEMBER, parent_no: int = 0): + ''' + This method returns the next available Id Number for the selected object type. + + Args: + type (enum): Object Type + parent_no (int): Object Parent Number + Note: + (1) A geometric object has, in general, a parent_no = 0 + (2) The parent_no parameter becomes signficant for example with loads + ''' + return clientModel.service.get_first_free_number(type.name, parent_no) \ No newline at end of file From bf9b0b90d992962a26e49c7e10bf48761c0fab6a Mon Sep 17 00:00:00 2001 From: Jaroslav Broz Date: Mon, 25 Oct 2021 09:52:49 +0200 Subject: [PATCH 4/4] typo corrected --- RFEM/initModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFEM/initModel.py b/RFEM/initModel.py index 20f81408..cec7af79 100644 --- a/RFEM/initModel.py +++ b/RFEM/initModel.py @@ -310,7 +310,7 @@ def FirstFreeIdNumber(type = ObjectTypes.E_OBJECT_TYPE_MEMBER, parent_no (int): Object Parent Number Note: (1) A geometric object has, in general, a parent_no = 0 - (2) The parent_no parameter becomes signficant for example with loads + (2) The parent_no parameter becomes significant for example with loads ''' return clientModel.service.get_first_free_number(type.name, parent_no) \ No newline at end of file