X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.hpp;h=d9c5b967f49980e682239b1729766ce8e819a4cb;hb=efadabab3de1a4c5b9cd09316de5d9ae66251519;hp=3701325bc704572758831b8781d800a56cc39065;hpb=870ea3dbf35b182e120c5d84ab89bf9cb7691232;p=pulseview.git

diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index 3701325..d9c5b96 100644
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -20,24 +20,24 @@
 #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 <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;
 }
@@ -69,6 +69,8 @@ public:
 
 private:
 	void set_all_channels(bool set);
+	void set_all_channels_conditionally(
+		function<bool (const shared_ptr<data::SignalBase>)> cond_func);
 
 	void populate_group(shared_ptr<sigrok::ChannelGroup> group,
 		const vector< shared_ptr<pv::data::SignalBase> > sigs);
@@ -84,6 +86,10 @@ private Q_SLOTS:
 
 	void enable_all_channels();
 	void disable_all_channels();
+	void enable_all_logic_channels();
+	void enable_all_analog_channels();
+	void enable_all_named_channels();
+	void enable_all_changing_channels();
 
 private:
 	pv::Session &session_;
@@ -95,10 +101,12 @@ private:
 	vector< shared_ptr<pv::binding::Device> > group_bindings_;
 	map< QCheckBox*, shared_ptr<pv::data::SignalBase> >
 		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 buttons_bar_;
+	QPushButton enable_all_channels_, disable_all_channels_;
+	QPushButton enable_all_logic_channels_, enable_all_analog_channels_;
+	QPushButton enable_all_named_channels_, enable_all_changing_channels_;
 
 	QSignalMapper check_box_mapper_;
 };