X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=24d036652d763ca6d9a4be898a2cdcbeedd35020;hp=ecce13893def06fb3e4c3f8559d412ef8d2fa5cc;hb=cb5a1216019ae561046f7812b7fc67c11ea3d6c5;hpb=9a3774933c3051262af1f0e3ec4bd747fd6b4f48
diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index ecce1389..24d03665 100644
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -14,17 +14,17 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include "cursorpair.hpp"
-#include "view.hpp"
#include "pv/util.hpp"
+#include "ruler.hpp"
+#include "view.hpp"
-#include
#include
+#include
using std::max;
using std::make_pair;
@@ -33,9 +33,11 @@ using std::shared_ptr;
using std::pair;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const int CursorPair::DeltaPadding = 8;
+const QColor CursorPair::ViewportFillColour(220, 231, 243);
CursorPair::CursorPair(View &view) :
TimeItem(view),
@@ -59,8 +61,9 @@ shared_ptr CursorPair::second() const
return second_;
}
-void CursorPair::set_time(double time) {
- const double delta = second_->time() - first_->time();
+void CursorPair::set_time(const pv::util::Timestamp& time)
+{
+ const pv::util::Timestamp delta = second_->time() - first_->time();
first_->set_time(time);
second_->set_time(time + delta);
}
@@ -70,9 +73,9 @@ float CursorPair::get_x() const
return (first_->get_x() + second_->get_x()) / 2.0f;
}
-QPoint CursorPair::point() const
+QPoint CursorPair::point(const QRect &rect) const
{
- return first_->point();
+ return first_->point(rect);
}
pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
@@ -83,9 +86,7 @@ pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
QRectF CursorPair::label_rect(const QRectF &rect) const
{
- const QSizeF label_size(
- text_size_.width() + View::LabelPadding.width() * 2,
- text_size_.height() + View::LabelPadding.height() * 2);
+ const QSizeF label_size(text_size_ + LabelPadding * 2);
const pair offsets(get_cursor_offsets());
const pair normal_offsets(
(offsets.first < offsets.second) ? offsets :
@@ -97,11 +98,11 @@ QRectF CursorPair::label_rect(const QRectF &rect) const
(float)rect.width() + height);
return QRectF(left, rect.height() - label_size.height() -
- TimeMarker::ArrowSize - TimeMarker::Offset - 0.5f,
+ TimeMarker::ArrowSize - 0.5f,
right - left, height);
}
-void CursorPair::paint_label(QPainter &p, const QRect &rect)
+void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover)
{
assert(first_);
assert(second_);
@@ -109,16 +110,17 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect)
if (!enabled())
return;
- const unsigned int prefix = view_.tick_prefix();
+ const QColor text_colour =
+ ViewItem::select_text_colour(Cursor::FillColour);
- compute_text_size(p, prefix);
+ 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));
- if(text_rect.width() >= text_size_.width())
- {
+ if (text_rect.width() >= text_size_.width()) {
const int highlight_radius = delta_rect.height() / 2 - 2;
if (selected()) {
@@ -127,7 +129,8 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect)
p.drawRoundedRect(delta_rect, radius, radius);
}
- p.setBrush(Cursor::FillColour);
+ p.setBrush(hover ? Cursor::FillColour.lighter() :
+ Cursor::FillColour);
p.setPen(Cursor::FillColour.darker());
p.drawRoundedRect(delta_rect, radius, radius);
@@ -135,45 +138,48 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect)
p.setPen(Cursor::FillColour.lighter());
p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
- p.setPen(SelectableItem::select_text_colour(
- Cursor::FillColour));
+ p.setPen(text_colour);
p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
- pv::util::format_time(second_->time() - first_->time(), prefix, 2));
+ format_string());
}
}
-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.setBrush(QBrush(View::CursorAreaColour));
+ p.setBrush(QBrush(ViewportFillColour));
const pair 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()
{
- assert(first_);
- assert(second_);
+ const pv::util::SIPrefix prefix = view_.tick_prefix();
+ const pv::util::Timestamp diff = abs(second_->time() - first_->time());
+
+ const QString s1 = Ruler::format_time_with_distance(
+ diff, diff, prefix, view_.time_unit(), view_.tick_precision(), false);
+ const QString s2 = util::format_time_si(
+ 1 / diff, pv::util::SIPrefix::unspecified, 4, "Hz", false);
- first_->paint(p, rect);
- second_->paint(p, rect);
+ return QString("%1 / %2").arg(s1).arg(s2);
}
-void CursorPair::compute_text_size(QPainter &p, unsigned int prefix)
+void CursorPair::compute_text_size(QPainter &p)
{
assert(first_);
assert(second_);
- text_size_ = p.boundingRect(QRectF(), 0, pv::util::format_time(
- second_->time() - first_->time(), prefix, 2)).size();
+ text_size_ = p.boundingRect(QRectF(), 0, format_string()).size();
}
pair CursorPair::get_cursor_offsets() const
@@ -181,10 +187,9 @@ pair CursorPair::get_cursor_offsets() const
assert(first_);
assert(second_);
- return pair(
- (first_->time() - view_.offset()) / view_.scale(),
- (second_->time() - view_.offset()) / view_.scale());
+ return pair(first_->get_x(), second_->get_x());
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv