Salome HOME
projects
/
modules
/
gui.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
15f895e
)
Use logStructuredUserEvent() for log message format consistency.
author
Pascal Obry
<pascal.obry@edf.fr>
Fri, 12 May 2023 07:30:49 +0000
(09:30 +0200)
committer
Pascal Obry
<pascal.obry@edf.fr>
Tue, 5 Sep 2023 09:36:26 +0000
(11:36 +0200)
src/CAM/CAM_Application.cxx
patch
|
blob
|
history
diff --git
a/src/CAM/CAM_Application.cxx
b/src/CAM/CAM_Application.cxx
index 5dd76fe3bcca4026c9449e9cdd842b21d805e0e6..d524028f4828139ae872d6d3ae761dabeafc39eb 100644
(file)
--- a/
src/CAM/CAM_Application.cxx
+++ b/
src/CAM/CAM_Application.cxx
@@
-467,7
+467,10
@@
bool CAM_Application::activateModule( CAM_Module* mod )
{
if ( myModule->deactivateModule( activeStudy() ) )
{
{
if ( myModule->deactivateModule( activeStudy() ) )
{
- logUserEvent( tr( "MODULE_DEACTIVATED" ).arg( myModule->moduleName() ) );
+ logStructuredUserEvent( myModule->moduleName(),
+ "",
+ "",
+ "deactivated" );
}
moduleDeactivated( myModule );
}
}
moduleDeactivated( myModule );
}
@@
-479,7
+482,10
@@
bool CAM_Application::activateModule( CAM_Module* mod )
myModule->connectToStudy( dynamic_cast<CAM_Study*>( activeStudy() ) );
if ( myModule->activateModule( activeStudy() ) )
{
myModule->connectToStudy( dynamic_cast<CAM_Study*>( activeStudy() ) );
if ( myModule->activateModule( activeStudy() ) )
{
- logUserEvent( tr( "MODULE_ACTIVATED" ).arg( myModule->moduleName() ) );
+ logStructuredUserEvent( myModule->moduleName(),
+ "",
+ "",
+ "activated" );
}
else
{
}
else
{
@@
-1034,7
+1040,9
@@
void CAM_Application::logUserEvent( const QString& eventDescription )
{
QDateTime current = QDateTime::currentDateTime();
QTextStream stream( &file );
{
QDateTime current = QDateTime::currentDateTime();
QTextStream stream( &file );
- stream << current.toString("yyyyMMdd-hhmmss") << ": " << eventDescription << endl;
+ stream << current.toString("yyyyMMdd-hhmmss")
+ << "," << eventDescription
+ << endl;
file.close();
}
}
file.close();
}
}
@@
-1067,21
+1075,24
@@
void CAM_Application::logAction( QAction* action, const QString& moduleName )
text = action->text();
if ( text.isEmpty() )
text = action->iconText();
text = action->text();
if ( text.isEmpty() )
text = action->iconText();
+
if ( !text.isEmpty() )
{
if ( !text.isEmpty() )
{
- QStringList message;
- if ( !moduleName.isEmpty() )
- message << moduleName;
if ( action->isCheckable() )
{
if ( action->isCheckable() )
{
- message << tr( "ACTION_TOGGLED" );
- message << ( action->isChecked() ? tr( "ACTION_ON" ) : tr( "ACTION_OFF" ) );
+ logStructuredUserEvent ( moduleName,
+ "",
+ tr( "ACTION_TOGGLED" ),
+ action->isChecked() ? tr( "ACTION_ON" ) : tr( "ACTION_OFF" ),
+ text );
}
else
{
}
else
{
- message << tr( "ACTION_TRIGGERED" );
+ logStructuredUserEvent ( moduleName,
+ "",
+ tr( "ACTION_TRIGGERED" ),
+ "",
+ text );
}
}
- message << text;
- logUserEvent( message.join( ": " ) );
}
}
}
}