Minor code clean-up and reformatting.

[modules/gui.git] / src / CAM / CAM_Application.cxx

diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx
index 1473f6ff2e013c428c40992afcc4c3041e867e06..edcc4968eae071cbbd14e71c3803d8503fe5180a 100644 (file)
--- a/src/CAM/CAM_Application.cxx
+++ b/src/CAM/CAM_Application.cxx
@@ -42,6 +42,7 @@
 #include <QMutexLocker>
 #include <QRegExp>
 #include <QTextStream>
+#include <QDateTime>
 
 #ifdef WIN32
 #include <windows.h>
@@ -464,9 +465,9 @@ bool CAM_Application::activateModule( CAM_Module* mod )
 
   if ( myModule )
   {
-    if ( !myModule->deactivateModule( activeStudy() ) )
+    if ( myModule->deactivateModule( activeStudy() ) )
     {
-      // ???
+      logUserEvent( tr( "MODULE_DEACTIVATED" ).arg( myModule->moduleName() ) );
     }
     moduleDeactivated( myModule );
   }
@@ -476,7 +477,11 @@ bool CAM_Application::activateModule( CAM_Module* mod )
   {
     // Connect the module to the active study
     myModule->connectToStudy( dynamic_cast<CAM_Study*>( activeStudy() ) );
-    if ( !myModule->activateModule( activeStudy() ) )
+    if ( myModule->activateModule( activeStudy() ) )
+    {
+      logUserEvent( tr( "MODULE_ACTIVATED" ).arg( myModule->moduleName() ) );
+    }
+    else
     {
       myModule->setMenuShown( false );
       myModule->setToolShown( false );
@@ -502,7 +507,8 @@ bool CAM_Application::activateModule( CAM_Module* mod )
   \param actionId is a numerical unique operation identifier
   \return \c true in case of success and \c false otherwise
 */
-bool CAM_Application::activateOperation( const QString& modName, int actionId )
+bool CAM_Application::activateOperation( const QString& modName,
+                                         const int actionId )
 {
   CAM_Module* mod = loadModule(modName, false);
   if (mod) {
@@ -519,7 +525,8 @@ bool CAM_Application::activateOperation( const QString& modName, int actionId )
   \param actionId is a string unique operation identifier
   \return \c true in case of success and \c false otherwise
 */
-bool CAM_Application::activateOperation( const QString& modName, const QString& actionId )
+bool CAM_Application::activateOperation( const QString& modName,
+                                         const QString& actionId )
 {
   CAM_Module* mod = loadModule(modName, false);
   if (mod) {
@@ -1025,8 +1032,9 @@ void CAM_Application::logUserEvent( const QString& eventDescription )
     QFile file ( guiLogFile );
     if ( file.open( QFile::Append ) ) // append to log file
     {
+      QDateTime current = QDateTime::currentDateTime();
       QTextStream stream( &file );
-      stream << eventDescription << endl;
+      stream << current.toString("yyyyMMdd-hhmmss") << ": " << eventDescription << endl;
       file.close();
     }
   }