commit d3058f5fd8bb786c5b70a0dd222bde646502258a
author chudy@google.com <chudy@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jul 19 13:41:27 2012 +0000
committer chudy@google.com <chudy@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jul 19 13:41:27 2012 +0000
tree 2e38d7b0d7e1633a7204275af787a471d7785038
parent 3da2a0d31523e8abf96d69643e1c200f444efcaa

Quick bug fix that was rendering debugger unusable.

Review URL: https://codereview.appspot.com/6422050

git-svn-id: http://skia.googlecode.com/svn/trunk@4668 2bbb7eff-a529-9590-31e7-b0007b416f81

debugger/QT/SkDebuggerGUI.cpp

diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index ea9d687..7448aeb 100644
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -44,6 +44,7 @@
     , fBreakpointsActivated(false)
     , fDeletesActivated(false)
     , fPause(false)
+    , fLoading(false)
 {
     setupUi(this);
     connect(&fListWidget, SIGNAL(currentItemChanged(QListWidgetItem*,
@@ -90,7 +91,11 @@
     connect(&fActionShowDeletes, SIGNAL(triggered()), this, SLOT(showDeletes()));
 
     fInspectorWidget.setDisabled(true);
-    fMenuBar.setDisabled(true);
+    //fMenuBar.setDisabled(true);
+    fMenuEdit.setDisabled(true);
+    fMenuNavigate.setDisabled(true);
+    fMenuView.setDisabled(true);
+
 }
 
 SkDebuggerGUI::~SkDebuggerGUI() {
@@ -257,28 +262,30 @@
 }
 
 void SkDebuggerGUI::registerListClick(QListWidgetItem *item) {
-    int currentRow = fListWidget.currentRow();
-    if (!fPause) {
-        fCanvasWidget.drawTo(currentRow);
-    }
-    std::vector<std::string> *v = fCanvasWidget.getCurrentCommandInfo(
-            currentRow);
-
-    /* TODO(chudy): Add command type before parameters. Rename v
-     * to something more informative. */
-    if (v) {
-        std::vector<std::string>::iterator it;
-
-        QString info;
-        info.append("<b>Parameters: </b><br/>");
-        for (it = v->begin(); it != v->end(); ++it) {
-            info.append(QString((*it).c_str()));
-            info.append("<br/>");
+    if(!fLoading) {
+        int currentRow = fListWidget.currentRow();
+        if (!fPause) {
+            fCanvasWidget.drawTo(currentRow);
         }
-        fInspectorWidget.setDetailText(info);
-        fInspectorWidget.setDisabled(false);
-        fInspectorWidget.setMatrix(fCanvasWidget.getCurrentMatrix());
-        fInspectorWidget.setClip(fCanvasWidget.getCurrentClip());
+        std::vector<std::string> *v = fCanvasWidget.getCurrentCommandInfo(
+                currentRow);
+
+        /* TODO(chudy): Add command type before parameters. Rename v
+         * to something more informative. */
+        if (v) {
+            std::vector<std::string>::iterator it;
+
+            QString info;
+            info.append("<b>Parameters: </b><br/>");
+            for (it = v->begin(); it != v->end(); ++it) {
+                info.append(QString((*it).c_str()));
+                info.append("<br/>");
+            }
+            fInspectorWidget.setDetailText(info);
+            fInspectorWidget.setDisabled(false);
+            fInspectorWidget.setMatrix(fCanvasWidget.getCurrentMatrix());
+            fInspectorWidget.setClip(fCanvasWidget.getCurrentClip());
+        }
     }
 }
 
@@ -528,7 +535,9 @@
 }
 
 void SkDebuggerGUI::loadPicture(QString fileName) {
+    fLoading = true;
     fCanvasWidget.loadPicture(fileName);
+    std::string cocks = fileName.toStdString();
     std::vector<std::string> *cv = fCanvasWidget.getDrawCommands();
     /* fDebugCanvas is reinitialized every load picture. Need it to retain value
      * of the visibility filter. */
@@ -538,7 +547,11 @@
     setupComboBox(cv);
     fInspectorWidget.setDisabled(false);
     fSettingsWidget.setDisabled(false);
-    fMenuBar.setDisabled(false);
+    fMenuEdit.setDisabled(false);
+    fMenuNavigate.setDisabled(false);
+    fMenuView.setDisabled(false);
+    fLoading = false;
+    actionPlay();
 }
 
 void SkDebuggerGUI::setupListWidget(std::vector<std::string>* cv) {