Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Seitosh
Seitosh
Commits
538da9d6
Commit
538da9d6
authored
Jan 05, 2017
by
thomas.forbriger
Browse files
ts/stuploxx [FIX]: properly handle negative time offset
parent
718f5f71
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/ts/stuploxx/scaling.cc
View file @
538da9d6
...
...
@@ -43,11 +43,7 @@ namespace stuplo {
pgplot
::
Trange
PanelTime
::
frange
()
const
{
libtime
::
TRelativeTime
first
=
this
->
begin
()
-
this
->
reference
();
libtime
::
TRelativeTime
last
=
this
->
end
()
-
this
->
reference
();
float
ffirst
=
libtime
::
time2double
(
first
);
float
flast
=
libtime
::
time2double
(
last
);
pgplot
::
Trange
range
(
ffirst
,
flast
);
pgplot
::
Trange
range
(
this
->
fbegin
(),
this
->
fend
());
return
(
range
);
}
// pgplot::Trange PanelTime::frange() const
...
...
@@ -55,14 +51,18 @@ namespace stuplo {
float
PanelTime
::
fbegin
()
const
{
return
(
float
(
libtime
::
time2double
(
this
->
begin
()
-
this
->
reference
())));
float
diff
=
libtime
::
time2double
(
this
->
begin
()
-
this
->
reference
());
if
(
this
->
begin
()
<
this
->
reference
())
{
diff
*=
-
1.
;
}
return
(
diff
);
}
/*----------------------------------------------------------------------*/
float
PanelTime
::
fend
()
const
{
return
(
float
(
libtime
::
time2double
(
this
->
end
()
-
this
->
reference
())));
float
diff
=
libtime
::
time2double
(
this
->
end
()
-
this
->
reference
());
if
(
this
->
end
()
<
this
->
reference
())
{
diff
*=
-
1.
;
}
return
(
diff
);
}
/*----------------------------------------------------------------------*/
...
...
@@ -73,19 +73,19 @@ namespace stuplo {
libtime
::
TAbsoluteTime
aend
;
if
(
range
.
min
<
0
)
{
abegin
=
M
reference
time
-
libtime
::
double2time
(
-
range
.
min
);
abegin
=
this
->
reference
()
-
libtime
::
double2time
(
-
range
.
min
);
}
else
{
abegin
=
M
reference
time
+
libtime
::
double2time
(
range
.
min
);
abegin
=
this
->
reference
()
+
libtime
::
double2time
(
range
.
min
);
}
if
(
range
.
max
<
0
)
{
aend
=
M
reference
time
-
libtime
::
double2time
(
-
range
.
max
);
aend
=
this
->
reference
()
-
libtime
::
double2time
(
-
range
.
max
);
}
else
{
aend
=
M
reference
time
+
libtime
::
double2time
(
range
.
max
);
aend
=
this
->
reference
()
+
libtime
::
double2time
(
range
.
max
);
}
this
->
setrange
(
libtime
::
TRange
(
abegin
,
aend
));
}
...
...
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