X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=ab458f26bf36e981d49a1992826dbddb41e3d6e1;hp=a086d23de523f07e2be1192cbfc3b4bd2a028b09;hb=489953884c0d7692fa20748314751e114ae54cf2;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index a086d23d..ab458f26 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
@@ -30,18 +29,16 @@
 #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 <QHBoxLayout>
 #include <QMouseEvent>
 #include <QScrollBar>
 
@@ -57,19 +54,17 @@
 #include "view.hpp"
 #include "viewport.hpp"
 
-#include "pv/session.hpp"
-#include "pv/devices/device.hpp"
 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"
+#include "pv/devices/device.hpp"
+#include "pv/globalsettings.hpp"
+#include "pv/session.hpp"
 #include "pv/util.hpp"
 
 #ifdef ENABLE_DECODE
 #include "decodetrace.hpp"
 #endif
 
-using boost::shared_lock;
-using boost::shared_mutex;
-
 using pv::data::SignalData;
 using pv::data::Segment;
 using pv::util::TimeUnit;
@@ -77,11 +72,9 @@ using pv::util::Timestamp;
 
 using std::back_inserter;
 using std::copy_if;
-using std::deque;
+using std::count_if;
 using std::dynamic_pointer_cast;
 using std::inserter;
-using std::list;
-using std::lock_guard;
 using std::max;
 using std::make_pair;
 using std::make_shared;
@@ -90,10 +83,10 @@ using std::pair;
 using std::set;
 using std::set_difference;
 using std::shared_ptr;
+using std::stringstream;
 using std::unordered_map;
 using std::unordered_set;
 using std::vector;
-using std::weak_ptr;
 
 namespace pv {
 namespace views {
@@ -136,8 +129,8 @@ bool CustomAbstractScrollArea::viewportEvent(QEvent *event)
 	}
 }
 
-View::View(Session &session, QWidget *parent) :
-	ViewBase(session, parent),
+View::View(Session &session, bool is_main_view, QWidget *parent) :
+	ViewBase(session, is_main_view, parent),
 	viewport_(new Viewport(*this)),
 	ruler_(new Ruler(*this)),
 	header_(new Header(*this)),
@@ -155,8 +148,14 @@ 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)
 {
+	GlobalSettings settings;
+	coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
+
 	connect(scrollarea_.horizontalScrollBar(), SIGNAL(valueChanged(int)),
 		this, SLOT(h_scroll_value_changed(int)));
 	connect(scrollarea_.verticalScrollBar(), SIGNAL(valueChanged(int)),
@@ -218,7 +217,7 @@ const Session& View::session() const
 	return session_;
 }
 
-std::unordered_set< std::shared_ptr<Signal> > View::signals() const
+unordered_set< shared_ptr<Signal> > View::signals() const
 {
 	return signals_;
 }
@@ -280,8 +279,10 @@ const Viewport* View::viewport() const
 void View::save_settings(QSettings &settings) const
 {
 	settings.setValue("scale", scale_);
+	settings.setValue("v_offset",
+		scrollarea_.verticalScrollBar()->sliderPosition());
 
-	std::stringstream ss;
+	stringstream ss;
 	boost::archive::text_oarchive oa(ss);
 	oa << boost::serialization::make_nvp("offset", offset_);
 	settings.setValue("offset", QString::fromStdString(ss.str()));
@@ -295,12 +296,15 @@ void View::save_settings(QSettings &settings) const
 
 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;
+		stringstream ss;
 		ss << settings.value("offset").toString().toStdString();
 
 		boost::archive::text_iarchive ia(ss);
@@ -314,6 +318,13 @@ void View::restore_settings(QSettings &settings)
 		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
@@ -432,7 +443,7 @@ void View::zoom(double steps)
 
 void View::zoom(double steps, int offset)
 {
-	set_zoom(scale_ * pow(3.0/2.0, -steps), offset);
+	set_zoom(scale_ * pow(3.0 / 2.0, -steps), offset);
 }
 
 void View::zoom_fit(bool gui_state)
@@ -521,8 +532,7 @@ pair<Timestamp, Timestamp> View::get_time_extents() const
 	boost::optional<Timestamp> left_time, right_time;
 	const set< shared_ptr<SignalData> > visible_data = get_visible_data();
 	for (const shared_ptr<SignalData> d : visible_data) {
-		const vector< shared_ptr<Segment> > segments =
-			d->segments();
+		const vector< shared_ptr<Segment> > segments = d->segments();
 		for (const shared_ptr<Segment> &s : segments) {
 			double samplerate = s->samplerate();
 			samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
@@ -544,38 +554,31 @@ pair<Timestamp, Timestamp> View::get_time_extents() const
 	return make_pair(*left_time, *right_time);
 }
 
-void View::enable_sticky_scrolling(bool state)
+void View::enable_show_sampling_points(bool state)
 {
-	sticky_scrolling_ = state;
+	(void)state;
+
+	viewport_->update();
 }
 
-void View::enable_coloured_bg(bool state)
+void View::enable_show_analog_minor_grid(bool state)
 {
-	const vector<shared_ptr<TraceTreeItem>> items(
-		list_by_type<TraceTreeItem>());
-
-	for (shared_ptr<TraceTreeItem> i : items) {
-		// Can't cast to Trace because it's abstract, so we need to
-		// check for any derived classes individually
+	(void)state;
 
-		shared_ptr<AnalogSignal> a = dynamic_pointer_cast<AnalogSignal>(i);
-		if (a)
-			a->set_coloured_bg(state);
-
-		shared_ptr<LogicSignal> l = dynamic_pointer_cast<LogicSignal>(i);
-		if (l)
-			l->set_coloured_bg(state);
-
-#ifdef ENABLE_DECODE
-		shared_ptr<DecodeTrace> d = dynamic_pointer_cast<DecodeTrace>(i);
-		if (d)
-			d->set_coloured_bg(state);
-#endif
-	}
+	viewport_->update();
+}
 
+void View::enable_coloured_bg(bool state)
+{
+	coloured_bg_ = state;
 	viewport_->update();
 }
 
+bool View::coloured_bg() const
+{
+	return coloured_bg_;
+}
+
 bool View::cursors_shown() const
 {
 	return show_cursors_;
@@ -597,15 +600,15 @@ void View::centre_cursors()
 	viewport_->update();
 }
 
-std::shared_ptr<CursorPair> View::cursors() const
+shared_ptr<CursorPair> View::cursors() const
 {
 	return cursors_;
 }
 
 void View::add_flag(const Timestamp& time)
 {
-	flags_.push_back(shared_ptr<Flag>(new Flag(*this, time,
-		QString("%1").arg(next_flag_text_))));
+	flags_.push_back(make_shared<Flag>(*this, time,
+		QString("%1").arg(next_flag_text_)));
 
 	next_flag_text_ = (next_flag_text_ >= 'Z') ? 'A' :
 		(next_flag_text_ + 1);
@@ -613,15 +616,15 @@ void View::add_flag(const Timestamp& time)
 	time_item_appearance_changed(true, true);
 }
 
-void View::remove_flag(std::shared_ptr<Flag> flag)
+void View::remove_flag(shared_ptr<Flag> flag)
 {
 	flags_.remove(flag);
 	time_item_appearance_changed(true, true);
 }
 
-vector< std::shared_ptr<Flag> > View::flags() const
+vector< shared_ptr<Flag> > View::flags() const
 {
-	vector< std::shared_ptr<Flag> > flags(flags_.begin(), flags_.end());
+	vector< shared_ptr<Flag> > flags(flags_.begin(), flags_.end());
 	stable_sort(flags.begin(), flags.end(),
 		[](const shared_ptr<Flag> &a, const shared_ptr<Flag> &b) {
 			return a->time() < b->time();
@@ -653,7 +656,7 @@ void View::restack_all_trace_tree_items()
 		o->restack_items();
 
 	// Re-assign background colors
-	bool next_bgcolour_state = 0;
+	bool next_bgcolour_state = false;
 
 	for (auto &o : sorted_owners)
 		next_bgcolour_state = o->reassign_bgcolour_states(next_bgcolour_state);
@@ -665,8 +668,7 @@ void View::restack_all_trace_tree_items()
 
 void View::trigger_event(util::Timestamp location)
 {
-	trigger_markers_.push_back(shared_ptr<TriggerMarker>(
-		new TriggerMarker(*this, location)));
+	trigger_markers_.push_back(make_shared<TriggerMarker>(*this, location));
 }
 
 void View::get_scroll_layout(double &length, Timestamp &offset) const
@@ -736,7 +738,7 @@ void View::calculate_tick_spacing()
 
 		// Precision is the number of fractional digits required, not
 		// taking the prefix into account (and it must never be negative)
-		tick_precision = std::max(ceil(log10(1 / tick_period)).convert_to<int>(), 0);
+		tick_precision = max(ceil(log10(1 / tick_period)).convert_to<int>(), 0);
 
 		tick_period_width = (tick_period / scale_).convert_to<double>();
 
@@ -798,7 +800,7 @@ void View::update_scroll()
 		vscrollbar->setRange(extents.first - areaSize.height(),
 			extents.second);
 
-	if (scroll_needs_defaults)
+	if (scroll_needs_defaults_)
 		set_scroll_default();
 }
 
@@ -813,15 +815,6 @@ void View::set_scroll_default()
 
 	const QSize areaSize = viewport_->size();
 
-	// 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;
-		return;
-	} else {
-		scroll_needs_defaults = false;
-	}
-
 	const pair<int, int> extents = v_extents();
 	const int trace_height = extents.second - extents.first;
 
@@ -833,6 +826,11 @@ void View::set_scroll_default()
 	else
 		// Put the first trace at the top, letting the bottom ones overflow
 		set_v_offset(extents.first);
+
+	// If we're not sure whether setting the defaults worked as
+	// the window wasn't set up entirely yet, we want to be called
+	// again later to make sure
+	scroll_needs_defaults_ = !size_finalized_;
 }
 
 void View::update_layout()
@@ -872,7 +870,7 @@ TraceTreeItemOwner* View::find_prevalent_trace_group(
 	size_t max_prevalence = 0;
 	TraceTreeItemOwner *prevalent_owner = nullptr;
 	for (TraceTreeItemOwner *owner : owners) {
-		const size_t prevalence = std::count_if(
+		const size_t prevalence = count_if(
 			owner_list.begin(), owner_list.end(),
 			[&](TraceTreeItemOwner *o) { return o == owner; });
 		if (prevalence > max_prevalence) {
@@ -956,6 +954,27 @@ bool View::eventFilter(QObject *object, QEvent *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)
@@ -1161,11 +1180,11 @@ void View::signals_changed()
 		}
 
 	// Add and position the pending top levels items
+	int offset = v_extents().second;
 	for (auto item : new_top_level_items) {
 		add_child_item(item);
 
 		// Position the item after the last item or at the top if there is none
-		int offset = v_extents().second;
 		const pair<int, int> extents = item->v_extents();
 
 		if (item->enabled())
@@ -1192,6 +1211,19 @@ void View::capture_state_updated(int state)
 		set_time_unit(util::TimeUnit::Samples);
 
 		trigger_markers_.clear();
+
+		// Activate "always zoom to fit" if the setting is enabled and we're
+		// the main view of this session (other trace views may be used for
+		// zooming and we don't want to mess them up)
+		GlobalSettings settings;
+		bool state = settings.value(GlobalSettings::Key_View_AlwaysZoomToFit).toBool();
+		if (is_main_view_ && state) {
+			always_zoom_to_fit_ = true;
+			always_zoom_to_fit_changed(always_zoom_to_fit_);
+		}
+
+		// Enable sticky scrolling if the setting is enabled
+		sticky_scrolling_ = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool();
 	}
 
 	if (state == Session::Stopped) {
@@ -1201,8 +1233,10 @@ void View::capture_state_updated(int state)
 
 		// Reset "always zoom to fit", the acquisition has stopped
 		if (always_zoom_to_fit_) {
+			// Perform a final zoom-to-fit before disabling
+			zoom_fit(always_zoom_to_fit_);
 			always_zoom_to_fit_ = false;
-			always_zoom_to_fit_changed(false);
+			always_zoom_to_fit_changed(always_zoom_to_fit_);
 		}
 	}
 }
@@ -1222,10 +1256,9 @@ void View::data_updated()
 
 void View::perform_delayed_view_update()
 {
-	if (always_zoom_to_fit_)
+	if (always_zoom_to_fit_) {
 		zoom_fit(true);
-
-	if (sticky_scrolling_) {
+	} else if (sticky_scrolling_) {
 		// Make right side of the view sticky
 		double length = 0;
 		Timestamp offset;