X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.hpp;h=972549a8d1c9fd2f65b63e997eb37b1d6440459f;hb=e23d7aa0d9980c3c269cbddb4cfbb32350d7425c;hp=b23af57046d808252ac7e8b6594c470926bcd87c;hpb=b5d20c6d003d853ad0828d15b365988519e73e88;p=pulseview.git

diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index b23af570..972549a8 100644
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -20,24 +20,25 @@
 #ifndef PULSEVIEW_PV_POPUPS_CHANNELS_HPP
 #define PULSEVIEW_PV_POPUPS_CHANNELS_HPP
 
+#include <functional>
 #include <map>
 #include <memory>
 #include <vector>
 
+#include <QCheckBox>
 #include <QFormLayout>
-#include <QHBoxLayout>
+#include <QGridLayout>
+#include <QLabel>
 #include <QPushButton>
 #include <QSignalMapper>
 
 #include <pv/widgets/popup.hpp>
 
+using std::function;
 using std::map;
 using std::shared_ptr;
 using std::vector;
 
-class QCheckBox;
-class QGridLayout;
-
 namespace sigrok {
 	class ChannelGroup;
 }
@@ -70,13 +71,14 @@ public:
 private:
 	void set_all_channels(bool set);
 
-	void populate_group(shared_ptr<sigrok::ChannelGroup> group,
-		const vector< shared_ptr<pv::data::SignalBase> > sigs);
+	void enable_channels_conditionally(
+		function<bool (const shared_ptr<data::SignalBase>)> cond_func);
+	void disable_channels_conditionally(
+		function<bool (const shared_ptr<data::SignalBase>)> cond_func);
 
-	QGridLayout* create_channel_group_grid(
+	void populate_group(shared_ptr<sigrok::ChannelGroup> group,
 		const vector< shared_ptr<pv::data::SignalBase> > sigs);
 
-private:
 	void showEvent(QShowEvent *event);
 
 private Q_SLOTS:
@@ -84,6 +86,14 @@ private Q_SLOTS:
 
 	void enable_all_channels();
 	void disable_all_channels();
+	void enable_all_logic_channels();
+	void disable_all_logic_channels();
+	void enable_all_analog_channels();
+	void disable_all_analog_channels();
+	void enable_all_named_channels();
+	void disable_all_unnamed_channels();
+	void enable_all_changing_channels();
+	void disable_all_non_changing_channels();
 
 private:
 	pv::Session &session_;
@@ -97,9 +107,12 @@ private:
 		check_box_signal_map_;
 	map< shared_ptr<sigrok::ChannelGroup>, QLabel*> group_label_map_;
 
-	QHBoxLayout buttons_bar_;
-	QPushButton enable_all_channels_;
-	QPushButton disable_all_channels_;
+	QGridLayout filter_buttons_bar_;
+	QPushButton enable_all_channels_, disable_all_channels_;
+	QPushButton enable_all_logic_channels_, disable_all_logic_channels_;
+	QPushButton enable_all_analog_channels_, disable_all_analog_channels_;
+	QPushButton enable_all_named_channels_, disable_all_unnamed_channels_;
+	QPushButton enable_all_changing_channels_, disable_all_non_changing_channels_;
 
 	QSignalMapper check_box_mapper_;
 };