feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Extend tracing points to the views

Browse Source 
Task-number: QDS-15148
Change-Id: I54ac7f8e63dd2fa2bc32e22a0b1bff09ca817a7e
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Burak Hancerli
2025-05-19 15:19:38 +02:00
committed by hancerliqt
parent 98f0c59dd1
commit a9dae5ea7a
4 changed files with 60 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/nanotrace/nanotracehr.h
View File

@@ -58,6 +58,10 @@ struct TracerLiteral
: text{text}
{}
consteval TracerLiteral(const char *text)
: text{text}
{}
template<std::size_t size>
consteval TracerLiteral(const char (&text)[size])
: text{text}

14
src/plugins/qmldesigner/libs/designercore/include/abstractview.h
View File

@@ -67,9 +67,11 @@ public:
};
Q_DECLARE_FLAGS(PropertyChangeFlags, PropertyChangeFlag)
AbstractView(ExternalDependenciesInterface &externalDependencies)
AbstractView(ExternalDependenciesInterface &externalDependencies,
NanotraceHR::TracerLiteral functionName = __builtin_FUNCTION())
: m_externalDependencies{externalDependencies}
, m_action{Utils::makeUniqueObjectPtr<AbstractViewAction>(*this)}
, m_name(functionName)
{}
void setWidgetRegistration(WidgetRegistrationInterface *interface);
@@ -287,6 +289,14 @@ public:
AbstractView *m_view;
};
template<typename String>
friend void convertToString(String &string, const AbstractView *view)
{
convertToString(string, view->m_name);
}
const auto &name() const { return m_name; }
protected:
void setModel(Model *model);
void removeModel();
@@ -310,6 +320,8 @@ private:
bool m_isBlockingNotifications = false;
Kind m_kind = Kind::Other;
WidgetRegistrationInterface *m_widgetRegistration = nullptr;
NanotraceHR::TracerLiteral m_name;
};
QMLDESIGNERCORE_EXPORT QList<ModelNode> toModelNodeList(

59
src/plugins/qmldesigner/libs/designercore/model/model.cpp
View File

@@ -546,15 +546,16 @@ bool ModelPrivate::propertyNameIsValid(PropertyNameView propertyName)
return true;
}
template<typename Callable>
void ModelPrivate::notifyNodeInstanceViewLast(Callable call)
void ModelPrivate::notifyNodeInstanceViewLast(const std::invocable<AbstractView *> auto &call)
{
bool resetModel = false;
QString description;
try {
if (m_rewriterView && !m_rewriterView->isBlockingNotifications())
if (m_rewriterView && !m_rewriterView->isBlockingNotifications()) {
NanotraceHR::Tracer tracer{m_rewriterView->name(), ModelTracing::category()};
call(m_rewriterView);
}
} catch (const RewritingException &e) {
description = e.description();
resetModel = true;
@@ -562,52 +563,62 @@ void ModelPrivate::notifyNodeInstanceViewLast(Callable call)
for (const QPointer<AbstractView> &view : std::as_const(m_viewList)) {
try {
if (!view->isBlockingNotifications())
if (!view->isBlockingNotifications()) {
NanotraceHR::Tracer tracer{view->name(), ModelTracing::category()};
call(view.data());
}
} catch (const Exception &e) {
e.showException(tr("Exception thrown by view %1.").arg(view->widgetInfo().tabName));
}
}
if (nodeInstanceView() && !nodeInstanceView()->isBlockingNotifications())
call(nodeInstanceView());
if (m_nodeInstanceView && !m_nodeInstanceView->isBlockingNotifications()) {
NanotraceHR::Tracer tracer{m_nodeInstanceView->name(), ModelTracing::category()};
call(m_nodeInstanceView);
}
if (resetModel)
resetModelByRewriter(description);
}
template<typename Callable>
void ModelPrivate::notifyNormalViewsLast(Callable call)
void ModelPrivate::notifyNormalViewsLast(const std::invocable<AbstractView *> auto &call)
{
bool resetModel = false;
QString description;
try {
if (m_rewriterView && !m_rewriterView->isBlockingNotifications())
if (m_rewriterView && !m_rewriterView->isBlockingNotifications()) {
NanotraceHR::Tracer tracer{m_rewriterView->name(), ModelTracing::category()};
call(m_rewriterView);
}
} catch (const RewritingException &e) {
description = e.description();
resetModel = true;
}
if (nodeInstanceView() && !nodeInstanceView()->isBlockingNotifications())
call(nodeInstanceView());
if (m_nodeInstanceView && !m_nodeInstanceView->isBlockingNotifications()) {
NanotraceHR::Tracer tracer{m_nodeInstanceView->name(), ModelTracing::category()};
call(m_nodeInstanceView);
}
for (const QPointer<AbstractView> &view : std::as_const(m_viewList)) {
if (!view->isBlockingNotifications())
if (!view->isBlockingNotifications()) {
NanotraceHR::Tracer tracer{view->name(), ModelTracing::category()};
call(view.data());
}
}
if (resetModel)
resetModelByRewriter(description);
}
template<typename Callable>
void ModelPrivate::notifyInstanceChanges(Callable call)
void ModelPrivate::notifyInstanceChanges(const std::invocable<AbstractView *> auto &call)
{
for (const QPointer<AbstractView> &view : std::as_const(m_viewList)) {
if (!view->isBlockingNotifications())
if (!view->isBlockingNotifications()) {
NanotraceHR::Tracer tracer{view->name(), ModelTracing::category()};
call(view.data());
}
}
}
@@ -615,6 +626,7 @@ void ModelPrivate::notifyAuxiliaryDataChanged(const InternalNodePointer &node,
AuxiliaryDataKeyView key,
const QVariant &data)
{
NanotraceHR::Tracer tracer{"notify auxiliary data changed", ModelTracing::category()};
notifyNodeInstanceViewLast([&](AbstractView *view) {
ModelNode modelNode(node, m_model, view);
view->auxiliaryDataChanged(modelNode, key, data);
@@ -809,8 +821,10 @@ void ModelPrivate::notifyCustomNotification(const AbstractView *senderView,
void ModelPrivate::notifyCustomNotificationTo(AbstractView *view,
const CustomNotificationPackage &package)
{
if (view)
if (view) {
NanotraceHR::Tracer tracer{view->name(), ModelTracing::category()};
view->customNotification(package);
}
}
void ModelPrivate::notifyPropertiesRemoved(const QList<PropertyPair> &propertyPairList)
@@ -832,6 +846,8 @@ void ModelPrivate::notifyPropertiesAboutToBeRemoved(const QList<InternalProperty
try {
if (m_rewriterView) {
NanotraceHR::Tracer tracer{m_rewriterView->name(), ModelTracing::category()};
QList<AbstractProperty> propertyList;
for (InternalProperty *property : internalPropertyList) {
AbstractProperty newProperty(property->name(),
@@ -849,6 +865,7 @@ void ModelPrivate::notifyPropertiesAboutToBeRemoved(const QList<InternalProperty
}
for (const QPointer<AbstractView> &view : std::as_const(m_viewList)) {
NanotraceHR::Tracer tracer{view->name(), ModelTracing::category()};
QList<AbstractProperty> propertyList;
Q_ASSERT(view != nullptr);
for (auto property : internalPropertyList) {
@@ -864,14 +881,18 @@ void ModelPrivate::notifyPropertiesAboutToBeRemoved(const QList<InternalProperty
}
}
if (nodeInstanceView()) {
if (m_nodeInstanceView) {
NanotraceHR::Tracer tracer{m_nodeInstanceView->name(), ModelTracing::category()};
QList<AbstractProperty> propertyList;
for (auto property : internalPropertyList) {
AbstractProperty newProperty(property->name(), property->propertyOwner(), m_model, nodeInstanceView());
AbstractProperty newProperty(property->name(),
property->propertyOwner(),
m_model,
m_nodeInstanceView);
propertyList.append(newProperty);
}
nodeInstanceView()->propertiesAboutToBeRemoved(propertyList);
m_nodeInstanceView->propertiesAboutToBeRemoved(propertyList);
}
if (resetModel)

9
src/plugins/qmldesigner/libs/designercore/model/model_p.h
View File

@@ -137,12 +137,9 @@ public:
void detachView(AbstractView *view, bool notifyView);
void detachAllViews();
template<typename Callable>
void notifyNodeInstanceViewLast(Callable call);
template<typename Callable>
void notifyNormalViewsLast(Callable call);
template<typename Callable>
void notifyInstanceChanges(Callable call);
void notifyNodeInstanceViewLast(const std::invocable<AbstractView *> auto &call);
void notifyNormalViewsLast(const std::invocable<AbstractView *> auto &call);
void notifyInstanceChanges(const std::invocable<AbstractView *> auto &call);
void notifyNodeCreated(const InternalNodePointer &newNode);
void notifyNodeAboutToBeReparent(const InternalNodePointer &node,