Update libshv

silicon-heaven · Dec 17, 2024 · 7563879 · 7563879
1 parent 81bb5b9
commit 7563879
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/3rdparty/libshv b/3rdparty/libshv
diff --git a/shvspy/src/appversion.h b/shvspy/src/appversion.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#define APP_VERSION "1.10.0"
+#define APP_VERSION "1.10.1"
 
diff --git a/shvspy/src/mainwindow.cpp b/shvspy/src/mainwindow.cpp
@@ -417,20 +417,12 @@ void MainWindow::displayValue(const shv::chainpack::RpcValue &rv)
 		view->setAttribute(Qt::WA_DeleteOnClose);
 		view->setWindowIconText(tr("Result"));
 		view->setReadOnly(true);
-		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));
+			view->setText(QString::fromStdString(rv.asString()));
 		}
 		else {
+			const auto &blob = rv.asBlob();
+			auto data = QByteArray::fromRawData(reinterpret_cast<const char*>(blob.data()), blob.size());
 			view->setBlob(data);
 		}
 		view->show();
+1 −1		.github/actions/cmake/action.yml
+2 −0		libshvchainpack/include/shv/chainpack/abstractstreamreader.h
+0 −2		libshvchainpack/include/shv/chainpack/rpcvalue.h
+9 −0		libshvchainpack/src/abstractstreamreader.cpp
+2 −3		libshvchainpack/src/chainpackreader.cpp
+1 −1		libshvchainpack/src/cponreader.cpp
+31 −50		libshvchainpack/src/rpcmessage.cpp
+4 −12		libshvchainpack/src/rpcvalue.cpp
+1 −1		libshviotqt/src/rpc/socket.cpp
+74 −13		libshviotqt/tests/test_frame_reader.cpp
+4 −2		libshvvisu/include/shv/visu/logview/logsortfilterproxymodel.h
+1 −1		libshvvisu/include/shv/visu/timeline/graph.h
+2 −1		libshvvisu/include/shv/visu/timeline/graphmodel.h
+2 −1		libshvvisu/src/logview/dlgloginspector.cpp
+21 −14		libshvvisu/src/logview/logsortfilterproxymodel.cpp
+85 −2		libshvvisu/src/timeline/graph.cpp