Kill PieChart (#661)

Kill PieChart (Fix #653)

src/Cutter.pro

@@ -129,7 +129,6 @@ SOURCES += \
     widgets/FunctionsWidget.cpp \
     widgets/ImportsWidget.cpp \
     widgets/Omnibar.cpp \
-    widgets/PieView.cpp \
     widgets/RelocsWidget.cpp \
     widgets/SdbDock.cpp \
     widgets/SectionsWidget.cpp \
@@ -221,7 +220,6 @@ HEADERS  += \
     widgets/FunctionsWidget.h \
     widgets/ImportsWidget.h \
     widgets/Omnibar.h \
-    widgets/PieView.h \
     widgets/RelocsWidget.h \
     widgets/SdbDock.h \
     widgets/SectionsWidget.h \
@@ -308,7 +306,6 @@ FORMS    += \
     widgets/ImportsWidget.ui \
     widgets/SdbDock.ui \
     widgets/RelocsWidget.ui \
-    widgets/SectionsWidget.ui \
     widgets/Sidebar.ui \
     widgets/StringsWidget.ui \
     widgets/SymbolsWidget.ui \

src/widgets/PieView.cpp

@@ -1,573 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "Cutter.h"
-#include <math.h>
-#include <QtWidgets>
-#include <QDebug>
-
-#ifndef M_PI
-#define M_PI 3.1415927
-#endif
-
-#include "PieView.h"
-
-PieView::PieView(QWidget *parent)
-    : QAbstractItemView(parent)
-{
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-
-    horizontalScrollBar()->setRange(0, 0);
-    verticalScrollBar()->setRange(0, 0);
-
-    margin = 8;
-    totalSize = 150;
-    pieSize = totalSize - 2 * margin;
-    validItems = 0;
-    totalValue = 0.0;
-    rubberBand = 0;
-}
-
-void PieView::reset()
-{
-    validItems = 0;
-    totalValue = 0.0;
-
-    QAbstractItemView::reset();
-}
-
-void PieView::dataChanged(const QModelIndex &topLeft,
-                          const QModelIndex &bottomRight,
-                          const QVector<int> &)
-{
-    QAbstractItemView::dataChanged(topLeft, bottomRight);
-
-    validItems = 0;
-    totalValue = 0.0;
-
-    for (int row = 0; row < model()->rowCount(rootIndex()); ++row) {
-
-        QModelIndex index = model()->index(row, 1, rootIndex());
-        double value = model()->data(index).toDouble();
-
-        if (value > 0.0) {
-            totalValue += value;
-            validItems++;
-        }
-    }
-    viewport()->update();
-}
-
-bool PieView::edit(const QModelIndex &index, EditTrigger trigger, QEvent *event)
-{
-    if (index.column() == 0)
-        return QAbstractItemView::edit(index, trigger, event);
-    else
-        return false;
-}
-
-/*
-    Returns the item that covers the coordinate given in the view.
-*/
-
-QModelIndex PieView::indexAt(const QPoint &point) const
-{
-    if (validItems == 0)
-        return QModelIndex();
-
-    // Transform the view coordinates into contents widget coordinates.
-    int wx = point.x() + horizontalScrollBar()->value();
-    int wy = point.y() + verticalScrollBar()->value();
-
-    if (wx < totalSize) {
-        double cx = wx - totalSize / 2;
-        double cy = totalSize / 2 - wy; // positive cy for items above the center
-
-        // Determine the distance from the center point of the pie chart.
-        double d = pow(pow(cx, 2) + pow(cy, 2), 0.5);
-
-        if (d == 0 || d > pieSize / 2)
-            return QModelIndex();
-
-        // Determine the angle of the point.
-        double angle = (180 / M_PI) * acos(cx / d);
-        if (cy < 0)
-            angle = 360 - angle;
-
-        // Find the relevant slice of the pie.
-        double startAngle = 0.0;
-
-        for (int row = 0; row < model()->rowCount(rootIndex()); ++row) {
-
-            QModelIndex index = model()->index(row, 1, rootIndex());
-            double value = model()->data(index).toDouble();
-
-            if (value > 0.0) {
-                double sliceAngle = 360 * value / totalValue;
-
-                if (angle >= startAngle && angle < (startAngle + sliceAngle))
-                    return model()->index(row, 1, rootIndex());
-
-                startAngle += sliceAngle;
-            }
-        }
-    } else {
-        double itemHeight = QFontMetrics(viewOptions().font).height();
-        int listItem = int((wy - margin) / itemHeight);
-        int validRow = 0;
-
-        for (int row = 0; row < model()->rowCount(rootIndex()); ++row) {
-
-            QModelIndex index = model()->index(row, 1, rootIndex());
-            if (model()->data(index).toDouble() > 0.0) {
-
-                if (listItem == validRow)
-                    return model()->index(row, 0, rootIndex());
-
-                // Update the list index that corresponds to the next valid row.
-                ++validRow;
-            }
-        }
-    }
-
-    return QModelIndex();
-}
-
-bool PieView::isIndexHidden(const QModelIndex & /*index*/) const
-{
-    return false;
-}
-
-/*
-    Returns the rectangle of the item at position \a index in the
-    model. The rectangle is in contents coordinates.
-*/
-
-QRect PieView::itemRect(const QModelIndex &index) const
-{
-    if (!index.isValid())
-        return QRect();
-
-    // Check whether the index's row is in the list of rows represented
-    // by slices.
-    QModelIndex valueIndex;
-
-    // Avoid scrolling to (removed) legend
-    //if (index.column() != 1)
-    //    valueIndex = model()->index(index.row(), 1, rootIndex());
-    //else
-    valueIndex = index;
-
-    if (model()->data(valueIndex).toDouble() <= 0.0)
-        return QRect();
-
-    int listItem = 0;
-    for (int row = index.row() - 1; row >= 0; --row) {
-        if (model()->data(model()->index(row, 1, rootIndex())).toDouble() > 0.0)
-            listItem++;
-    }
-
-    double itemHeight;
-
-    switch (index.column()) {
-    case 0:
-        itemHeight = QFontMetrics(viewOptions().font).height();
-
-        return QRect(totalSize,
-                     int(margin + listItem * itemHeight),
-                     totalSize - margin, int(itemHeight));
-    case 1:
-        return viewport()->rect();
-    }
-    return QRect();
-}
-
-QRegion PieView::itemRegion(const QModelIndex &index) const
-{
-    if (!index.isValid())
-        return QRegion();
-
-    if (index.column() != 1)
-        return itemRect(index);
-
-    if (model()->data(index).toDouble() <= 0.0)
-        return QRegion();
-
-    double startAngle = 0.0;
-    for (int row = 0; row < model()->rowCount(rootIndex()); ++row) {
-
-        QModelIndex sliceIndex = model()->index(row, 1, rootIndex());
-        double value = model()->data(sliceIndex).toDouble();
-
-        if (value > 0.0) {
-            double angle = 360 * value / totalValue;
-
-            if (sliceIndex == index) {
-                QPainterPath slicePath;
-                slicePath.moveTo(totalSize / 2, totalSize / 2);
-                slicePath.arcTo(margin, margin, margin + pieSize, margin + pieSize,
-                                startAngle, angle);
-                slicePath.closeSubpath();
-
-                return QRegion(slicePath.toFillPolygon().toPolygon());
-            }
-
-            startAngle += angle;
-        }
-    }
-
-    return QRegion();
-}
-
-int PieView::horizontalOffset() const
-{
-    return horizontalScrollBar()->value();
-}
-
-void PieView::mousePressEvent(QMouseEvent *event)
-{
-    QAbstractItemView::mousePressEvent(event);
-    origin = event->pos();
-    if (!rubberBand)
-        rubberBand = new QRubberBand(QRubberBand::Rectangle, viewport());
-    rubberBand->setGeometry(QRect(origin, QSize()));
-    rubberBand->show();
-}
-
-void PieView::mouseMoveEvent(QMouseEvent *event)
-{
-    if (rubberBand)
-        rubberBand->setGeometry(QRect(origin, event->pos()).normalized());
-    QAbstractItemView::mouseMoveEvent(event);
-}
-
-void PieView::mouseReleaseEvent(QMouseEvent *event)
-{
-    QAbstractItemView::mouseReleaseEvent(event);
-    if (rubberBand)
-        rubberBand->hide();
-    viewport()->update();
-}
-
-QModelIndex PieView::moveCursor(QAbstractItemView::CursorAction cursorAction,
-                                Qt::KeyboardModifiers /*modifiers*/)
-{
-    QModelIndex current = currentIndex();
-
-    switch (cursorAction) {
-    case MoveLeft:
-    case MoveUp:
-        if (current.row() > 0)
-            current = model()->index(current.row() - 1, current.column(),
-                                     rootIndex());
-        else
-            current = model()->index(0, current.column(), rootIndex());
-        break;
-    case MoveRight:
-    case MoveDown:
-        if (current.row() < rows(current) - 1)
-            current = model()->index(current.row() + 1, current.column(),
-                                     rootIndex());
-        else
-            current = model()->index(rows(current) - 1, current.column(),
-                                     rootIndex());
-        break;
-    default:
-        break;
-    }
-
-    viewport()->update();
-    return current;
-}
-
-void PieView::paintEvent(QPaintEvent *event)
-{
-    QItemSelectionModel *selections = selectionModel();
-    QStyleOptionViewItem option = viewOptions();
-
-    QBrush background = option.palette.base();
-    //QPen foreground(option.palette.color(QPalette::WindowText));
-    QPen foreground(Qt::white);
-    foreground.setWidth(2);
-
-    QPainter painter(viewport());
-    painter.setRenderHint(QPainter::Antialiasing);
-
-    painter.fillRect(event->rect(), background);
-    painter.setPen(foreground);
-
-    // Viewport rectangles
-    // Meow: Code to be used with graph size change allowed
-    int newSize = getMin(painter.device()->width(), painter.device()->height());
-    pieSize = newSize - 2 * margin;
-    QRect pieRect = QRect(margin, margin, pieSize, pieSize);
-
-    if (validItems <= 0)
-        return;
-
-    painter.save();
-    painter.translate(pieRect.x() - horizontalScrollBar()->value(),
-                      pieRect.y() - verticalScrollBar()->value());
-    painter.drawEllipse(0, 0, pieSize, pieSize);
-    double startAngle = 0.0;
-    int row;
-
-    for (row = 0; row < model()->rowCount(rootIndex()); ++row) {
-        QModelIndex index = model()->index(row, 1, rootIndex());
-        double value = model()->data(index).toDouble();
-
-        if (value > 0.0) {
-            double angle = 360 * value / totalValue;
-
-            QModelIndex colorIndex = model()->index(row, 0, rootIndex());
-            QColor color = QColor(model()->data(colorIndex, Qt::DecorationRole).toString());
-
-            if (currentIndex() == index)
-                painter.setBrush(QBrush(color, Qt::Dense4Pattern));
-            else if (selections->isSelected(index))
-                painter.setBrush(QBrush(color, Qt::Dense3Pattern));
-            else
-                painter.setBrush(QBrush(color));
-
-            painter.drawPie(0, 0, pieSize, pieSize, int(startAngle * 16), int(angle * 16));
-
-            startAngle += angle;
-        }
-    }
-
-    // Draw the donut "hole"
-    //QRect meowRect = QRect(margin + 38, margin + 38, pieSize/2, pieSize/2);
-    painter.setBrush(QBrush(Qt::white));
-    //painter.drawEllipse(meowRect);
-    QPoint p = pieRect.center();
-    QPoint q(margin - 2, margin - 2);
-    painter.setBrush(background);
-    painter.drawEllipse(p -= q, pieSize / 4, pieSize / 4);
-
-    painter.restore();
-}
-
-void PieView::resizeEvent(QResizeEvent * /* event */)
-{
-    updateGeometries();
-}
-
-int PieView::rows(const QModelIndex &index) const
-{
-    return model()->rowCount(model()->parent(index));
-}
-
-void PieView::rowsInserted(const QModelIndex &parent, int start, int end)
-{
-    for (int row = start; row <= end; ++row) {
-        QModelIndex index = model()->index(row, 1, rootIndex());
-        double value = model()->data(index).toDouble();
-
-        if (value > 0.0) {
-            totalValue += value;
-            ++validItems;
-        }
-    }
-
-    QAbstractItemView::rowsInserted(parent, start, end);
-}
-
-void PieView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
-{
-    for (int row = start; row <= end; ++row) {
-        QModelIndex index = model()->index(row, 1, rootIndex());
-        double value = model()->data(index).toDouble();
-        if (value > 0.0) {
-            totalValue -= value;
-            --validItems;
-        }
-    }
-
-    QAbstractItemView::rowsAboutToBeRemoved(parent, start, end);
-}
-
-void PieView::scrollContentsBy(int dx, int dy)
-{
-    viewport()->scroll(dx, dy);
-}
-
-void PieView::scrollTo(const QModelIndex &index, ScrollHint)
-{
-    QRect area = viewport()->rect();
-    QRect rect = visualRect(index);
-
-    if (rect.left() < area.left()) {
-        horizontalScrollBar()->setValue(
-            horizontalScrollBar()->value() + rect.left() - area.left());
-    } else if (rect.right() > area.right()) {
-        horizontalScrollBar()->setValue(
-            horizontalScrollBar()->value() + qMin(
-                rect.right() - area.right(), rect.left() - area.left()));
-    }
-
-    if (rect.top() < area.top()) {
-        verticalScrollBar()->setValue(
-            verticalScrollBar()->value() + rect.top() - area.top());
-    } else if (rect.bottom() > area.bottom()) {
-        verticalScrollBar()->setValue(
-            verticalScrollBar()->value() + qMin(
-                rect.bottom() - area.bottom(), rect.top() - area.top()));
-    }
-
-    update();
-}
-
-/*
-    Find the indices corresponding to the extent of the selection.
-*/
-
-void PieView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command)
-{
-    Q_UNUSED(command);
-
-    // Use content widget coordinates because we will use the itemRegion()
-    // function to check for intersections.
-
-    QRect contentsRect = rect.translated(
-                             horizontalScrollBar()->value(),
-                             verticalScrollBar()->value()).normalized();
-
-    int rows = model()->rowCount(rootIndex());
-    int columns = model()->columnCount(rootIndex());
-    QModelIndexList indexes;
-
-    for (int row = 0; row < rows; ++row) {
-        for (int column = 0; column < columns; ++column) {
-            QModelIndex index = model()->index(row, column, rootIndex());
-            QRegion region = itemRegion(index);
-            if (region.intersects(contentsRect))
-                indexes.append(index);
-        }
-    }
-
-    if (indexes.size() > 0) {
-        int firstRow = indexes[0].row();
-        int lastRow = indexes[0].row();
-        int firstColumn = indexes[0].column();
-        int lastColumn = indexes[0].column();
-
-        for (int i = 1; i < indexes.size(); ++i) {
-            firstRow = qMin(firstRow, indexes[i].row());
-            lastRow = qMax(lastRow, indexes[i].row());
-            firstColumn = qMin(firstColumn, indexes[i].column());
-            lastColumn = qMax(lastColumn, indexes[i].column());
-        }
-
-        QItemSelection selection(
-            model()->index(firstRow, firstColumn, rootIndex()),
-            model()->index(lastRow, lastColumn, rootIndex()));
-        selectionModel()->select(selection,
-                                 QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
-    } else {
-        QModelIndex noIndex;
-        QItemSelection selection(noIndex, noIndex);
-        selectionModel()->select(selection,
-                                 QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
-    }
-
-    update();
-}
-
-void PieView::updateGeometries()
-{
-    // Sets size of the pie widget
-    horizontalScrollBar()->setPageStep(viewport()->width());
-    // Uncomment instead of the one below if legend is shown
-    //horizontalScrollBar()->setRange(0, qMax(0, 2*totalSize - viewport()->width()));
-    horizontalScrollBar()->setRange(0, qMax(0, totalSize - viewport()->width()));
-    //horizontalScrollBar()->setRange(0, qMax(0, viewport()->width()));
-    verticalScrollBar()->setPageStep(viewport()->height());
-    verticalScrollBar()->setRange(0, qMax(0, totalSize - viewport()->height()));
-}
-
-int PieView::verticalOffset() const
-{
-    return verticalScrollBar()->value();
-}
-
-/*
-    Returns the position of the item in viewport coordinates.
-*/
-
-QRect PieView::visualRect(const QModelIndex &index) const
-{
-    QRect rect = itemRect(index);
-    if (!rect.isValid())
-        return rect;
-
-    return QRect(rect.left() - horizontalScrollBar()->value(),
-                 rect.top() - verticalScrollBar()->value(),
-                 rect.width(), rect.height());
-}
-
-/*
-    Returns a region corresponding to the selection in viewport coordinates.
-*/
-
-QRegion PieView::visualRegionForSelection(const QItemSelection &selection) const
-{
-    int ranges = selection.count();
-
-    if (ranges == 0)
-        return QRect();
-
-    QRegion region;
-    for (int i = 0; i < ranges; ++i) {
-        QItemSelectionRange range = selection.at(i);
-        for (int row = range.top(); row <= range.bottom(); ++row) {
-            for (int col = range.left(); col <= range.right(); ++col) {
-                QModelIndex index = model()->index(row, col, rootIndex());
-                region += visualRect(index);
-            }
-        }
-    }
-    return region;
-}
-
-/*Function to find minimum of x and y*/
-int PieView::getMin(int x, int y) const
-{
-    return y ^ ((x ^ y) & -(x < y));
-}

src/widgets/PieView.h

@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef PIEVIEW_H
-#define PIEVIEW_H
-
-#include <QAbstractItemView>
-
-//! [0]
-class PieView : public QAbstractItemView
-{
-    Q_OBJECT
-
-public:
-    explicit PieView(QWidget *parent = nullptr);
-
-    QRect visualRect(const QModelIndex &index) const override;
-    void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override;
-    QModelIndex indexAt(const QPoint &point) const override;
-
-public slots:
-    void reset() override;
-
-protected slots:
-    void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
-                     const QVector<int> &roles = QVector<int>()) override;
-    void rowsInserted(const QModelIndex &parent, int start, int end) override;
-    void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) override;
-
-protected:
-    bool edit(const QModelIndex &index, EditTrigger trigger, QEvent *event) override;
-    QModelIndex moveCursor(QAbstractItemView::CursorAction cursorAction,
-                           Qt::KeyboardModifiers modifiers) override;
-
-    int horizontalOffset() const override;
-    int verticalOffset() const override;
-
-    bool isIndexHidden(const QModelIndex &index) const override;
-
-    void setSelection(const QRect &, QItemSelectionModel::SelectionFlags command) override;
-
-    void mousePressEvent(QMouseEvent *event) override;
-
-    void mouseMoveEvent(QMouseEvent *event) override;
-    void mouseReleaseEvent(QMouseEvent *event) override;
-
-    void paintEvent(QPaintEvent *event) override;
-    void resizeEvent(QResizeEvent *event) override;
-    void scrollContentsBy(int dx, int dy) override;
-
-    QRegion visualRegionForSelection(const QItemSelection &selection) const override;
-
-private:
-    QRect itemRect(const QModelIndex &index) const;
-    QRegion itemRegion(const QModelIndex &index) const;
-    int rows(const QModelIndex &index = QModelIndex()) const;
-    void updateGeometries() override;
-    int getMin(int x, int y) const;
-
-    int margin;
-    int totalSize;
-    int pieSize;
-    int validItems;
-    double totalValue;
-    QPoint origin;
-    QRubberBand *rubberBand;
-};
-//! [0]
-
-#endif // PIEVIEW_H

src/widgets/SectionsWidget.cpp

@@ -1,11 +1,6 @@
-#include <QMenu>
-#include <QSplitter>
 #include <QTreeView>
-#include <QResizeEvent>
 
 #include "SectionsWidget.h"
-#include "ui_SectionsWidget.h"
-#include "PieView.h"
 
 #include "MainWindow.h"
 #include "utils/Helpers.h"
@@ -105,8 +100,6 @@ void SectionsModel::beginReloadSections()
 void SectionsModel::endReloadSections()
 {
     endResetModel();
-    // Update PieChart
-    emit dataChanged(QModelIndex(), QModelIndex());
 }
 
 SectionsProxyModel::SectionsProxyModel(SectionsModel *sourceModel, QObject *parent)
@@ -115,16 +108,6 @@ SectionsProxyModel::SectionsProxyModel(SectionsModel *sourceModel, QObject *pare
     setSourceModel(sourceModel);
     setFilterCaseSensitivity(Qt::CaseInsensitive);
     setSortCaseSensitivity(Qt::CaseInsensitive);
-    connect(sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)),
-            this, SLOT(onSourceModelDataChanged(QModelIndex,QModelIndex,QVector<int>)));
-}
-
-void SectionsProxyModel::onSourceModelDataChanged(const QModelIndex &topLeft,
-                                                  const QModelIndex &bottomRight,
-                                                  const QVector<int> &roles)
-{
-    // Pass the signal further to update PieChart
-    emit dataChanged(topLeft, bottomRight, roles);
 }
 
 bool SectionsProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
@@ -152,59 +135,32 @@ bool SectionsProxyModel::lessThan(const QModelIndex &left, const QModelIndex &ri
 
 SectionsWidget::SectionsWidget(MainWindow *main, QAction *action) :
     CutterDockWidget(main, action),
-    ui(new Ui::SectionsWidget),
     main(main)
 {
-    ui->setupUi(this);
+    setWindowTitle(QStringLiteral("Sections"));
 
+    sectionsTable = new QTreeView;
     sectionsModel = new SectionsModel(&sections, this);
-    sectionsProxyModel = new SectionsProxyModel(sectionsModel, this);
+    auto proxyModel = new SectionsProxyModel(sectionsModel, this);
 
-    setupViews();
+    sectionsTable->setModel(proxyModel);
+
+    sectionsTable->setIndentation(10);
+    sectionsTable->setSortingEnabled(true);
+    sectionsTable->sortByColumn(SectionsModel::NameColumn, Qt::AscendingOrder);
+
+    connect(sectionsTable, SIGNAL(doubleClicked(const QModelIndex &)),
+            this, SLOT(onSectionsDoubleClicked(const QModelIndex &)));
+
+    setWidget(sectionsTable);
 
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 
-    setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(this, SIGNAL(customContextMenuRequested(const QPoint &)),
-            this, SLOT(showSectionsContextMenu(const QPoint &)));
-
     connect(Core(), SIGNAL(refreshAll()), this, SLOT(refreshSections()));
 }
 
 SectionsWidget::~SectionsWidget() {}
 
-void SectionsWidget::resizeEvent(QResizeEvent *event)
-{
-    if (main->responsive && isVisible()) {
-        if (event->size().width() >= event->size().height()) {
-            on_actionHorizontal_triggered();
-        } else {
-            on_actionVertical_triggered();
-        }
-    }
-    QWidget::resizeEvent(event);
-}
-
-void SectionsWidget::showSectionsContextMenu(const QPoint &pt)
-{
-    // Set functions popup menu
-    QMenu *menu = new QMenu(this);
-    menu->clear();
-    menu->addAction(ui->actionHorizontal);
-    menu->addAction(ui->actionVertical);
-
-    if (splitter->orientation() == 1) {
-        ui->actionHorizontal->setChecked(true);
-        ui->actionVertical->setChecked(false);
-    } else {
-        ui->actionVertical->setChecked(true);
-        ui->actionHorizontal->setChecked(false);
-    }
-
-    menu->exec(mapToGlobal(pt));
-    delete menu;
-}
-
 void SectionsWidget::refreshSections()
 {
     sectionsModel->beginReloadSections();
@@ -214,37 +170,6 @@ void SectionsWidget::refreshSections()
     qhelpers::adjustColumns(sectionsTable, SectionsModel::ColumnCount, 0);
 }
 
-void SectionsWidget::setupViews()
-{
-    splitter = new QSplitter;
-    sectionsTable = new QTreeView;
-    sectionsPieChart = new PieView;
-
-    splitter->addWidget(sectionsTable);
-    splitter->addWidget(sectionsPieChart);
-    //splitter->setStretchFactor(0, 4);
-
-    sectionsTable->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    sectionsTable->setIndentation(10);
-    sectionsTable->setFrameShape(QFrame::NoFrame);
-    sectionsTable->setSortingEnabled(true);
-    sectionsTable->sortByColumn(SectionsModel::NameColumn, Qt::AscendingOrder);
-    connect(sectionsTable, SIGNAL(doubleClicked(const QModelIndex &)),
-            this, SLOT(onSectionsDoubleClicked(const QModelIndex &)));
-
-    sectionsPieChart->setFrameShape(QFrame::NoFrame);
-    sectionsPieChart->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-
-    sectionsTable->setModel(sectionsProxyModel);
-    sectionsPieChart->setModel(sectionsProxyModel);
-
-    QItemSelectionModel *selectionModel = new QItemSelectionModel(sectionsProxyModel);
-    sectionsTable->setSelectionModel(selectionModel);
-    sectionsPieChart->setSelectionModel(selectionModel);
-
-    setWidget(splitter);
-}
-
 void SectionsWidget::onSectionsDoubleClicked(const QModelIndex &index)
 {
     if (!index.isValid())
@@ -253,13 +178,3 @@ void SectionsWidget::onSectionsDoubleClicked(const QModelIndex &index)
     auto section = index.data(SectionsModel::SectionDescriptionRole).value<SectionDescription>();
     Core()->seek(section.vaddr);
 }
-
-void SectionsWidget::on_actionVertical_triggered()
-{
-    splitter->setOrientation(Qt::Vertical);
-}
-
-void SectionsWidget::on_actionHorizontal_triggered()
-{
-    splitter->setOrientation(Qt::Horizontal);
-}

src/widgets/SectionsWidget.h

@@ -9,16 +9,10 @@
 #include "Cutter.h"
 #include "CutterDockWidget.h"
 
-class QSplitter;
 class QTreeView;
 class QAbstractItemView;
-class QResizeEvent;
 class MainWindow;
 
-namespace Ui {
-class SectionsWidget;
-}
-
 class SectionsModel : public QAbstractListModel
 {
     Q_OBJECT
@@ -49,10 +43,6 @@ class SectionsProxyModel : public QSortFilterProxyModel
 public:
     SectionsProxyModel(SectionsModel *sourceModel, QObject *parent = nullptr);
 
-private slots:
-    void onSourceModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight,
-                                  const QVector<int>& roles);
-
 protected:
     bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
 };
@@ -65,28 +55,15 @@ public:
     explicit SectionsWidget(MainWindow *main, QAction *action = nullptr);
     ~SectionsWidget();
 
-protected:
-    void resizeEvent(QResizeEvent *event) override;
-
 private slots:
     void refreshSections();
-    void showSectionsContextMenu(const QPoint &pt);
-    void on_actionVertical_triggered();
-    void on_actionHorizontal_triggered();
     void onSectionsDoubleClicked(const QModelIndex &index);
 
 private:
-    std::unique_ptr<Ui::SectionsWidget> ui;
-
     QList<SectionDescription> sections;
     SectionsModel *sectionsModel;
-    SectionsProxyModel *sectionsProxyModel;
-    QSplitter *splitter;
     QTreeView *sectionsTable;
-    QAbstractItemView *sectionsPieChart;
     MainWindow *main;
-
-    void setupViews();
 };
 
 #endif // SECTIONSWIDGET_H

src/widgets/SectionsWidget.ui

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SectionsWidget</class>
- <widget class="QDockWidget" name="SectionsWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Sections</string>
-  </property>
-  <action name="actionVertical">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Vertical</string>
-   </property>
-  </action>
-  <action name="actionHorizontal">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Horizontal</string>
-   </property>
-  </action>
- </widget>
- <resources/>
- <connections/>
-</ui>