X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=e0e3de65f3c9adc427f0ae877e79f0fcb4b0de1e;hp=0370793d0407b9a9d8db11dc55e592f50ef53732;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=5a0192d4091b29e1e8e103482a498bd6c050c666
diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 0370793d..e0e3de65 100644
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -14,12 +14,12 @@
* 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 "ruler.hpp"
#include "view.hpp"
#include "pv/util.hpp"
@@ -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,9 +61,21 @@ shared_ptr CursorPair::second() const
return second_;
}
-QPoint CursorPair::point() const
+void CursorPair::set_time(const pv::util::Timestamp& time)
{
- return first_->point();
+ const pv::util::Timestamp 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 first_->point(rect);
}
pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
@@ -70,11 +84,9 @@ pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
return nullptr;
}
-QRectF CursorPair::get_label_rect(const QRect &rect) const
+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 :
@@ -86,28 +98,39 @@ QRectF CursorPair::get_label_rect(const QRect &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::draw_markers(QPainter &p, const QRect &rect)
+void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover)
{
assert(first_);
assert(second_);
- const unsigned int prefix = view_.tick_prefix();
+ if (!enabled())
+ return;
+
+ const QColor text_colour =
+ ViewItem::select_text_colour(Cursor::FillColour);
- compute_text_size(p, prefix);
- QRectF delta_rect(get_label_rect(rect));
+ 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;
- p.setBrush(Cursor::FillColour);
+ 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);
@@ -115,49 +138,48 @@ void CursorPair::draw_markers(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());
}
-
- // Paint the cursor markers
- first_->paint_label(p, rect);
- second_->paint_label(p, rect);
}
-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
@@ -166,9 +188,10 @@ pair CursorPair::get_cursor_offsets() const
assert(second_);
return pair(
- (first_->time() - view_.offset()) / view_.scale(),
- (second_->time() - view_.offset()) / view_.scale());
+ ((first_->time() - view_.offset()) / view_.scale()).convert_to(),
+ ((second_->time() - view_.offset()) / view_.scale()).convert_to());
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv