debugger: Update inspector view data consistently while paused

debugger/QT/SkDebuggerGUI.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDebuggerGUI.h"
 #include "SkForceLinking.h"
 #include <QListWidgetItem>
@@ skipping 48 matching lines @@
     , fCanvasWidget(this, &fDebugger)
     , fDrawCommandGeometryWidget(&fDebugger)
     , fMenuBar(this)
     , fMenuFile(this)
     , fMenuNavigate(this)
     , fMenuView(this)
     , fLoading(false)
 {
     setupUi(this);
     fListWidget.setSelectionMode(QAbstractItemView::ExtendedSelection);
-    connect(&fListWidget, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(registerListClick(QListWidgetItem *)));
+    connect(&fListWidget, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this,
+            SLOT(updateDrawCommandInfo()));
     connect(&fActionOpen, SIGNAL(triggered()), this, SLOT(openFile()));
     connect(&fActionDirectory, SIGNAL(triggered()), this, SLOT(toggleDirectory()));
     connect(&fDirectoryWidget, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(loadFile(QListWidgetItem *)));
     connect(&fActionDelete, SIGNAL(triggered()), this, SLOT(actionDelete()));
     connect(&fListWidget, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(toggleBreakpoint()));
     connect(&fActionRewind, SIGNAL(triggered()), this, SLOT(actionRewind()));
     connect(&fActionPlay, SIGNAL(triggered()), this, SLOT(actionPlay()));
     connect(&fActionStepBack, SIGNAL(triggered()), this, SLOT(actionStepBack()));
     connect(&fActionStepForward, SIGNAL(triggered()), this, SLOT(actionStepForward()));
     connect(&fActionBreakpoint, SIGNAL(triggered()), this, SLOT(actionBreakpoints()));
@@ skipping 11 matching lines @@
 #endif
     connect(&fSettingsWidget, SIGNAL(rasterSettingsChanged()), this, SLOT(actionRasterSettingsChanged()));
     connect(&fSettingsWidget, SIGNAL(visualizationsChanged()), this, SLOT(actionVisualizationsChanged()));
     connect(&fSettingsWidget, SIGNAL(texFilterSettingsChanged()), this, SLOT(actionTextureFilter()));
     connect(&fActionPause, SIGNAL(toggled(bool)), this, SLOT(pauseDrawing(bool)));
     connect(&fActionCreateBreakpoint, SIGNAL(activated()), this, SLOT(toggleBreakpoint()));
     connect(&fActionShowDeletes, SIGNAL(triggered()), this, SLOT(showDeletes()));
     connect(&fCanvasWidget, SIGNAL(hitChanged(int)), this, SLOT(selectCommand(int)));
     connect(&fCanvasWidget, SIGNAL(hitChanged(int)), this, SLOT(updateHit(int)));
     connect(&fCanvasWidget, SIGNAL(scaleFactorChanged(float)), this, SLOT(actionScale(float)));
-    connect(&fCanvasWidget, SIGNAL(commandChanged(int)), this, SLOT(updateCommand(int)));
-    connect(&fCanvasWidget, SIGNAL(commandChanged(int)), &fDrawCommandGeometryWidget, SLOT(updateImage()));
 
     connect(&fActionSaveAs, SIGNAL(triggered()), this, SLOT(actionSaveAs()));
     connect(&fActionSave, SIGNAL(triggered()), this, SLOT(actionSave()));
 
     fMapper.setMapping(&fActionZoomIn, SkCanvasWidget::kIn_ZoomCommand);
     fMapper.setMapping(&fActionZoomOut, SkCanvasWidget::kOut_ZoomCommand);
 
     connect(&fActionZoomIn, SIGNAL(triggered()), &fMapper, SLOT(map()));
     connect(&fActionZoomOut, SIGNAL(triggered()), &fMapper, SLOT(map()));
     connect(&fMapper, SIGNAL(mapped(int)), &fCanvasWidget, SLOT(zoom(int)));
@@ skipping 284 matching lines @@
     fDirectoryWidgetActive = true;
 }
 
 void SkDebuggerGUI::pauseDrawing(bool isPaused) {
     fPausedRow = fListWidget.currentRow();
     if (!fLoading) {
         fCanvasWidget.drawTo(fPausedRow);
     }
 }
 
-void SkDebuggerGUI::registerListClick(QListWidgetItem *item) {
-    if(!fLoading) {
-        int currentRow = fListWidget.currentRow();
+void SkDebuggerGUI::updateDrawCommandInfo() {
+    int currentRow = -1;
+    if (!fLoading) {
+        currentRow = fListWidget.currentRow();
+    }
+    if (currentRow == -1) {
+        fInspectorWidget.setText("", SkInspectorWidget::kDetail_TabType);
+        fInspectorWidget.setText("", SkInspectorWidget::kClipStack_TabType);
+        fCurrentCommandBox.setText("");
+        fDrawCommandGeometryWidget.setDrawCommandIndex(-1);
+    } else {
+        fInspectorWidget.setDisabled(false);
+        fViewStateFrame.setDisabled(false);
 

[robertphillips, 2015/01/05 19:14:09]

Don't we no longer need this "currentRow != -1" test?

[Kimmo Kinnunen, 2015/01/07 07:33:48]

Done. (Sorry, that was a rebase error, too many patches for my skills :( )

         if (currentRow != -1) {
             if (!this->isPaused()) {
                 fCanvasWidget.drawTo(currentRow);
             }
             const SkTDArray<SkString*> *currInfo = fDebugger.getCommandInfo(currentRow);
 
             /* TODO(chudy): Add command type before parameters. Rename v
              * to something more informative. */
             if (currInfo) {
                 QString info;
                 info.append("<b>Parameters: </b><br/>");
                 for (int i = 0; i < currInfo->count(); i++) {
 
                     info.append(QString((*currInfo)[i]->c_str()));
                     info.append("<br/>");
                 }
                 fInspectorWidget.setText(info, SkInspectorWidget::kDetail_TabType);
                 fInspectorWidget.setDisabled(false);
                 fViewStateFrame.setDisabled(false);
             }
-            setupClipStackText();
+        } else {
+            fInspectorWidget.setText("", SkInspectorWidget::kDetail_TabType);
         }
 
+        SkString clipStack;
+        fDebugger.getClipStackText(&clipStack);
+        fInspectorWidget.setText(clipStack.c_str(), SkInspectorWidget::kClipStack_TabType);
+
+        fCurrentCommandBox.setText(QString::number(currentRow));
+
+        fDrawCommandGeometryWidget.setDrawCommandIndex(currentRow);
     }
 }
 
 void SkDebuggerGUI::selectCommand(int command) {
     if (this->isPaused()) {
         fListWidget.setCurrentRow(command);
     }
 }
 
 void SkDebuggerGUI::toggleBreakpoint() {
@@ skipping 332 matching lines @@
     this->setupOverviewText(NULL, 0.0, 1);
     fInspectorWidget.setDisabled(false);
     fViewStateFrame.setDisabled(false);
     fSettingsWidget.setDisabled(false);
     fMenuEdit.setDisabled(false);
     fMenuNavigate.setDisabled(false);
     fMenuView.setDisabled(false);
     fActionSave.setDisabled(false);
     fActionSaveAs.setDisabled(false);
     fActionPause.setChecked(false);
+    fDrawCommandGeometryWidget.setDrawCommandIndex(-1);
+
     fLoading = false;
     actionPlay();
 }
 
 void SkDebuggerGUI::setupListWidget() {
     fListWidget.clear();
     int counter = 0;
     int indent = 0;
     for (int i = 0; i < fDebugger.getSize(); i++) {
         QListWidgetItem *item = new QListWidgetItem();
@@ skipping 23 matching lines @@
 }
 
 void SkDebuggerGUI::setupOverviewText(const SkTDArray<double>* typeTimes,
                                       double totTime,
                                       int numRuns) {
     SkString overview;
     fDebugger.getOverviewText(typeTimes, totTime, &overview, numRuns);
     fInspectorWidget.setText(overview.c_str(), SkInspectorWidget::kOverview_TabType);
 }
 
-void SkDebuggerGUI::setupClipStackText() {
-    SkString clipStack;
-    fDebugger.getClipStackText(&clipStack);
-    fInspectorWidget.setText(clipStack.c_str(), SkInspectorWidget::kClipStack_TabType);
-}
 
 void SkDebuggerGUI::setupComboBox() {
     fFilter.clear();
     fFilter.addItem("--Filter By Available Commands--");
 
     std::map<std::string, int> map;
     for (int i = 0; i < fDebugger.getSize(); i++) {
         map[fDebugger.getDrawCommandAt(i)->toString().c_str()]++;
     }
 
     for (std::map<std::string, int>::iterator it = map.begin(); it != map.end();
          ++it) {
         fFilter.addItem((it->first).c_str());
     }
 
     // NOTE(chudy): Makes first item unselectable.
     QStandardItemModel* model = qobject_cast<QStandardItemModel*>(
             fFilter.model());
     QModelIndex firstIndex = model->index(0, fFilter.modelColumn(),
             fFilter.rootModelIndex());
     QStandardItem* firstItem = model->itemFromIndex(firstIndex);
     firstItem->setSelectable(false);
 }
 
-void SkDebuggerGUI::updateCommand(int newCommand) {
-    fCurrentCommandBox.setText(QString::number(newCommand));
-}
-
 void SkDebuggerGUI::updateHit(int newHit) {
     fCommandHitBox.setText(QString::number(newHit));
 }