X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=0376c2d40d7badbefefd632bbd0e42437248b6be;hp=e4704be497500fd3323ef254ca2dc6c35086d06f;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=60d9b99a32e551cffd2b537d3e157d578a761c9b diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp index e4704be..0376c2d 100644 --- a/pv/view/cursor.cpp +++ b/pv/view/cursor.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 "cursor.hpp" +#include "ruler.hpp" #include "view.hpp" #include "pv/util.hpp" @@ -39,7 +39,8 @@ using std::shared_ptr; using std::numeric_limits; namespace pv { -namespace view { +namespace views { +namespace TraceView { const QColor Cursor::FillColour(52, 101, 164); @@ -55,8 +56,11 @@ bool Cursor::enabled() const QString Cursor::get_text() const { - return util::format_time(time_, view_.tick_prefix(), - view_.time_unit(), 2); + 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::label_rect(const QRectF &rect) const @@ -93,5 +97,6 @@ shared_ptr Cursor::get_other_cursor() const cursors->second() : cursors->first(); } -} // namespace view +} // namespace TraceView +} // namespace views } // namespace pv