From 6390b27195af9d2835ecb51f8624e267618b98f3 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Tue, 18 Sep 2012 17:09:51 +0200
Subject: [PATCH] Disabled firebug, fixed beachballing in Debug console

---
 files/images/earth.html |  2 +-
 src/ui/DebugConsole.cc  | 12 +++++++++---
 src/ui/DebugConsole.h   |  1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/files/images/earth.html b/files/images/earth.html
index 8fa28ef..fb810a7 100644
--- a/files/images/earth.html
+++ b/files/images/earth.html
@@ -7,7 +7,7 @@
 <!-- QGroundControl -->
     <title>QGroundControl Google Earth View</title>
     <!-- *** Replace the key below below with your own API key, available at http://code.google.com/apis/maps/signup.html *** -->
-    <script type="text/javascript" src="https://getfirebug.com/firebug-lite-beta.js"></script>
+    <!--<script type="text/javascript" src="https://getfirebug.com/firebug-lite-beta.js"></script>-->
     <script type="text/javascript" src="https://www.google.com/jsapi?key=ABQIAAAA5Q6wxQ6lxKS8haLVdUJaqhSjosg_0jiTTs2iXtkDVG0n0If1mBRHzhWw5VqBZX-j4NuzoVpU-UaHVg"></script>
     <script type="text/javascript">
 google.load("earth", "1", { 'language': 'en'});
diff --git a/src/ui/DebugConsole.cc b/src/ui/DebugConsole.cc
index 0d27f37..3c0c679 100644
--- a/src/ui/DebugConsole.cc
+++ b/src/ui/DebugConsole.cc
@@ -52,6 +52,7 @@ DebugConsole::DebugConsole(QWidget *parent) :
     sentBytes(),
     holdBuffer(),
     lineBuffer(""),
+    lastLineBuffer(0),
     lineBufferTimer(),
     snapShotTimer(),
     snapShotInterval(500),
@@ -489,14 +490,19 @@ void DebugConsole::receiveBytes(LinkInterface* link, QByteArray bytes)
             }
 
         }
-        if (lineBuffer.length() > 0) {
+        if (lineBuffer.length() > 0 && (QGC::groundTimeMilliseconds() - lastLineBuffer) > 200) {
             if (isVisible())
             {
-                m_ui->receiveText->insertPlainText(lineBuffer);
+                m_ui->receiveText->appendPlainText(lineBuffer);
+                lineBuffer.clear();
+                lastLineBuffer = QGC::groundTimeMilliseconds();
                 // Ensure text area scrolls correctly
                 m_ui->receiveText->ensureCursorVisible();
             }
-            lineBuffer.clear();
+            if (lineBuffer.size() > 8192)
+            {
+                lineBuffer.remove(0, 4096);
+            }
         }
     }
     else if (link == currLink && holdOn)
diff --git a/src/ui/DebugConsole.h b/src/ui/DebugConsole.h
index d369cc8..fb63184 100644
--- a/src/ui/DebugConsole.h
+++ b/src/ui/DebugConsole.h
@@ -128,6 +128,7 @@ protected:
     QList<QString> sentBytes; ///< Transmitted bytes, per transmission
     QByteArray holdBuffer;    ///< Buffer where bytes are stored during hold-enable
     QString lineBuffer;       ///< Buffere where bytes are stored before writing them out
+    quint64 lastLineBuffer;   ///< Last line buffer emission time
     QTimer lineBufferTimer;   ///< Line buffer timer
     QTimer snapShotTimer;     ///< Timer for measuring traffic snapshots
     int snapShotInterval;     ///< Snapshot interval for traffic measurements