X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fcursor.cpp;h=f22680b9f46f547bfbb315f43f9131140a588dc0;hb=ad21e6c1a85b991c0363232baf18ba7edbe2e31a;hp=e4704be497500fd3323ef254ca2dc6c35086d06f;hpb=60d9b99a32e551cffd2b537d3e157d578a761c9b;p=pulseview.git
diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index e4704be..f22680b 100644
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -14,14 +14,14 @@
* 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 "view.hpp"
#include "pv/util.hpp"
+#include "ruler.hpp"
+#include "view.hpp"
#include
#include
@@ -34,12 +34,12 @@
#include
#include
-using std::abs;
+using std::abs; // Force usage of std::abs() instead of C's abs().
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 +55,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
@@ -64,7 +67,7 @@ QRectF Cursor::label_rect(const QRectF &rect) const
const shared_ptr other(get_other_cursor());
assert(other);
- const float x = ((time_ - view_.offset())/ view_.scale()).convert_to();
+ const float x = get_x();
QFontMetrics m(QApplication::font());
QSize text_size = m.boundingRect(get_text()).size();
@@ -93,5 +96,6 @@ shared_ptr Cursor::get_other_cursor() const
cursors->second() : cursors->first();
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv