projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pulseview_cross.nsi.in: Bump Python version to 3.6.
[pulseview.git]
/
pv
/
view
/
timemarker.hpp
diff --git
a/pv/view/timemarker.hpp
b/pv/view/timemarker.hpp
index 113a6a10a6f04c097d2bc9d828e1f516f63fa2f0..9dd43886ee4bcc7e699495ef4c3d273e73f92fa2 100644
(file)
--- a/
pv/view/timemarker.hpp
+++ b/
pv/view/timemarker.hpp
@@
-14,12
+14,11
@@
* 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/>.
*/
*/
-#ifndef PULSEVIEW_PV_VIEW
_MARKER_H
-#define PULSEVIEW_PV_VIEW
_MARKER_H
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW_MARKER_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW_MARKER_HPP
#include <QColor>
#include <QDoubleSpinBox>
#include <QColor>
#include <QDoubleSpinBox>
@@
-33,7
+32,12
@@
class QPainter;
class QRect;
namespace pv {
class QRect;
namespace pv {
-namespace view {
+namespace widgets {
+ class TimestampSpinBox;
+}
+
+namespace views {
+namespace TraceView {
class View;
class View;
@@
-51,40
+55,40
@@
protected:
* @param colour A reference to the colour of this cursor.
* @param time The time to set the flag to.
*/
* @param colour A reference to the colour of this cursor.
* @param time The time to set the flag to.
*/
- TimeMarker(View &view, const QColor &colour,
double
time);
+ TimeMarker(View &view, const QColor &colour,
const pv::util::Timestamp&
time);
public:
/**
* Gets the time of the marker.
*/
public:
/**
* Gets the time of the marker.
*/
-
double
time() const;
+
const pv::util::Timestamp&
time() const;
/**
* Sets the time of the marker.
*/
/**
* Sets the time of the marker.
*/
- void set_time(
double time)
;
+ void set_time(
const pv::util::Timestamp& time) override
;
- float get_x() const;
+ float get_x() const
override
;
/**
* Gets the arrow-tip point of the time marker.
* @param rect the rectangle of the ruler area.
*/
/**
* Gets the arrow-tip point of the time marker.
* @param rect the rectangle of the ruler area.
*/
- QPoint point(const QRect &rect) const;
+ QPoint point(const QRect &rect) const
override
;
/**
* Computes the outline rectangle of a label.
* @param rect the rectangle of the header area.
* @return Returns the rectangle of the signal label.
*/
/**
* Computes the outline rectangle of a label.
* @param rect the rectangle of the header area.
* @return Returns the rectangle of the signal label.
*/
- QRectF label_rect(const QRectF &rect) const;
+ QRectF label_rect(const QRectF &rect) const
override
;
/**
* Computes the outline rectangle of the viewport hit-box.
* @param rect the rectangle of the viewport area.
* @return Returns the rectangle of the hit-box.
*/
/**
* Computes the outline rectangle of the viewport hit-box.
* @param rect the rectangle of the viewport area.
* @return Returns the rectangle of the hit-box.
*/
- QRectF hit_box_rect(const
QRectF &rect) const
;
+ QRectF hit_box_rect(const
ViewItemPaintParams &pp) const override
;
/**
* Gets the text to show in the marker.
/**
* Gets the text to show in the marker.
@@
-97,33
+101,34
@@
public:
* @param rect The rectangle of the ruler client area.
* @param hover true if the label is being hovered over by the mouse.
*/
* @param rect The rectangle of the ruler client area.
* @param hover true if the label is being hovered over by the mouse.
*/
- void paint_label(QPainter &p, const QRect &rect, bool hover);
+ void paint_label(QPainter &p, const QRect &rect, bool hover)
override
;
/**
* Paints the foreground layer of the item with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
/**
* Paints the foreground layer of the item with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
- *
*
/
- void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
+ */
+ void paint_fore(QPainter &p, const ViewItemPaintParams &pp)
override
;
- virtual pv::widgets::Popup* create_popup(QWidget *parent);
+ virtual pv::widgets::Popup* create_popup(QWidget *parent)
override
;
private Q_SLOTS:
private Q_SLOTS:
- void on_value_changed(
double
value);
+ void on_value_changed(
const pv::util::Timestamp&
value);
protected:
const QColor &colour_;
protected:
const QColor &colour_;
-
double
time_;
+
pv::util::Timestamp
time_;
QSizeF text_size_;
QWidgetAction *value_action_;
QSizeF text_size_;
QWidgetAction *value_action_;
-
QDouble
SpinBox *value_widget_;
+
pv::widgets::Timestamp
SpinBox *value_widget_;
bool updating_value_widget_;
};
bool updating_value_widget_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW
_MARKER_H
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW_MARKER_HPP