Bring method tool-tip back, update libshv, APP_VERSION "1.9.8"

silicon-heaven · Sep 18, 2024 · d8772ef · d8772ef
1 parent 006fbf2
commit d8772ef
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 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.9.7"
+#define APP_VERSION "1.9.8"
 
diff --git a/shvspy/src/attributesmodel/attributesmodel.cpp b/shvspy/src/attributesmodel/attributesmodel.cpp
@@ -145,10 +145,10 @@ QVariant AttributesModel::data(const QModelIndex &ix, int role) const
 			return is_notify? tr("Method is notify signal"): QVariant();
 		}
 		if(ix.column() == ColMethodName) {
-			auto attrs = m_rows[static_cast<unsigned>(ix.row())][ColAttributes].asMap();
+			auto mm = shv::chainpack::MetaMethod::fromRpcValue(m_rows[static_cast<unsigned>(ix.row())][ColMetaMethod]);
 			QStringList lines;
-			for(const auto &kv : attrs) {
-				lines << tr("%1: %2").arg(kv.first.c_str(), kv.second.toCpon().c_str());
+			for(const auto &[k, v] : mm.toMap()) {
+				lines << tr("%1: %2").arg(k.c_str(), v.toCpon().c_str());
 			}
 			return lines.join('\n');
 		}
@@ -308,7 +308,7 @@ void AttributesModel::loadRow(unsigned method_ix)
 	rv[ColFlags] = mtd->flagsStr();
 	rv[ColAccessLevel] = mtd->accessLevelStr();
 	rv[ColParams] = mtd->params;
-	rv[ColAttributes] = mtd->metamethod.toRpcValue();
+	rv[ColMetaMethod] = mtd->metamethod.toRpcValue();
 	shvDebug() << "\t response:" << mtd->response.toCpon() << "is valid:" << mtd->response.isValid();
 	if(mtd->response.isError()) {
 		rv[ColResult] = mtd->response.error().toRpcValue();

diff --git a/shvspy/src/attributesmodel/attributesmodel.h b/shvspy/src/attributesmodel/attributesmodel.h
@@ -17,7 +17,7 @@ class AttributesModel : public QAbstractTableModel
 private:
 	typedef QAbstractTableModel Super;
 public:
-	enum Columns {ColMethodName = 0, ColParamType, ColResultType, ColSignals, ColFlags, ColAccessLevel, ColParams, ColResult, ColBtRun, ColError, ColAttributes, ColCnt};
+	enum Columns {ColMethodName = 0, ColParamType, ColResultType, ColSignals, ColFlags, ColAccessLevel, ColParams, ColResult, ColBtRun, ColError, ColMetaMethod, ColCnt};
 	enum Roles {RpcValueRole = Qt::UserRole };
 public:
 	AttributesModel(QObject *parent = nullptr);
+1 −0		CMakeLists.txt
+2 −0		examples/cli/shvcall/src/appclioptions.cpp
+4 −2		examples/cli/shvcall/src/appclioptions.h
+7 −1		examples/cli/shvcall/src/application.cpp
+2 −2		examples/cli/shvcall/src/application.h
+3 −3		libshvbroker/src/rpc/clientconnectiononbroker.cpp
+2 −2		libshvbroker/src/rpc/masterbrokerconnection.cpp
+5 −0		libshvchainpack/include/shv/chainpack/rpc.h
+0 −4		libshvchainpack/include/shv/chainpack/rpcdriver.h
+5 −5		libshvchainpack/include/shv/chainpack/rpcvalue.h
+1 −1		libshvchainpack/src/rpcdriver.cpp
+21 −47		libshvchainpack/src/rpcvalue.cpp
+0 −2		libshvcore/include/shv/core/string.h
+12 −0		libshviotqt/CMakeLists.txt
+1 −1		libshviotqt/include/shv/iotqt/rpc/localsocket.h
+4 −0		libshviotqt/include/shv/iotqt/rpc/rpccall.h
+4 −4		libshviotqt/include/shv/iotqt/rpc/serialportsocket.h
+19 −10		libshviotqt/include/shv/iotqt/rpc/socket.h
+5 −0		libshviotqt/include/shv/iotqt/rpc/socketrpcconnection.h
+1 −1		libshviotqt/include/shv/iotqt/rpc/websocket.h
+17 −8		libshviotqt/src/rpc/clientconnection.cpp
+5 −2		libshviotqt/src/rpc/localsocket.cpp
+25 −0		libshviotqt/src/rpc/rpccall.cpp
+28 −8		libshviotqt/src/rpc/serialportsocket.cpp
+57 −8		libshviotqt/src/rpc/socket.cpp
+5 −3		libshviotqt/src/rpc/socketrpcconnection.cpp
+9 −3		libshviotqt/src/rpc/websocket.cpp
+182 −0		libshviotqt/tests/test_frame_reader.cpp
+17 −14		libshvvisu/src/timeline/graph.cpp