SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

fix: The label of decoder trace can't restore from file

Browse Source
This commit is contained in:
dreamsourcelabTAI
2023-02-22 11:40:53 +08:00
parent 501c7ee98c
commit 6295bfad8d
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DSView/pv/sigsession.cpp
View File

@@ -2016,4 +2016,12 @@ namespace pv
}
}
void SigSession::set_decoder_row_label(int index, QString label)
{
auto trace = get_decoder_trace(index);
if (trace != NULL){
trace->set_name(label);
}
}
} // namespace pv

2
DSView/pv/sigsession.h
View File

@@ -388,6 +388,8 @@ public:
void broadcast_msg(int msg);
bool have_new_realtime_refresh(bool keep);
void set_decoder_row_label(int index, QString label);
private:
void set_cur_samplelimits(uint64_t samplelimits);
void set_cur_snap_samplerate(uint64_t samplerate);

16
DSView/pv/storesession.cpp
View File

@@ -1031,9 +1031,10 @@ bool StoreSession::json_decoders(QJsonArray &array)
QJsonArray stack_array;
QJsonObject show_obj;
const auto &stack = s->decoder();
const auto &decoder = stack->stack();
const auto &decoderList = stack->stack();
for(auto dec : decoder) {
for(auto dec : decoderList)
{
QJsonArray ch_array;
const srd_decoder *const d = dec->decoder();;
const bool have_probes = (d->channels || d->opt_channels) != 0;
@@ -1090,6 +1091,7 @@ bool StoreSession::json_decoders(QJsonArray &array)
show_obj[d->id] = QJsonValue::fromVariant(dec->shown());
}
dec_obj["version"] = DEOCDER_CONFIG_VERSION;
dec_obj["label"] = QString(s->get_name().toUtf8().data());
dec_obj["stacked decoders"] = stack_array;
auto rows = stack->get_rows_gshow();
@@ -1118,6 +1120,8 @@ bool StoreSession::load_decoders(dock::ProtocolDock *widget, QJsonArray &dec_arr
dsv_info("%s", "StoreSession::load_decoders(), json object array is empty.");
return false;
}
int dec_index = -1;
for (const QJsonValue &dec_value : dec_array)
{
@@ -1154,7 +1158,13 @@ bool StoreSession::load_decoders(dock::ProtocolDock *widget, QJsonArray &dec_arr
sub_decoders.clear();
continue; //protocol is not exists;
}
}
dec_index++;
if (dec_obj.contains("label")){
_session->set_decoder_row_label(dec_index, dec_obj["label"].toString());
}
std::vector<view::DecodeTrace*> &aft_dsigs = _session->get_decode_signals();