using std::list;
using std::map;
-using std::pair;
using std::shared_ptr;
using std::string;
namespace pv {
namespace view {
-class SelectableItem;
+class ViewItem;
}
const char *MainWindow::SettingOpenDirectory = "MainWindow/OpenDirectory";
}
}
+void MainWindow::run_stop()
+{
+ switch(session_.get_capture_state()) {
+ case Session::Stopped:
+ session_.start_capture([&](QString message) {
+ session_error("Capture failed", message); });
+ break;
+
+ case Session::AwaitingTrigger:
+ case Session::Running:
+ session_.stop_capture();
+ break;
+ }
+}
+
+void MainWindow::select_device(shared_ptr<Device> device)
+{
+ try {
+ session_.set_device(device);
+ } catch(const QString &e) {
+ QMessageBox msg(this);
+ msg.setText(e);
+ msg.setInformativeText(tr("Failed to Select Device"));
+ msg.setStandardButtons(QMessageBox::Ok);
+ msg.setIcon(QMessageBox::Warning);
+ msg.exec();
+ }
+}
+
void MainWindow::setup_ui()
{
setObjectName(QString::fromUtf8("MainWindow"));
addToolBar(toolbar);
// Setup the sampling bar
- sampling_bar_ = new toolbars::SamplingBar(session_, 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(run_stop()), this,
- SLOT(run_stop()));
addToolBar(sampling_bar_);
// Set the title
device = device_manager_.find_device_from_info(dev_info);
if (device) {
- session_.set_device(device);
+ select_device(device);
update_device_list();
}
devices.push_back(selected_device);
assert(selected_device);
- list< pair< shared_ptr<Device>, string> > device_list;
-
- for (auto device : devices)
- device_list.push_back(make_pair(
- device, device_manager_.get_display_name(device)));
-
- sampling_bar_->set_device_list(device_list, selected_device);
+ sampling_bar_->set_device_list(devices, selected_device);
}
void MainWindow::closeEvent(QCloseEvent *event)
// If the user selected a device, select it in the device list. Select the
// current device otherwise.
if (dlg.exec())
- session_.set_device(dlg.get_selected_device());
+ select_device(dlg.get_selected_device());
update_device_list();
}
#endif
}
-void MainWindow::run_stop()
-{
- switch(session_.get_capture_state()) {
- case SigSession::Stopped:
- session_.start_capture([&](QString message) {
- session_error("Capture failed", message); });
- break;
-
- case SigSession::AwaitingTrigger:
- case SigSession::Running:
- session_.stop_capture();
- break;
- }
-}
-
void MainWindow::capture_state_changed(int state)
{
- sampling_bar_->set_capture_state((pv::SigSession::capture_state)state);
+ sampling_bar_->set_capture_state((pv::Session::capture_state)state);
}
void MainWindow::device_selected()