Debugger improvements

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 "SkGraphics.h"
@@ skipping 16 matching lines @@
 #endif
 
 
 SkDebuggerGUI::SkDebuggerGUI(QWidget *parent) :
         QMainWindow(parent)
     , fCentralSplitter(this)
     , fStatusBar(this)
     , fToolBar(this)
     , fActionOpen(this)
     , fActionBreakpoint(this)
+    , fActionToggleIndexStyle(this)
     , fActionProfile(this)
     , fActionCancel(this)
     , fActionClearBreakpoints(this)
     , fActionClearDeletes(this)
     , fActionClose(this)
     , fActionCreateBreakpoint(this)
     , fActionDelete(this)
     , fActionDirectory(this)
     , fActionGoToLine(this)
     , fActionInspector(this)
@@ skipping 11 matching lines @@
     , fMapper(this)
     , fListWidget(&fCentralSplitter)
     , fDirectoryWidget(&fCentralSplitter)
     , fCanvasWidget(this, &fDebugger)
     , fImageWidget(&fDebugger)
     , fMenuBar(this)
     , fMenuFile(this)
     , fMenuNavigate(this)
     , fMenuView(this)
     , fBreakpointsActivated(false)
+    , fIndexStyleToggle(false)
     , fDeletesActivated(false)
     , fPause(false)
     , fLoading(false)
 {
     setupUi(this);
     fListWidget.setSelectionMode(QAbstractItemView::ExtendedSelection);
     connect(&fListWidget, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(registerListClick(QListWidgetItem *)));
     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()));
+    connect(&fActionToggleIndexStyle, SIGNAL(triggered()), this, SLOT(actionToggleIndexStyle()));
     connect(&fActionInspector, SIGNAL(triggered()), this, SLOT(actionInspector()));
     connect(&fActionSettings, SIGNAL(triggered()), this, SLOT(actionSettings()));
     connect(&fFilter, SIGNAL(activated(QString)), this, SLOT(toggleFilter(QString)));
     connect(&fActionProfile, SIGNAL(triggered()), this, SLOT(actionProfile()));
     connect(&fActionCancel, SIGNAL(triggered()), this, SLOT(actionCancel()));
     connect(&fActionClearBreakpoints, SIGNAL(triggered()), this, SLOT(actionClearBreakpoints()));
     connect(&fActionClearDeletes, SIGNAL(triggered()), this, SLOT(actionClearDeletes()));
     connect(&fActionClose, SIGNAL(triggered()), this, SLOT(actionClose()));
     connect(&fSettingsWidget, SIGNAL(visibilityFilterChanged()), this, SLOT(actionCommandFilter()));
 #if SK_SUPPORT_GPU
@@ skipping 33 matching lines @@
 }
 
 void SkDebuggerGUI::actionBreakpoints() {
     fBreakpointsActivated = !fBreakpointsActivated;
     for (int row = 0; row < fListWidget.count(); row++) {
         QListWidgetItem *item = fListWidget.item(row);
         item->setHidden(item->checkState() == Qt::Unchecked && fBreakpointsActivated);
     }
 }
 
+void SkDebuggerGUI::actionToggleIndexStyle() {
+    fIndexStyleToggle = !fIndexStyleToggle;
+    SkListWidget* list = (SkListWidget*) fListWidget.itemDelegate();
+    list->setIndexStyle(fIndexStyleToggle ? SkListWidget::kIndex_IndexStyle : 
+                                            SkListWidget::kOffset_IndexStyle);
+    fListWidget.update();
+}
+
 void SkDebuggerGUI::showDeletes() {
     fDeletesActivated = !fDeletesActivated;
     for (int row = 0; row < fListWidget.count(); row++) {
         QListWidgetItem *item = fListWidget.item(row);
-        item->setHidden(fDebugger.isCommandVisible(row)
-                && fDeletesActivated);
+        item->setHidden(fDebugger.isCommandVisible(row) && fDeletesActivated);
     }
 }
 
 // The timed picture playback uses the SkPicturePlayback's profiling stubs
 // to time individual commands. The offsets are needed to map SkPicture
 // offsets to individual commands.
 class SkTimedPicturePlayback : public SkPicturePlayback {
 public:
     static SkTimedPicturePlayback* CreateFromStream(SkStream* stream, const SkPictInfo& info,
                                                     SkPicture::InstallPixelRefProc proc,
@@ skipping 548 matching lines @@
     fActionOpen.setShortcuts(QKeySequence::Open);
     fActionOpen.setText("Open");
 
     QIcon breakpoint;
     breakpoint.addFile(QString::fromUtf8(":/breakpoint.png"),
             QSize(), QIcon::Normal, QIcon::Off);
     fActionBreakpoint.setShortcut(QKeySequence(tr("Ctrl+B")));
     fActionBreakpoint.setIcon(breakpoint);
     fActionBreakpoint.setText("Breakpoints");
 
+    fActionToggleIndexStyle.setShortcut(QKeySequence(tr("Ctrl+T")));
+    fActionToggleIndexStyle.setText("Toggle Index Style");
+
     QIcon cancel;
     cancel.addFile(QString::fromUtf8(":/reload.png"), QSize(),
             QIcon::Normal, QIcon::Off);
     fActionCancel.setIcon(cancel);
     fActionCancel.setText("Clear Filter");
 
     fActionClearBreakpoints.setShortcut(QKeySequence(tr("Alt+B")));
     fActionClearBreakpoints.setText("Clear Breakpoints");
 
     fActionClearDeletes.setShortcut(QKeySequence(tr("Alt+X")));
@@ skipping 177 matching lines @@
     fMenuNavigate.addAction(&fActionRewind);
     fMenuNavigate.addAction(&fActionStepBack);
     fMenuNavigate.addAction(&fActionStepForward);
     fMenuNavigate.addAction(&fActionPlay);
     fMenuNavigate.addAction(&fActionPause);
     fMenuNavigate.addAction(&fActionGoToLine);
 
     fMenuView.setTitle("View");
     fMenuView.addAction(&fActionBreakpoint);
     fMenuView.addAction(&fActionShowDeletes);
+    fMenuView.addAction(&fActionToggleIndexStyle);
     fMenuView.addAction(&fActionZoomIn);
     fMenuView.addAction(&fActionZoomOut);
 
     fMenuWindows.setTitle("Window");
     fMenuWindows.addAction(&fActionInspector);
     fMenuWindows.addAction(&fActionSettings);
     fMenuWindows.addAction(&fActionDirectory);
 
     fActionGoToLine.setText("Go to Line...");
     fActionGoToLine.setDisabled(true);
@@ skipping 40 matching lines @@
     fSkipCommands.setCount(fDebugger.getSize());
     for (int i = 0; i < fSkipCommands.count(); ++i) {
         fSkipCommands[i] = false;
     }
 
     SkSafeUnref(stream);
     SkSafeUnref(picture);
 
     // Will this automatically clear out due to nature of refcnt?
     SkTArray<SkString>* commands = fDebugger.getDrawCommandsAsStrings();
+    SkTDArray<size_t>* offsets = fDebugger.getDrawCommandOffsets();
+    SkASSERT(commands->count() == offsets->count());
 
     fActionProfile.setDisabled(false);
 
     /* fDebugCanvas is reinitialized every load picture. Need it to retain value
      * of the visibility filter.
      * TODO(chudy): This should be deprecated since fDebugger is not
      * recreated.
      * */
     fDebugger.highlightCurrentCommand(fSettingsWidget.getVisibilityFilter());
 
-    setupListWidget(commands);
-    setupComboBox(commands);
-    setupOverviewText(NULL, 0.0, 1);
+    this->setupListWidget(commands, offsets);
+    this->setupComboBox(commands);
+    this->setupOverviewText(NULL, 0.0, 1);
     fInspectorWidget.setDisabled(false);
     fSettingsWidget.setDisabled(false);
     fMenuEdit.setDisabled(false);
     fMenuNavigate.setDisabled(false);
     fMenuView.setDisabled(false);
     fActionSave.setDisabled(false);
     fActionSaveAs.setDisabled(false);
     fLoading = false;
     actionPlay();
 }
 
-void SkDebuggerGUI::setupListWidget(SkTArray<SkString>* command) {
+void SkDebuggerGUI::setupListWidget(SkTArray<SkString>* commands, SkTDArray<size_t>* offsets) {
+    SkASSERT(commands->count() == offsets->count());
     fListWidget.clear();
     int counter = 0;
     int indent = 0;
-    for (int i = 0; i < command->count(); i++) {
+    for (int i = 0; i < commands->count(); i++) {
         QListWidgetItem *item = new QListWidgetItem();
-        item->setData(Qt::DisplayRole, (*command)[i].c_str());
+        item->setData(Qt::DisplayRole, (*commands)[i].c_str());
         item->setData(Qt::UserRole + 1, counter++);
 
-        if (0 == strcmp("Restore", (*command)[i].c_str()) ||
-            0 == strcmp("EndCommentGroup", (*command)[i].c_str()) ||
-            0 == strcmp("PopCull", (*command)[i].c_str())) {
+        if (0 == strcmp("Restore", (*commands)[i].c_str()) ||
+            0 == strcmp("EndCommentGroup", (*commands)[i].c_str()) ||
+            0 == strcmp("PopCull", (*commands)[i].c_str())) {
             indent -= 10;
         }
 
         item->setData(Qt::UserRole + 3, indent);
 
-        if (0 == strcmp("Save", (*command)[i].c_str()) ||
-            0 == strcmp("Save Layer", (*command)[i].c_str()) ||
-            0 == strcmp("BeginCommentGroup", (*command)[i].c_str()) ||
-            0 == strcmp("PushCull", (*command)[i].c_str())) {
+        if (0 == strcmp("Save", (*commands)[i].c_str()) ||
+            0 == strcmp("Save Layer", (*commands)[i].c_str()) ||
+            0 == strcmp("BeginCommentGroup", (*commands)[i].c_str()) ||
+            0 == strcmp("PushCull", (*commands)[i].c_str())) {
             indent += 10;
         }
 
-        item->setData(Qt::UserRole + 4, -1.0);
+        item->setData(Qt::UserRole + 4, -1);
+        item->setData(Qt::UserRole + 5, (int)(*offsets)[i]);
 
         fListWidget.addItem(item);
     }
 }
 
 void SkDebuggerGUI::setupOverviewText(const SkTDArray<double>* typeTimes,
                                       double totTime,
                                       int numRuns) {
     SkString overview;
     fDebugger.getOverviewText(typeTimes, totTime, &overview, numRuns);
@@ skipping 15 matching lines @@
     }
 
     // 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);
 }