debugger: Make draw command image widget resize

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 43 matching lines @@
     , fActionSaveAs(this)
     , fActionShowDeletes(this)
     , fActionStepBack(this)
     , fActionStepForward(this)
     , fActionZoomIn(this)
     , fActionZoomOut(this)
     , fMapper(this)
     , fListWidget(&fCentralSplitter)
     , fDirectoryWidget(&fCentralSplitter)
     , fCanvasWidget(this, &fDebugger)
-    , fImageWidget(&fDebugger)
+    , fDrawGeometryWidget(&fDebugger)
     , fMenuBar(this)
     , fMenuFile(this)
     , fMenuNavigate(this)
     , fMenuView(this)
     , fBreakpointsActivated(false)
     , fIndexStyleToggle(false)
     , fDeletesActivated(false)
     , fPause(false)
     , fLoading(false)
 {
@@ skipping 25 matching lines @@
     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)), &fDrawGeometryWidget, 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 105 matching lines @@
 
 void SkDebuggerGUI::actionClearDeletes() {
     for (int row = 0; row < fListWidget.count(); row++) {
         QListWidgetItem* item = fListWidget.item(row);
         item->setData(Qt::UserRole + 2, QPixmap(":/blank.png"));
         fDebugger.setCommandVisible(row, true);
         fSkipCommands[row] = false;
     }
     if (fPause) {
         fCanvasWidget.drawTo(fPausedRow);
-        fImageWidget.draw();
     } else {
         fCanvasWidget.drawTo(fListWidget.currentRow());
-        fImageWidget.draw();
     }
 }
 
 void SkDebuggerGUI::actionClose() {
     this->close();
 }
 
 void SkDebuggerGUI::actionDelete() {
 
     for (int row = 0; row < fListWidget.count(); ++row) {
@@ skipping 11 matching lines @@
             item->setData(Qt::UserRole + 2, QPixmap(":/blank.png"));
             fDebugger.setCommandVisible(row, true);
             fSkipCommands[row] = false;
         }
     }
 
     int currentRow = fListWidget.currentRow();
 
     if (fPause) {
         fCanvasWidget.drawTo(fPausedRow);
-        fImageWidget.draw();
     } else {
         fCanvasWidget.drawTo(currentRow);
-        fImageWidget.draw();
     }
 }
 
 #if SK_SUPPORT_GPU
 void SkDebuggerGUI::actionGLSettingsChanged() {
     bool isToggled = fSettingsWidget.isGLActive();
     if (isToggled) {
         fCanvasWidget.setGLSampleCount(fSettingsWidget.getGLSampleCount());
     }
     fCanvasWidget.setWidgetVisibility(SkCanvasWidget::kGPU_WidgetType, !isToggled);
 }
 #endif
 
 void SkDebuggerGUI::actionInspector() {
     bool newState = !fInspectorWidget.isHidden();
 
     fInspectorWidget.setHidden(newState);
     fViewStateFrame.setHidden(newState);
-    fImageWidget.setHidden(newState);
+    fDrawGeometryWidget.setHidden(newState);
 }
 
 void SkDebuggerGUI::actionPlay() {
     for (int row = fListWidget.currentRow() + 1; row < fListWidget.count();
             row++) {
         QListWidgetItem *item = fListWidget.item(row);
         if (item->checkState() == Qt::Checked) {
             fListWidget.setCurrentItem(item);
             return;
         }
     }
     fListWidget.setCurrentRow(fListWidget.count() - 1);
 }
 
 void SkDebuggerGUI::actionRasterSettingsChanged() {
     fCanvasWidget.setWidgetVisibility(SkCanvasWidget::kRaster_8888_WidgetType, !fSettingsWidget.isRasterEnabled());
     fDebugger.setOverdrawViz(fSettingsWidget.isOverdrawVizEnabled());
     fCanvasWidget.update();
 }
 
 void SkDebuggerGUI::actionVisualizationsChanged() {
     fDebugger.setMegaViz(fSettingsWidget.isMegaVizEnabled());
     fDebugger.setPathOps(fSettingsWidget.isPathOpsEnabled());
     fDebugger.highlightCurrentCommand(fSettingsWidget.isVisibilityFilterEnabled());
     fCanvasWidget.drawTo(fListWidget.currentRow());
-    fImageWidget.draw();
 }
 
 void SkDebuggerGUI::actionTextureFilter() {
     SkPaint::FilterLevel level;
     bool enabled = fSettingsWidget.getFilterOverride(&level);
     fDebugger.setTexFilterOverride(enabled, level);
     fCanvasWidget.update();
 }
 
 void SkDebuggerGUI::actionRewind() {
@@ skipping 81 matching lines @@
         loadPicture(SkString(filename.toAscii().data()));
         setupDirectoryWidget(pathInfo.path());
     }
     fDirectoryWidgetActive = true;
 }
 
 void SkDebuggerGUI::pauseDrawing(bool isPaused) {
     fPause = isPaused;
     fPausedRow = fListWidget.currentRow();
     fCanvasWidget.drawTo(fPausedRow);
-    fImageWidget.draw();
 }
 
 void SkDebuggerGUI::registerListClick(QListWidgetItem *item) {
     if(!fLoading) {
         int currentRow = fListWidget.currentRow();
 
         if (currentRow != -1) {
             if (!fPause) {
                 fCanvasWidget.drawTo(currentRow);
-                fImageWidget.draw();
             }
             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++) {
 
@@ skipping 162 matching lines @@
     fListWidget.setObjectName(QString::fromUtf8("listWidget"));
     fListWidget.setMinimumWidth(250);
 
     fFilter.addItem("--Filter By Available Commands--");
 
     fDirectoryWidget.setMinimumWidth(250);
     fDirectoryWidget.setStyleSheet("QListWidget::Item {padding: 5px;}");
 
     fCanvasWidget.setSizePolicy(QSizePolicy::Expanding,
             QSizePolicy::Expanding);
 

[robertphillips, 2014/12/30 17:35:33]

one line ?

[Kimmo Kinnunen, 2014/12/31 06:43:29]

Done.

-    fImageWidget.setFixedSize(SkImageWidget::kImageWidgetWidth,
-                              SkImageWidget::kImageWidgetHeight);
+    fDrawGeometryWidget.setSizePolicy(QSizePolicy::Expanding,
+            QSizePolicy::Expanding);
 
     fInspectorWidget.setSizePolicy(QSizePolicy::Expanding,
             QSizePolicy::Expanding);
     fInspectorWidget.setMaximumHeight(300);
 
     fSettingsAndImageLayout.addWidget(&fSettingsWidget);
 
     // View state group, part of inspector.
     fViewStateFrame.setFrameStyle(QFrame::Panel);
     fViewStateFrame.setLayout(&fViewStateFrameLayout);
@@ skipping 13 matching lines @@
     fCommandHitBox.setReadOnly(true);
     fViewStateLayout.addRow("Zoom Level", &fZoomBox);
     fZoomBox.setText("100%");
     fZoomBox.setMinimumSize(QSize(50,25));
     fZoomBox.setMaximumSize(QSize(50,25));
     fZoomBox.setAlignment(Qt::AlignRight);
     fZoomBox.setReadOnly(true);
     fViewStateGroup.setLayout(&fViewStateLayout);
     fSettingsAndImageLayout.addWidget(&fViewStateFrame);
 
-    fSettingsAndImageLayout.addWidget(&fImageWidget);
+    fDrawGeometryGroup.setTitle("Draw Geometry");
+    fDrawGeometryGroupLayout.addWidget(&fDrawGeometryWidget);
+    fDrawGeometryGroup.setLayout(&fDrawGeometryGroupLayout);
+    fSettingsAndImageLayout.addWidget(&fDrawGeometryGroup);
 
     fLeftColumnSplitter.addWidget(&fListWidget);
     fLeftColumnSplitter.addWidget(&fDirectoryWidget);
     fLeftColumnSplitter.setOrientation(Qt::Vertical);
 
     fCanvasSettingsAndImageLayout.setSpacing(6);
     fCanvasSettingsAndImageLayout.addWidget(&fCanvasWidget, 1);
     fCanvasSettingsAndImageLayout.addLayout(&fSettingsAndImageLayout, 0);
 
     fMainAndRightColumnLayout.setSpacing(6);
@@ skipping 218 matching lines @@
 }
 
 void SkDebuggerGUI::updateCommand(int newCommand) {
     fCurrentCommandBox.setText(QString::number(newCommand));
 }
 
 void SkDebuggerGUI::updateHit(int newHit) {
     fCommandHitBox.setText(QString::number(newHit));
 }