X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=8a36afaf116f9d76fca1154ca53cac9d558090b0;hp=49d1263642b9b97ee3bac15c95fbe8a897e2f724;hb=124be547578fe32c0a1af118f0108a88e613363b;hpb=4c60462b00cc329e61daedd1c2e66724077bd412

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 49d12636..8a36afaf 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.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/>.
  */
 
 #include <extdef.h>
@@ -25,17 +24,20 @@
 
 #include <algorithm>
 
+#include <QApplication>
 #include <QFormLayout>
 #include <QToolBar>
 
 #include "logicsignal.hpp"
 #include "view.hpp"
 
-#include <pv/session.hpp>
-#include <pv/devicemanager.hpp>
-#include <pv/devices/device.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
+#include <pv/data/signalbase.hpp>
+#include <pv/devicemanager.hpp>
+#include <pv/devices/device.hpp>
+#include <pv/globalsettings.hpp>
+#include <pv/session.hpp>
 #include <pv/view/view.hpp>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
@@ -44,29 +46,27 @@ using std::deque;
 using std::max;
 using std::make_pair;
 using std::min;
+using std::none_of;
 using std::pair;
 using std::shared_ptr;
 using std::vector;
 
-using sigrok::Channel;
 using sigrok::ConfigKey;
-using sigrok::Error;
+using sigrok::Capability;
 using sigrok::Trigger;
-using sigrok::TriggerStage;
 using sigrok::TriggerMatch;
 using sigrok::TriggerMatchType;
 
 namespace pv {
-namespace view {
-
-const int LogicSignal::SignalHeight = 30;
-const int LogicSignal::SignalMargin = 10;
+namespace views {
+namespace TraceView {
 
 const float LogicSignal::Oversampling = 2.0f;
 
 const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80);
 const QColor LogicSignal::HighColour(0x00, 0xC0, 0x00);
 const QColor LogicSignal::LowColour(0xC0, 0x00, 0x00);
+const QColor LogicSignal::SamplingPointColour(0x77, 0x77, 0x77);
 
 const QColor LogicSignal::SignalColours[10] = {
 	QColor(0x16, 0x19, 0x1A),	// Black
@@ -100,11 +100,10 @@ QCache<QString, const QPixmap> LogicSignal::pixmap_cache_;
 LogicSignal::LogicSignal(
 	pv::Session &session,
 	shared_ptr<devices::Device> device,
-	shared_ptr<Channel> channel,
-	shared_ptr<data::Logic> data) :
-	Signal(session, channel),
+	shared_ptr<data::SignalBase> base) :
+	Signal(session, base),
+	signal_height_(QFontMetrics(QApplication::font()).height() * 2),
 	device_(device),
-	data_(data),
 	trigger_none_(nullptr),
 	trigger_rising_(nullptr),
 	trigger_high_(nullptr),
@@ -114,7 +113,7 @@ LogicSignal::LogicSignal(
 {
 	shared_ptr<Trigger> trigger;
 
-	colour_ = SignalColours[channel->index() % countof(SignalColours)];
+	base_->set_colour(SignalColours[base->index() % countof(SignalColours)]);
 
 	/* Populate this channel's trigger setting with whatever we
 	 * find in the current session trigger, if anything. */
@@ -122,65 +121,62 @@ LogicSignal::LogicSignal(
 	if ((trigger = session_.session()->trigger()))
 		for (auto stage : trigger->stages())
 			for (auto match : stage->matches())
-				if (match->channel() == channel_)
+				if (match->channel() == base_->channel())
 					trigger_match_ = match->type();
 }
 
-LogicSignal::~LogicSignal()
-{
-}
-
 shared_ptr<pv::data::SignalData> LogicSignal::data() const
 {
-	return data_;
+	return base_->logic_data();
 }
 
 shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
 {
-	return data_;
+	return base_->logic_data();
 }
 
-void LogicSignal::set_logic_data(std::shared_ptr<pv::data::Logic> data)
+pair<int, int> LogicSignal::v_extents() const
 {
-	data_ = data;
+	const int signal_margin =
+		QFontMetrics(QApplication::font()).height() / 2;
+	return make_pair(-signal_height_ - signal_margin, signal_margin);
 }
 
-std::pair<int, int> LogicSignal::v_extents() const
+int LogicSignal::scale_handle_offset() const
 {
-	return make_pair(-SignalHeight - SignalMargin, SignalMargin);
+	return -signal_height_;
 }
 
-void LogicSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+void LogicSignal::scale_handle_dragged(int offset)
 {
-	if (channel_->enabled())
-		paint_axis(p, pp, get_visual_y());
+	const int font_height = QFontMetrics(QApplication::font()).height();
+	const int units = (-offset / font_height);
+	signal_height_ = ((units < 1) ? 1 : units) * font_height;
 }
 
-void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
+void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 {
 	QLineF *line;
 
 	vector< pair<int64_t, bool> > edges;
 
-	assert(channel_);
-	assert(data_);
+	assert(base_);
 	assert(owner_);
 
 	const int y = get_visual_y();
 
-	if (!channel_->enabled())
+	if (!base_->enabled())
 		return;
 
-	const float high_offset = y - SignalHeight + 0.5f;
+	const float high_offset = y - signal_height_ + 0.5f;
 	const float low_offset = y + 0.5f;
 
 	const deque< shared_ptr<pv::data::LogicSegment> > &segments =
-		data_->logic_segments();
+		base_->logic_data()->logic_segments();
 	if (segments.empty())
 		return;
 
-	const shared_ptr<pv::data::LogicSegment> &segment =
-		segments.front();
+	const shared_ptr<pv::data::LogicSegment> &segment = segments.front();
 
 	double samplerate = segment->samplerate();
 
@@ -189,18 +185,38 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 		samplerate = 1.0;
 
 	const double pixels_offset = pp.pixels_offset();
-	const double start_time = segment->start_time();
+	const pv::util::Timestamp& start_time = segment->start_time();
 	const int64_t last_sample = segment->get_sample_count() - 1;
 	const double samples_per_pixel = samplerate * pp.scale();
-	const double start = samplerate * (pp.offset() - start_time);
-	const double end = start + samples_per_pixel * pp.width();
+	const double pixels_per_sample = 1 / samples_per_pixel;
+	const pv::util::Timestamp start = samplerate * (pp.offset() - start_time);
+	const pv::util::Timestamp end = start + samples_per_pixel * pp.width();
+
+	const int64_t start_sample = min(max(floor(start).convert_to<int64_t>(),
+		(int64_t)0), last_sample);
+	const uint64_t end_sample = min(max(ceil(end).convert_to<int64_t>(),
+		(int64_t)0), last_sample);
 
-	segment->get_subsampled_edges(edges,
-		min(max((int64_t)floor(start), (int64_t)0), last_sample),
-		min(max((int64_t)ceil(end), (int64_t)0), last_sample),
-		samples_per_pixel / Oversampling, channel_->index());
+	segment->get_subsampled_edges(edges, start_sample, end_sample,
+		samples_per_pixel / Oversampling, base_->index());
 	assert(edges.size() >= 2);
 
+	// Check whether we need to paint the sampling points
+	GlobalSettings settings;
+	const bool show_sampling_points =
+		settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool() &&
+		(samples_per_pixel < 0.25);
+
+	vector<QRectF> sampling_points;
+	float sampling_point_x = 0.0f;
+	int64_t sampling_point_sample = start_sample;
+	const int w = 2;
+
+	if (show_sampling_points) {
+		sampling_points.reserve(end_sample - start_sample + 1);
+		sampling_point_x = (edges.cbegin()->first / samples_per_pixel - pixels_offset) + pp.left();
+	}
+
 	// Paint the edges
 	const unsigned int edge_count = edges.size() - 2;
 	QLineF *const edge_lines = new QLineF[edge_count];
@@ -210,8 +226,28 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 		const float x = ((*i).first / samples_per_pixel -
 			pixels_offset) + pp.left();
 		*line++ = QLineF(x, high_offset, x, low_offset);
+
+		if (show_sampling_points)
+			while (sampling_point_sample < (*i).first) {
+				const float y = (*i).second ? low_offset : high_offset;
+				sampling_points.emplace_back(
+					QRectF(sampling_point_x - (w / 2), y - (w / 2), w, w));
+				sampling_point_sample++;
+				sampling_point_x += pixels_per_sample;
+			};
 	}
 
+	// Calculate the sample points from the last edge to the end of the trace
+	if (show_sampling_points)
+		while ((uint64_t)sampling_point_sample <= end_sample) {
+			// Signal changed after the last edge, so the level is inverted
+			const float y = (edges.cend() - 1)->second ? high_offset : low_offset;
+			sampling_points.emplace_back(
+				QRectF(sampling_point_x - (w / 2), y - (w / 2), w, w));
+			sampling_point_sample++;
+			sampling_point_x += pixels_per_sample;
+		};
+
 	p.setPen(EdgeColour);
 	p.drawLines(edge_lines, edge_count);
 	delete[] edge_lines;
@@ -228,12 +264,18 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 		pixels_offset, pp.left(), low_offset);
 
 	delete[] cap_lines;
+
+	// Paint the sampling points
+	if (show_sampling_points) {
+		p.setPen(SamplingPointColour);
+		p.drawRects(sampling_points.data(), sampling_points.size());
+	}
 }
 
-void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+void LogicSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp)
 {
 	// Draw the trigger marker
-	if (!trigger_match_)
+	if (!trigger_match_ || !base_->enabled())
 		return;
 
 	const int y = get_visual_y();
@@ -255,7 +297,7 @@ void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
 		const QSize size = pixmap->size();
 		const QPoint point(
 			pp.right() - size.width() - pad * 2,
-			y - (SignalHeight + size.height()) / 2);
+			y - (signal_height_ + size.height()) / 2);
 
 		p.setPen(QPen(TriggerMarkerBackgroundColour.darker()));
 		p.setBrush(TriggerMarkerBackgroundColour);
@@ -321,23 +363,31 @@ void LogicSignal::init_trigger_actions(QWidget *parent)
 
 const vector<int32_t> LogicSignal::get_trigger_types() const
 {
+	// We may not be associated with a device
+	if (!device_)
+		return vector<int32_t>();
+
 	const auto sr_dev = device_->device();
-	const auto keys = sr_dev->config_keys(ConfigKey::DEVICE_OPTIONS);
-	const auto iter = keys.find(ConfigKey::TRIGGER_MATCH);
-	if (iter != keys.end() &&
-		(*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
-		try {
-			const Glib::VariantContainerBase gvar =
-				sr_dev->config_list(ConfigKey::TRIGGER_MATCH);
-			return Glib::VariantBase::cast_dynamic<
-				Glib::Variant<vector<int32_t>>>(gvar).get();
-		} catch (Error e) {
-			// Failed to enumerate triggers
-			(void)e;
+	if (sr_dev->config_check(ConfigKey::TRIGGER_MATCH, Capability::LIST)) {
+		const Glib::VariantContainerBase gvar =
+			sr_dev->config_list(ConfigKey::TRIGGER_MATCH);
+
+		vector<int32_t> ttypes;
+
+		for (unsigned int i = 0; i < gvar.get_n_children(); i++) {
+			Glib::VariantBase tmp_vb;
+			gvar.get_child(tmp_vb, i);
+
+			Glib::Variant<int32_t> tmp_v =
+				Glib::VariantBase::cast_dynamic< Glib::Variant<int32_t> >(tmp_vb);
+
+			ttypes.push_back(tmp_v.get());
 		}
-	}
 
-	return vector<int32_t>();
+		return ttypes;
+	} else {
+		return vector<int32_t>();
+	}
 }
 
 QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type)
@@ -363,7 +413,7 @@ QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type)
 			action = trigger_change_;
 			break;
 		default:
-			assert(0);
+			assert(false);
 		}
 	}
 
@@ -417,22 +467,30 @@ void LogicSignal::modify_trigger()
 	if (trigger) {
 		for (auto stage : trigger->stages()) {
 			const auto &matches = stage->matches();
-			if (std::none_of(begin(matches), end(matches),
+			if (none_of(matches.begin(), matches.end(),
 			    [&](shared_ptr<TriggerMatch> match) {
-					return match->channel() != channel_; }))
+					return match->channel() != base_->channel(); }))
 				continue;
 
 			auto new_stage = new_trigger->add_stage();
 			for (auto match : stage->matches()) {
-				if (match->channel() == channel_)
+				if (match->channel() == base_->channel())
 					continue;
 				new_stage->add_match(match->channel(), match->type());
 			}
 		}
 	}
 
-	if (trigger_match_)
-		new_trigger->add_stage()->add_match(channel_, trigger_match_);
+	if (trigger_match_) {
+		// Until we can let the user decide how to group trigger matches
+		// into stages, put all of the matches into a single stage --
+		// most devices only support a single trigger stage.
+		if (new_trigger->stages().empty())
+			new_trigger->add_stage();
+
+		new_trigger->stages().back()->add_match(base_->channel(),
+			trigger_match_);
+	}
 
 	session_.session()->set_trigger(
 		new_trigger->stages().empty() ? nullptr : new_trigger);
@@ -443,24 +501,22 @@ void LogicSignal::modify_trigger()
 
 const QIcon* LogicSignal::get_icon(const char *path)
 {
-	const QIcon *icon = icon_cache_.take(path);
-	if (!icon) {
-		icon = new QIcon(path);
+	if (!icon_cache_.contains(path)) {
+		const QIcon *icon = new QIcon(path);
 		icon_cache_.insert(path, icon);
 	}
 
-	return icon;
+	return icon_cache_.take(path);
 }
 
 const QPixmap* LogicSignal::get_pixmap(const char *path)
 {
-	const QPixmap *pixmap = pixmap_cache_.take(path);
-	if (!pixmap) {
-		pixmap = new QPixmap(path);
+	if (!pixmap_cache_.contains(path)) {
+		const QPixmap *pixmap = new QPixmap(path);
 		pixmap_cache_.insert(path, pixmap);
 	}
 
-	return pixmap;
+	return pixmap_cache_.take(path);
 }
 
 void LogicSignal::on_trigger()
@@ -476,5 +532,6 @@ void LogicSignal::on_trigger()
 	modify_trigger();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv