X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=mainwindow.cpp;h=04f852d92fe053f85b2be6815bc43a567dc6fe7f;hb=6fb67b27a85f19002d43b8c8498ca7d2979401b0;hp=45d415dd16114ffefa38735a95f82b37b9d7ccf6;hpb=40eb2ff4f27ae8209271f3d6992ebdcb5de60d76;p=pulseview.git

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 45d415d..04f852d 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -22,10 +22,14 @@ extern "C" {
 #include <sigrokdecode.h>
 }
 
+#include <QFileDialog>
+
 #include "about.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++). */
@@ -42,6 +46,12 @@ MainWindow::MainWindow(QWidget *parent) :
 	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()
@@ -49,6 +59,14 @@ MainWindow::~MainWindow()
 	delete ui;
 }
 
+void MainWindow::on_actionOpen_triggered()
+{
+	QString fileName = QFileDialog::getOpenFileName(
+		this, tr("Open File"), "",
+		tr("Sigrok Sessions (*.sr)"));
+	session.loadFile(fileName.toStdString());
+}
+
 void MainWindow::on_actionAbout_triggered()
 {
 	About dlg(this);