Use logStructuredUserEvent() for log message format consistency.

[modules/geom.git] / src / GEOMBase / GEOMBase_Helper.cxx

diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx
index 332b1652b651d3741f7220d51d767b4d6570a435..d7fa50169943083c59382e1e8e36b49811bb445e 100644 (file)
--- a/src/GEOMBase/GEOMBase_Helper.cxx
+++ b/src/GEOMBase/GEOMBase_Helper.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -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"
@@ -754,7 +756,7 @@ bool GEOMBase_Helper::openCommand()
   bool res = false;
   if ( !getStudy() || hasCommand() )
   {
-    MESSAGE("Getting out from openCommand()")
+    MESSAGE("Getting out from openCommand()");
       return res;
   }
 
@@ -766,8 +768,8 @@ bool GEOMBase_Helper::openCommand()
   }
   else
   {
-    MESSAGE("anOp->_is_nil() = true")
-      }
+    MESSAGE("anOp->_is_nil() = true");
+  }
 
   return res;
 }
@@ -857,7 +859,7 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
   SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() );
   if ( !appStudy )
   {
-    MESSAGE("appStudy is empty")
+    MESSAGE("appStudy is empty");
       return false;
   }
   _PTR(Study) aStudy = appStudy->studyDS();
@@ -943,12 +945,20 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
         }
 
         if ( nbObjs ) {
+          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() )
@@ -968,13 +978,13 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
   catch( const SALOME::SALOME_Exception& e ) {
     SalomeApp_Tools::QtCatchCorbaException( e );
     abortCommand();
-    MESSAGE("Exception caught")
-      }
+    MESSAGE("Exception caught");
+  }
 
   updateViewer();
 
-  MESSAGE("result ="<<result)
-    return result;
+  MESSAGE("result ="<<result);
+  return result;
 }