X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Fdecoder_output%2Fview.cpp;h=f22f6c5d508bf47dfeeaecc61c588501dbf7ff3b;hb=feda6c6bbde575242cf01c769c0ecd3e89f9f7a0;hp=775f6daf92a8d1ebe9b10f56eed98da1b7a25770;hpb=d5645564896bd753551b2ad814cefafd4e29a6d4;p=pulseview.git diff --git a/pv/views/decoder_output/view.cpp b/pv/views/decoder_output/view.cpp index 775f6daf..f22f6c5d 100644 --- a/pv/views/decoder_output/view.cpp +++ b/pv/views/decoder_output/view.cpp @@ -41,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 { @@ -135,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; @@ -238,14 +231,14 @@ void View::update_data() if (!signal_) return; - if (!binary_data_exists_) - 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; + if (!save_button_->isEnabled()) save_button_->setEnabled(true); } @@ -316,11 +309,11 @@ void View::save_data_as_hex_dump(bool with_offset, bool with_ascii) const QTextStream out_stream(&file); uint64_t offset = selection.first; - unsigned int n = hex_view_->get_bytes_per_line(); + uint64_t n = hex_view_->get_bytes_per_line(); QString s; while (offset < selection.second) { - size_t end = std::min(selection.second, offset + n); + 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; }