X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Fdecoder_output%2Fview.cpp;h=0f127c8751d72340530f0a940a407c255f725115;hp=18cb3b449726ad19e953624d334d3f3e4fb17460;hb=a767229eb18acbd70af38bb660c8ebd1bbd82e73;hpb=6961eab0d4bf976cee015afacfa7c25795e574b9 diff --git a/pv/views/decoder_output/view.cpp b/pv/views/decoder_output/view.cpp index 18cb3b44..0f127c87 100644 --- a/pv/views/decoder_output/view.cpp +++ b/pv/views/decoder_output/view.cpp @@ -21,8 +21,10 @@ #include #include +#include #include #include +#include #include #include @@ -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,17 +41,22 @@ 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 { namespace views { namespace decoder_output { +const char* SaveTypeNames[SaveTypeCount] = { + "Binary", + "Hex Dump, plain", + "Hex Dump, with offset", + "Hex Dump, canonical" +}; + + View::View(Session &session, bool is_main_view, QMainWindow *parent) : ViewBase(session, is_main_view, parent), @@ -59,6 +67,8 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) : class_selector_(new QComboBox()), stacked_widget_(new QStackedWidget()), hex_view_(new QHexView()), + save_button_(new QToolButton()), + save_action_(new QAction(this)), signal_(nullptr) { QVBoxLayout *root_layout = new QVBoxLayout(this); @@ -76,6 +86,8 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) : toolbar->addSeparator(); toolbar->addWidget(new QLabel(tr("Show data as"))); toolbar->addWidget(format_selector_); + toolbar->addSeparator(); + toolbar->addWidget(save_button_); // Add format types format_selector_->addItem(tr("Hexdump"), qVariantFromValue(QString("text/hexdump"))); @@ -94,15 +106,32 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) : decoder_selector_->setSizeAdjustPolicy(QComboBox::AdjustToContents); class_selector_->setSizeAdjustPolicy(QComboBox::AdjustToContents); + // Configure actions + save_action_->setText(tr("&Save...")); + save_action_->setIcon(QIcon::fromTheme("document-save-as", + QIcon(":/icons/document-save-as.png"))); + save_action_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_S)); + connect(save_action_, SIGNAL(triggered(bool)), + this, SLOT(on_actionSave_triggered())); + + QMenu *save_menu = new QMenu(); + connect(save_menu, SIGNAL(triggered(QAction*)), + this, SLOT(on_actionSave_triggered(QAction*))); + + for (int i = 0; i < SaveTypeCount; i++) { + QAction *const action = save_menu->addAction(tr(SaveTypeNames[i])); + action->setData(qVariantFromValue(i)); + } + + save_button_->setMenu(save_menu); + save_button_->setDefaultAction(save_action_); + save_button_->setPopupMode(QToolButton::MenuButtonPopup); + parent->setSizePolicy(hex_view_->sizePolicy()); // TODO Must be updated when selected widget changes reset_view_state(); } -View::~View() -{ -} - ViewType View::get_type() const { return ViewTypeDecoderOutput; @@ -111,22 +140,21 @@ ViewType View::get_type() const void View::reset_view_state() { ViewBase::reset_view_state(); -} -void View::clear_signals() -{ - ViewBase::clear_signalbases(); - signal_ = nullptr; + decoder_selector_->clear(); + class_selector_->clear(); + format_selector_->setCurrentIndex(0); + save_button_->setEnabled(false); + + hex_view_->clear(); } void View::clear_decode_signals() { ViewBase::clear_decode_signals(); - decoder_selector_->clear(); - class_selector_->clear(); - format_selector_->setCurrentIndex(0); - signal_ = nullptr; + reset_data(); + reset_view_state(); } void View::add_decode_signal(shared_ptr signal) @@ -170,10 +198,9 @@ void View::remove_decode_signal(shared_ptr signal) ViewBase::remove_decode_signal(signal); if (signal.get() == signal_) { - signal_ = nullptr; - decoder_ = nullptr; - bin_class_id_ = 0; + reset_data(); update_data(); + reset_view_state(); } } @@ -189,22 +216,123 @@ void View::restore_settings(QSettings &settings) (void)settings; } +void View::reset_data() +{ + signal_ = nullptr; + decoder_ = nullptr; + bin_class_id_ = 0; + binary_data_exists_ = false; + + hex_view_->clear(); +} + void View::update_data() { - if (!signal_) { - hex_view_->clear(); + if (!signal_) return; - } - if (signal_->get_binary_data_chunk_count(current_segment_, decoder_, bin_class_id_) == 0) { - hex_view_->clear(); + 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; + + 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 selection = hex_view_->get_selection(); + + vector 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; + } } +} - const DecodeBinaryClass* bin_class = - signal_->get_binary_data_class(current_segment_, decoder_, bin_class_id_); +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; - hex_view_->setData(bin_class); + QFile file(file_name); + if (file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) { + pair selection = hex_view_->get_selection(); + + vector 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); + + 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) @@ -212,11 +340,11 @@ void View::on_selected_decoder_changed(int index) if (signal_) disconnect(signal_, SIGNAL(new_binary_data(unsigned int, void*, unsigned int))); + reset_data(); + decoder_ = (Decoder*)decoder_selector_->itemData(index).value(); // Find the signal that contains the selected decoder - signal_ = nullptr; - for (const shared_ptr& ds : decode_signals_) for (const shared_ptr& dec : ds->decoder_stack()) if (decoder_ == dec.get()) @@ -243,6 +371,9 @@ void View::on_selected_class_changed(int index) { bin_class_id_ = class_selector_->itemData(index).value(); + binary_data_exists_ = + signal_->get_binary_data_chunk_count(current_segment_, decoder_, bin_class_id_); + update_data(); } @@ -319,8 +450,27 @@ void View::on_decoder_removed(void* decoder) decoder_selector_->removeItem(index); } +void View::on_actionSave_triggered(QAction* 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 (signal_ && !binary_data_exists_) + if (signal_->get_binary_data_chunk_count(current_segment_, decoder_, bin_class_id_)) + binary_data_exists_ = true; + update_data(); }