projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TimeMarker: Align to a integer pixel offset
[pulseview.git]
/
pv
/
view
/
timemarker.cpp
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index 52fcf45612167fa50f2cbc4dffbcd975990a2ef6..88616bf20fb2cdb1a06367aeb8ee77250fc2c55b 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-14,22
+14,22
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* 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 <http://www.gnu.org/licenses/>.
*/
#include <algorithm>
*/
#include <algorithm>
+#include <cmath>
#include <extdef.h>
#include "timemarker.hpp"
#include <extdef.h>
#include "timemarker.hpp"
-#include "view.hpp"
#include "pv/widgets/timestampspinbox.hpp"
#include "pv/widgets/timestampspinbox.hpp"
+#include "view.hpp"
#include <QApplication>
#include <QApplication>
-#include <QFormLayout>
#include <QFontMetrics>
#include <QFontMetrics>
+#include <QFormLayout>
#include <QPainter>
#include <pv/widgets/popup.hpp>
#include <QPainter>
#include <pv/widgets/popup.hpp>
@@
-74,7
+74,7
@@
void TimeMarker::set_time(const pv::util::Timestamp& time)
float TimeMarker::get_x() const
{
float TimeMarker::get_x() const
{
- return
((time_ - view_.offset()) / view_.scale()).convert_to<float>()
;
+ return
std::roundf(((time_ - view_.offset()) / view_.scale()).convert_to<float>()) + 0.5f
;
}
QPoint TimeMarker::point(const QRect &rect) const
}
QPoint TimeMarker::point(const QRect &rect) const
@@
-108,7
+108,7
@@
void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
if (!enabled())
return;
if (!enabled())
return;
- const qreal x =
((time_ - view_.offset()) / view_.scale()).convert_to<qreal>
();
+ const qreal x =
get_x
();
const QRectF r(label_rect(rect));
const QPointF points[] = {
const QRectF r(label_rect(rect));
const QPointF points[] = {