projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CursorHeader: Use the same number format as the ruler.
[pulseview.git]
/
pv
/
view
/
view.h
diff --git
a/pv/view/view.h
b/pv/view/view.h
index db03ce9b43a81b1a7b6a5eda32e0986e15cb1c86..85e990f7464660fe596635f2b41018cc5527bdca 100644
(file)
--- a/
pv/view/view.h
+++ b/
pv/view/view.h
@@
-23,14
+23,15
@@
#include <stdint.h>
#include <stdint.h>
+#include <memory>
+#include <set>
#include <vector>
#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
#include <QAbstractScrollArea>
#include <QSizeF>
#include <QAbstractScrollArea>
#include <QSizeF>
+#include <pv/data/signaldata.h>
+
#include "cursorpair.h"
namespace pv {
#include "cursorpair.h"
namespace pv {
@@
-39,6
+40,7
@@
class SigSession;
namespace view {
namespace view {
+class CursorHeader;
class Header;
class Ruler;
class Trace;
class Header;
class Ruler;
class Trace;
@@
-51,9
+53,6
@@
private:
static const double MaxScale;
static const double MinScale;
static const double MaxScale;
static const double MinScale;
- static const int LabelMarginWidth;
- static const int RulerHeight;
-
static const int MaxScrollValue;
public:
static const int MaxScrollValue;
public:
@@
-97,9
+96,14
@@
public:
*/
void set_scale_offset(double scale, double offset);
*/
void set_scale_offset(double scale, double offset);
- std::vector<
boost
::shared_ptr<Trace> > get_traces() const;
+ std::vector<
std
::shared_ptr<Trace> > get_traces() const;
- std::list<boost::weak_ptr<SelectableItem> > selected_items() const;
+ std::list<std::weak_ptr<SelectableItem> > selected_items() const;
+
+ std::set< std::shared_ptr<pv::data::SignalData> >
+ get_visible_data() const;
+
+ std::pair<double, double> get_time_extents() const;
/**
* Returns true if cursors are displayed. false otherwise.
/**
* Returns true if cursors are displayed. false otherwise.
@@
-143,14
+147,22
@@
signals:
private:
void get_scroll_layout(double &length, double &offset) const;
private:
void get_scroll_layout(double &length, double &offset) const;
-
+
+ /**
+ * Simultaneously sets the zoom and offset.
+ * @param scale The scale to set the view to in seconds per pixel. This
+ * value is clamped between MinScale and MaxScale.
+ * @param offset The offset of the left edge of the view in seconds.
+ */
void set_zoom(double scale, int offset);
void update_scroll();
void set_zoom(double scale, int offset);
void update_scroll();
+ void update_layout();
+
static bool compare_trace_v_offsets(
static bool compare_trace_v_offsets(
- const
boost
::shared_ptr<pv::view::Trace> &a,
- const
boost
::shared_ptr<pv::view::Trace> &b);
+ 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);
@@
-171,15
+183,16
@@
private slots:
void on_signals_moved();
void on_signals_moved();
+ void on_geometry_updated();
+
private:
SigSession &_session;
Viewport *_viewport;
Ruler *_ruler;
private:
SigSession &_session;
Viewport *_viewport;
Ruler *_ruler;
+ CursorHeader *_cursorheader;
Header *_header;
Header *_header;
- uint64_t _data_length;
-
/// The view time scale in seconds per pixel.
double _scale;
/// The view time scale in seconds per pixel.
double _scale;