Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
beat.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
14
Issues
14
List
Boards
Labels
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
beat
beat.core
Commits
796d9a0e
Commit
796d9a0e
authored
May 06, 2019
by
Samuel GAIST
Committed by
Flavio TARSETTI
May 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[plotterparameter] Pre-commit cleanup
parent
b12f863e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
21 deletions
+18
-21
beat/core/plotterparameter.py
beat/core/plotterparameter.py
+18
-21
No files found.
beat/core/plotterparameter.py
View file @
796d9a0e
...
...
@@ -42,15 +42,12 @@ plotterparameter
Validation for plotterparameters
"""
import
os
from
.
import
dataformat
from
.
import
schema
from
.
import
prototypes
from
.
import
utils
from
.
import
loader
from
.
import
plotter
class
Storage
(
utils
.
Storage
):
"""Resolves paths for plotterparameters
...
...
@@ -71,7 +68,9 @@ class Storage(utils.Storage):
self
.
fullname
=
name
self
.
prefix
=
prefix
path
=
utils
.
hashed_or_simple
(
self
.
prefix
,
"plotterparameters"
,
name
,
suffix
=
".json"
)
path
=
utils
.
hashed_or_simple
(
self
.
prefix
,
"plotterparameters"
,
name
,
suffix
=
".json"
)
path
=
path
[:
-
5
]
super
(
Storage
,
self
).
__init__
(
path
)
...
...
@@ -122,12 +121,7 @@ class Plotterparameter(object):
JSON decoder.
"""
def
__init__
(
self
,
prefix
,
data
,
plotter_cache
=
None
,
):
def
__init__
(
self
,
prefix
,
data
,
plotter_cache
=
None
):
self
.
_name
=
None
self
.
storage
=
None
self
.
errors
=
[]
...
...
@@ -170,20 +164,21 @@ class Plotterparameter(object):
self
.
_name
=
data
self
.
storage
=
Storage
(
self
.
prefix
,
self
.
_name
)
if
not
self
.
storage
.
json
.
exists
():
self
.
errors
.
append
(
f'Plotterparameter declaration file not found:
{
data
}
'
)
self
.
errors
.
append
(
f"Plotterparameter declaration file not found:
{
data
}
"
)
return
data
=
self
.
storage
.
json
.
path
# loads data from JSON declaration
# At this point, `data' can be a dictionary or ``None``
# Either way, assign something valid to `self.data'
if
data
is
None
:
# use the dummy plotterparameter
if
data
is
None
:
# use the dummy plotterparameter
self
.
data
,
self
.
errors
=
prototypes
.
load
(
"plotterparameter"
)
assert
not
self
.
errors
,
"
\
n
* %s"
%
"
\
n
*"
.
join
(
self
.
errors
)
assert
not
self
.
errors
,
"
\
n
* %s"
%
"
\
n
*"
.
join
(
self
.
errors
)
# nosec
else
:
# this runs basic validation, including JSON loading if required
self
.
data
,
self
.
errors
=
schema
.
validate
(
"plotterparameter"
,
data
)
def
_load_plotter
(
self
,
plotter_cache
):
"""Loads the plotter for the plotterparameter.
Assumes that `self.data' has been calculated.
...
...
@@ -195,7 +190,7 @@ class Plotterparameter(object):
"""
# find the plotter if it wasnt given
if
self
.
plotter
is
None
:
plotter_name
=
self
.
data
[
'plotter'
]
plotter_name
=
self
.
data
[
"plotter"
]
pl
=
None
if
plotter_name
in
plotter_cache
:
...
...
@@ -210,22 +205,24 @@ class Plotterparameter(object):
plotter_cache
[
plotter_name
]
=
pl
self
.
plotter
=
pl
def
_validate_data
(
self
):
"""Validates that the properties in the plotterparameter's
data properly configure the plotter's fields
"""
for
key
,
val
in
self
.
data
[
'data'
].
items
():
for
key
,
val
in
self
.
data
[
"data"
].
items
():
try
:
self
.
plotter
.
clean_parameter
(
key
,
val
)
except
KeyError
:
self
.
errors
.
append
(
f"'
{
key
}
' isn't a parameter for plotter
{
self
.
plotter
.
name
}
"
)
self
.
errors
.
append
(
f"'
{
key
}
' isn't a parameter for plotter
{
self
.
plotter
.
name
}
"
)
return
except
ValueError
:
self
.
errors
.
append
(
f"'
{
value
}
' is invalid for parameter
{
key
}
of plotter
{
self
.
plotter
.
name
}
"
)
self
.
errors
.
append
(
f"'
{
val
}
' is invalid for parameter
{
key
}
of plotter
{
self
.
plotter
.
name
}
"
)
return
@
property
def
valid
(
self
):
"""A boolean that indicates if this plotterparameter is valid or not"""
...
...
Write
Preview
Markdown
is supported
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