X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=mainwindow.cpp;h=3390e183e0b4b89617f6abdfa88b6fab6b650ae8;hb=215f9499495716d6a33b53b0fa9cac47f0e43fbd;hp=50847e2ac1268108b48ee1a0945c28966a39fcda;hpb=274d4f133825cddfc6a42438dd47899db20c7d97;p=pulseview.git diff --git a/mainwindow.cpp b/mainwindow.cpp index 50847e2..3390e18 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -43,30 +43,30 @@ extern "C" { MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), - ui(new Ui::MainWindow) + _ui(new Ui::MainWindow) { - ui->setupUi(this); + _ui->setupUi(this); _sampling_bar = new SamplingBar(this); connect(_sampling_bar, SIGNAL(run_stop()), this, SLOT(run_stop())); addToolBar(_sampling_bar); - view = new SigView(session, this); - ui->verticalLayout->addWidget(view); + _view = new SigView(_session, this); + _ui->verticalLayout->addWidget(_view); } MainWindow::~MainWindow() { - delete ui; + delete _ui; } void MainWindow::on_actionOpen_triggered() { - QString fileName = QFileDialog::getOpenFileName( + QString file_name = QFileDialog::getOpenFileName( this, tr("Open File"), "", tr("Sigrok Sessions (*.sr)")); - session.loadFile(fileName.toStdString()); + _session.load_file(file_name.toStdString()); } void MainWindow::on_actionAbout_triggered() @@ -77,7 +77,8 @@ void MainWindow::on_actionAbout_triggered() void MainWindow::run_stop() { - session.start_capture( + _session.start_capture( _sampling_bar->get_selected_device(), + _sampling_bar->get_record_length(), _sampling_bar->get_sample_rate()); }