projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6e2c3c8
)
TimeMarker: Fixed position of set_time function
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sat, 13 Dec 2014 15:45:07 +0000
(15:45 +0000)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sun, 28 Dec 2014 18:52:53 +0000
(18:52 +0000)
pv/view/timemarker.cpp
patch
|
blob
|
history
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index ad3830590a8b059a1d3006275c3e812f0dff2e8e..8eed6e7e2b6240c91c9cef368e3873df100b392b 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-57,16
+57,6
@@
double TimeMarker::time() const
return time_;
}
return time_;
}
-float TimeMarker::get_x() const
-{
- return (time_ - view_.offset()) / view_.scale();
-}
-
-QPoint TimeMarker::point() const
-{
- return QPoint(get_x(), 0);
-}
-
void TimeMarker::set_time(double time)
{
time_ = time;
void TimeMarker::set_time(double time)
{
time_ = time;
@@
-80,6
+70,16
@@
void TimeMarker::set_time(double time)
time_changed();
}
time_changed();
}
+float TimeMarker::get_x() const
+{
+ return (time_ - view_.offset()) / view_.scale();
+}
+
+QPoint TimeMarker::point() const
+{
+ return QPoint(get_x(), 0);
+}
+
QRectF TimeMarker::label_rect(const QRectF &rect) const
{
const float x = (time_ - view_.offset()) / view_.scale();
QRectF TimeMarker::label_rect(const QRectF &rect) const
{
const float x = (time_ - view_.offset()) / view_.scale();