From: Pascal Obry Date: Fri, 12 May 2023 07:32:36 +0000 (+0200) Subject: Use logStructuredUserEvent() for log message format consistency. X-Git-Tag: V9_12_0a1~6^2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6891a9c6c60d2a8274d744d6ac18d3ed5dad7be8;p=modules%2Fshaper.git Use logStructuredUserEvent() for log message format consistency. --- diff --git a/src/SHAPERGUI/SHAPERGUI.cpp b/src/SHAPERGUI/SHAPERGUI.cpp index 156141d8b..eebf6e6c4 100644 --- a/src/SHAPERGUI/SHAPERGUI.cpp +++ b/src/SHAPERGUI/SHAPERGUI.cpp @@ -500,40 +500,45 @@ void SHAPERGUI::logShaperGUIEvent() QAction* anAction = static_cast(sender()); if ( !anAction ) return; - QString anId = anAction->data().toString(); - QStringList message = (QStringList() << moduleName()); - if (anId.contains("Sketch")) - message << tr("sketcher"); - message << tr("operation %1 has been activated").arg(anAction->text()); - CAM_Application::logUserEvent(message.join(": ")); + const QString anId = anAction->data().toString(); + const QString section = anId.contains("Sketch") ? "sketcher" : ""; + + CAM_Application::logStructuredUserEvent( moduleName(), + section, + anAction->text(), + "activated" ); } //****************************************************** -void SHAPERGUI::onOperationCommitted(ModuleBase_Operation* theOperation) +static void onOperationGeneric( ModuleBase_Operation* theOperation, + const QString moduleName, + const QString &event ) { - QStringList message = (QStringList() << moduleName()); QString anId = theOperation->id(); + QString section = ""; + if (anId.contains("Sketch")) { - message << tr("sketcher"); + section = "sketcher"; anId.remove("Sketch"); } - message << tr("operation %1 has been committed").arg(anId); - CAM_Application::logUserEvent(message.join(": ")); + + CAM_Application::logStructuredUserEvent( moduleName, + section, + anId, + event ); +} + +//****************************************************** +void SHAPERGUI::onOperationCommitted(ModuleBase_Operation* theOperation) +{ + onOperationGeneric(theOperation, moduleName(), "committed"); } //****************************************************** void SHAPERGUI::onOperationAborted(ModuleBase_Operation* theOperation) { - QStringList message = (QStringList() << moduleName()); - QString anId = theOperation->id(); - if (anId.contains("Sketch")) - { - message << tr("sketcher"); - anId.remove("Sketch"); - } - message << tr("operation %1 has been aborted").arg(anId); - CAM_Application::logUserEvent(message.join(": ")); + onOperationGeneric(theOperation, moduleName(), "aborted"); } //******************************************************