ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-11 16:19:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'po/29467_gui_log_file'

Browse Source 
* po/29467_gui_log_file:
  Use logStructuredUserEvent() for log message format consistency.
  [bos #29467] [EDF] (2022-T1) Logging of SALOME usage: specific log in SALOME
This commit is contained in:
Pascal Obry 2023-09-11 09:00:04 +02:00
commit a501322551
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/GEOMBase/GEOMBase_Helper.cxx
View File

@ -24,6 +24,8 @@
// File : GEOMBase_Helper.cxx // File : GEOMBase_Helper.cxx
// Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com) // Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
#include <QRegExp>
#include "GEOMBase_Helper.h" #include "GEOMBase_Helper.h"
#include "GEOMBase.h" #include "GEOMBase.h"
#include "GEOM_Operation.h" #include "GEOM_Operation.h"
@ -943,12 +945,20 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
} }
if ( nbObjs ) { 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(); commitCommand();
updateObjBrowser(); updateObjBrowser();
if( SUIT_Application* anApp = SUIT_Session::session()->activeApplication() ) { if( SUIT_Application* anApp = SUIT_Session::session()->activeApplication() ) {
LightApp_Application* aLightApp = dynamic_cast<LightApp_Application*>( anApp ); LightApp_Application* aLightApp = dynamic_cast<LightApp_Application*>( anApp );
if(aLightApp) { if(aLightApp) {
QString anOpName( typeid(*this).name() );
aLightApp->emitOperationFinished( "Geometry", anOpName, anEntryList ); aLightApp->emitOperationFinished( "Geometry", anOpName, anEntryList );
if ( !isDisableBrowsing() ) if ( !isDisableBrowsing() )

2
src/GEOMGUI/GeometryGUI.cxx
View File

@ -980,6 +980,8 @@ void GeometryGUI::initialize( CAM_Application* app )
{ {
SalomeApp_Module::initialize( app ); SalomeApp_Module::initialize( app );
setActionLoggingEnabled( true ); // enable action logging
// ----- create actions -------------- // ----- create actions --------------
createGeomAction( GEOMOp::OpDelete, "DELETE", "", Qt::Key_Delete ); createGeomAction( GEOMOp::OpDelete, "DELETE", "", Qt::Key_Delete );