Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Biometris
MCRA.DataConversionTools
Commits
1849eade
Commit
1849eade
authored
Apr 13, 2020
by
Hans van den Heuvel
Browse files
Better implemenation of datasheet iterator.
parent
52ec86a4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Convert-EUProcessingFactorsDB/mcra.py
View file @
1849eade
...
...
@@ -365,15 +365,7 @@ class DataSet:
# It is usefull to be able to iterate over all the datasheets.
# Basically, avoid using .list. in all DataSet references.
def
__iter__
(
self
):
self
.
n
=
0
return
self
def
__next__
(
self
):
if
self
.
n
<
len
(
self
.
list
):
self
.
n
=
self
.
n
+
1
return
getattr
(
self
,
self
.
list
[
self
.
n
-
1
])
else
:
raise
StopIteration
return
iter
(
self
.
list
)
# Container for all the files
def
add
(
self
,
name
,
default_name
,
default_dir
,
short_argument
=
None
,
...
...
@@ -381,6 +373,7 @@ class DataSet:
necessary
=
True
):
if
getattr
(
self
,
name
,
None
)
is
None
:
# Create a new sheet with a different name
# directly under this class. Then no .list is needed
setattr
(
self
,
name
,
DataSheet
(
...
...
@@ -391,7 +384,7 @@ class DataSet:
direction
=
direction
,
checksum
=
checksum
,
autoload
=
autoload
))
# But we must do some bookkeeping
self
.
list
.
append
(
name
)
long_argument
=
'--'
+
name
+
'_file'
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment