X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.hpp;h=54d24340d7d85229db92576df8efc17bab24a7fc;hp=62721ee177a36080d87e842668405fe1424a8c81;hb=8d49811c6da39b75e3f421fb5f507f45f3543a9a;hpb=520362f8c4082820193f09e43b27a8c7df2ef011

diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index 62721ee..54d2434 100644
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -14,26 +14,30 @@
  * 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/>.
  */
 
 #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>
 
-class QCheckBox;
-class QGridLayout;
+using std::function;
+using std::map;
+using std::shared_ptr;
+using std::vector;
 
 namespace sigrok {
 	class ChannelGroup;
@@ -47,6 +51,10 @@ namespace binding {
 class Device;
 }
 
+namespace data {
+class SignalBase;
+}
+
 namespace view {
 class Signal;
 }
@@ -63,20 +71,32 @@ public:
 private:
 	void set_all_channels(bool set);
 
-	void populate_group(std::shared_ptr<sigrok::ChannelGroup> group,
-		const std::vector< std::shared_ptr<pv::view::Signal> > 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);
+
+	void populate_group(shared_ptr<sigrok::ChannelGroup> group,
+		const vector< shared_ptr<pv::data::SignalBase> > sigs);
 
 	QGridLayout* create_channel_group_grid(
-		const std::vector< std::shared_ptr<pv::view::Signal> > sigs);
+		const vector< shared_ptr<pv::data::SignalBase> > sigs);
 
-private:
-	void showEvent(QShowEvent *e);
+	void showEvent(QShowEvent *event);
 
 private Q_SLOTS:
 	void on_channel_checked(QWidget *widget);
 
 	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_;
@@ -85,19 +105,22 @@ private:
 
 	bool updating_channels_;
 
-	std::vector< std::shared_ptr<pv::binding::Device> >
-		 group_bindings_;
-	std::map< QCheckBox*, std::shared_ptr<pv::view::Signal> >
+	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 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_;
 };
 
-} // popups
-} // pv
+}  // namespace popups
+}  // namespace pv
 
 #endif // PULSEVIEW_PV_POPUPS_CHANNELS_HPP