* 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/>.
*/
#include <map>
#include <QGridLayout>
#include <QLabel>
-#include "channels.h"
+#include "channels.hpp"
-#include <pv/prop/binding/deviceoptions.h>
-#include <pv/sigsession.h>
-#include <pv/view/signal.h>
+#include <pv/session.hpp>
+#include <pv/binding/device.hpp>
+#include <pv/data/signalbase.hpp>
+#include <pv/devices/device.hpp>
-#include <libsigrok/libsigrok.hpp>
-
-using namespace Qt;
-
-using boost::shared_lock;
-using boost::shared_mutex;
-using std::lock_guard;
+using std::make_shared;
using std::map;
-using std::mutex;
-using std::set;
+using std::out_of_range;
using std::shared_ptr;
+using std::unordered_set;
using std::vector;
+using pv::data::SignalBase;
+
using sigrok::Channel;
using sigrok::ChannelGroup;
using sigrok::Device;
-using pv::view::Signal;
-
namespace pv {
namespace popups {
-Channels::Channels(SigSession &session, QWidget *parent) :
+Channels::Channels(Session &session, QWidget *parent) :
Popup(parent),
session_(session),
updating_channels_(false),
// Create the layout
setLayout(&layout_);
- shared_ptr<sigrok::Device> device = session_.device();
+ const shared_ptr<sigrok::Device> device = session_.device()->device();
assert(device);
// Collect a set of signals
- map<shared_ptr<Channel>, shared_ptr<Signal> > signal_map;
+ map<shared_ptr<Channel>, shared_ptr<SignalBase> > signal_map;
- shared_lock<shared_mutex> lock(session_.signals_mutex());
- const vector< shared_ptr<Signal> > &sigs(session_.signals());
+ unordered_set< shared_ptr<SignalBase> > sigs;
+ for (const shared_ptr<data::SignalBase> b : session_.signalbases())
+ sigs.insert(b);
- for (const shared_ptr<Signal> &sig : sigs)
+ for (const shared_ptr<SignalBase> &sig : sigs)
signal_map[sig->channel()] = sig;
// Populate channel groups
- for (auto entry : device->channel_groups())
- {
- shared_ptr<ChannelGroup> group = entry.second;
- // Make a set of signals, and removed this signals from the
- // signal map.
- vector< shared_ptr<Signal> > group_sigs;
- for (auto channel : group->channels())
- {
+ for (auto entry : device->channel_groups()) {
+ const shared_ptr<ChannelGroup> group = entry.second;
+ // Make a set of signals and remove these signals from the signal map
+ vector< shared_ptr<SignalBase> > group_sigs;
+ for (auto channel : group->channels()) {
const auto iter = signal_map.find(channel);
if (iter == signal_map.end())
}
// Make a vector of the remaining channels
- vector< shared_ptr<Signal> > global_sigs;
- for (auto channel : device->channels())
- {
- const map<shared_ptr<Channel>, shared_ptr<Signal> >::
+ vector< shared_ptr<SignalBase> > global_sigs;
+ for (auto channel : device->channels()) {
+ const map<shared_ptr<Channel>, shared_ptr<SignalBase> >::
const_iterator iter = signal_map.find(channel);
if (iter != signal_map.end())
global_sigs.push_back((*iter).second);
}
// Create a group
- populate_group(NULL, global_sigs);
+ populate_group(nullptr, global_sigs);
// Create the enable/disable all buttons
connect(&enable_all_channels_, SIGNAL(clicked()),
{
updating_channels_ = true;
- for (map<QCheckBox*, shared_ptr<Signal> >::const_iterator i =
- check_box_signal_map_.begin();
- i != check_box_signal_map_.end(); i++)
- {
- const shared_ptr<Signal> sig = (*i).second;
+ for (auto entry : check_box_signal_map_) {
+ QCheckBox *cb = entry.first;
+ const shared_ptr<SignalBase> sig = entry.second;
assert(sig);
- sig->enable(set);
- (*i).first->setChecked(set);
+ sig->set_enabled(set);
+ cb->setChecked(set);
}
updating_channels_ = false;
}
void Channels::populate_group(shared_ptr<ChannelGroup> group,
- const vector< shared_ptr<pv::view::Signal> > sigs)
+ const vector< shared_ptr<SignalBase> > sigs)
{
- using pv::prop::binding::DeviceOptions;
+ using pv::binding::Device;
// Only bind options if this is a group. We don't do it for general
// options, because these properties are shown in the device config
// popup.
- shared_ptr<DeviceOptions> binding;
+ shared_ptr<Device> binding;
if (group)
- binding = shared_ptr<DeviceOptions>(new DeviceOptions(group));
+ binding = make_shared<Device>(group);
// Create a title if the group is going to have any content
- if ((!sigs.empty() || (binding && !binding->properties().empty())) &&
- group)
- layout_.addRow(new QLabel(
- QString("<h3>%1</h3>").arg(group->name().c_str())));
+ if ((!sigs.empty() || (binding && !binding->properties().empty())) && group)
+ {
+ QLabel *label = new QLabel(
+ QString("<h3>%1</h3>").arg(group->name().c_str()));
+ layout_.addRow(label);
+ group_label_map_[group] = label;
+ }
// Create the channel group grid
- QGridLayout *const channel_grid =
- create_channel_group_grid(sigs);
+ QGridLayout *const channel_grid = create_channel_group_grid(sigs);
layout_.addRow(channel_grid);
// Create the channel group options
- if (binding)
- {
+ if (binding) {
binding->add_properties_to_form(&layout_, true);
group_bindings_.push_back(binding);
}
}
QGridLayout* Channels::create_channel_group_grid(
- const vector< shared_ptr<pv::view::Signal> > sigs)
+ const vector< shared_ptr<SignalBase> > sigs)
{
int row = 0, col = 0;
QGridLayout *const grid = new QGridLayout();
- for (const shared_ptr<pv::view::Signal>& sig : sigs)
- {
+ for (const shared_ptr<SignalBase>& sig : sigs) {
assert(sig);
- QCheckBox *const checkbox = new QCheckBox(sig->name());
+ QCheckBox *const checkbox = new QCheckBox(sig->display_name());
check_box_mapper_.setMapping(checkbox, checkbox);
connect(checkbox, SIGNAL(toggled(bool)),
&check_box_mapper_, SLOT(map()));
check_box_signal_map_[checkbox] = sig;
- if(++col >= 8)
+ if (++col >= 8)
col = 0, row++;
}
return grid;
}
-void Channels::showEvent(QShowEvent *e)
+void Channels::showEvent(QShowEvent *event)
{
- pv::widgets::Popup::showEvent(e);
+ pv::widgets::Popup::showEvent(event);
+
+ const shared_ptr<sigrok::Device> device = session_.device()->device();
+ assert(device);
+
+ // Update group labels
+ for (auto entry : device->channel_groups()) {
+ const shared_ptr<ChannelGroup> group = entry.second;
+
+ try {
+ QLabel* label = group_label_map_.at(group);
+ label->setText(QString("<h3>%1</h3>").arg(group->name().c_str()));
+ } catch (out_of_range&) {
+ // Do nothing
+ }
+ }
updating_channels_ = true;
- for (map<QCheckBox*, shared_ptr<Signal> >::const_iterator i =
- check_box_signal_map_.begin();
- i != check_box_signal_map_.end(); i++)
- {
- const shared_ptr<Signal> sig = (*i).second;
+ for (auto entry : check_box_signal_map_) {
+ QCheckBox *cb = entry.first;
+ const shared_ptr<SignalBase> sig = entry.second;
assert(sig);
- (*i).first->setChecked(sig->enabled());
+ // Update the check box
+ cb->setChecked(sig->enabled());
+ cb->setText(sig->display_name());
}
updating_channels_ = false;
assert(check_box);
// Look up the signal of this check-box
- map< QCheckBox*, shared_ptr<Signal> >::const_iterator iter =
+ map< QCheckBox*, shared_ptr<SignalBase> >::const_iterator iter =
check_box_signal_map_.find((QCheckBox*)check_box);
assert(iter != check_box_signal_map_.end());
- const shared_ptr<pv::view::Signal> s = (*iter).second;
+ const shared_ptr<SignalBase> s = (*iter).second;
assert(s);
- s->enable(check_box->isChecked());
+ s->set_enabled(check_box->isChecked());
}
void Channels::enable_all_channels()
set_all_channels(false);
}
-} // popups
-} // pv
+} // namespace popups
+} // namespace pv
projects / pulseview.git / blobdiff