X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=cb170fe0b45a1a7da62aa7c8d0a559e3ad74c735;hp=78bfdec517667646c35f87c212d5cc4ab5ca2f7d;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=7bb0fbf4d3809dbbd0fe5b35fc7e475b1065ae20

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 78bfdec..cb170fe 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>
@@ -37,6 +36,7 @@
 #include <pv/devices/device.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
+#include <pv/data/signalbase.hpp>
 #include <pv/view/view.hpp>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
@@ -49,7 +49,6 @@ using std::pair;
 using std::shared_ptr;
 using std::vector;
 
-using sigrok::Channel;
 using sigrok::ConfigKey;
 using sigrok::Capability;
 using sigrok::Error;
@@ -59,7 +58,8 @@ using sigrok::TriggerMatch;
 using sigrok::TriggerMatchType;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const float LogicSignal::Oversampling = 2.0f;
 
@@ -99,12 +99,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 +112,7 @@ LogicSignal::LogicSignal(
 {
 	shared_ptr<Trigger> trigger;
 
-	set_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,27 +120,18 @@ 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_;
-}
-
-void LogicSignal::set_logic_data(std::shared_ptr<pv::data::Logic> data)
-{
-	data_ = data;
+	return base_->logic_data();
 }
 
 std::pair<int, int> LogicSignal::v_extents() const
@@ -170,20 +159,19 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 
 	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 - 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;
 
@@ -209,7 +197,7 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 		(int64_t)0), last_sample);
 
 	segment->get_subsampled_edges(edges, start_sample, end_sample,
-		samples_per_pixel / Oversampling, channel_->index());
+		samples_per_pixel / Oversampling, base_->index());
 	assert(edges.size() >= 2);
 
 	// Paint the edges
@@ -244,7 +232,7 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
 {
 	// Draw the trigger marker
-	if (!trigger_match_ || !channel_->enabled())
+	if (!trigger_match_ || !base_->enabled())
 		return;
 
 	const int y = get_visual_y();
@@ -336,8 +324,20 @@ const vector<int32_t> LogicSignal::get_trigger_types() const
 	if (sr_dev->config_check(ConfigKey::TRIGGER_MATCH, Capability::LIST)) {
 		const Glib::VariantContainerBase gvar =
 			sr_dev->config_list(ConfigKey::TRIGGER_MATCH);
-		return Glib::VariantBase::cast_dynamic<
-			Glib::Variant<vector<int32_t>>>(gvar).get();
+
+		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 ttypes;
 	} else {
 		return vector<int32_t>();
 	}
@@ -422,12 +422,12 @@ void LogicSignal::modify_trigger()
 			const auto &matches = stage->matches();
 			if (std::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());
 			}
@@ -441,7 +441,8 @@ void LogicSignal::modify_trigger()
 		if (new_trigger->stages().empty())
 			new_trigger->add_stage();
 
-		new_trigger->stages().back()->add_match(channel_, trigger_match_);
+		new_trigger->stages().back()->add_match(base_->channel(),
+			trigger_match_);
 	}
 
 	session_.session()->set_trigger(
@@ -453,24 +454,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()
@@ -486,5 +485,6 @@ void LogicSignal::on_trigger()
 	modify_trigger();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv