projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DeviceManager: Tidied up forward declarations
[pulseview.git]
/
pv
/
view
/
view.hpp
diff --git
a/pv/view/view.hpp
b/pv/view/view.hpp
index 6b7841f926ed105450a6181fe199e2b3eb2ed222..e4d0ebad1ab5237968b0e37ebf1f34c4faa6a877 100644
(file)
--- a/
pv/view/view.hpp
+++ b/
pv/view/view.hpp
@@
-18,8
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_VIEW_VIEW_H
-#define PULSEVIEW_PV_VIEW_VIEW_H
+#ifndef PULSEVIEW_PV_VIEW_VIEW_H
PP
+#define PULSEVIEW_PV_VIEW_VIEW_H
PP
#include <stdint.h>
#include <stdint.h>
@@
-67,11
+67,6
@@
private:
static const int ScaleUnits[3];
static const int ScaleUnits[3];
-public:
- static const QColor CursorAreaColour;
-
- static const QSizeF LabelPadding;
-
public:
explicit View(Session &session, QWidget *parent = 0);
public:
explicit View(Session &session, QWidget *parent = 0);
@@
-107,8
+102,17
@@
public:
* seconds.
*/
double offset() const;
* seconds.
*/
double offset() const;
+
+ /**
+ * Returns the vertical scroll offset.
+ */
int owner_visual_v_offset() const;
int owner_visual_v_offset() const;
+ /**
+ * Sets the visual v-offset.
+ */
+ void set_v_offset(int offset);
+
/**
* Returns the SI prefix to apply to the graticule time markings.
*/
/**
* Returns the SI prefix to apply to the graticule time markings.
*/
@@
-187,8
+191,6
@@
public:
Q_SIGNALS:
void hover_point_changed();
Q_SIGNALS:
void hover_point_changed();
- void signals_moved();
-
void selection_changed();
void scale_offset_changed();
void selection_changed();
void scale_offset_changed();
@@
-256,13
+258,11
@@
public:
private Q_SLOTS:
void h_scroll_value_changed(int value);
private Q_SLOTS:
void h_scroll_value_changed(int value);
- void v_scroll_value_changed(
int value
);
+ void v_scroll_value_changed();
void signals_changed();
void data_updated();
void signals_changed();
void data_updated();
- void on_signals_moved();
-
void process_sticky_events();
void on_hover_point_changed();
void process_sticky_events();
void on_hover_point_changed();
@@
-272,7
+272,6
@@
private:
Viewport *viewport_;
Ruler *ruler_;
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.
@@
-281,7
+280,6
@@
private:
/// The view time offset in seconds.
double offset_;
/// The view time offset in seconds.
double offset_;
- int v_offset_;
bool updating_scroll_;
double tick_period_;
bool updating_scroll_;
double tick_period_;
@@
-302,4
+300,4
@@
private:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_VIEW_H
+#endif // PULSEVIEW_PV_VIEW_VIEW_H
PP