projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved annotation painting code into DecodeTrace, and moved Annotation in pv::data...
[pulseview.git]
/
pv
/
view
/
view.h
diff --git
a/pv/view/view.h
b/pv/view/view.h
index f378e9116c24a6ccb0b3376cf2fe7d77ac18b7ba..6f1e87288bd1dd14f40568f86198ea39f0a3a7bc 100644
(file)
--- a/
pv/view/view.h
+++ b/
pv/view/view.h
@@
-23,6
+23,9
@@
#include <stdint.h>
#include <stdint.h>
+#include <vector>
+
+#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
#include <QAbstractScrollArea>
#include <boost/weak_ptr.hpp>
#include <QAbstractScrollArea>
@@
-38,6
+41,7
@@
namespace view {
class Header;
class Ruler;
class Header;
class Ruler;
+class Trace;
class Viewport;
class View : public QAbstractScrollArea {
class Viewport;
class View : public QAbstractScrollArea {
@@
-47,9
+51,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:
@@
-65,6
+66,7
@@
public:
explicit View(SigSession &session, QWidget *parent = 0);
SigSession& session();
explicit View(SigSession &session, QWidget *parent = 0);
SigSession& session();
+ const SigSession& session() const;
/**
* Returns the view time scale in seconds per pixel.
/**
* Returns the view time scale in seconds per pixel.
@@
-81,6
+83,10
@@
public:
void zoom(double steps);
void zoom(double steps, int offset);
void zoom(double steps);
void zoom(double steps, int offset);
+ void zoom_fit();
+
+ void zoom_one_to_one();
+
/**
* Sets the scale and offset.
* @param scale The new view scale in seconds per pixel.
/**
* Sets the scale and offset.
* @param scale The new view scale in seconds per pixel.
@@
-88,6
+94,8
@@
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::list<boost::weak_ptr<SelectableItem> > selected_items() const;
/**
std::list<boost::weak_ptr<SelectableItem> > selected_items() const;
/**
@@
-119,6
+127,8
@@
public:
void normalize_layout();
void normalize_layout();
+ void update_viewport();
+
signals:
void hover_point_changed();
signals:
void hover_point_changed();
@@
-126,11
+136,21
@@
signals:
void selection_changed();
void selection_changed();
+ void scale_offset_changed();
+
private:
void get_scroll_layout(double &length, double &offset) const;
private:
void get_scroll_layout(double &length, double &offset) const;
+ void set_zoom(double scale, int offset);
+
void update_scroll();
void update_scroll();
+ void update_layout();
+
+ static bool compare_trace_v_offsets(
+ const boost::shared_ptr<pv::view::Trace> &a,
+ const boost::shared_ptr<pv::view::Trace> &b);
+
private:
bool eventFilter(QObject *object, QEvent *event);
private:
bool eventFilter(QObject *object, QEvent *event);
@@
-150,6
+170,8
@@
private slots:
void on_signals_moved();
void on_signals_moved();
+ void on_geometry_updated();
+
private:
SigSession &_session;
private:
SigSession &_session;