projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #942 by making sure we always have at least one positive div
[pulseview.git]
/
pv
/
view
/
cursorpair.hpp
diff --git
a/pv/view/cursorpair.hpp
b/pv/view/cursorpair.hpp
index fc9f0d1ba6f4a4edc718e869bfe61dd381588641..ee91ff427ee11dfae8737f9f28dde0bc4d870b4d 100644
(file)
--- a/
pv/view/cursorpair.hpp
+++ b/
pv/view/cursorpair.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
_CURSORPAIR_H
-#define PULSEVIEW_PV_VIEW
_CURSORPAIR_H
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW_CURSORPAIR_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW_CURSORPAIR_HPP
#include "cursor.hpp"
#include "cursor.hpp"
@@
-27,15
+26,20
@@
#include <QPainter>
#include <QPainter>
+using std::pair;
+using std::shared_ptr;
+
class QPainter;
namespace pv {
class QPainter;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
class CursorPair : public TimeItem
{
private:
static const int DeltaPadding;
class CursorPair : public TimeItem
{
private:
static const int DeltaPadding;
+ static const QColor ViewportFillColour;
public:
/**
public:
/**
@@
-48,31
+52,31
@@
public:
/**
* Returns true if the item is visible and enabled.
*/
/**
* Returns true if the item is visible and enabled.
*/
- bool enabled() const;
+ bool enabled() const
override
;
/**
* Returns a pointer to the first cursor.
*/
/**
* Returns a pointer to the first cursor.
*/
- s
td::s
hared_ptr<Cursor> first() const;
+ shared_ptr<Cursor> first() const;
/**
* Returns a pointer to the second cursor.
*/
/**
* Returns a pointer to the second cursor.
*/
- s
td::s
hared_ptr<Cursor> second() const;
+ shared_ptr<Cursor> second() 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
;
- QPoint point(
) const
;
+ QPoint point(
const QRect &rect) const override
;
- pv::widgets::Popup* create_popup(QWidget *parent);
+ pv::widgets::Popup* create_popup(QWidget *parent)
override
;
public:
public:
- QRectF label_rect(const QRectF &rect) const;
+ QRectF label_rect(const QRectF &rect) const
override
;
/**
* Paints the marker's label to the ruler.
/**
* Paints the marker's label to the ruler.
@@
-80,26
+84,32
@@
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 background 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 background 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_back(QPainter &p, const ViewItemPaintParams &pp);
+ */
+ void paint_back(QPainter &p, ViewItemPaintParams &pp) override;
+
+ /**
+ * Constructs the string to display.
+ */
+ QString format_string();
- void compute_text_size(QPainter &p
, unsigned int prefix
);
+ void compute_text_size(QPainter &p);
-
std::
pair<float, float> get_cursor_offsets() const;
+ pair<float, float> get_cursor_offsets() const;
private:
private:
- s
td::s
hared_ptr<Cursor> first_, second_;
+ shared_ptr<Cursor> first_, second_;
QSizeF text_size_;
};
QSizeF text_size_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW
_CURSORPAIR_H
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW_CURSORPAIR_HPP