X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=b35e14661373d88325eb4a28c1d73a580d587e4f;hp=a2a20fb62a93aafe4956d0a6b52b4742099e7dfc;hb=b0773a8aa01735d7220284ab7a3e8b5d02b48e9e;hpb=2cd6be62cb3dbbc60f4af3a888b232b7d0437532

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index a2a20fb6..b35e1466 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -35,6 +35,7 @@
 
 #include <boost/algorithm/string/join.hpp>
 
+#include <pv/data/mathsignal.hpp>
 #include <pv/devicemanager.hpp>
 #include <pv/devices/hardwaredevice.hpp>
 #include <pv/devices/inputfile.hpp>
@@ -59,6 +60,7 @@ using std::back_inserter;
 using std::copy;
 using std::list;
 using std::make_pair;
+using std::make_shared;
 using std::map;
 using std::max;
 using std::min;
@@ -108,10 +110,11 @@ MainBar::MainBar(Session &session, QWidget *parent, pv::views::trace::View *view
 	sample_rate_("Hz", this),
 	updating_sample_rate_(false),
 	updating_sample_count_(false),
-	sample_count_supported_(false)
+	sample_count_supported_(false),
 #ifdef ENABLE_DECODE
-	, add_decoder_button_(new QToolButton())
+	add_decoder_button_(new QToolButton()),
 #endif
+	add_math_signal_button_(new QToolButton())
 {
 	setObjectName(QString::fromUtf8("MainBar"));
 
@@ -240,6 +243,16 @@ MainBar::MainBar(Session &session, QWidget *parent, pv::views::trace::View *view
 		this, SLOT(on_add_decoder_clicked()));
 #endif
 
+	// Setup the math signal button
+	add_math_signal_button_->setIcon(QIcon(":/icons/add-math-signal.svg"));
+	add_math_signal_button_->setPopupMode(QToolButton::InstantPopup);
+	add_math_signal_button_->setToolTip(tr("Add math signal"));
+	add_math_signal_button_->setShortcut(QKeySequence(Qt::Key_M));
+
+	connect(add_math_signal_button_, SIGNAL(clicked()),
+		this, SLOT(on_add_math_signal_clicked()));
+
+
 	connect(&sample_count_, SIGNAL(value_changed()),
 		this, SLOT(on_sample_count_changed()));
 	connect(&sample_rate_, SIGNAL(value_changed()),
@@ -608,7 +621,7 @@ void MainBar::show_session_error(const QString text, const QString info_text)
 	msg.exec();
 }
 
-void MainBar::export_file(shared_ptr<OutputFormat> format, bool selection_only, QString path)
+void MainBar::export_file(shared_ptr<OutputFormat> format, bool selection_only, QString file_name)
 {
 	using pv::dialogs::StoreProgress;
 
@@ -667,9 +680,8 @@ void MainBar::export_file(shared_ptr<OutputFormat> format, bool selection_only,
 			tr("All Files"));
 
 	// Show the file dialog
-	const QString file_name = path.isEmpty() ?
-		QFileDialog::getSaveFileName(this, tr("Save File"), dir, filter) :
-		path;
+	if (file_name.isEmpty())
+		file_name = QFileDialog::getSaveFileName(this, tr("Save File"), dir, filter);
 
 	if (file_name.isEmpty())
 		return;
@@ -689,9 +701,13 @@ void MainBar::export_file(shared_ptr<OutputFormat> format, bool selection_only,
 		options = dlg.options();
 	}
 
-	if (!selection_only &&
-			format == session_.device_manager().context()->output_formats()["srzip"])
-		session_.set_path(file_name);
+	if (!selection_only) {
+		if (format == session_.device_manager().context()->output_formats()["srzip"]) {
+			session_.set_save_path(QFileInfo(file_name).absolutePath());
+			session_.set_name(QFileInfo(file_name).fileName());
+		} else
+			session_.set_save_path("");
+	}
 
 	StoreProgress *dlg = new StoreProgress(file_name, format, options,
 		sample_range, session_, this);
@@ -815,7 +831,15 @@ void MainBar::on_actionOpen_triggered()
 
 void MainBar::on_actionSave_triggered()
 {
-	export_file(session_.device_manager().context()->output_formats()["srzip"], false, session_.path());
+	// A path is only set if we loaded/saved an srzip file before
+	if (session_.save_path().isEmpty()) {
+		on_actionSaveAs_triggered();
+		return;
+	}
+
+	QFileInfo fi = QFileInfo(QDir(session_.save_path()), session_.name());
+	export_file(session_.device_manager().context()->output_formats()["srzip"], false,
+		fi.absoluteFilePath());
 }
 
 void MainBar::on_actionSaveAs_triggered()
@@ -882,6 +906,12 @@ void MainBar::on_add_decoder_clicked()
 	show_decoder_selector(&session_);
 }
 
+void MainBar::on_add_math_signal_clicked()
+{
+	shared_ptr<data::SignalBase> signal = make_shared<data::MathSignal>(session_);
+	session_.add_generated_signal(signal);
+}
+
 void MainBar::add_toolbar_widgets()
 {
 	addWidget(new_view_button_);
@@ -901,6 +931,7 @@ void MainBar::add_toolbar_widgets()
 	addSeparator();
 	addWidget(add_decoder_button_);
 #endif
+	addWidget(add_math_signal_button_);
 }
 
 bool MainBar::eventFilter(QObject *watched, QEvent *event)