Random simplifications, cosmetics/whitespace/consistency fixes.

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

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index 1a042da8283c847abfec1efaab4c5441781cfab9..4a5e396c2e08e685d81205caa642608d3be73a13 100644 (file)
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -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 <http://www.gnu.org/licenses/>.
  */
 
 #include <map>
@@ -25,8 +24,6 @@
 #define NOGDI
 #define NORESOURCE
 #endif
-#include <boost/thread/locks.hpp>
-#include <boost/thread/shared_mutex.hpp>
 
 #include <QCheckBox>
 #include <QFormLayout>
@@ -36,6 +33,7 @@
 #include "channels.hpp"
 
 #include <pv/binding/device.hpp>
+#include <pv/data/signalbase.hpp>
 #include <pv/devices/device.hpp>
 #include <pv/session.hpp>
 #include <pv/view/signal.hpp>
@@ -44,22 +42,18 @@
 
 using namespace Qt;
 
-using boost::shared_lock;
-using boost::shared_mutex;
-using std::lock_guard;
 using std::map;
-using std::mutex;
-using std::set;
 using std::shared_ptr;
+using std::make_shared;
 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 {
 
@@ -78,11 +72,13 @@ Channels::Channels(Session &session, QWidget *parent) :
        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;
 
-       const unordered_set< 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
@@ -90,7 +86,7 @@ Channels::Channels(Session &session, QWidget *parent) :
                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;
+               vector< shared_ptr<SignalBase> > group_sigs;
                for (auto channel : group->channels()) {
                        const auto iter = signal_map.find(channel);
 
@@ -105,9 +101,9 @@ Channels::Channels(Session &session, QWidget *parent) :
        }
 
        // Make a vector of the remaining channels
-       vector< shared_ptr<Signal> > global_sigs;
+       vector< shared_ptr<SignalBase> > global_sigs;
        for (auto channel : device->channels()) {
-               const map<shared_ptr<Channel>, shared_ptr<Signal> >::
+               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);
@@ -140,13 +136,13 @@ void Channels::set_all_channels(bool set)
 {
        updating_channels_ = true;
 
-       for (map<QCheckBox*, shared_ptr<Signal> >::const_iterator i =
+       for (map<QCheckBox*, shared_ptr<SignalBase> >::const_iterator i =
                        check_box_signal_map_.begin();
                        i != check_box_signal_map_.end(); i++) {
-               const shared_ptr<Signal> sig = (*i).second;
+               const shared_ptr<SignalBase> sig = (*i).second;
                assert(sig);
 
-               sig->enable(set);
+               sig->set_enabled(set);
                (*i).first->setChecked(set);
        }
 
@@ -154,7 +150,7 @@ void Channels::set_all_channels(bool set)
 }
 
 void Channels::populate_group(shared_ptr<ChannelGroup> group,
-       const vector< shared_ptr<pv::view::Signal> > sigs)
+       const vector< shared_ptr<SignalBase> > sigs)
 {
        using pv::binding::Device;
 
@@ -163,7 +159,7 @@ void Channels::populate_group(shared_ptr<ChannelGroup> group,
        // popup.
        shared_ptr<Device> binding;
        if (group)
-               binding = shared_ptr<Device>(new Device(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())) &&
@@ -172,25 +168,23 @@ void Channels::populate_group(shared_ptr<ChannelGroup> group,
                        QString("<h3>%1</h3>").arg(group->name().c_str())));
 
        // 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());
@@ -209,16 +203,16 @@ QGridLayout* Channels::create_channel_group_grid(
        return grid;
 }
 
-void Channels::showEvent(QShowEvent *e)
+void Channels::showEvent(QShowEvent *event)
 {
-       pv::widgets::Popup::showEvent(e);
+       pv::widgets::Popup::showEvent(event);
 
        updating_channels_ = true;
 
-       for (map<QCheckBox*, shared_ptr<Signal> >::const_iterator i =
+       for (map<QCheckBox*, shared_ptr<SignalBase> >::const_iterator i =
                        check_box_signal_map_.begin();
                        i != check_box_signal_map_.end(); i++) {
-               const shared_ptr<Signal> sig = (*i).second;
+               const shared_ptr<SignalBase> sig = (*i).second;
                assert(sig);
 
                (*i).first->setChecked(sig->enabled());
@@ -236,14 +230,14 @@ void Channels::on_channel_checked(QWidget *widget)
        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()