projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced duplicated code with Trace::get_y
[pulseview.git]
/
pv
/
view
/
view.h
diff --git
a/pv/view/view.h
b/pv/view/view.h
index 83a6fe2d2a4d318288f084920e07f5c3c963e25a..6e097a4d68c11b4ba3e31df41e16f5a9d98a4dfc 100644
(file)
--- a/
pv/view/view.h
+++ b/
pv/view/view.h
@@
-40,6
+40,7
@@
class SigSession;
namespace view {
namespace view {
+class CursorHeader;
class Header;
class Ruler;
class Trace;
class Header;
class Ruler;
class Trace;
@@
-69,6
+70,10
@@
public:
SigSession& session();
const SigSession& session() const;
SigSession& session();
const SigSession& session() const;
+ Viewport* viewport();
+
+ const Viewport* viewport() const;
+
/**
* Returns the view time scale in seconds per pixel.
*/
/**
* Returns the view time scale in seconds per pixel.
*/
@@
-135,7
+140,7
@@
public:
void update_viewport();
void update_viewport();
-
signals
:
+
Q_SIGNALS
:
void hover_point_changed();
void signals_moved();
void hover_point_changed();
void signals_moved();
@@
-159,10
+164,6
@@
private:
void update_layout();
void update_layout();
- static bool compare_trace_v_offsets(
- const std::shared_ptr<pv::view::Trace> &a,
- const std::shared_ptr<pv::view::Trace> &b);
-
private:
bool eventFilter(QObject *object, QEvent *event);
private:
bool eventFilter(QObject *object, QEvent *event);
@@
-170,7
+171,7
@@
private:
void resizeEvent(QResizeEvent *e);
void resizeEvent(QResizeEvent *e);
-private
slots
:
+private
Q_SLOTS
:
void h_scroll_value_changed(int value);
void v_scroll_value_changed(int value);
void h_scroll_value_changed(int value);
void v_scroll_value_changed(int value);
@@
-184,11
+185,14
@@
private slots:
void on_geometry_updated();
void on_geometry_updated();
+ void on_hover_point_changed();
+
private:
SigSession &_session;
Viewport *_viewport;
Ruler *_ruler;
private:
SigSession &_session;
Viewport *_viewport;
Ruler *_ruler;
+ CursorHeader *_cursorheader;
Header *_header;
/// The view time scale in seconds per pixel.
Header *_header;
/// The view time scale in seconds per pixel.