projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added device selector combo box
[pulseview.git]
/
mainwindow.cpp
diff --git
a/mainwindow.cpp
b/mainwindow.cpp
index d85c0a40e46e0604690cb62ab6ea5eefec04d11a..04f852d92fe053f85b2be6815bc43a567dc6fe7f 100644
(file)
--- a/
mainwindow.cpp
+++ b/
mainwindow.cpp
@@
-28,6
+28,8
@@
extern "C" {
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include "mainwindow.h"
#include "ui_mainwindow.h"
+#include "samplingbar.h"
+#include "sigview.h"
extern "C" {
/* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
extern "C" {
/* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
@@
-44,6
+46,12
@@
MainWindow::MainWindow(QWidget *parent) :
ui(new Ui::MainWindow)
{
ui->setupUi(this);
ui(new Ui::MainWindow)
{
ui->setupUi(this);
+
+ _sampling_bar = new SamplingBar(this);
+ addToolBar(_sampling_bar);
+
+ view = new SigView(session, this);
+ ui->verticalLayout->addWidget(view);
}
MainWindow::~MainWindow()
}
MainWindow::~MainWindow()