X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=08dc8828357d0e704a45dc6782411024968a7381;hp=7e47140c6bf2f3d4335df419e8cea74dd8976ecf;hb=ae5f66281c38a76dcb7011907d7a86a99b9dd4dd;hpb=47e9e7bbc3a4e91a960f4cbb1db48c5aff6dcace

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 7e47140c..08dc8828 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -14,8 +14,7 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 
 #ifdef ENABLE_DECODE
@@ -28,13 +27,18 @@
 #include <cassert>
 #include <climits>
 #include <cmath>
+#include <iostream>
 #include <iterator>
 #include <mutex>
 #include <unordered_set>
 
+#include <boost/archive/text_iarchive.hpp>
+#include <boost/archive/text_oarchive.hpp>
+#include <boost/serialization/serialization.hpp>
 #include <boost/thread/locks.hpp>
 
 #include <QApplication>
+#include <QHBoxLayout>
 #include <QEvent>
 #include <QFontMetrics>
 #include <QMouseEvent>
@@ -91,7 +95,8 @@ using std::vector;
 using std::weak_ptr;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const Timestamp View::MaxScale("1e9");
 const Timestamp View::MinScale("1e-12");
@@ -101,12 +106,41 @@ const int View::MaxViewAutoUpdateRate = 25; // No more than 25 Hz with sticky sc
 
 const int View::ScaleUnits[3] = {1, 2, 5};
 
+
+CustomAbstractScrollArea::CustomAbstractScrollArea(QWidget *parent) :
+	QAbstractScrollArea(parent)
+{
+}
+
+void CustomAbstractScrollArea::setViewportMargins(int left, int top, int right, int bottom)
+{
+	QAbstractScrollArea::setViewportMargins(left, top, right, bottom);
+}
+
+bool CustomAbstractScrollArea::viewportEvent(QEvent *event)
+{
+	switch (event->type()) {
+	case QEvent::Paint:
+	case QEvent::MouseButtonPress:
+	case QEvent::MouseButtonRelease:
+	case QEvent::MouseButtonDblClick:
+	case QEvent::MouseMove:
+	case QEvent::Wheel:
+	case QEvent::TouchBegin:
+	case QEvent::TouchUpdate:
+	case QEvent::TouchEnd:
+		return false;
+	default:
+		return QAbstractScrollArea::viewportEvent(event);
+	}
+}
+
 View::View(Session &session, QWidget *parent) :
-	QAbstractScrollArea(parent),
-	session_(session),
+	ViewBase(session, parent),
 	viewport_(new Viewport(*this)),
 	ruler_(new Ruler(*this)),
 	header_(new Header(*this)),
+	scrollarea_(this),
 	scale_(1e-3),
 	offset_(0),
 	updating_scroll_(false),
@@ -120,22 +154,16 @@ View::View(Session &session, QWidget *parent) :
 	cursors_(new CursorPair(*this)),
 	next_flag_text_('A'),
 	trigger_markers_(),
-	hover_point_(-1, -1)
+	hover_point_(-1, -1),
+	scroll_needs_defaults_(false),
+	saved_v_offset_(0),
+	size_finalized_(false)
 {
-	connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
+	connect(scrollarea_.horizontalScrollBar(), SIGNAL(valueChanged(int)),
 		this, SLOT(h_scroll_value_changed(int)));
-	connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
+	connect(scrollarea_.verticalScrollBar(), SIGNAL(valueChanged(int)),
 		this, SLOT(v_scroll_value_changed()));
 
-	connect(&session_, SIGNAL(signals_changed()),
-		this, SLOT(signals_changed()));
-	connect(&session_, SIGNAL(capture_state_changed(int)),
-		this, SLOT(capture_state_updated(int)));
-	connect(&session_, SIGNAL(data_received()),
-		this, SLOT(data_updated()));
-	connect(&session_, SIGNAL(frame_ended()),
-		this, SLOT(data_updated()));
-
 	connect(header_, SIGNAL(selection_changed()),
 		ruler_, SLOT(clear_selection()));
 	connect(ruler_, SIGNAL(selection_changed()),
@@ -158,7 +186,13 @@ View::View(Session &session, QWidget *parent) :
 	delayed_view_updater_.setSingleShot(true);
 	delayed_view_updater_.setInterval(1000 / MaxViewAutoUpdateRate);
 
-	setViewport(viewport_);
+	/* To let the scroll area fill up the parent QWidget (this), we need a layout */
+	QHBoxLayout *layout = new QHBoxLayout(this);
+	setLayout(layout);
+	layout->setContentsMargins(0, 0, 0, 0);
+	layout->addWidget(&scrollarea_);
+
+	scrollarea_.setViewport(viewport_);
 
 	viewport_->installEventFilter(this);
 	ruler_->installEventFilter(this);
@@ -186,7 +220,7 @@ const Session& View::session() const
 	return session_;
 }
 
-std::unordered_set< std::shared_ptr<view::Signal> > View::signals() const
+std::unordered_set< std::shared_ptr<Signal> > View::signals() const
 {
 	return signals_;
 }
@@ -196,11 +230,35 @@ void View::clear_signals()
 	signals_.clear();
 }
 
-void View::add_signal(const shared_ptr<view::Signal> signal)
+void View::add_signal(const shared_ptr<Signal> signal)
 {
 	signals_.insert(signal);
 }
 
+#ifdef ENABLE_DECODE
+void View::clear_decode_signals()
+{
+	decode_traces_.clear();
+}
+
+void View::add_decode_signal(shared_ptr<data::SignalBase> signalbase)
+{
+	shared_ptr<DecodeTrace> d(
+		new DecodeTrace(session_, signalbase, decode_traces_.size()));
+	decode_traces_.push_back(d);
+}
+
+void View::remove_decode_signal(shared_ptr<data::SignalBase> signalbase)
+{
+	for (auto i = decode_traces_.begin(); i != decode_traces_.end(); i++)
+		if ((*i)->base() == signalbase) {
+			decode_traces_.erase(i);
+			signals_changed();
+			return;
+		}
+}
+#endif
+
 View* View::view()
 {
 	return this;
@@ -221,6 +279,57 @@ const Viewport* View::viewport() const
 	return viewport_;
 }
 
+void View::save_settings(QSettings &settings) const
+{
+	settings.setValue("scale", scale_);
+	settings.setValue("v_offset",
+		scrollarea_.verticalScrollBar()->sliderPosition());
+
+	std::stringstream ss;
+	boost::archive::text_oarchive oa(ss);
+	oa << boost::serialization::make_nvp("offset", offset_);
+	settings.setValue("offset", QString::fromStdString(ss.str()));
+
+	for (shared_ptr<Signal> signal : signals_) {
+		settings.beginGroup(signal->base()->internal_name());
+		signal->save_settings(settings);
+		settings.endGroup();
+	}
+}
+
+void View::restore_settings(QSettings &settings)
+{
+	// Note: It is assumed that this function is only called once,
+	// immediately after restoring a previous session.
+
+	if (settings.contains("scale"))
+		set_scale(settings.value("scale").toDouble());
+
+	if (settings.contains("offset")) {
+		util::Timestamp offset;
+		std::stringstream ss;
+		ss << settings.value("offset").toString().toStdString();
+
+		boost::archive::text_iarchive ia(ss);
+		ia >> boost::serialization::make_nvp("offset", offset);
+
+		set_offset(offset);
+	}
+
+	for (shared_ptr<Signal> signal : signals_) {
+		settings.beginGroup(signal->base()->internal_name());
+		signal->restore_settings(settings);
+		settings.endGroup();
+	}
+
+	if (settings.contains("v_offset")) {
+		saved_v_offset_ = settings.value("v_offset").toInt();
+		set_v_offset(saved_v_offset_);
+		scroll_needs_defaults_ = false;
+		// Note: see resizeEvent() for additional information
+	}
+}
+
 vector< shared_ptr<TimeItem> > View::time_items() const
 {
 	const vector<shared_ptr<Flag>> f(flags());
@@ -263,12 +372,12 @@ void View::set_offset(const pv::util::Timestamp& offset)
 
 int View::owner_visual_v_offset() const
 {
-	return -verticalScrollBar()->sliderPosition();
+	return -scrollarea_.verticalScrollBar()->sliderPosition();
 }
 
 void View::set_v_offset(int offset)
 {
-	verticalScrollBar()->setSliderPosition(offset);
+	scrollarea_.verticalScrollBar()->setSliderPosition(offset);
 	header_->update();
 	viewport_->update();
 }
@@ -663,6 +772,8 @@ void View::calculate_tick_spacing()
 void View::update_scroll()
 {
 	assert(viewport_);
+	QScrollBar *hscrollbar = scrollarea_.horizontalScrollBar();
+	QScrollBar *vscrollbar = scrollarea_.verticalScrollBar();
 
 	const QSize areaSize = viewport_->size();
 
@@ -674,40 +785,40 @@ void View::update_scroll()
 
 	int major_tick_distance = (tick_period_ / scale_).convert_to<int>();
 
-	horizontalScrollBar()->setPageStep(areaSize.width() / 2);
-	horizontalScrollBar()->setSingleStep(major_tick_distance);
+	hscrollbar->setPageStep(areaSize.width() / 2);
+	hscrollbar->setSingleStep(major_tick_distance);
 
 	updating_scroll_ = true;
 
 	if (length < MaxScrollValue) {
-		horizontalScrollBar()->setRange(0, length);
-		horizontalScrollBar()->setSliderPosition(offset.convert_to<double>());
+		hscrollbar->setRange(0, length);
+		hscrollbar->setSliderPosition(offset.convert_to<double>());
 	} else {
-		horizontalScrollBar()->setRange(0, MaxScrollValue);
-		horizontalScrollBar()->setSliderPosition(
+		hscrollbar->setRange(0, MaxScrollValue);
+		hscrollbar->setSliderPosition(
 			(offset_ * MaxScrollValue / (scale_ * length)).convert_to<double>());
 	}
 
 	updating_scroll_ = false;
 
 	// Set the vertical scrollbar
-	verticalScrollBar()->setPageStep(areaSize.height());
-	verticalScrollBar()->setSingleStep(areaSize.height() / 8);
+	vscrollbar->setPageStep(areaSize.height());
+	vscrollbar->setSingleStep(areaSize.height() / 8);
 
 	const pair<int, int> extents = v_extents();
 
 	// Don't change the scrollbar range if there are no traces
 	if (extents.first != extents.second)
-		verticalScrollBar()->setRange(extents.first - areaSize.height(),
+		vscrollbar->setRange(extents.first - areaSize.height(),
 			extents.second);
 
-	if (scroll_needs_defaults)
+	if (scroll_needs_defaults_)
 		set_scroll_default();
 }
 
 void View::reset_scroll()
 {
-	verticalScrollBar()->setRange(0, 0);
+	scrollarea_.verticalScrollBar()->setRange(0, 0);
 }
 
 void View::set_scroll_default()
@@ -718,11 +829,11 @@ void View::set_scroll_default()
 
 	// Special case: when starting up and the window isn't visible yet,
 	// areaSize is [0, 0]. In this case we want to be called again later
-	if (areaSize.height() == 0) {
-		scroll_needs_defaults = true;
+	if ((areaSize.height() == 0) || (!size_finalized_)) {
+		scroll_needs_defaults_ = true;
 		return;
 	} else {
-		scroll_needs_defaults = false;
+		scroll_needs_defaults_ = false;
 	}
 
 	const pair<int, int> extents = v_extents();
@@ -740,8 +851,8 @@ void View::set_scroll_default()
 
 void View::update_layout()
 {
-	setViewportMargins(
-		header_->sizeHint().width() - pv::view::Header::BaselineOffset,
+	scrollarea_.setViewportMargins(
+		header_->sizeHint().width() - Header::BaselineOffset,
 		ruler_->sizeHint().height(), 0, 0);
 	ruler_->setGeometry(viewport_->x(), 0,
 		viewport_->width(), ruler_->extended_size_hint().height());
@@ -856,27 +967,30 @@ bool View::eventFilter(QObject *object, QEvent *event)
 	return QObject::eventFilter(object, event);
 }
 
-bool View::viewportEvent(QEvent *event)
-{
-	switch (event->type()) {
-	case QEvent::Paint:
-	case QEvent::MouseButtonPress:
-	case QEvent::MouseButtonRelease:
-	case QEvent::MouseButtonDblClick:
-	case QEvent::MouseMove:
-	case QEvent::Wheel:
-	case QEvent::TouchBegin:
-	case QEvent::TouchUpdate:
-	case QEvent::TouchEnd:
-		return false;
-	default:
-		return QAbstractScrollArea::viewportEvent(event);
-	}
-}
-
 void View::resizeEvent(QResizeEvent*)
 {
 	update_layout();
+
+	// This is somewhat of a hack, unfortunately. We cannot use
+	// set_v_offset() from within restore_settings() as the view
+	// at that point is neither visible nor properly sized.
+	// This is the least intrusive workaround I could come up
+	// with: set the vertical offset (or scroll defaults) when
+	// the view is visible and resized to its final size.
+	// Resize events that are sent when the view is not visible
+	// must be ignored as they have wrong sizes, potentially
+	// preventing the v offset from being set successfully.
+
+	if (isVisible())
+		size_finalized_ = true;
+
+	if (size_finalized_ && saved_v_offset_) {
+		set_v_offset(saved_v_offset_);
+		saved_v_offset_ = 0;
+	}
+
+	if (size_finalized_ && scroll_needs_defaults_)
+		set_scroll_default();
 }
 
 void View::row_item_appearance_changed(bool label, bool content)
@@ -915,7 +1029,7 @@ void View::h_scroll_value_changed(int value)
 		sticky_scrolling_changed(false);
 	}
 
-	const int range = horizontalScrollBar()->maximum();
+	const int range = scrollarea_.horizontalScrollBar()->maximum();
 	if (range < MaxScrollValue)
 		set_offset(scale_ * value);
 	else {
@@ -945,7 +1059,8 @@ void View::signals_changed()
 	// Do we need to set the vertical scrollbar to its default position later?
 	// We do if there are no traces, i.e. the scroll bar has no range set
 	bool reset_scrollbar =
-		verticalScrollBar()->minimum() == verticalScrollBar()->maximum();
+		(scrollarea_.verticalScrollBar()->minimum() ==
+			scrollarea_.verticalScrollBar()->maximum());
 
 	if (!session_.device()) {
 		reset_scroll();
@@ -967,9 +1082,7 @@ void View::signals_changed()
 	set< shared_ptr<Trace> > traces(signals_.begin(), signals_.end());
 
 #ifdef ENABLE_DECODE
-	const vector< shared_ptr<DecodeTrace> > decode_traces(
-		session().get_decode_signals());
-	traces.insert(decode_traces.begin(), decode_traces.end());
+	traces.insert(decode_traces_.begin(), decode_traces_.end());
 #endif
 
 	set< shared_ptr<Trace> > add_traces;
@@ -1186,5 +1299,6 @@ void View::on_hover_point_changed()
 		r->hover_point_changed();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv