X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=0376c2d40d7badbefefd632bbd0e42437248b6be;hb=87a97d8aa169936ec2dcd229df88b8c5b4a1411c;hp=7a4272f956642b1129d1c3c37987074ff99cafa7;hpb=f796cf5163179e9df5cac676d0e3131be765b013;p=pulseview.git
diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 7a4272f..0376c2d 100644
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -14,132 +14,89 @@
* 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 "cursor.h"
+#include "cursor.hpp"
-#include "ruler.h"
-#include "view.h"
+#include "ruler.hpp"
+#include "view.hpp"
+#include "pv/util.hpp"
+#include
#include
#include
#include
#include
#include
-#include
+#include
+#include
+#include
-#include
+using std::abs;
+using std::shared_ptr;
+using std::numeric_limits;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
-const QColor Cursor::LineColour(32, 74, 135);
const QColor Cursor::FillColour(52, 101, 164);
-const QColor Cursor::HighlightColour(83, 130, 186);
-const QColor Cursor::TextColour(Qt::white);
-const int Cursor::Offset = 1;
+Cursor::Cursor(View &view, double time) :
+ TimeMarker(view, FillColour, time)
+{
+}
-const int Cursor::ArrowSize = 4;
+bool Cursor::enabled() const
+{
+ return view_.cursors_shown();
+}
-Cursor::Cursor(const View &view, double time, Cursor &other) :
- TimeMarker(view, LineColour, time),
- _other(other)
+QString Cursor::get_text() const
{
+ const shared_ptr other = get_other_cursor();
+ const pv::util::Timestamp& diff = abs(time_ - other->time_);
+
+ return Ruler::format_time_with_distance(
+ diff, time_, view_.tick_prefix(), view_.time_unit(), view_.tick_precision());
}
-QRectF Cursor::get_label_rect(const QRect &rect) const
+QRectF Cursor::label_rect(const QRectF &rect) const
{
- const float x = (_time - _view.offset()) / _view.scale();
+ const shared_ptr other(get_other_cursor());
+ assert(other);
+
+ const float x = ((time_ - view_.offset())/ view_.scale()).convert_to();
+
+ QFontMetrics m(QApplication::font());
+ QSize text_size = m.boundingRect(get_text()).size();
const QSizeF label_size(
- _text_size.width() + View::LabelPadding.width() * 2,
- _text_size.height() + View::LabelPadding.height() * 2);
+ text_size.width() + LabelPadding.width() * 2,
+ text_size.height() + LabelPadding.height() * 2);
const float top = rect.height() - label_size.height() -
- Cursor::Offset - Cursor::ArrowSize - 0.5f;
+ TimeMarker::ArrowSize - 0.5f;
const float height = label_size.height();
- if (_time > _other.time())
+ const pv::util::Timestamp& other_time = other->time();
+
+ if (time_ > other_time ||
+ (abs(time_ - other_time).is_zero() && this > other.get()))
return QRectF(x, top, label_size.width(), height);
else
- return QRectF(x - label_size.width(), top,
- label_size.width(), height);
-}
-
-void Cursor::paint_label(QPainter &p, const QRect &rect,
- unsigned int prefix)
-{
- compute_text_size(p, prefix);
- const QRectF r(get_label_rect(rect));
-
- const QPointF left_points[] = {
- r.topLeft(),
- r.topRight(),
- r.bottomRight(),
- QPointF(r.left() + ArrowSize, r.bottom()),
- QPointF(r.left(), rect.bottom()),
- };
-
- const QPointF right_points[] = {
- r.topRight(),
- r.topLeft(),
- r.bottomLeft(),
- QPointF(r.right() - ArrowSize, r.bottom()),
- QPointF(r.right(), rect.bottom()),
- };
-
- const QPointF left_highlight_points[] = {
- QPointF(r.left() + 1, r.top() + 1),
- QPointF(r.right() - 1, r.top() + 1),
- QPointF(r.right() - 1, r.bottom() - 1),
- QPointF(r.left() + ArrowSize - 1, r.bottom() - 1),
- QPointF(r.left() + 1, rect.bottom() - 1),
- };
-
- const QPointF right_highlight_points[] = {
- QPointF(r.right() - 1, r.top() + 1),
- QPointF(r.left() + 1, r.top() + 1),
- QPointF(r.left() + 1, r.bottom() - 1),
- QPointF(r.right() - ArrowSize + 1, r.bottom() - 1),
- QPointF(r.right() - 1, rect.bottom() - 1),
- };
-
- const QPointF *const points = (_time > _other.time()) ?
- left_points : right_points;
- const QPointF *const highlight_points = (_time > _other.time()) ?
- left_highlight_points : right_highlight_points;
-
- if (selected()) {
- p.setPen(highlight_pen());
- p.setBrush(Qt::transparent);
- p.drawPolygon(points, countof(left_points));
- }
-
- p.setPen(Qt::transparent);
- p.setBrush(FillColour);
- p.drawPolygon(points, countof(left_points));
-
- p.setPen(HighlightColour);
- p.setBrush(Qt::transparent);
- p.drawPolygon(highlight_points, countof(left_highlight_points));
-
- p.setPen(LineColour);
- p.setBrush(Qt::transparent);
- p.drawPolygon(points, countof(left_points));
-
- p.setPen(TextColour);
- p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,
- Ruler::format_time(_time, prefix, 2));
+ return QRectF(x - label_size.width(), top, label_size.width(), height);
}
-void Cursor::compute_text_size(QPainter &p, unsigned int prefix)
+shared_ptr Cursor::get_other_cursor() const
{
- _text_size = p.boundingRect(QRectF(), 0,
- Ruler::format_time(_time, prefix, 2)).size();
+ const shared_ptr cursors(view_.cursors());
+ assert(cursors);
+ return (cursors->first().get() == this) ?
+ cursors->second() : cursors->first();
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv