From 88f26e359e8bce95f0affbdf58f84442e08f8fa5 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Fri, 7 Jun 2024 10:27:50 +0800 Subject: [PATCH] update --- .vscode/settings.json | 20 +++++++++++++++++++- libzqt/zui/z_reg_table_list_box.cpp | 17 +++++++++++++---- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 66372a9..96e5204 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -103,7 +103,25 @@ "qspaceritem": "cpp", "xlocinfo": "cpp", "xstring": "cpp", - "xlocale": "cpp" + "xlocale": "cpp", + "format": "cpp", + "forward_list": "cpp", + "ios": "cpp", + "locale": "cpp", + "queue": "cpp", + "ranges": "cpp", + "xfacet": "cpp", + "xhash": "cpp", + "xiosbase": "cpp", + "xlocbuf": "cpp", + "xlocmes": "cpp", + "xlocmon": "cpp", + "xlocnum": "cpp", + "xloctime": "cpp", + "xmemory": "cpp", + "xtr1common": "cpp", + "xtree": "cpp", + "xutility": "cpp" }, "files.autoGuessEncoding": false, } \ No newline at end of file diff --git a/libzqt/zui/z_reg_table_list_box.cpp b/libzqt/zui/z_reg_table_list_box.cpp index 663334c..c10bf17 100644 --- a/libzqt/zui/z_reg_table_list_box.cpp +++ b/libzqt/zui/z_reg_table_list_box.cpp @@ -75,7 +75,7 @@ ZRegTableList::ZRegTableList(QWidget *parent, const QString &title) // // RegBox { m_regBox = new QGroupBox("寄存器列表", this); - auto sp = QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + auto sp = QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); sp.setVerticalStretch(1); m_regBox->setSizePolicy(sp); { @@ -157,19 +157,28 @@ void ZRegTableList::readAll() { for (auto it = m_regMap.begin(); it != m_regMap.end(); it++) { ZRegItem *item = it.value(); int32_t val; + string outputinfo; + + bool readsuc = false; try { - ZQUI::ins()->ishow("try read reg %s", it.key().toStdString().c_str()); m_readreg_fn(item->m_addr, &val); QString displayval = formatRegVal(val, item->m_flag); QLineEdit *displayiterm = item->m_val; - ZQUI::ins()->doinui([item,displayiterm, displayval]() { + ZQUI::ins()->doinui([item, displayiterm, displayval]() { item->show(); displayiterm->setText(displayval); }); + readsuc = true; } catch (std::zexception &e) { ZQUI::ins()->doinui([item]() { - // item->hide(); + // item->hide(); }); + readsuc = false; + } + if (readsuc) { + ZQUI::ins()->ishow("read reg:%-50s(%-8d) :%10d", it.key().toStdString().c_str(), item->m_addr, val); + } else { + ZQUI::ins()->ishow("read reg:%-50s(%-8d) :fail", it.key().toStdString().c_str()); } } }