X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fview.hpp;h=007ea3b68ba688395e0d20a87c25aea3cab30503;hb=09f55d9665efb3b17ba7de4bae47be6989e884fe;hp=d699be4ffaa37092391c8a492e6d30f82ba2849e;hpb=47e9e7bbc3a4e91a960f4cbb1db48c5aff6dcace;p=pulseview.git
diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index d699be4..007ea3b 100644
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -14,12 +14,11 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
-#ifndef PULSEVIEW_PV_VIEW_VIEW_HPP
-#define PULSEVIEW_PV_VIEW_VIEW_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
#include
@@ -34,6 +33,7 @@
#include
#include
+#include
#include
#include "cursorpair.hpp"
@@ -48,9 +48,12 @@ namespace pv {
class Session;
-namespace view {
+namespace views {
+
+namespace TraceView {
class CursorHeader;
+class DecodeTrace;
class Header;
class Ruler;
class Signal;
@@ -58,7 +61,16 @@ class Trace;
class Viewport;
class TriggerMarker;
-class View : public QAbstractScrollArea, public TraceTreeItemOwner {
+class CustomAbstractScrollArea : public QAbstractScrollArea {
+ Q_OBJECT
+
+public:
+ CustomAbstractScrollArea(QWidget *parent = 0);
+ void setViewportMargins(int left, int top, int right, int bottom);
+ bool viewportEvent(QEvent *event);
+};
+
+class View : public ViewBase, public TraceTreeItemOwner {
Q_OBJECT
private:
@@ -85,26 +97,38 @@ public:
/**
* Returns the signals contained in this view.
*/
- std::unordered_set< std::shared_ptr > signals() const;
+ std::unordered_set< std::shared_ptr > signals() const;
+
+ virtual void clear_signals();
+
+ virtual void add_signal(const std::shared_ptr signal);
+
+#ifdef ENABLE_DECODE
+ virtual void clear_decode_signals();
- void clear_signals();
+ virtual void add_decode_signal(std::shared_ptr signalbase);
- void add_signal(const std::shared_ptr signal);
+ virtual void remove_decode_signal(std::shared_ptr signalbase);
+#endif
/**
* Returns the view of the owner.
*/
- virtual pv::view::View* view();
+ virtual View* view();
/**
* Returns the view of the owner.
*/
- virtual const pv::view::View* view() const;
+ virtual const View* view() const;
Viewport* viewport();
const Viewport* viewport() const;
+ virtual void save_settings(QSettings &settings) const;
+
+ virtual void restore_settings(QSettings &settings);
+
/**
* Gets a list of time markers.
*/
@@ -297,8 +321,6 @@ private:
bool eventFilter(QObject *object, QEvent *event);
- bool viewportEvent(QEvent *event);
-
void resizeEvent(QResizeEvent *event);
public:
@@ -359,13 +381,17 @@ private Q_SLOTS:
void set_time_unit(pv::util::TimeUnit time_unit);
private:
- Session &session_;
-
Viewport *viewport_;
Ruler *ruler_;
Header *header_;
- std::unordered_set< std::shared_ptr > signals_;
+ std::unordered_set< std::shared_ptr > signals_;
+
+#ifdef ENABLE_DECODE
+ std::vector< std::shared_ptr > decode_traces_;
+#endif
+
+ CustomAbstractScrollArea scrollarea_;
/// The view time scale in seconds per pixel.
double scale_;
@@ -397,10 +423,16 @@ private:
QTimer lazy_event_handler_;
// This is true when the defaults couldn't be set due to insufficient info
- bool scroll_needs_defaults;
+ bool scroll_needs_defaults_;
+
+ // A nonzero value indicates the v offset to restore. See View::resizeEvent()
+ int saved_v_offset_;
+
+ bool size_finalized_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_VIEW_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP