From: Pascal Obry <pascal.obry@edf.fr>
Date: Mon, 15 May 2023 08:25:38 +0000 (+0200)
Subject: Use logStructuredUserEvent() for log message format consistency.
X-Git-Tag: V9_12_0a1^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=efb533a09c6c5f38d840c71cb4e73355d13af530;p=modules%2Fgeom.git

Use logStructuredUserEvent() for log message format consistency.

Also clean-up the operation name to keep only the meaningful
part.
---

diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx
index a9f97d7ea..d7fa50169 100644
--- a/src/GEOMBase/GEOMBase_Helper.cxx
+++ b/src/GEOMBase/GEOMBase_Helper.cxx
@@ -24,6 +24,8 @@
 //  File   : GEOMBase_Helper.cxx
 //  Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
 
+#include <QRegExp>
+
 #include "GEOMBase_Helper.h"
 #include "GEOMBase.h"
 #include "GEOM_Operation.h"
@@ -943,13 +945,20 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
         }
 
         if ( nbObjs ) {
-          SalomeApp_Application::logUserEvent( QString( "Geometry") + ": " + QObject::tr( "OPERATION_APPLIED" ) );
+          const QString anOpName( typeid(*this).name() );
+          // The operator name may have the following format: 24PrimitiveGUI_CylinderDlg
+          // clean it up to get the simple operator (here Cylinder) name into the log.
+          const QRegExp rx("^[^\w]*_(.*)Dlg$");
+          const int pos = rx.indexIn(anOpName);
+          SalomeApp_Application::logStructuredUserEvent( "Geom",
+                                                         "geometry",
+                                                         pos == -1 ? anOpName : rx.cap(1),
+                                                         "applied" );
           commitCommand();
           updateObjBrowser();
           if( SUIT_Application* anApp = SUIT_Session::session()->activeApplication() ) {
             LightApp_Application* aLightApp = dynamic_cast<LightApp_Application*>( anApp );
             if(aLightApp) {
-              QString anOpName( typeid(*this).name() );
               aLightApp->emitOperationFinished( "Geometry", anOpName, anEntryList );
 
               if ( !isDisableBrowsing() )