diff --git a/plugins/tools/selectiontools/KisMagneticWorker.cc b/plugins/tools/selectiontools/KisMagneticWorker.cc index 96f25e96c6..30a1e6a2ba 100644 --- a/plugins/tools/selectiontools/KisMagneticWorker.cc +++ b/plugins/tools/selectiontools/KisMagneticWorker.cc @@ -1,238 +1,238 @@ /* * Copyright (c) 2019 Kuntal Majumder * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation; version 2.1 of the License. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "KisMagneticWorker.h" #include #include #include #include #include #include #include #include #include "KisMagneticGraph.h" struct DistanceMap { typedef VertexDescriptor key_type; typedef double data_type; typedef std::pair value_type; explicit DistanceMap(double const& dval) : m_default(dval) { } data_type &operator [] (key_type const& k) { if (m.find(k) == m.end()) m[k] = m_default; return m[k]; } private: std::map m; data_type const m_default; }; struct PredecessorMap { PredecessorMap() = default; PredecessorMap(PredecessorMap const& that) = default; typedef VertexDescriptor key_type; typedef VertexDescriptor value_type; typedef boost::read_write_property_map_tag category; VertexDescriptor &operator [] (VertexDescriptor v) { return m_map[v]; } std::map m_map; }; VertexDescriptor get(PredecessorMap const &m, VertexDescriptor v) { auto found = m.m_map.find(v); return found != m.m_map.end() ? found->second : v; } void put(PredecessorMap &m, VertexDescriptor key, VertexDescriptor value) { m.m_map[key] = value; } double EuclideanDistance(VertexDescriptor p1, VertexDescriptor p2) { return std::sqrt(std::pow(p1.y - p2.y, 2) + std::pow(p1.x - p2.x, 2)); } class AStarHeuristic : public boost::astar_heuristic { private: VertexDescriptor m_goal; public: explicit AStarHeuristic(VertexDescriptor goal) : m_goal(goal) { } double operator () (VertexDescriptor v) { return EuclideanDistance(v, m_goal); } }; struct GoalFound { }; class AStarGoalVisitor : public boost::default_astar_visitor { public: explicit AStarGoalVisitor(VertexDescriptor goal) : m_goal(goal){ } void examine_vertex(VertexDescriptor u, KisMagneticGraph const &g) { Q_UNUSED(g) if (u == m_goal) { throw GoalFound(); } } private: VertexDescriptor m_goal; }; struct WeightMap { typedef std::pair key_type; typedef double data_type; typedef std::pair value_type; WeightMap() = default; explicit WeightMap(const KisMagneticGraph &g) : m_graph(g) { } data_type& operator [] (key_type const& k) { if (m_map.find(k) == m_map.end()) { double edge_gradient = (m_graph.getIntensity(k.first) + m_graph.getIntensity(k.second)) / 2; m_map[k] = EuclideanDistance(k.first, k.second) + 255.0 - edge_gradient; } return m_map[k]; } private: std::map m_map; KisMagneticGraph m_graph; }; KisMagneticWorker::KisMagneticWorker(const KisPaintDeviceSP& dev, qreal radius) { m_dev = KisPainter::convertToAlphaAsGray(dev); KisPainter::copyAreaOptimized(dev->exactBounds().topLeft(), dev, m_dev, dev->exactBounds()); - //KisGaussianKernel::applyTightLoG(m_dev, m_dev->exactBounds(), radius, -1.0, QBitArray(), nullptr); - KisGaussianKernel::applyLoG(m_dev, m_dev->exactBounds(), radius, -1.0, QBitArray(), nullptr); + KisGaussianKernel::applyTightLoG(m_dev, m_dev->exactBounds(), radius, -1.0, QBitArray(), nullptr); + //KisGaussianKernel::applyLoG(m_dev, m_dev->exactBounds(), radius, -1.0, QBitArray(), nullptr); KisLazyFillTools::normalizeAlpha8Device(m_dev, m_dev->exactBounds()); m_graph = new KisMagneticGraph(m_dev); } QVector KisMagneticWorker::computeEdge(int radius, QPoint begin, QPoint end) { QRect rect; KisAlgebra2D::accumulateBounds(QVector { begin, end }, &rect); rect = kisGrowRect(rect, radius); VertexDescriptor goal(end); VertexDescriptor start(begin); m_graph->m_rect = rect; // How many maps does it require? // Take a look here, if it doesn't make sense, https://www.boost.org/doc/libs/1_70_0/libs/graph/doc/astar_search.html PredecessorMap pmap; DistanceMap dmap(std::numeric_limits::max()); dmap[start] = 0; std::map rmap; std::map cmap; std::map imap; WeightMap wmap(*m_graph); AStarHeuristic heuristic(goal); QVector result; try{ boost::astar_search_no_init( *m_graph, start, heuristic, boost::visitor(AStarGoalVisitor(goal)) .distance_map(boost::associative_property_map(dmap)) .predecessor_map(boost::ref(pmap)) .weight_map(boost::associative_property_map(wmap)) .vertex_index_map(boost::associative_property_map >(imap)) .rank_map(boost::associative_property_map >(rmap)) .color_map(boost::associative_property_map >(cmap)) .distance_combine(std::plus()) .distance_compare(std::less()) ); }catch (GoalFound const&) { for (VertexDescriptor u = goal; u != start; u = pmap[u]) { result.push_front(QPointF(u.x, u.y)); } } result.push_front(QPoint(start.x, start.y)); return result; } // KisMagneticWorker::computeEdge void KisMagneticWorker::saveTheImage(vQPointF points) { QImage img = m_dev->convertToQImage(0, m_dev->exactBounds()); const QPointF offset = m_dev->exactBounds().topLeft(); for (QPointF &pt : points) { pt -= offset; } img = img.convertToFormat(QImage::Format_ARGB32); QPainter gc(&img); QPainterPath path; for (int i = 0; i < points.size(); i++) { if (i == 0) { path.moveTo(points[i]); } else { path.lineTo(points[i]); } } gc.setPen(Qt::blue); gc.drawPath(path); gc.setPen(Qt::green); gc.drawEllipse(points[0], 3, 3); gc.setPen(Qt::red); gc.drawEllipse(points[points.count() -1], 2, 2); img.save("result.png"); } quint8 KisMagneticWorker::intensity(QPoint pt) { return m_graph->getIntensity(VertexDescriptor(pt)); } diff --git a/plugins/tools/selectiontools/KisToolSelectMagnetic.cc b/plugins/tools/selectiontools/KisToolSelectMagnetic.cc index 27b9f03d90..c57c9e8287 100644 --- a/plugins/tools/selectiontools/KisToolSelectMagnetic.cc +++ b/plugins/tools/selectiontools/KisToolSelectMagnetic.cc @@ -1,464 +1,464 @@ /* * Copyright (c) 2019 Kuntal Majumder * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "KisToolSelectMagnetic.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "kis_painter.h" #include #include "canvas/kis_canvas2.h" #include "kis_pixel_selection.h" #include "kis_selection_tool_helper.h" #include "kis_algebra_2d.h" #include "KisHandlePainterHelper.h" #include #define FEEDBACK_LINE_WIDTH 2 #define distBetween(x, y) kisDistance(pixelToView(m_points[x]), pixelToView(m_points[y])) KisToolSelectMagnetic::KisToolSelectMagnetic(KoCanvasBase *canvas) : KisToolSelect(canvas, KisCursor::load("tool_magnetic_selection_cursor.png", 5, 5), i18n("Magnetic Selection")), - m_continuedMode(false), m_complete(true), m_threshold(70), m_checkPoint(-1), m_frequency(30), m_radius(2.0) + m_continuedMode(false), m_complete(true), m_threshold(70), m_checkPoint(-1), m_frequency(30), m_radius(3.0) { } void KisToolSelectMagnetic::keyPressEvent(QKeyEvent *event) { if (event->key() == Qt::Key_Control) { m_continuedMode = true; } KisToolSelect::keyPressEvent(event); } void KisToolSelectMagnetic::keyReleaseEvent(QKeyEvent *event) { if (event->key() == Qt::Key_Control || !(event->modifiers() & Qt::ControlModifier)) { m_continuedMode = false; if (mode() != PAINT_MODE && !m_points.isEmpty()) { finishSelectionAction(); } } KisToolSelect::keyReleaseEvent(event); } void KisToolSelectMagnetic::calculateCheckPoints() { qreal totalDistance = 0.0; int finalPoint = m_checkPoint + 2; int midPoint = m_checkPoint + 1; int minPoint = m_checkPoint; for(; finalPoint 2*m_frequency){ break; } } if(totalDistance > 2*m_frequency){ bool foundSomething = false; for(int i = midPoint; i < finalPoint; i++){ if(m_worker.intensity(m_points.at(i).toPoint()) >= m_threshold){ m_checkPoint = i; m_lastAnchor = m_points.at(i).toPoint(); m_anchorPoints.push_back(i); foundSomething = true; break; } } if(!foundSomething){ for(int i = midPoint - 1; i>= minPoint; i--){ if(m_worker.intensity(m_points.at(i).toPoint()) >= m_threshold){ m_checkPoint = i; m_lastAnchor = m_points.at(i).toPoint(); m_anchorPoints.push_back(i); foundSomething = true; break; } } } if(!foundSomething && m_checkPoint >= 0){ m_checkPoint = midPoint; m_lastAnchor = m_points.at(m_checkPoint).toPoint(); m_anchorPoints.push_back(m_checkPoint); foundSomething = true; } } totalDistance = 0.0; for(; finalPoint 2*m_frequency){ calculateCheckPoints(); totalDistance = 0.0; } } } // the cursor is still tracked even when no mousebutton is pressed void KisToolSelectMagnetic::mouseMoveEvent(KoPointerEvent *event) { KisToolSelect::mouseMoveEvent(event); if (m_complete) return; m_lastCursorPos = convertToPixelCoord(event); QPoint current = m_lastCursorPos.toPoint(); if (m_anchorPoints.count() > 0 && m_snapBound.contains(m_lastAnchor)) { //set a freaking cursor //useCursor(KisCursor::load("tool_outline_selection_cursor_add.png", 6, 6)); } vQPointF pointSet = m_worker.computeEdge(m_frequency, m_lastAnchor, current); m_points.resize(m_checkPoint); m_points.append(pointSet); calculateCheckPoints(); m_paintPath = QPainterPath(); m_paintPath.moveTo(pixelToView(m_points[0])); for (int i = 1; i < m_points.count(); i++) { m_paintPath.lineTo(pixelToView(m_points[i])); } updateFeedback(); if (m_continuedMode && mode() != PAINT_MODE) { updateContinuedMode(); } } // KisToolSelectMagnetic::mouseMoveEvent // press primary mouse button void KisToolSelectMagnetic::beginPrimaryAction(KoPointerEvent *event) { setMode(KisTool::PAINT_MODE); QPointF temp(convertToPixelCoord(event)); m_lastAnchor = QPoint((int) temp.x(), (int) temp.y()); m_checkPoint = m_points.count() == 0 ? 0 : m_points.count() - 1; if (m_anchorPoints.count() == 0) { m_snapBound = QRect(QPoint(0, 0), QSize(10, 10)); m_snapBound.moveCenter(m_lastAnchor); } if (m_anchorPoints.count() > 0 && m_snapBound.contains(m_lastAnchor)) { m_complete = true; finishSelectionAction(); return; } m_anchorPoints.push_back(m_checkPoint); m_complete = false; } // drag while primary mouse button is pressed void KisToolSelectMagnetic::continuePrimaryAction(KoPointerEvent *event) { KisToolSelectBase::continuePrimaryAction(event); } // release primary mouse button void KisToolSelectMagnetic::endPrimaryAction(KoPointerEvent *event) { KisToolSelectBase::endPrimaryAction(event); } void KisToolSelectMagnetic::finishSelectionAction() { KisCanvas2 *kisCanvas = dynamic_cast(canvas()); KIS_ASSERT_RECOVER_RETURN(kisCanvas); kisCanvas->updateCanvas(); setMode(KisTool::HOVER_MODE); //just for testing out m_worker.saveTheImage(m_points); QRectF boundingViewRect = pixelToView(KisAlgebra2D::accumulateBounds(m_points)); KisSelectionToolHelper helper(kisCanvas, kundo2_i18n("Magnetic Selection")); if (m_points.count() > 2 && !helper.tryDeselectCurrentSelection(boundingViewRect, selectionAction())) { QApplication::setOverrideCursor(KisCursor::waitCursor()); const SelectionMode mode = helper.tryOverrideSelectionMode(kisCanvas->viewManager()->selection(), selectionMode(), selectionAction()); if (mode == PIXEL_SELECTION) { KisPixelSelectionSP tmpSel = KisPixelSelectionSP(new KisPixelSelection()); KisPainter painter(tmpSel); painter.setPaintColor(KoColor(Qt::black, tmpSel->colorSpace())); painter.setAntiAliasPolygonFill(antiAliasSelection()); painter.setFillStyle(KisPainter::FillStyleForegroundColor); painter.setStrokeStyle(KisPainter::StrokeStyleNone); painter.paintPolygon(m_points); QPainterPath cache; cache.addPolygon(m_points); cache.closeSubpath(); tmpSel->setOutlineCache(cache); helper.selectPixelSelection(tmpSel, selectionAction()); } else { KoPathShape *path = new KoPathShape(); path->setShapeId(KoPathShapeId); QTransform resolutionMatrix; resolutionMatrix.scale(1 / currentImage()->xRes(), 1 / currentImage()->yRes()); path->moveTo(resolutionMatrix.map(m_points[0])); for (int i = 1; i < m_points.count(); i++) path->lineTo(resolutionMatrix.map(m_points[i])); path->close(); path->normalize(); helper.addSelectionShape(path, selectionAction()); } QApplication::restoreOverrideCursor(); } m_points.clear(); m_anchorPoints.clear(); m_paintPath = QPainterPath(); } // KisToolSelectMagnetic::finishSelectionAction void KisToolSelectMagnetic::paint(QPainter& gc, const KoViewConverter &converter) { Q_UNUSED(converter); if ((mode() == KisTool::PAINT_MODE || m_continuedMode) && !m_points.isEmpty()) { QPainterPath outline = m_paintPath; if (m_continuedMode && mode() != KisTool::PAINT_MODE) { outline.lineTo(pixelToView(m_lastCursorPos)); } paintToolOutline(&gc, outline); Q_FOREACH (const int pt, m_anchorPoints) { if(pt < 0){ //no points are set continue; } KisHandlePainterHelper helper(&gc, handleRadius()); helper.setHandleStyle(KisHandleStyle::primarySelection()); helper.drawHandleRect(pixelToView(m_points[pt]), 4, QPoint(0,0)); } } } void KisToolSelectMagnetic::updateFeedback() { if (m_points.count() > 1) { qint32 lastPointIndex = m_points.count() - 1; QRectF updateRect = QRectF(m_points[lastPointIndex - 1], m_points[lastPointIndex]).normalized(); updateRect = kisGrowRect(updateRect, FEEDBACK_LINE_WIDTH); updateCanvasPixelRect(updateRect); } } void KisToolSelectMagnetic::updateContinuedMode() { if (!m_points.isEmpty()) { qint32 lastPointIndex = m_points.count() - 1; QRectF updateRect = QRectF(m_points[lastPointIndex - 1], m_lastCursorPos).normalized(); updateRect = kisGrowRect(updateRect, FEEDBACK_LINE_WIDTH); updateCanvasPixelRect(updateRect); } } void KisToolSelectMagnetic::activate(KoToolBase::ToolActivation activation, const QSet &shapes) { m_worker = KisMagneticWorker(image()->projection(), m_radius); m_configGroup = KSharedConfig::openConfig()->group(toolId()); KisToolSelect::activate(activation, shapes); } void KisToolSelectMagnetic::deactivate() { KisCanvas2 *kisCanvas = dynamic_cast(canvas()); KIS_ASSERT_RECOVER_RETURN(kisCanvas); kisCanvas->updateCanvas(); m_continuedMode = false; m_complete = true; KisTool::deactivate(); } void KisToolSelectMagnetic::requestUndoDuringStroke() { if (m_complete) return; m_anchorPoints.pop_back(); m_lastAnchor = m_points[m_anchorPoints.last()].toPoint(); m_checkPoint = m_anchorPoints.last(); updateCanvasPixelRect(image()->bounds()); } void KisToolSelectMagnetic::requestStrokeEnd() { if (m_complete) return; m_complete = true; finishSelectionAction(); } void KisToolSelectMagnetic::requestStrokeCancellation() { setMode(KisTool::HOVER_MODE); m_complete = true; m_points.clear(); m_anchorPoints.clear(); m_paintPath = QPainterPath(); updateCanvasPixelRect(image()->bounds()); } QWidget * KisToolSelectMagnetic::createOptionWidget() { KisToolSelectBase::createOptionWidget(); KisSelectionOptions *selectionWidget = selectionOptionWidget(); QHBoxLayout *f1 = new QHBoxLayout(); QLabel *lblRad = new QLabel(i18n("Radius: "), selectionWidget); f1->addWidget(lblRad); KisDoubleSliderSpinBox *radInput = new KisDoubleSliderSpinBox(selectionWidget); radInput->setObjectName("radius"); - radInput->setRange(1.0, 100.0, 2); + radInput->setRange(2.5, 100.0, 2); radInput->setSingleStep(0.5); f1->addWidget(radInput); connect(radInput, SIGNAL(valueChanged(qreal)), this, SLOT(slotSetRadius(qreal))); QHBoxLayout *f2 = new QHBoxLayout(); QLabel *lblThreshold = new QLabel(i18n("Threshold: "), selectionWidget); f2->addWidget(lblThreshold); KisSliderSpinBox *threshInput = new KisSliderSpinBox(selectionWidget); threshInput->setObjectName("threshold"); threshInput->setRange(1, 255); threshInput->setSingleStep(10); f2->addWidget(threshInput); connect(threshInput, SIGNAL(valueChanged(int)), this, SLOT(slotSetThreshold(int))); QHBoxLayout *f3 = new QHBoxLayout(); QLabel *lblFrquency = new QLabel(i18n("Anchor Gap: "), selectionWidget); f3->addWidget(lblFrquency); KisSliderSpinBox *freqInput = new KisSliderSpinBox(selectionWidget); freqInput->setObjectName("frequency"); freqInput->setRange(20, 200); freqInput->setSingleStep(10); f3->addWidget(freqInput); connect(freqInput, SIGNAL(valueChanged(int)), this, SLOT(slotSetFrequency(int))); QVBoxLayout *l = dynamic_cast(selectionWidget->layout()); Q_ASSERT(l); l->insertLayout(1, f1); l->insertLayout(2, f2); l->insertLayout(3, f3); - radInput->setValue(m_configGroup.readEntry("radius", 2.0)); + radInput->setValue(m_configGroup.readEntry("radius", 3.0)); threshInput->setValue(m_configGroup.readEntry("threshold", 100)); freqInput->setValue(m_configGroup.readEntry("frequency", 30)); return selectionWidget; } // KisToolSelectMagnetic::createOptionWidget void KisToolSelectMagnetic::slotSetRadius(qreal r) { m_radius = r; m_worker = KisMagneticWorker(image()->projection(), m_radius); m_configGroup.writeEntry("radius", r); } void KisToolSelectMagnetic::slotSetThreshold(int t) { m_threshold = t; m_configGroup.writeEntry("threshold", t); } void KisToolSelectMagnetic::slotSetFrequency(int f) { m_frequency = f; m_configGroup.writeEntry("frequency", f); } void KisToolSelectMagnetic::resetCursorStyle() { if (selectionAction() == SELECTION_ADD) { useCursor(KisCursor::load("tool_outline_selection_cursor_add.png", 6, 6)); } else if (selectionAction() == SELECTION_SUBTRACT) { useCursor(KisCursor::load("tool_outline_selection_cursor_sub.png", 6, 6)); } else { KisToolSelect::resetCursorStyle(); } }