projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement MainWindow::add_view()
[pulseview.git]
/
pv
/
widgets
/
devicetoolbutton.cpp
diff --git
a/pv/widgets/devicetoolbutton.cpp
b/pv/widgets/devicetoolbutton.cpp
index ffa1cc6546561f74ceebba4b198e5a85d702cd71..d553aba32987d7bded07a7be5767d63501fb69c0 100644
(file)
--- a/
pv/widgets/devicetoolbutton.cpp
+++ b/
pv/widgets/devicetoolbutton.cpp
@@
-23,9
+23,10
@@
#include <QTimer>
#include <QToolTip>
#include <QTimer>
#include <QToolTip>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include <pv/devicemanager.hpp>
#include <pv/devicemanager.hpp>
+#include <pv/devices/device.hpp>
#include "devicetoolbutton.hpp"
#include "devicetoolbutton.hpp"
@@
-35,7
+36,7
@@
using std::string;
using std::weak_ptr;
using std::vector;
using std::weak_ptr;
using std::vector;
-using
sigrok
::Device;
+using
pv::devices
::Device;
namespace pv {
namespace widgets {
namespace pv {
namespace widgets {
@@
-71,12
+72,19
@@
void DeviceToolButton::set_device_list(
const list< shared_ptr<Device> > &devices, shared_ptr<Device> selected)
{
selected_device_ = selected;
const list< shared_ptr<Device> > &devices, shared_ptr<Device> selected)
{
selected_device_ = selected;
- setText(QString::fromStdString(
-
device_manager_.get_display_name(selected)
));
+ setText(
selected ?
QString::fromStdString(
+
selected->display_name(device_manager_)) : tr("<No Device>"
));
devices_ = vector< weak_ptr<Device> >(devices.begin(), devices.end());
update_device_list();
}
devices_ = vector< weak_ptr<Device> >(devices.begin(), devices.end());
update_device_list();
}
+void DeviceToolButton::reset()
+{
+ setText(tr("<No Device>"));
+ selected_device_.reset();
+ update_device_list();
+}
+
void DeviceToolButton::update_device_list()
{
menu_.clear();
void DeviceToolButton::update_device_list()
{
menu_.clear();
@@
-85,16
+93,16
@@
void DeviceToolButton::update_device_list()
menu_.addSeparator();
for (weak_ptr<Device> dev_weak_ptr : devices_) {
menu_.addSeparator();
for (weak_ptr<Device> dev_weak_ptr : devices_) {
- shared_ptr<Device> dev(dev_weak_ptr);
+ shared_ptr<Device> dev(dev_weak_ptr
.lock()
);
if (!dev)
continue;
QAction *const a = new QAction(QString::fromStdString(
if (!dev)
continue;
QAction *const a = new QAction(QString::fromStdString(
- dev
ice_manager_.get_display_name(dev
)), this);
+ dev
->display_name(device_manager_
)), this);
a->setCheckable(true);
a->setChecked(selected_device_ == dev);
a->setData(qVariantFromValue((void*)dev.get()));
a->setCheckable(true);
a->setChecked(selected_device_ == dev);
a->setData(qVariantFromValue((void*)dev.get()));
- a->setToolTip(QString::fromStdString(dev
ice_manager_.get_full_name(dev
)));
+ a->setToolTip(QString::fromStdString(dev
->full_name(
)));
mapper_.setMapping(a, a);
connect(a, SIGNAL(triggered()), &mapper_, SLOT(map()));
mapper_.setMapping(a, a);
connect(a, SIGNAL(triggered()), &mapper_, SLOT(map()));
@@
-107,6
+115,8
@@
void DeviceToolButton::on_action(QObject *action)
{
assert(action);
{
assert(action);
+ selected_device_.reset();
+
Device *const dev = (Device*)((QAction*)action)->data().value<void*>();
for (weak_ptr<Device> dev_weak_ptr : devices_) {
shared_ptr<Device> dev_ptr(dev_weak_ptr);
Device *const dev = (Device*)((QAction*)action)->data().value<void*>();
for (weak_ptr<Device> dev_weak_ptr : devices_) {
shared_ptr<Device> dev_ptr(dev_weak_ptr);
@@
-118,7
+128,7
@@
void DeviceToolButton::on_action(QObject *action)
update_device_list();
setText(QString::fromStdString(
update_device_list();
setText(QString::fromStdString(
-
device_manager_.get_display_name(selected_device
_)));
+
selected_device_->display_name(device_manager
_)));
device_selected();
}
device_selected();
}