X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.hpp;h=b23af57046d808252ac7e8b6594c470926bcd87c;hb=e4cc0ee6270eb4d388a169438f58aa481f705261;hp=6ba86469f04ff64b44e22f8aa427736f7101d6e8;hpb=7a01bd3654ed046216308fa64edfd79be7cd525f;p=pulseview.git
diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index 6ba8646..b23af57 100644
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -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 .
*/
#ifndef PULSEVIEW_PV_POPUPS_CHANNELS_HPP
@@ -32,6 +31,10 @@
#include
+using std::map;
+using std::shared_ptr;
+using std::vector;
+
class QCheckBox;
class QGridLayout;
@@ -47,6 +50,10 @@ namespace binding {
class Device;
}
+namespace data {
+class SignalBase;
+}
+
namespace view {
class Signal;
}
@@ -58,19 +65,19 @@ class Channels : public pv::widgets::Popup
Q_OBJECT
public:
- Channels(Session &session_, QWidget *parent);
+ Channels(Session &session, QWidget *parent);
private:
void set_all_channels(bool set);
- void populate_group(std::shared_ptr group,
- const std::vector< std::shared_ptr > sigs);
+ void populate_group(shared_ptr group,
+ const vector< shared_ptr > sigs);
QGridLayout* create_channel_group_grid(
- const std::vector< std::shared_ptr > sigs);
+ const vector< shared_ptr > sigs);
private:
- void showEvent(QShowEvent *e);
+ void showEvent(QShowEvent *event);
private Q_SLOTS:
void on_channel_checked(QWidget *widget);
@@ -85,10 +92,10 @@ private:
bool updating_channels_;
- std::vector< std::shared_ptr >
- group_bindings_;
- std::map< QCheckBox*, std::shared_ptr >
+ vector< shared_ptr > group_bindings_;
+ map< QCheckBox*, shared_ptr >
check_box_signal_map_;
+ map< shared_ptr, QLabel*> group_label_map_;
QHBoxLayout buttons_bar_;
QPushButton enable_all_channels_;
@@ -97,7 +104,7 @@ private:
QSignalMapper check_box_mapper_;
};
-} // popups
-} // pv
+} // namespace popups
+} // namespace pv
#endif // PULSEVIEW_PV_POPUPS_CHANNELS_HPP