projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #958 by using new method that auto-converts analog samples
[pulseview.git]
/
pv
/
view
/
timemarker.hpp
diff --git
a/pv/view/timemarker.hpp
b/pv/view/timemarker.hpp
index f16fea03f4c0d8d9e93ca9ce77ac5dd2f5cfd7b2..dba52fa4efa5642a76c9c1150750d664bcadfd59 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_HPP
-#define PULSEVIEW_PV_VIEW_MARKER_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_MARKER_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_MARKER_HPP
#include <QColor>
#include <QDoubleSpinBox>
#include <QColor>
#include <QDoubleSpinBox>
@@
-37,7
+36,8
@@
namespace widgets {
class TimestampSpinBox;
}
class TimestampSpinBox;
}
-namespace view {
+namespace views {
+namespace TraceView {
class View;
class View;
@@
-68,27
+68,27
@@
public:
*/
void set_time(const pv::util::Timestamp& time) override;
*/
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 ViewItemPaintParams &pp) 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.
@@
-101,16
+101,16
@@
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,
ViewItemPaintParams &pp) override
;
- virtual pv::widgets::Popup* create_popup(QWidget *parent);
+ virtual pv::widgets::Popup* create_popup(QWidget *parent)
override
;
private Q_SLOTS:
void on_value_changed(const pv::util::Timestamp& value);
private Q_SLOTS:
void on_value_changed(const pv::util::Timestamp& value);
@@
-127,7
+127,8
@@
protected:
bool updating_value_widget_;
};
bool updating_value_widget_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_MARKER_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_MARKER_HPP