Fix #1089 by updating the signal labels and group labels

[pulseview.git] / pv / popups / channels.hpp

diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index a0b0693f608d59ed3577d0d673bb9ae8d0507110..b23af57046d808252ac7e8b6594c470926bcd87c 100644 (file)
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -14,12 +14,11 @@
  * 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_H
-#define PULSEVIEW_PV_POPUPS_CHANNELS_H
+#ifndef PULSEVIEW_PV_POPUPS_CHANNELS_HPP
+#define PULSEVIEW_PV_POPUPS_CHANNELS_HPP
 
 #include <map>
 #include <memory>
@@ -32,6 +31,10 @@
 
 #include <pv/widgets/popup.hpp>
 
+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<sigrok::ChannelGroup> group,
-               const std::vector< std::shared_ptr<pv::view::Signal> > sigs);
+       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);
@@ -85,10 +92,10 @@ 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_;
@@ -97,7 +104,7 @@ private:
        QSignalMapper check_box_mapper_;
 };
 
-} // popups
-} // pv
+}  // namespace popups
+}  // namespace pv
 
-#endif // PULSEVIEW_PV_POPUPS_CHANNELS_H
+#endif // PULSEVIEW_PV_POPUPS_CHANNELS_HPP