Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update libshv #63

Merged
merged 1 commit into from
Dec 9, 2024
Merged

Update libshv #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/libshv
Open in desktop
Submodule libshv updated 72 files
+89 −84 .clang-tidy
+8 −1 .github/actions/run-linter/action.yml
+9 −9 .github/workflows/lint.yml
+1 −1 .github/workflows/test.yml
+2 −2 examples/cli/minimalshvclient/src/application.cpp
+2 −2 examples/cli/minimalshvclient/src/application.h
+1 −1 libshvbroker/include/shv/broker/brokerapp.h
+2 −3 libshvbroker/src/brokeraclnode.cpp
+1 −1 libshvbroker/src/brokeraclnode.h
+2 −2 libshvbroker/src/brokerapp.cpp
+10 −10 libshvchainpack/include/shv/chainpack/irpcconnection.h
+5 −5 libshvchainpack/include/shv/chainpack/metamethod.h
+1 −1 libshvchainpack/include/shv/chainpack/rpcdriver.h
+2 −1 libshvchainpack/include/shv/chainpack/rpcmessage.h
+2 −2 libshvchainpack/include/shv/chainpack/rpcvalue.h
+1 −1 libshvchainpack/include/shv/chainpack/socketrpcdriver.h
+12 −12 libshvchainpack/src/irpcconnection.cpp
+5 −5 libshvchainpack/src/metamethod.cpp
+6 −4 libshvchainpack/src/rpcdriver.cpp
+9 −3 libshvchainpack/src/rpcmessage.cpp
+11 −21 libshvchainpack/src/rpcvalue.cpp
+14 −3 libshvchainpack/src/socketrpcdriver.cpp
+1 −1 libshvchainpack/tests/test_chainpack.cpp
+2 −2 libshvcore/include/shv/core/utils/clioptions.h
+2 −2 libshvcore/include/shv/core/utils/crypt.h
+1 −1 libshvcore/include/shv/core/utils/shvfilejournal.h
+6 −6 libshvcore/include/shv/core/utils/shvjournalentry.h
+0 −1 libshvcore/include/shv/core/utils/shvpath.h
+2 −2 libshvcore/include/shv/core/utils/shvtypeinfo.h
+11 −11 libshvcore/src/utils/clioptions.cpp
+2 −2 libshvcore/src/utils/crypt.cpp
+2 −2 libshvcore/src/utils/shvfilejournal.cpp
+9 −9 libshvcore/src/utils/shvjournalentry.cpp
+3 −4 libshvcore/src/utils/shvtypeinfo.cpp
+3 −3 libshviotqt/include/shv/iotqt/node/shvnode.h
+4 −4 libshviotqt/include/shv/iotqt/rpc/rpccall.h
+2 −1 libshviotqt/include/shv/iotqt/rpc/serialportsocket.h
+6 −3 libshviotqt/include/shv/iotqt/rpc/socket.h
+1 −1 libshviotqt/include/shv/iotqt/rpc/socketrpcconnection.h
+1 −1 libshviotqt/src/acl/aclroleaccessrules.cpp
+4 −4 libshviotqt/src/node/shvnode.cpp
+4 −4 libshviotqt/src/rpc/rpccall.cpp
+5 −2 libshviotqt/src/rpc/serialportsocket.cpp
+22 −9 libshviotqt/src/rpc/socket.cpp
+2 −2 libshviotqt/src/rpc/socketrpcconnection.cpp
+7 −10 libshviotqt/tests/test_frame_reader.cpp
+3 −3 libshvvisu/CMakeLists.txt
+37 −0 libshvvisu/include/shv/visu/logview/dataviewfilterselector.h
+0 −34 libshvvisu/include/shv/visu/logview/dataviewwidget.h
+2 −2 libshvvisu/include/shv/visu/logview/dlgloginspector.h
+1 −1 libshvvisu/include/shv/visu/svgscene/simpletextitem.h
+2 −1 libshvvisu/include/shv/visu/timeline/channelfilterdialog.h
+1 −1 libshvvisu/include/shv/visu/timeline/graphmodel.h
+23 −4 libshvvisu/libshvvisu.cs_CZ.ts
+23 −4 libshvvisu/libshvvisu.de_DE.ts
+3 −7 libshvvisu/libshvvisu.fi_FI.ts
+3 −7 libshvvisu/libshvvisu.hu_HU.ts
+3 −7 libshvvisu/libshvvisu.it_IT.ts
+3 −7 libshvvisu/libshvvisu.nl_BE.ts
+18 −7 libshvvisu/libshvvisu.pl_PL.ts
+23 −4 libshvvisu/libshvvisu.sk_SK.ts
+3 −7 libshvvisu/libshvvisu.sr_RS.ts
+26 −11 libshvvisu/src/logview/dataviewfilterselector.cpp
+5 −5 libshvvisu/src/logview/dataviewfilterselector.ui
+3 −3 libshvvisu/src/logview/dlgloginspector.cpp
+14 −14 libshvvisu/src/logview/dlgloginspector.ui
+1 −1 libshvvisu/src/svgscene/simpletextitem.cpp
+27 −7 libshvvisu/src/timeline/channelfilterdialog.cpp
+1 −1 libshvvisu/src/timeline/channelfiltermodel.cpp
+6 −2 libshvvisu/src/timeline/graph.cpp
+1 −1 libshvvisu/src/timeline/graphmodel.cpp
+4 −4 utils/cpmerge/main.cpp
10 changes: 9 additions & 1 deletion shvspy/src/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,15 @@ void MainWindow::displayValue(const shv::chainpack::RpcValue &rv)
view->setAttribute(Qt::WA_DeleteOnClose);
view->setWindowIconText(tr("Result"));
view->setReadOnly(true);
auto [blob, size] = rv.asData();
const char* blob;
size_t size;
if (rv.isString()) {
blob = rv.asString().data();
size = rv.asString().size();
} else {
blob = reinterpret_cast<const char*>(rv.asBlob().data());
size = rv.asBlob().size();
}
auto data = QByteArray::fromRawData(blob, size);
if (rv.isString()) {
view->setText(QString::fromUtf8(data));
Expand Down
Loading