* 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 <cmath>
#include <extdef.h>
#include "timemarker.hpp"
+#include "pv/widgets/timestampspinbox.hpp"
#include "view.hpp"
+#include <QApplication>
+#include <QFontMetrics>
#include <QFormLayout>
#include <QPainter>
-#include <pv/util.hpp>
#include <pv/widgets/popup.hpp>
using std::max;
using std::min;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const int TimeMarker::ArrowSize = 4;
-const int TimeMarker::Offset = 1;
-TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
- view_(view),
+TimeMarker::TimeMarker(
+ View &view, const QColor &colour, const pv::util::Timestamp& time) :
+ TimeItem(view),
colour_(colour),
time_(time),
- value_action_(NULL),
- value_widget_(NULL),
+ value_action_(nullptr),
+ value_widget_(nullptr),
updating_value_widget_(false)
{
}
-double TimeMarker::time() const
+const pv::util::Timestamp& TimeMarker::time() const
{
return time_;
}
-float TimeMarker::get_x() const
-{
- return (time_ - view_.offset()) / view_.scale();
-}
-
-QPoint TimeMarker::point() const
-{
- return QPoint(get_x(), 0);
-}
-
-void TimeMarker::set_time(double time)
+void TimeMarker::set_time(const pv::util::Timestamp& time)
{
time_ = time;
updating_value_widget_ = false;
}
- time_changed();
+ view_.time_item_appearance_changed(true, true);
}
-void TimeMarker::paint(QPainter &p, const QRect &rect)
+float TimeMarker::get_x() const
{
+ // Use roundf() from cmath, std::roundf() causes Android issues (see #945).
+ return roundf(((time_ - view_.offset()) / view_.scale()).convert_to<float>()) + 0.5f;
+}
+
+QPoint TimeMarker::point(const QRect &rect) const
+{
+ return QPoint(get_x(), rect.bottom());
+}
+
+QRectF TimeMarker::label_rect(const QRectF &rect) const
+{
+ QFontMetrics m(QApplication::font());
+ const QSizeF text_size(
+ max(m.boundingRect(get_text()).size().width(), ArrowSize),
+ m.height());
+ const QSizeF label_size(text_size + LabelPadding * 2);
+ const float top = rect.height() - label_size.height() -
+ TimeMarker::ArrowSize - 0.5f;
const float x = get_x();
- p.setPen(colour_.darker());
- p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
+
+ return QRectF(QPointF(x - label_size.width() / 2, top), label_size);
}
-void TimeMarker::paint_label(QPainter &p, const QRect &rect)
+QRectF TimeMarker::hit_box_rect(const ViewItemPaintParams &pp) const
{
- const qreal x = (time_ - view_.offset()) / view_.scale();
- const QRectF r(get_label_rect(rect));
+ const float x = get_x();
+ const float h = QFontMetrics(QApplication::font()).height();
+ return QRectF(x - h / 2.0f, pp.top(), h, pp.height());
+}
+
+void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
+{
+ if (!enabled())
+ return;
+
+ const qreal x = get_x();
+ const QRectF r(label_rect(rect));
const QPointF points[] = {
r.topLeft(),
}
p.setPen(Qt::transparent);
- p.setBrush(colour_);
+ p.setBrush(hover ? colour_.lighter() : colour_);
p.drawPolygon(points, countof(points));
p.setPen(colour_.lighter());
p.drawPolygon(points, countof(points));
p.setPen(select_text_colour(colour_));
- p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,
- pv::util::format_time(time_, view_.tick_prefix(), 2));
+ p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
+}
+
+void TimeMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp)
+{
+ if (!enabled())
+ return;
+
+ const float x = get_x();
+ p.setPen(colour_.darker());
+ p.drawLine(QPointF(x, pp.top()), QPointF(x, pp.bottom()));
}
pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
using pv::widgets::Popup;
Popup *const popup = new Popup(parent);
+ popup->set_position(parent->mapToGlobal(
+ point(parent->rect())), Popup::Bottom);
+
QFormLayout *const form = new QFormLayout(popup);
popup->setLayout(form);
- value_widget_ = new QDoubleSpinBox(parent);
- value_widget_->setDecimals(9);
- value_widget_->setSuffix("s");
- value_widget_->setSingleStep(1e-6);
- value_widget_->setRange(-1.0e9, 1.0e9);
+ value_widget_ = new pv::widgets::TimestampSpinBox(parent);
value_widget_->setValue(time_);
- connect(value_widget_, SIGNAL(valueChanged(double)),
- this, SLOT(on_value_changed(double)));
+ connect(value_widget_, SIGNAL(valueChanged(const pv::util::Timestamp&)),
+ this, SLOT(on_value_changed(const pv::util::Timestamp&)));
form->addRow(tr("Time"), value_widget_);
return popup;
}
-void TimeMarker::on_value_changed(double value)
+void TimeMarker::on_value_changed(const pv::util::Timestamp& value)
{
- if (!updating_value_widget_) {
- time_ = value;
- time_changed();
- }
+ if (!updating_value_widget_)
+ set_time(value);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv