*** empty log message ***

diff --git a/src/LogWindow/LogWindow.cxx b/src/LogWindow/LogWindow.cxx
index 2c0669ea83b5c2eba69c15097a9cdd4d7f38f7be..3570c6ed6737a8abdbd44c44d84c1621131f19fc 100755 (executable)
--- a/src/LogWindow/LogWindow.cxx
+++ b/src/LogWindow/LogWindow.cxx
@@ -1,22 +1,22 @@
 //  KERNEL SALOME_Event : Define event posting mechanism
 //
 //  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 
 #include "LogWindow.h"
@@ -99,16 +99,19 @@ LogWindow::~LogWindow()
 }
 
 /*!
-  Custom event handler
+  Returnss the banner (title of message log)
 */
-bool LogWindow::eventFilter( QObject* o, QEvent* e )
+QString LogWindow::banner() const
 {
-  if ( o == myView->viewport() && e->type() == QEvent::ContextMenu )
-  {
-    contextMenuRequest( (QContextMenuEvent*)e );
-    return true;
-  }
-  return QFrame::eventFilter( o, e );
+  return myBanner;
+}
+
+/*!
+  Returnss the separator (line printing between messages)
+*/
+QString LogWindow::separator() const
+{
+  return mySeparator;
 }
 
 /*!
@@ -133,17 +136,70 @@ void LogWindow::setSeparator( const QString& separator )
   clear( false );
 }
 
+/*!
+  Custom event handler
+*/
+bool LogWindow::eventFilter( QObject* o, QEvent* e )
+{
+  if ( o == myView->viewport() && e->type() == QEvent::ContextMenu )
+  {
+    contextMenuRequest( (QContextMenuEvent*)e );
+    return true;
+  }
+  return QFrame::eventFilter( o, e );
+}
+
 /*!
   Puts message to log window
   \param message - text of message
-  \addSeparator - if it is true, then separator is added to tail of message log
+  \flags - bit flags which defines view of printed message
 */
-void LogWindow::putMessage( const QString& message, bool addSeparator )
+void LogWindow::putMessage( const QString& message, const int flags )
 {
-  myView->append( message );
+  putMessage( message, QColor(), flags );
+}
+
+/*!
+  Puts message to log window
+  \param message - text of message
+  \color - text color of printed message
+  \flags - bit flags which defines view of printed message
+*/
+void LogWindow::putMessage( const QString& message, const QColor& color, const int flags )
+{
+  QString msg = message;
+  if ( msg.isEmpty() )
+    return;
+
+  bool noColor = flags & DisplayNoColor;
+
+  if ( color.isValid() )
+    msg = QString( "<font color=\"%1\">%2</font>" ).arg( color.name() ).arg( msg );
+
+  QString dStr;
+  if ( flags & DisplayDate )
+  {
+    dStr = QDate::currentDate().toString( Qt::SystemLocaleDate );
+    if ( !noColor )
+      dStr = QString( "<font color=\"#003380\">%1</font>" ).arg( dStr );
+  }
+
+  QString tStr;
+  if ( flags & DisplayTime )
+  {
+    tStr = QTime::currentTime().toString( Qt::SystemLocaleDate );
+    if ( !noColor )
+      tStr = QString( "<font color=\"#008033\">%1</font>" ).arg( tStr );
+  }
+
+  QString dateTime = QString( "%1 %2" ).arg( dStr ).arg( tStr ).trimmed();
+  if ( !dateTime.isEmpty() )
+    msg = QString( "[%1] %2" ).arg( dateTime ).arg( msg );
+
+  myView->append( msg );
   myHistory.append( plainText( message ) );
 
-  if ( addSeparator && !mySeparator.isNull() )
+  if ( flags & DisplaySeparator && !mySeparator.isEmpty() )
   {
     myView->append( mySeparator );   // add separator
     myHistory.append( plainText( mySeparator ) );
@@ -188,7 +244,7 @@ bool LogWindow::saveLog( const QString& fileName )
   stream << QTime::currentTime().toString( "hh:mm:ss" )   << endl;
   stream << "*****************************************"   << endl;
 
-  for ( uint i = 0; i < myHistory.count(); i++ )
+  for ( int i = 0; i < (int)myHistory.count(); i++ )
     stream << myHistory[ i ] << endl;
 
   file.close();
@@ -230,14 +286,14 @@ void LogWindow::contextMenuPopup( QMenu* popup )
     popup->addAction( myActions[ CopyId ] );
   if ( myOpFlags & ClearId )
     popup->addAction( myActions[ ClearId ] );
-  
+
   popup->addSeparator();
-  
+
   if ( myOpFlags & SelectAllId )
     popup->addAction( myActions[ SelectAllId ] );
-  
+
   popup->addSeparator();
-  
+
   if ( myOpFlags & SaveToFileId )
     popup->addAction( myActions[ SaveToFileId ] );
 
@@ -255,7 +311,7 @@ void LogWindow::updateActions()
   int paraFrom, paraTo, indexFrom, indexTo;
   myView->getSelection( &paraFrom, &indexFrom, &paraTo, &indexTo );
   bool allSelected = myView->hasSelectedText() &&
-                     !paraFrom && paraTo == myView->paragraphs() - 1 && 
+                     !paraFrom && paraTo == myView->paragraphs() - 1 &&
                      !indexFrom && indexTo == myView->paragraphLength( paraTo );
   myActions[ CopyId ]->setEnabled( ( myOpFlags & CopyId )&& myView->hasSelectedText() );
   myActions[ ClearId ]->setEnabled( ( myOpFlags & ClearId ) && myView->document()->blockCount() > myBannerSize );
@@ -279,7 +335,7 @@ void LogWindow::onSaveToFile()
     return;
 
   QApplication::setOverrideCursor( Qt::WaitCursor );
-    
+
   bool bOk = saveLog( aName );
 
   QApplication::restoreOverrideCursor();

diff --git a/src/LogWindow/LogWindow.h b/src/LogWindow/LogWindow.h
index 17460b3bc7d946d4ae109a0e4bb4610a24be3f3b..3c8b71c11e896c69073a50de774350a87b956bc2 100755 (executable)
--- a/src/LogWindow/LogWindow.h
+++ b/src/LogWindow/LogWindow.h
@@ -73,6 +73,17 @@ public:
     All = CopyId | ClearId | SelectAllId | SaveToFileId,
   };
 
+  //! display messages flags
+  enum
+  {
+    DisplayNormal    = 0x00,
+    DisplayDate      = 0x01,
+    DisplayTime      = 0x02,
+    DisplaySeparator = 0x04,
+    DisplayNoColor   = 0x08,
+    DisplayDateTime  = DisplayDate | DisplayTime
+  };
+
 public:
   LogWindow( QWidget* theParent );
   virtual ~LogWindow();
@@ -82,11 +93,15 @@ public:
 
   virtual bool        eventFilter( QObject* o, QEvent* e );
 
+  QString             banner() const;
+  QString             separator() const;
+
   void                setBanner( const QString& banner );
   void                setSeparator( const QString& separator );
 
-  virtual void        putMessage( const QString& message, bool addSeparator = true );
-  void                clear( bool clearHistory = false );
+  void                putMessage( const QString& message, const int = DisplayNormal );
+  virtual void        putMessage( const QString& message, const QColor&, const int = DisplayNormal );
+  void                clear( const bool clearHistory = false );
 
   bool                saveLog( const QString& fileName );