Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OSUG
RESIF
ws-timeseries
Commits
e7bd43d5
Commit
e7bd43d5
authored
May 18, 2021
by
Jerome Touvier
Browse files
move the merge method after the processed stream
parent
f5078aa2
Changes
3
Hide whitespace changes
Inline
Side-by-side
apps/timeseries/output.py
View file @
e7bd43d5
...
...
@@ -228,6 +228,7 @@ def get_output(params):
return
error_nodata
(
params
,
Error
.
RESPONSE
)
st
=
get_processed_signal
(
st
,
params
)
st
.
merge
(
method
=
1
)
if
params
[
"format"
]
==
"plot"
:
response
=
static_plots
(
params
,
st
)
...
...
apps/timeseriesplot/output.py
View file @
e7bd43d5
...
...
@@ -161,6 +161,7 @@ def get_output(params):
return
error_nodata
(
params
,
Error
.
RESPONSE
)
st
=
get_processed_signal
(
st
,
params
)
st
.
merge
(
method
=
1
)
if
params
[
"iplot"
]:
response
=
dynamic_plots
(
params
,
st
)
...
...
apps/utils.py
View file @
e7bd43d5
...
...
@@ -369,7 +369,6 @@ def get_signal_from_client(params):
end
,
)
logging
.
debug
(
"Transfer terminated."
)
st
.
merge
(
method
=
1
)
st
.
trim
(
start
,
end
)
logging
.
debug
(
"Trimming terminated."
)
return
st
...
...
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