projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CursorPair: Added frequency indication
[pulseview.git]
/
pv
/
view
/
cursorpair.cpp
diff --git
a/pv/view/cursorpair.cpp
b/pv/view/cursorpair.cpp
index d8af3d76f319e19596e406f2b4aa9deca1f24685..4f4d39754805ee2cf988f42b8c2b011b24e7454f 100644
(file)
--- a/
pv/view/cursorpair.cpp
+++ b/
pv/view/cursorpair.cpp
@@
-18,52
+18,73
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "cursorpair.h"
+#include "cursorpair.h
pp
"
-#include "
ruler.h
"
-#include "
view.h
"
+#include "
view.hpp
"
+#include "
pv/util.hpp
"
+#include <cassert>
#include <algorithm>
#include <algorithm>
-using namespace std;
+using std::max;
+using std::make_pair;
+using std::min;
+using std::shared_ptr;
+using std::pair;
namespace pv {
namespace view {
const int CursorPair::DeltaPadding = 8;
namespace pv {
namespace view {
const int CursorPair::DeltaPadding = 8;
+const QColor CursorPair::ViewportFillColour(220, 231, 243);
-CursorPair::CursorPair(
const
View &view) :
-
_first(view, 0.0, _second
),
-
_second(view, 1.0, _first
),
-
_view(view
)
+CursorPair::CursorPair(View &view) :
+
TimeItem(view
),
+
first_(new Cursor(view, 0.0)
),
+
second_(new Cursor(view, 1.0)
)
{
}
{
}
-
const Cursor& CursorPair::first
() const
+
bool CursorPair::enabled
() const
{
{
- return
_first
;
+ return
view_.cursors_shown()
;
}
}
-Cursor& CursorPair::first()
+shared_ptr<Cursor> CursorPair::first() const
{
{
- return
_first
;
+ return
first_
;
}
}
-
const Cursor&
CursorPair::second() const
+
shared_ptr<Cursor>
CursorPair::second() const
{
{
- return
_second
;
+ return
second_
;
}
}
-Cursor& CursorPair::second()
+void CursorPair::set_time(double time) {
+ const double delta = second_->time() - first_->time();
+ first_->set_time(time);
+ second_->set_time(time + delta);
+}
+
+float CursorPair::get_x() const
+{
+ return (first_->get_x() + second_->get_x()) / 2.0f;
+}
+
+QPoint CursorPair::point(const QRect &rect) const
{
{
- return
_second
;
+ return
first_->point(rect)
;
}
}
-QRectF CursorPair::get_label_rect(const QRect &rect) const
+pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
{
{
- const QSizeF label_size(
- _text_size.width() + View::LabelPadding.width() * 2,
- _text_size.height() + View::LabelPadding.height() * 2);
+ (void)parent;
+ return nullptr;
+}
+
+QRectF CursorPair::label_rect(const QRectF &rect) const
+{
+ const QSizeF label_size(text_size_ + LabelPadding * 2);
const pair<float, float> offsets(get_cursor_offsets());
const pair<float, float> normal_offsets(
(offsets.first < offsets.second) ? offsets :
const pair<float, float> offsets(get_cursor_offsets());
const pair<float, float> normal_offsets(
(offsets.first < offsets.second) ? offsets :
@@
-75,74
+96,94
@@
QRectF CursorPair::get_label_rect(const QRect &rect) const
(float)rect.width() + height);
return QRectF(left, rect.height() - label_size.height() -
(float)rect.width() + height);
return QRectF(left, rect.height() - label_size.height() -
-
Cursor::ArrowSize - Cursor::Offset
- 0.5f,
+
TimeMarker::ArrowSize
- 0.5f,
right - left, height);
}
right - left, height);
}
-void CursorPair::draw_markers(QPainter &p,
- const QRect &rect, unsigned int prefix)
+void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover)
{
{
- compute_text_size(p, prefix);
- QRectF delta_rect(get_label_rect(rect));
+ assert(first_);
+ assert(second_);
+
+ if (!enabled())
+ return;
+
+ const QColor text_colour =
+ ViewItem::select_text_colour(Cursor::FillColour);
+
+ p.setPen(text_colour);
+ compute_text_size(p);
+ QRectF delta_rect(label_rect(rect));
const int radius = delta_rect.height() / 2;
const QRectF text_rect(delta_rect.intersected(
rect).adjusted(radius, 0, -radius, 0));
const int radius = delta_rect.height() / 2;
const QRectF text_rect(delta_rect.intersected(
rect).adjusted(radius, 0, -radius, 0));
- if(text_rect.width() >=
_text_size
.width())
+ if(text_rect.width() >=
text_size_
.width())
{
const int highlight_radius = delta_rect.height() / 2 - 2;
{
const int highlight_radius = delta_rect.height() / 2 - 2;
- p.setBrush(Cursor::FillColour);
- p.setPen(Cursor::LineColour);
+ if (selected()) {
+ p.setBrush(Qt::transparent);
+ p.setPen(highlight_pen());
+ p.drawRoundedRect(delta_rect, radius, radius);
+ }
+
+ p.setBrush(hover ? Cursor::FillColour.lighter() :
+ Cursor::FillColour);
+ p.setPen(Cursor::FillColour.darker());
p.drawRoundedRect(delta_rect, radius, radius);
delta_rect.adjust(1, 1, -1, -1);
p.drawRoundedRect(delta_rect, radius, radius);
delta_rect.adjust(1, 1, -1, -1);
- p.setPen(Cursor::
HighlightColour
);
+ p.setPen(Cursor::
FillColour.lighter()
);
p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
- p.setPen(
Cursor::TextC
olour);
+ p.setPen(
text_c
olour);
p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
-
Ruler::format_time(_second.time() - _first.time(), prefix, 2
));
+
format_string(
));
}
}
-
- // Paint the cursor markers
- _first.paint_label(p, rect, prefix);
- _second.paint_label(p, rect, prefix);
}
}
-void CursorPair::draw_viewport_background(QPainter &p,
- const QRect &rect)
-{
+void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) {
+ if (!enabled())
+ return;
+
p.setPen(Qt::NoPen);
p.setPen(Qt::NoPen);
- p.setBrush(QBrush(View
::CursorArea
Colour));
+ p.setBrush(QBrush(View
portFill
Colour));
const pair<float, float> offsets(get_cursor_offsets());
const int l = (int)max(min(
offsets.first, offsets.second), 0.0f);
const int r = (int)min(max(
const pair<float, float> offsets(get_cursor_offsets());
const int l = (int)max(min(
offsets.first, offsets.second), 0.0f);
const int r = (int)min(max(
- offsets.first, offsets.second), (float)
rect
.width());
+ offsets.first, offsets.second), (float)
pp
.width());
- p.drawRect(l,
0, r - l, rect
.height());
+ p.drawRect(l,
pp.top(), r - l, pp
.height());
}
}
-void CursorPair::draw_viewport_foreground(QPainter &p,
- const QRect &rect)
+QString CursorPair::format_string()
{
{
- _first.paint(p, rect);
- _second.paint(p, rect);
+ const unsigned int prefix = view_.tick_prefix();
+ const double delta = second_->time() - first_->time();
+ return QString("%1 / %2").
+ arg(util::format_time(delta, prefix, 2)).
+ arg(util::format_si_value(1.0 / fabs(delta), "Hz", -1, 4));
}
}
-void CursorPair::compute_text_size(QPainter &p
, unsigned int prefix
)
+void CursorPair::compute_text_size(QPainter &p)
{
{
- _text_size = p.boundingRect(QRectF(), 0, Ruler::format_time(
- _second.time() - _first.time(), prefix, 2)).size();
+ assert(first_);
+ assert(second_);
+
+ text_size_ = p.boundingRect(QRectF(), 0, format_string()).size();
}
pair<float, float> CursorPair::get_cursor_offsets() const
{
}
pair<float, float> CursorPair::get_cursor_offsets() const
{
+ assert(first_);
+ assert(second_);
+
return pair<float, float>(
return pair<float, float>(
- (
_first.time() - _view.offset()) / _view
.scale(),
- (
_second.time() - _view.offset()) / _view
.scale());
+ (
first_->time() - view_.offset()) / view_
.scale(),
+ (
second_->time() - view_.offset()) / view_
.scale());
}
} // namespace view
}
} // namespace view