X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=c9fa4c1a25fc749a9d47804ea369b8c9ff3e1ad1;hb=18203d86e200131f50e9830c4f16a9edba96d669;hp=35b0da57b3c9d87c14396d50bff73c495976162f;hpb=2a032dcb6151bd8b019c88f6ef1db1a8c1e5b61e;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 35b0da5..c9fa4c1 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern "C" {
 #include <sigrokdecode.h>
-}
 
 #include <QAction>
 #include <QApplication>
@@ -35,9 +33,9 @@ extern "C" {
 #include "mainwindow.h"
 #include "samplingbar.h"
 #include "dialogs/about.h"
+#include "dialogs/connect.h"
 #include "view/view.h"
 
-extern "C" {
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
@@ -45,14 +43,21 @@ extern "C" {
 #include <stdarg.h>
 #include <glib.h>
 #include <libsigrok/libsigrok.h>
-}
+
 
 namespace pv {
 
-MainWindow::MainWindow(QWidget *parent) :
+MainWindow::MainWindow(const char *open_file_name,
+	QWidget *parent) :
 	QMainWindow(parent)
 {
 	setup_ui();
+	if (open_file_name) {
+		const QString s(QString::fromUtf8(open_file_name));
+		QMetaObject::invokeMethod(this, "load_file",
+			Qt::QueuedConnection,
+			Q_ARG(QString, s));
+	}
 }
 
 void MainWindow::setup_ui()
@@ -96,6 +101,15 @@ void MainWindow::setup_ui()
 
 	_menu_file->addSeparator();
 
+	_action_connect = new QAction(this);
+	_action_connect->setText(QApplication::translate(
+		"MainWindow", "&Connect to Device...", 0,
+		QApplication::UnicodeUTF8));
+	_action_connect->setObjectName(QString::fromUtf8("actionConnect"));
+	_menu_file->addAction(_action_connect);
+
+	_menu_file->addSeparator();
+
 	_action_quit = new QAction(this);
 	_action_quit->setText(QApplication::translate(
 		"MainWindow", "&Quit", 0, QApplication::UnicodeUTF8));
@@ -165,6 +179,7 @@ void MainWindow::setup_ui()
 	addToolBar(_toolbar);
 
 	_sampling_bar = new SamplingBar(this);
+	scan_devices();
 	connect(_sampling_bar, SIGNAL(run_stop()), this,
 		SLOT(run_stop()));
 	addToolBar(_sampling_bar);
@@ -178,12 +193,40 @@ void MainWindow::setup_ui()
 
 }
 
+void MainWindow::scan_devices()
+{
+	_devices.clear();
+
+	/* Scan all drivers for all devices. */
+	struct sr_dev_driver **const drivers = sr_driver_list();
+	for (struct sr_dev_driver **driver = drivers; *driver; driver++) {
+		GSList *const devices = sr_driver_scan(*driver, NULL);
+		for (GSList *l = devices; l; l = l->next)
+			_devices.push_back((sr_dev_inst*)l->data);
+		g_slist_free(devices);
+	}
+
+	assert(_sampling_bar);
+	_sampling_bar->set_device_list(_devices);
+}
+
+void MainWindow::load_file(QString file_name)
+{
+	_session.load_file(file_name.toStdString());
+}
+
 void MainWindow::on_actionOpen_triggered()
 {
-	QString file_name = QFileDialog::getOpenFileName(
+	const QString file_name = QFileDialog::getOpenFileName(
 		this, tr("Open File"), "",
 		tr("Sigrok Sessions (*.sr)"));
-	_session.load_file(file_name.toStdString());
+	load_file(file_name);
+}
+
+void MainWindow::on_actionConnect_triggered()
+{
+	dialogs::Connect dlg(this);
+	dlg.exec();
 }
 
 void MainWindow::on_actionQuit_triggered()
@@ -219,8 +262,7 @@ void MainWindow::run_stop()
 	case SigSession::Stopped:
 		_session.start_capture(
 			_sampling_bar->get_selected_device(),
-			_sampling_bar->get_record_length(),
-			_sampling_bar->get_sample_rate());
+			_sampling_bar->get_record_length());
 		break;
 
 	case SigSession::Running: