Finished Marker implementation

Author: pinebit

dock/markerwidget.cpp

@@ -22,12 +22,13 @@ MarkerWidget::MarkerWidget(QWidget *parent)
     vlayout->addSpacing(8);
 
     // undo button
-    QPushButton* undoButton = new QPushButton(tr("Undo"));
-    undoButton->setIcon(AwesomeService::awesome()->icon(fa::undo));
-    undoButton->setMaximumWidth(100);
-    connect(undoButton, &QPushButton::clicked, this, &MarkerWidget::signalUndo);
+    _undoButton = new QPushButton(tr("Undo"));
+    _undoButton->setIcon(AwesomeService::awesome()->icon(fa::undo));
+    _undoButton->setMaximumWidth(100);
+    _undoButton->setEnabled(false);
+    connect(_undoButton, &QPushButton::clicked, this, &MarkerWidget::signalUndo);
 
-    vlayout->addWidget(undoButton);
+    vlayout->addWidget(_undoButton);
     vlayout->addSpacing(8);
 
     // marker shape
@@ -74,6 +75,11 @@ MarkerWidget::MarkerWidget(QWidget *parent)
     vlayout->addStretch();
 }
 
+void MarkerWidget::setUndoEnabled(bool enabled)
+{
+    _undoButton->setEnabled(enabled);
+}
+
 void MarkerWidget::slotColorButtonToggled(QColor color)
 {
     QToolButton* button = static_cast<QToolButton*>(sender());

dock/markerwidget.h

@@ -5,6 +5,7 @@
 
 class ColorActionWidget;
 class QToolButton;
+class QPushButton;
 
 
 class MarkerWidget : public QWidget
@@ -29,6 +30,8 @@ class MarkerWidget : public QWidget
         return _currentShape;
     }
 
+    void setUndoEnabled(bool enabled);
+
 signals:
     void signalUndo();
     void signalMarkerChanged();
@@ -41,6 +44,7 @@ private slots:
     QToolButton* createColorSwitch(const QColor& color);
 
     QList<QToolButton*> _colorButtons;
+    QPushButton* _undoButton;
     QColor _currentColor;
     MarkerShape _currentShape;
 };

mainwindow.cpp

@@ -86,7 +86,7 @@ void MainWindow::slotActionPaste()
 void MainWindow::slotActionCopy()
 {
     QClipboard *clipboard = QApplication::clipboard();
-    clipboard->setImage(_currentImage);
+    clipboard->setImage(_rsview->renderToPixmap().toImage());
 
     _statusbar->showMessage(tr("Copied to the clipboard."));
 }
@@ -140,6 +140,12 @@ void MainWindow::slotSelectionFinished()
     if (_state == ColorState) {
         _colorsWidget->setSelectedColor();
     }
+    else if (_state == MarkerState) {
+        _markers.push(_rsview->selectionDrawing());
+        _markerWidget->setUndoEnabled(true);
+        _rsview->clearSelection();
+        _rsview->setCustomSelectionDrawings(_markers.toList());
+    }
 
     slotSelectionChanged();
 }
@@ -154,13 +160,20 @@ void MainWindow::slotMouseMove(const QPoint &pos)
 
 void MainWindow::slotMarkerUndo()
 {
-    // TODO: implement me
-    qWarning() << "MainWindow::slotMarkerUndo()";
+    if (_markers.size() > 0) {
+        _markers.pop();
+        _rsview->setCustomSelectionDrawings(_markers.toList());
+    }
+
+    if (_markers.size() == 0) {
+        _markerWidget->setUndoEnabled(false);
+    }
 }
 
 void MainWindow::slotMarkerChanged()
 {
     _rsview->setSelectionAccentPainter(createMarkerAccentPainter());
+    _rsview->setCustomSelectionDrawings(_markers.toList());
 }
 
 void MainWindow::slotBuildCompleted(QSharedPointer<CvModel> model)
@@ -207,7 +220,7 @@ QSharedPointer<AccentPainter> MainWindow::createMarkerAccentPainter()
 bool MainWindow::saveImage(const QString &fileName)
 {
     QImageWriter writer(fileName);
-    if (!writer.write(_currentImage)) {
+    if (!writer.write(_rsview->renderToPixmap().toImage())) {
         QMessageBox::information(this, QGuiApplication::applicationDisplayName(),
                                  tr("Cannot save %1: %2")
                                  .arg(QDir::toNativeSeparators(fileName)), writer.errorString());
@@ -278,25 +291,18 @@ void MainWindow::updateImage(const QImage& image)
         _currentImage = image;
     }
 
+    _markers.clear();
+    _markerWidget->setUndoEnabled(false);
+    _colorsWidget->clearColors();
+
     _rsview->setImage(_currentImage);
     _modelBuilder->buildAsync(_currentImage, CvModelBuilderOptions());
 }
 
 void MainWindow::updateImage(const QRect& selection)
 {
-    setCursor(Qt::WaitCursor);
-
     QImage image = _currentImage.copy(selection);
-    if (image.format() != QImage::Format_RGBA8888) {
-        _currentImage = image.convertToFormat(QImage::Format_RGBA8888);
-    } else {
-        _currentImage = image;
-    }
-
-    _rsview->setImage(_currentImage);
-
-    _colorsWidget->clearColors();
-    _modelBuilder->buildAsync(_currentImage, CvModelBuilderOptions());
+    updateImage(image);
 }
 
 void MainWindow::setupUi()

mainwindow.h

@@ -8,6 +8,8 @@
 #include <QScrollArea>
 #include <QDockWidget>
 #include <QLabel>
+#include <QStack>
+#include <QPainterPath>
 
 class QtAwesome;
 class RsView;
@@ -74,6 +76,7 @@ private slots:
     CvModelBuilder* _modelBuilder;
     QSharedPointer<CvModel> _model;
     State _state;
+    QStack<QPainterPath> _markers;
 
     QtAwesome* _awesome;
     RsView* _rsview;

params.cpp

@@ -5,5 +5,5 @@ int    Params::ShadeAlpha = 150;
 QColor Params::SelectionAccentColor = Qt::red;
 int    Params::MarkerFrameWidth = 3;
 int    Params::MarkerAlpha = 100;
-int    Params::MarkerRoundCornerSize = 8;
+int    Params::MarkerRoundCornerSize = 4;
 int    Params::SelectionMarginSize = 8;

rsview.cpp

@@ -16,8 +16,8 @@
 RsView::RsView(QWidget *parent)
     : QWidget(parent)
     , _userSelection(new UserSelection(this))
-    , _selector(0)
     , _addMargins(true)
+    , _selector(0)
 {
     setAutoFillBackground(false);
     setMouseTracking(true);
@@ -35,7 +35,9 @@ void RsView::setImage(const QImage& image){
     _cinemaSelector = QSharedPointer<Selector>(new CinemaSelector(_image.rect()));
     _userSelection->clear();
     _selectionDrawing = QPainterPath();
+    _customDrawings = QPainterPath();
     _preferredSelection = QRect();
+    _customDrawingsAccentPainter.clear();
 
     resize(image.size());
     update();
@@ -59,6 +61,38 @@ void RsView::setShadeMode(RsView::ShadeMode shadeMode)
     update();
 }
 
+void RsView::setCustomSelectionDrawings(const QList<QPainterPath> &drawings)
+{
+    _customDrawingsAccentPainter = _selectionAccentPainter;
+
+    QPainterPath united;
+    foreach (const QPainterPath& pp, drawings) {
+        united = united.united(pp);
+    }
+    _customDrawings = united;
+
+    update();
+}
+
+void RsView::clearSelection()
+{
+    _userSelection->clear();
+    emit signalSelectionCancelled();
+    update();
+}
+
+QPixmap RsView::renderToPixmap()
+{
+    QPixmap pixmap = QPixmap::fromImage(_image);
+    QPainter painter(&pixmap);
+
+    if (!_customDrawingsAccentPainter.isNull()) {
+        _customDrawingsAccentPainter->paint(&painter, _customDrawings);
+    }
+
+    return pixmap;
+}
+
 void RsView::paintEvent(QPaintEvent *event){
     Q_UNUSED(event);
 
@@ -79,6 +113,10 @@ void RsView::paintEvent(QPaintEvent *event){
         }
     }
 
+    if (!_customDrawingsAccentPainter.isNull()) {
+        _customDrawingsAccentPainter->paint(&painter, _customDrawings);
+    }
+
     if (hasSelection && !_selectionAccentPainter.isNull()) {
         _selectionAccentPainter->paint(&painter, _selectionDrawing);
     }
@@ -126,12 +164,9 @@ bool RsView::eventFilter(QObject *obj, QEvent *event) {
 
 bool RsView::processingKeyPressEvents(QKeyEvent* keyEvent) {
     switch (keyEvent->key()) {
-    case Qt::Key_Escape: {
-        _userSelection->clear();
-        emit signalSelectionCancelled();
-        update();
+    case Qt::Key_Escape:
+        clearSelection();
         return true;
-    }
     case Qt::Key_Space:
         _addMargins = !_addMargins;
     case Qt::Key_Control:

rsview.h

@@ -31,6 +31,7 @@ class RsView : public QWidget
     void setSelectionAccentPainter(const QSharedPointer<AccentPainter>& accentPainter);
     void setSelectionRenderer(const QSharedPointer<Selector>& selectionRenderer);
     void setShadeMode(ShadeMode shadeMode);
+    void setCustomSelectionDrawings(const QList<QPainterPath>& drawings);
 
     const UserSelection* userSelection() const {
         return _userSelection;
@@ -40,6 +41,14 @@ class RsView : public QWidget
         return _preferredSelection;
     }
 
+    QPainterPath selectionDrawing() const {
+        return _selectionDrawing;
+    }
+
+    void clearSelection();
+
+    QPixmap renderToPixmap();
+
 signals:
     void signalMouseMove(const QPoint& point);
     void signalSelectionChanged();
@@ -66,12 +75,14 @@ private slots:
     QRect _preferredSelection;
     bool _addMargins;
 
+    QPainterPath _customDrawings;
     QPainterPath _cinemaDrawing;
     QPainterPath _selectionDrawing;
 
     QSharedPointer<Selector> _selector;
     QSharedPointer<Selector> _cinemaSelector;
 
     QSharedPointer<AccentPainter> _selectionAccentPainter;
+    QSharedPointer<AccentPainter> _customDrawingsAccentPainter;
     QSharedPointer<AccentPainter> _cinemaAccentPainter;
 };

selector/markerselector.cpp

@@ -22,8 +22,7 @@ QPainterPath MarkerSelector::render(const QRect &selection)
     QPainterPath path;
 
     if (!selection.isNull()) {
-        QRect rect = selection.adjusted(-Params::MarkerRoundCornerSize, -Params::MarkerRoundCornerSize, Params::MarkerRoundCornerSize, Params::MarkerRoundCornerSize);
-        path.addRoundedRect(rect, Params::MarkerRoundCornerSize, Params::MarkerRoundCornerSize);
+        path.addRoundedRect(selection, Params::MarkerRoundCornerSize, Params::MarkerRoundCornerSize);
     }
 
     return path;