projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pv::view::View::zoom_fit: clamp the scale between MaxScale and MinScale
[pulseview.git]
/
pv
/
view
/
view.h
diff --git
a/pv/view/view.h
b/pv/view/view.h
index f378e9116c24a6ccb0b3376cf2fe7d77ac18b7ba..62157eed76a5613e552571aa0a0e322be3a23c3a 100644
(file)
--- a/
pv/view/view.h
+++ b/
pv/view/view.h
@@
-23,11
+23,17
@@
#include <stdint.h>
#include <stdint.h>
+#include <set>
+#include <vector>
+
+#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
#include <QAbstractScrollArea>
#include <QSizeF>
#include <boost/weak_ptr.hpp>
#include <QAbstractScrollArea>
#include <QSizeF>
+#include <pv/data/signaldata.h>
+
#include "cursorpair.h"
namespace pv {
#include "cursorpair.h"
namespace pv {
@@
-38,6
+44,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
+54,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
+69,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
+86,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,8
+97,15
@@
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;
+ std::set< boost::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.
*/
@@
-119,6
+135,8
@@
public:
void normalize_layout();
void normalize_layout();
+ void update_viewport();
+
signals:
void hover_point_changed();
signals:
void hover_point_changed();
@@
-126,11
+144,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
+178,8
@@
private slots:
void on_signals_moved();
void on_signals_moved();
+ void on_geometry_updated();
+
private:
SigSession &_session;
private:
SigSession &_session;
@@
-157,8
+187,6
@@
private:
Ruler *_ruler;
Header *_header;
Ruler *_ruler;
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;