projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Restructure add_view()
[pulseview.git]
/
pv
/
popups
/
channels.hpp
diff --git
a/pv/popups/channels.hpp
b/pv/popups/channels.hpp
index e472fdffae05dece304a2c8330a2dac7d49fd164..6fe9159d3f854f862b989645fb6b410001a848e8 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
* 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_H
PP
+#define PULSEVIEW_PV_POPUPS_CHANNELS_H
PP
#include <map>
#include <memory>
#include <map>
#include <memory>
@@
-41,12
+40,14
@@
namespace sigrok {
namespace pv {
namespace pv {
-class S
igS
ession;
+class Session;
-namespace prop {
namespace binding {
namespace binding {
-class Device
Options
;
+class Device;
}
}
+
+namespace data {
+class SignalBase;
}
namespace view {
}
namespace view {
@@
-60,19
+61,19
@@
class Channels : public pv::widgets::Popup
Q_OBJECT
public:
Q_OBJECT
public:
- Channels(S
igSession &session_
, QWidget *parent);
+ Channels(S
ession &session
, QWidget *parent);
private:
void set_all_channels(bool set);
void populate_group(std::shared_ptr<sigrok::ChannelGroup> group,
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);
+ const std::vector< std::shared_ptr<pv::
data::SignalBase
> > sigs);
QGridLayout* create_channel_group_grid(
QGridLayout* create_channel_group_grid(
- const std::vector< std::shared_ptr<pv::
view::Signal
> > sigs);
+ const std::vector< std::shared_ptr<pv::
data::SignalBase
> > sigs);
private:
private:
- void showEvent(QShowEvent *e);
+ void showEvent(QShowEvent *e
vent
);
private Q_SLOTS:
void on_channel_checked(QWidget *widget);
private Q_SLOTS:
void on_channel_checked(QWidget *widget);
@@
-81,15
+82,15
@@
private Q_SLOTS:
void disable_all_channels();
private:
void disable_all_channels();
private:
- pv::S
igS
ession &session_;
+ pv::Session &session_;
QFormLayout layout_;
bool updating_channels_;
QFormLayout layout_;
bool updating_channels_;
- std::vector< std::shared_ptr<pv::
prop::binding::DeviceOptions
> >
+ std::vector< std::shared_ptr<pv::
binding::Device
> >
group_bindings_;
group_bindings_;
- std::map< QCheckBox*, std::shared_ptr<pv::
view::Signal
> >
+ std::map< QCheckBox*, std::shared_ptr<pv::
data::SignalBase
> >
check_box_signal_map_;
QHBoxLayout buttons_bar_;
check_box_signal_map_;
QHBoxLayout buttons_bar_;
@@
-102,4
+103,4
@@
private:
} // popups
} // pv
} // popups
} // pv
-#endif // PULSEVIEW_PV_POPUPS_CHANNELS_H
+#endif // PULSEVIEW_PV_POPUPS_CHANNELS_H
PP