X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Fdecoder_output%2Fview.cpp;h=0f127c8751d72340530f0a940a407c255f725115;hp=218c5c9a6e84fbf07e09c043915c8ad6130dff4f;hb=a767229eb18acbd70af38bb660c8ebd1bbd82e73;hpb=03408f5f5b62ce74016d91d60bdadce8dbddd46b

diff --git a/pv/views/decoder_output/view.cpp b/pv/views/decoder_output/view.cpp
index 218c5c9a..0f127c87 100644
--- a/pv/views/decoder_output/view.cpp
+++ b/pv/views/decoder_output/view.cpp
@@ -21,8 +21,10 @@
 
 #include <QByteArray>
 #include <QDebug>
+#include <QFileDialog>
 #include <QLabel>
 #include <QMenu>
+#include <QMessageBox>
 #include <QToolBar>
 #include <QVBoxLayout>
 
@@ -31,6 +33,7 @@
 #include "view.hpp"
 #include "QHexView.hpp"
 
+#include "pv/globalsettings.hpp"
 #include "pv/session.hpp"
 #include "pv/util.hpp"
 #include "pv/data/decode/decoder.hpp"
@@ -38,11 +41,8 @@
 using pv::data::DecodeSignal;
 using pv::data::SignalBase;
 using pv::data::decode::Decoder;
-using pv::util::TimeUnit;
 using pv::util::Timestamp;
 
-using std::dynamic_pointer_cast;
-using std::numeric_limits;
 using std::shared_ptr;
 
 namespace pv {
@@ -51,7 +51,9 @@ namespace decoder_output {
 
 const char* SaveTypeNames[SaveTypeCount] = {
 	"Binary",
-	"Hex Dump"
+	"Hex Dump, plain",
+	"Hex Dump, with offset",
+	"Hex Dump, canonical"
 };
 
 
@@ -130,10 +132,6 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) :
 	reset_view_state();
 }
 
-View::~View()
-{
-}
-
 ViewType View::get_type() const
 {
 	return ViewTypeDecoderOutput;
@@ -233,13 +231,108 @@ void View::update_data()
 	if (!signal_)
 		return;
 
+	const DecodeBinaryClass* bin_class =
+		signal_->get_binary_data_class(current_segment_, decoder_, bin_class_id_);
+
+	hex_view_->set_data(bin_class);
+
 	if (!binary_data_exists_)
 		return;
 
-	const DecodeBinaryClass* bin_class =
-		signal_->get_binary_data_class(current_segment_, decoder_, bin_class_id_);
+	if (!save_button_->isEnabled())
+		save_button_->setEnabled(true);
+}
+
+void View::save_data() const
+{
+	assert(decoder_);
+	assert(signal_);
+
+	if (!signal_)
+		return;
+
+	GlobalSettings settings;
+	const QString dir = settings.value("MainWindow/SaveDirectory").toString();
+
+	const QString file_name = QFileDialog::getSaveFileName(
+		parent_, tr("Save Binary Data"), dir, tr("Binary Data Files (*.bin);;All Files (*)"));
+
+	if (file_name.isEmpty())
+		return;
+
+	QFile file(file_name);
+	if (file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+		pair<size_t, size_t> selection = hex_view_->get_selection();
+
+		vector<uint8_t> data;
+		data.resize(selection.second - selection.first + 1);
+
+		signal_->get_merged_binary_data_chunks_by_offset(current_segment_, decoder_,
+			bin_class_id_, selection.first, selection.second, &data);
+
+		int64_t bytes_written = file.write((const char*)data.data(), data.size());
+
+		if ((bytes_written == -1) || ((uint64_t)bytes_written != data.size())) {
+			QMessageBox msg(parent_);
+			msg.setText(tr("Error") + "\n\n" + tr("File %1 could not be written to.").arg(file_name));
+			msg.setStandardButtons(QMessageBox::Ok);
+			msg.setIcon(QMessageBox::Warning);
+			msg.exec();
+			return;
+		}
+	}
+}
+
+void View::save_data_as_hex_dump(bool with_offset, bool with_ascii) const
+{
+	assert(decoder_);
+	assert(signal_);
+
+	if (!signal_)
+		return;
+
+	GlobalSettings settings;
+	const QString dir = settings.value("MainWindow/SaveDirectory").toString();
+
+	const QString file_name = QFileDialog::getSaveFileName(
+		parent_, tr("Save Binary Data"), dir, tr("Hex Dumps (*.txt);;All Files (*)"));
+
+	if (file_name.isEmpty())
+		return;
+
+	QFile file(file_name);
+	if (file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) {
+		pair<size_t, size_t> selection = hex_view_->get_selection();
+
+		vector<uint8_t> data;
+		data.resize(selection.second - selection.first + 1);
 
-	hex_view_->setData(bin_class);
+		signal_->get_merged_binary_data_chunks_by_offset(current_segment_, decoder_,
+			bin_class_id_, selection.first, selection.second, &data);
+
+		QTextStream out_stream(&file);
+
+		uint64_t offset = selection.first;
+		uint64_t n = hex_view_->get_bytes_per_line();
+		QString s;
+
+		while (offset < selection.second) {
+			size_t end = std::min((uint64_t)(selection.second), offset + n);
+			offset = hex_view_->create_hex_line(offset, end, &s, with_offset, with_ascii);
+			out_stream << s << endl;
+		}
+
+		out_stream << endl;
+
+		if (out_stream.status() != QTextStream::Ok) {
+			QMessageBox msg(parent_);
+			msg.setText(tr("Error") + "\n\n" + tr("File %1 could not be written to.").arg(file_name));
+			msg.setStandardButtons(QMessageBox::Ok);
+			msg.setIcon(QMessageBox::Warning);
+			msg.exec();
+			return;
+		}
+	}
 }
 
 void View::on_selected_decoder_changed(int index)
@@ -359,18 +452,25 @@ void View::on_decoder_removed(void* decoder)
 
 void View::on_actionSave_triggered(QAction* action)
 {
-	(void)action;
+	int save_type = SaveTypeBinary;
+	if (action)
+		save_type = action->data().toInt();
+
+	switch (save_type)
+	{
+	case SaveTypeBinary: save_data(); break;
+	case SaveTypeHexDumpPlain: save_data_as_hex_dump(false, false); break;
+	case SaveTypeHexDumpWithOffset: save_data_as_hex_dump(true, false); break;
+	case SaveTypeHexDumpComplete: save_data_as_hex_dump(true, true); break;
+	}
 }
 
 void View::perform_delayed_view_update()
 {
-	if (!binary_data_exists_)
-		if (signal_->get_binary_data_chunk_count(current_segment_, decoder_, bin_class_id_)) {
+	if (signal_ && !binary_data_exists_)
+		if (signal_->get_binary_data_chunk_count(current_segment_, decoder_, bin_class_id_))
 			binary_data_exists_ = true;
 
-			save_button_->setEnabled(true);
-		}
-
 	update_data();
 }