/[svn]/qsampler/trunk/src/qsamplerMessages.cpp
ViewVC logotype

Diff of /qsampler/trunk/src/qsamplerMessages.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3758 by capela, Fri Mar 27 17:57:40 2020 UTC revision 3793 by capela, Mon Jun 15 17:21:04 2020 UTC
# Line 26  Line 26 
26  #include <QSocketNotifier>  #include <QSocketNotifier>
27    
28  #include <QFile>  #include <QFile>
29  #include <QTextEdit>  #include <QTextBrowser>
30  #include <QTextCursor>  #include <QTextCursor>
31  #include <QTextStream>  #include <QTextStream>
32  #include <QTextBlock>  #include <QTextBlock>
 #include <QScrollBar>  
33  #include <QDateTime>  #include <QDateTime>
34  #include <QIcon>  #include <QIcon>
35    
# Line 40  Line 39 
39  #endif  #endif
40    
41    
42    // Deprecated QTextStreamFunctions/Qt namespaces workaround.
43    #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
44    #define endl    Qt::endl
45    #endif
46    
47    
48  namespace QSampler {  namespace QSampler {
49    
50  // The default maximum number of message lines.  // The default maximum number of message lines.
# Line 68  Messages::Messages ( QWidget *pParent ) Line 73  Messages::Messages ( QWidget *pParent )
73          m_fdStdout[QSAMPLER_MESSAGES_FDWRITE] = QSAMPLER_MESSAGES_FDNIL;          m_fdStdout[QSAMPLER_MESSAGES_FDWRITE] = QSAMPLER_MESSAGES_FDNIL;
74    
75          // Create local text view widget.          // Create local text view widget.
76          m_pMessagesTextView = new QTextEdit(this);          m_pMessagesTextView = new QTextBrowser(this);
77  //  QFont font(m_pMessagesTextView->font());  //  QFont font(m_pMessagesTextView->font());
78  //  font.setFamily("Fixed");  //  font.setFamily("Fixed");
79  //  m_pMessagesTextView->setFont(font);  //  m_pMessagesTextView->setFont(font);
80          m_pMessagesTextView->setLineWrapMode(QTextEdit::NoWrap);          m_pMessagesTextView->setLineWrapMode(QTextEdit::NoWrap);
81          m_pMessagesTextView->setReadOnly(true);  //      m_pMessagesTextView->setReadOnly(true);
82          m_pMessagesTextView->setUndoRedoEnabled(false);  //      m_pMessagesTextView->setUndoRedoEnabled(false);
83  //      m_pMessagesTextView->setTextFormat(Qt::LogText);  //      m_pMessagesTextView->setTextFormat(Qt::LogText);
84    
85          // Initialize default message limit.          // Initialize default message limit.
# Line 85  Messages::Messages ( QWidget *pParent ) Line 90  Messages::Messages ( QWidget *pParent )
90    
91          // Prepare the dockable window stuff.          // Prepare the dockable window stuff.
92          QDockWidget::setWidget(m_pMessagesTextView);          QDockWidget::setWidget(m_pMessagesTextView);
93          QDockWidget::setFeatures(QDockWidget::AllDockWidgetFeatures);  //      QDockWidget::setFeatures(QDockWidget::AllDockWidgetFeatures);
94          QDockWidget::setAllowedAreas(          QDockWidget::setAllowedAreas(
95                  Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);                  Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
96          // Some specialties to this kind of dock window...          // Some specialties to this kind of dock window...
# Line 157  void Messages::appendStdoutBuffer ( cons Line 162  void Messages::appendStdoutBuffer ( cons
162  {  {
163          m_sStdoutBuffer.append(s);          m_sStdoutBuffer.append(s);
164    
165            processStdoutBuffer();
166    }
167    
168    void Messages::processStdoutBuffer (void)
169    {
170          const int iLength = m_sStdoutBuffer.lastIndexOf('\n');          const int iLength = m_sStdoutBuffer.lastIndexOf('\n');
171          if (iLength > 0) {          if (iLength > 0) {
172                  const QString& sTemp = m_sStdoutBuffer.left(iLength);                  const QString& sTemp = m_sStdoutBuffer.left(iLength);
# Line 173  void Messages::appendStdoutBuffer ( cons Line 183  void Messages::appendStdoutBuffer ( cons
183  void Messages::flushStdoutBuffer (void)  void Messages::flushStdoutBuffer (void)
184  {  {
185          if (!m_sStdoutBuffer.isEmpty()) {          if (!m_sStdoutBuffer.isEmpty()) {
186                  appendMessagesText(m_sStdoutBuffer);                  processStdoutBuffer();
187                  m_sStdoutBuffer.clear();                  m_sStdoutBuffer.clear();
188          }          }
189  }  }
# Line 272  void Messages::setLogging ( bool bEnable Line 282  void Messages::setLogging ( bool bEnable
282  void Messages::appendMessagesLog ( const QString& s )  void Messages::appendMessagesLog ( const QString& s )
283  {  {
284          if (m_pMessagesLog) {          if (m_pMessagesLog) {
285                  QTextStream(m_pMessagesLog) << s << Qt::endl;                  QTextStream(m_pMessagesLog)
286                            << QTime::currentTime().toString("hh:mm:ss.zzz")
287                            << ' ' << s << endl;
288                  m_pMessagesLog->flush();                  m_pMessagesLog->flush();
289          }          }
290  }  }
# Line 304  void Messages::appendMessagesLine ( cons Line 316  void Messages::appendMessagesLine ( cons
316  // The main utility methods.  // The main utility methods.
317  void Messages::appendMessages ( const QString& s )  void Messages::appendMessages ( const QString& s )
318  {  {
319          appendMessagesColor(s, "#999999");          appendMessagesColor(s, Qt::gray);
320  }  }
321    
322  void Messages::appendMessagesColor ( const QString& s, const QString &c )  void Messages::appendMessagesColor ( const QString& s, const QColor& rgb )
323  {  {
324          const QString& sText          appendMessagesLine("<font color=\"" + rgb.name() + "\">" + s + "</font>");
325                  = QTime::currentTime().toString("hh:mm:ss.zzz") + ' ' + s;          appendMessagesLog(s);
         appendMessagesLine("<font color=\"" + c + "\">" + sText + "</font>");  
         appendMessagesLog(sText);  
326  }  }
327    
328  void Messages::appendMessagesText ( const QString& s )  void Messages::appendMessagesText ( const QString& s )
Legend:
Removed from v.3758  
changed lines
  Added in v.3793
  ViewVC Help
Powered by ViewVC