projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added zoom one-to-one
[pulseview.git]
/
pv
/
view
/
view.h
diff --git
a/pv/view/view.h
b/pv/view/view.h
index cda0741d127ecc3f26551effa382206ca9025283..db03ce9b43a81b1a7b6a5eda32e0986e15cb1c86 100644
(file)
--- a/
pv/view/view.h
+++ b/
pv/view/view.h
@@
-23,12
+23,15
@@
#include <stdint.h>
#include <stdint.h>
-#include <utility>
+#include <vector>
+
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
#include <QAbstractScrollArea>
#include <QSizeF>
#include <QAbstractScrollArea>
#include <QSizeF>
-#include "cursor.h"
+#include "cursor
pair
.h"
namespace pv {
namespace pv {
@@
-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 {
@@
-54,6
+58,8
@@
private:
public:
static const int SignalHeight;
public:
static const int SignalHeight;
+ static const int SignalMargin;
+ static const int SignalSnapGridSize;
static const QColor CursorAreaColour;
static const QColor CursorAreaColour;
@@
-63,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.
@@
-79,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.
@@
-86,6
+97,10
@@
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;
+
/**
* Returns true if cursors are displayed. false otherwise.
*/
/**
* Returns true if cursors are displayed. false otherwise.
*/
@@
-96,22
+111,46
@@
public:
*/
void show_cursors(bool show = true);
*/
void show_cursors(bool show = true);
+ /**
+ * Moves the cursors to a convenient position in the view.
+ */
+ void centre_cursors();
+
+ /**
+ * Returns a reference to the pair of cursors.
+ */
+ CursorPair& cursors();
+
/**
* Returns a reference to the pair of cursors.
*/
/**
* Returns a reference to the pair of cursors.
*/
-
std::pair<Cursor, Cursor>& cursors()
;
+
const CursorPair& cursors() const
;
const QPoint& hover_point() const;
const QPoint& hover_point() const;
+ void normalize_layout();
+
+ void update_viewport();
+
signals:
void hover_point_changed();
signals:
void hover_point_changed();
+ void signals_moved();
+
+ 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 reset_signal_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);
@@
-125,11
+164,12
@@
private 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);
+ void signals_changed();
void data_updated();
void marker_time_changed();
void data_updated();
void marker_time_changed();
- void signals_moved();
+ void
on_
signals_moved();
private:
SigSession &_session;
private:
SigSession &_session;
@@
-147,9
+187,10
@@
private:
double _offset;
int _v_offset;
double _offset;
int _v_offset;
+ bool _updating_scroll;
bool _show_cursors;
bool _show_cursors;
-
std::pair<Cursor, Cursor>
_cursors;
+
CursorPair
_cursors;
QPoint _hover_point;
};
QPoint _hover_point;
};