X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=24d036652d763ca6d9a4be898a2cdcbeedd35020;hp=5ce398a0ff3f764e9b0e6d6914bf9f258254bce0;hb=cb5a1216019ae561046f7812b7fc67c11ea3d6c5;hpb=199441e4fe68f1ee45f3d4b7617a7166a87c7926
diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 5ce398a0..24d03665 100644
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -14,83 +14,182 @@
* 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.h"
+#include "cursorpair.hpp"
-#include "view.h"
+#include "pv/util.hpp"
+#include "ruler.hpp"
+#include "view.hpp"
#include
+#include
-using namespace std;
+using std::max;
+using std::make_pair;
+using std::min;
+using std::shared_ptr;
+using std::pair;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
-CursorPair::CursorPair(const View &view) :
- _first(view, 0.0, _second),
- _second(view, 1.0, _first),
- _view(view)
+const int CursorPair::DeltaPadding = 8;
+const QColor CursorPair::ViewportFillColour(220, 231, 243);
+
+CursorPair::CursorPair(View &view) :
+ TimeItem(view),
+ first_(new Cursor(view, 0.0)),
+ second_(new Cursor(view, 1.0))
+{
+}
+
+bool CursorPair::enabled() const
+{
+ return view_.cursors_shown();
+}
+
+shared_ptr CursorPair::first() const
+{
+ return first_;
+}
+
+shared_ptr CursorPair::second() const
+{
+ return second_;
+}
+
+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);
}
-const Cursor& CursorPair::first() const
+float CursorPair::get_x() const
{
- return _first;
+ return (first_->get_x() + second_->get_x()) / 2.0f;
}
-Cursor& CursorPair::first()
+QPoint CursorPair::point(const QRect &rect) const
{
- return _first;
+ return first_->point(rect);
}
-const Cursor& CursorPair::second() const
+pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
{
- return _second;
+ (void)parent;
+ return nullptr;
}
-Cursor& CursorPair::second()
+QRectF CursorPair::label_rect(const QRectF &rect) const
{
- return _second;
+ const QSizeF label_size(text_size_ + LabelPadding * 2);
+ const pair offsets(get_cursor_offsets());
+ const pair normal_offsets(
+ (offsets.first < offsets.second) ? offsets :
+ make_pair(offsets.second, offsets.first));
+
+ const float height = label_size.height();
+ const float left = max(normal_offsets.first + DeltaPadding, -height);
+ const float right = min(normal_offsets.second - DeltaPadding,
+ (float)rect.width() + height);
+
+ return QRectF(left, rect.height() - label_size.height() -
+ TimeMarker::ArrowSize - 0.5f,
+ 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)
{
- _first.paint_label(p, rect, prefix);
- _second.paint_label(p, rect, prefix);
+ 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));
+ if (text_rect.width() >= text_size_.width()) {
+ const int highlight_radius = delta_rect.height() / 2 - 2;
+
+ 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.setPen(Cursor::FillColour.lighter());
+ p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
+
+ p.setPen(text_colour);
+ p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
+ 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()
{
- _first.paint(p, rect);
- _second.paint(p, rect);
+ 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);
+
+ return QString("%1 / %2").arg(s1).arg(s2);
+}
+
+void CursorPair::compute_text_size(QPainter &p)
+{
+ assert(first_);
+ assert(second_);
+
+ text_size_ = p.boundingRect(QRectF(), 0, format_string()).size();
}
pair CursorPair::get_cursor_offsets() const
{
- return pair(
- (_first.time() - _view.offset()) / _view.scale(),
- (_second.time() - _view.offset()) / _view.scale());
+ assert(first_);
+ assert(second_);
+
+ return pair(first_->get_x(), second_->get_x());
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv