X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=05b9dfcad744bb6fb996ac4d91e178241bbe1702;hb=303eec78f3c499cd30fc88b282aa1f336e82a806;hp=d7723752b62e6952467ef5ec5c615df4f049c364;hpb=ef454ad5cf454ae2da91b45219e1be2e010d8312;p=pulseview.git
diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index d772375..05b9dfc 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,7 +33,8 @@ 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);
@@ -60,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);
}
@@ -118,8 +120,7 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover)
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()) {
@@ -143,7 +144,8 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover)
}
}
-void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) {
+void CursorPair::paint_back(QPainter &p, ViewItemPaintParams &pp)
+{
if (!enabled())
return;
@@ -161,11 +163,15 @@ void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) {
QString CursorPair::format_string()
{
- const unsigned int prefix = view_.tick_prefix();
- const double delta = second_->time() - first_->time();
- return QString("%1 / %2").
- arg(util::format_time(delta, prefix, view_.time_unit(), 2)).
- arg(util::format_si_value(1.0 / fabs(delta), "Hz", -1, 4));
+ 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)
@@ -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