cmake/travis.sh

@@ -246,6 +246,7 @@ else
 fi
 
 $cmakebin ../kst/cmake/ \
+    -Dkst_console=1 \
     -Dkst_release=1  \
     -Dkst_version_string=$versionname \
     -Dkst_install_prefix=./$versionname \

src/datasources/ascii/asciisource.cpp

@@ -21,6 +21,7 @@
 
 #include "kst_atof.h"
 #include "measuretime.h"
+#include "debug.h"
 
 #include <QFile>
 #include <QFileInfo>
@@ -297,6 +298,8 @@ int AsciiSource::readField(double *v, const QString& field, int s, int n)
     emitProgress(0, tr("Reading field: ") + field);
   }
 
+  Debug::trace(QString("AsciiSource::readField() %1  s=%2  n=%3").arg(field.leftJustified(15)).arg(QString("%1").arg(s, 10)).arg(n));
+
   int read = tryReadField(v, field, s, n);
 
   if (isTime(field)) {

src/libkst/debug.cpp

@@ -128,14 +128,14 @@ void Debug::clear() {
 
 QString Debug::label(LogLevel level) const {
   switch (level) {
-    case Notice:
-      return tr("Notice");
-    case Warning:
-      return tr("Warning");
     case Error:
       return tr("Error");
-    case DebugLog:
-      return tr("Debug");
+    case Warning:
+      return tr("Warning");
+    case Notice:
+      return tr("Notice");
+    case Trace:
+      return tr("Trace");
     default:
       return tr("Other");
   }    

src/libkst/debug.h

@@ -30,7 +30,12 @@ namespace Kst {
 class KSTCORE_EXPORT Debug : public QObject {
   Q_OBJECT
   public:
-    enum LogLevel { Unknown = 0, Notice = 1, Warning = 2, Error = 4, DebugLog = 8, None = 16384 };
+    enum LogLevel {
+      Trace     = 1,
+      Notice    = 2,
+      Warning   = 4,
+      Error     = 8
+    };
     struct LogMessage {
       QDateTime date;
       QString msg;
@@ -43,6 +48,12 @@ class KSTCORE_EXPORT Debug : public QObject {
     void setLimit(bool applyLimit, int limit);
     QString text();
 
+#define DEBUG_LOG_FUNC(X, T) static void X(const QString& msg) { self()->log(msg, T); }
+    DEBUG_LOG_FUNC(error, Error);
+    DEBUG_LOG_FUNC(warning, Warning);
+    DEBUG_LOG_FUNC(notice, Notice);
+    DEBUG_LOG_FUNC(trace, Trace);
+
     int logLength() const;
     QList<LogMessage> messages() const;
     Debug::LogMessage message(unsigned n) const;

src/libkst/measuretime.cpp

@@ -99,7 +99,7 @@ void MeasureTime::print()
 {
   measure();
   qWarning("MeasureTime in %s: %g sec", qPrintable(name), interval);
-  Kst::Debug::self()->log(QString("Timing: %2 sec, Scope: %1").arg(name).arg(interval), Kst::Debug::DebugLog);
+  Kst::Debug::trace(QString("Timing: %2 sec, Scope: %1").arg(name).arg(interval));
 }
 
 

src/libkstapp/debugdialog.cpp

@@ -32,10 +32,11 @@ DebugDialog::DebugDialog(QWidget *parent)
   _logTabLayout->addWidget(_log,0,0);
 
   connect(_clear, SIGNAL(clicked()), this, SLOT(clear()));
-  connect(_showDebug, SIGNAL(toggled(bool)), _log, SLOT(setShowDebug(bool)));
+
+  connect(_showError, SIGNAL(toggled(bool)), _log, SLOT(setShowError(bool)));
   connect(_showWarning, SIGNAL(toggled(bool)), _log, SLOT(setShowWarning(bool)));
   connect(_showNotice, SIGNAL(toggled(bool)), _log, SLOT(setShowNotice(bool)));
-  connect(_showError, SIGNAL(toggled(bool)), _log, SLOT(setShowError(bool)));
+  connect(_showTrace, SIGNAL(toggled(bool)), _log, SLOT(setShowTrace(bool)));
 
   if (!Debug::self()->kstRevision().isEmpty())
     _buildInfo->setText(tr("<h1>Kst</h1> Version %1 (%2)").arg(KSTVERSION).arg(Debug::self()->kstRevision()));

src/libkstapp/debugdialog.ui

@@ -17,7 +17,7 @@
    <item>
     <widget class="QTabWidget" name="_tabs">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="_buildInfoTab">
       <attribute name="title">
@@ -102,42 +102,45 @@
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="_showDebug">
+          <widget class="QCheckBox" name="_showError">
            <property name="text">
-            <string>&amp;Debug</string>
+            <string>&amp;Error</string>
            </property>
            <property name="checked">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="_showNotice">
+          <widget class="QCheckBox" name="_showWarning">
            <property name="text">
-            <string>&amp;Notice</string>
+            <string>&amp;Warning</string>
            </property>
            <property name="checked">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="_showWarning">
+          <widget class="QCheckBox" name="_showNotice">
            <property name="text">
-            <string>&amp;Warning</string>
+            <string>&amp;Notice</string>
            </property>
            <property name="checked">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="_showError">
+          <widget class="QCheckBox" name="_showTrace">
+           <property name="enabled">
+            <bool>true</bool>
+           </property>
            <property name="text">
-            <string>&amp;Error</string>
+            <string>&amp;Trace</string>
            </property>
            <property name="checked">
-            <bool>true</bool>
+            <bool>false</bool>
            </property>
           </widget>
          </item>

src/libkstapp/logwidget.cpp

@@ -21,9 +21,10 @@
 
 namespace Kst {
 
+
 LogWidget::LogWidget(QWidget *parent)
   : QTextBrowser(parent) {
-  _show = Debug::Warning | Debug::Error | Debug::Notice | Debug::DebugLog;
+  _show = Debug::Warning | Debug::Error | Debug::Notice | Debug::Trace;
 }
 
 
@@ -43,9 +44,9 @@ void LogWidget::logAdded(const Debug::LogMessage& msg) {
     case Debug::Notice:
       sym = "<img src=\"DebugNotice\"/> ";
       break;
-    case Debug::DebugLog:
-      sym = "<img src=\"DebugDebug\"/> ";
-      break;
+    case Debug::Trace:
+        sym = "<img src=\"DebugTrace\"/> ";
+        break;
     default:
       return;
   }
@@ -58,55 +59,36 @@ void LogWidget::logAdded(const Debug::LogMessage& msg) {
 }
 
 
-void LogWidget::setShowDebug(bool show) {
-  int old = _show;
+void LogWidget::setShowLevel(Debug::LogLevel level, bool show) {
+  const int old = _show;
   if (show) {
-    _show |= Debug::DebugLog;
+    _show |= level;
   } else {
-    _show &= ~Debug::DebugLog;
+    _show &= ~level;
   }
   if (_show != old) {
     regenerate();
   }
 }
 
 
-void LogWidget::setShowNotice(bool show) {
-  int old = _show;
-  if (show) {
-    _show |= Debug::Notice;
-  } else {
-    _show &= ~Debug::Notice;
-  }
-  if (_show != old) {
-    regenerate();
-  }
+void LogWidget::setShowError(bool show) {
+  setShowLevel(Debug::Error, show);
 }
 
 
 void LogWidget::setShowWarning(bool show) {
-  int old = _show;
-  if (show) {
-    _show |= Debug::Warning;
-  } else {
-    _show &= ~Debug::Warning;
-  }
-  if (_show != old) {
-    regenerate();
-  }
+  setShowLevel(Debug::Warning, show);
 }
 
 
-void LogWidget::setShowError(bool show) {
-  int old = _show;
-  if (show) {
-    _show |= Debug::Error;
-  } else {
-    _show &= ~Debug::Error;
-  }
-  if (_show != old) {
-    regenerate();
-  }
+void LogWidget::setShowNotice(bool show) {
+  setShowLevel(Debug::Notice, show);
+}
+
+
+void LogWidget::setShowTrace(bool show) {
+  setShowLevel(Debug::Trace, show);
 }
 
 

src/libkstapp/logwidget.h

@@ -29,16 +29,18 @@ class LogWidget : public QTextBrowser
 
   public Q_SLOTS:
     void logAdded(const Debug::LogMessage&);
-    void setShowDebug(bool show);
-    void setShowNotice(bool show);
-    void setShowWarning(bool show);
+
     void setShowError(bool show);
+    void setShowWarning(bool show);
+    void setShowNotice(bool show);
+    void setShowTrace(bool show);
 
   private slots:
     void regenerate();
 
   private:
     int _show;
+    void setShowLevel(Debug::LogLevel, bool show);
 };
 
 }