#include "dialogs/about.h"
#include "dialogs/connect.h"
#include "dialogs/decoder.h"
-#include "toolbars/contextbar.h"
#include "toolbars/samplingbar.h"
#include "view/view.h"
setCentralWidget(_central_widget);
_view = new pv::view::View(_session, this);
- connect(_view, SIGNAL(selection_changed()), this,
- SLOT(view_selection_changed()));
_vertical_layout->addWidget(_view);
addToolBar(_toolbar);
// Setup the sampling bar
- _sampling_bar = new toolbars::SamplingBar(this);
+ _sampling_bar = new toolbars::SamplingBar(_session, this);
// Populate the device list and select the initially selected device
update_device_list();
- connect(_sampling_bar, SIGNAL(device_selected()), this,
- SLOT(device_selected()));
connect(_sampling_bar, SIGNAL(run_stop()), this,
SLOT(run_stop()));
addToolBar(_sampling_bar);
- // Setup the context bar
- _context_bar = new toolbars::ContextBar(this);
- addToolBar(_context_bar);
-
// Set the title
setWindowTitle(QApplication::translate("MainWindow", "PulseView", 0,
QApplication::UnicodeUTF8));
{
GSList *l = g_slist_sort(g_slist_copy(
(GSList*)srd_decoder_list()), decoder_name_cmp);
- while ((l = l->next)) {
+ for(; l; l = l->next)
+ {
QAction *const action = parent->addAction(QString(
((srd_decoder*)l->data)->name));
action->setData(qVariantFromValue(l->data));
dlg.exec();
}
-void MainWindow::device_selected()
-{
- _session.set_device(_sampling_bar->get_selected_device());
-}
-
void MainWindow::add_decoder(QObject *action)
{
assert(action);
const std::vector< boost::shared_ptr<view::Signal> > &sigs =
_session.get_signals();
- dialogs::Decoder dlg(this, dec, sigs);
- if(dlg.exec() != QDialog::Accepted)
+ GHashTable *const options = g_hash_table_new_full(g_str_hash,
+ g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
+
+ dialogs::Decoder dlg(this, dec, sigs, options);
+ if(dlg.exec() != QDialog::Accepted) {
+ g_hash_table_destroy(options);
return;
+ }
- _session.add_decoder(dec);
+ _session.add_decoder(dec, dlg.get_probes(), options);
}
void MainWindow::run_stop()
_sampling_bar->set_capture_state((pv::SigSession::capture_state)state);
}
-void MainWindow::view_selection_changed()
-{
- assert(_context_bar);
-
- const list<weak_ptr<pv::view::SelectableItem> > items(
- _view->selected_items());
- _context_bar->set_selected_items(items);
-}
-
} // namespace pv