X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=f22680b9f46f547bfbb315f43f9131140a588dc0;hb=eae3bbbbfd35aef309c186e278ff7ab2d90f362a;hp=4f2ef126a83fa357e88f5b6d69872fd0802cc29e;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;p=pulseview.git diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp index 4f2ef126..f22680b9 100644 --- a/pv/view/cursor.cpp +++ b/pv/view/cursor.cpp @@ -14,15 +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 "pv/util.hpp" #include "ruler.hpp" #include "view.hpp" -#include "pv/util.hpp" #include #include @@ -35,9 +34,8 @@ #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 views { @@ -69,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();