diff --git a/plugins/assistants/Assistants/ConjugateAssistant.cc b/plugins/assistants/Assistants/ConjugateAssistant.cc index 406bb3db39..6b68f46531 100644 --- a/plugins/assistants/Assistants/ConjugateAssistant.cc +++ b/plugins/assistants/Assistants/ConjugateAssistant.cc @@ -1,420 +1,369 @@ #include "ConjugateAssistant.h" #include "kis_debug.h" #include #include #include #include #include #include #include #include #include #include ConjugateAssistant::ConjugateAssistant() : KisPaintingAssistant("conjugate", i18n("Conjugate assistant")) { } ConjugateAssistant::ConjugateAssistant(const ConjugateAssistant &rhs, QMap &handleMap) : KisPaintingAssistant(rhs, handleMap) , m_canvas(rhs.m_canvas) , m_referenceLineDensity(rhs.m_referenceLineDensity) , m_spacing(rhs.m_spacing) , m_spacingTilt(rhs.m_spacingTilt) , m_fade(rhs.m_fade) , m_count(rhs.m_count) , m_useSpacing(rhs.m_useSpacing) , sp(rhs.sp) , hl(rhs.hl) , cov(rhs.cov) , m_snapLine(rhs.m_snapLine) { } KisPaintingAssistantSP ConjugateAssistant::clone(QMap &handleMap) const { return KisPaintingAssistantSP(new ConjugateAssistant(*this, handleMap)); } QPointF ConjugateAssistant::project(const QPointF& pt, const QPointF& strokeBegin) { //Q_ASSERT(handles().size() == 1 || handles().size() == 5); //code nicked from the perspective ruler. qreal dx = pt.x() - strokeBegin.x(); qreal dy = pt.y() - strokeBegin.y(); if (dx * dx + dy * dy < 4.0) { // allow some movement before snapping return strokeBegin; } QLineF first = QLineF(strokeBegin, *handles()[0]); QLineF second = QLineF(strokeBegin, *handles()[1]); QList angles = QList({first.angleTo(QLineF(strokeBegin,pt)), second.angleTo(QLineF(strokeBegin,pt)), }); // for (int i = 0; i < 2; i++) { // ENTER_FUNCTION() << "angle: " << angles[i]; // if (angles[i] > 180) { // angles[i] = 360 - angles[i] ; // } // } for (int i = 0; i < angles.length(); i++) { ENTER_FUNCTION() << i << angles[i]; if (90 < angles[i] && angles[i] < 270) { angles[i] = qAbs(angles[i] - 180); } if (angles[i] > 270) { angles[i] = 360 - angles[i]; } ENTER_FUNCTION() << i << angles[i]; } //dbgKrita<canvasWidget()->mapFromGlobal(QCursor::pos()); m_canvas = canvas; } else { mousePos = QCursor::pos();//this'll give an offset// dbgFile<<"canvas does not exist in ruler, you may have passed arguments incorrectly:"<documentToWidgetTransform(); bool isEditing = canvas->paintingAssistantsDecoration()->isEditingAssistants(); if (isEditing){ Q_FOREACH (const QPointF* handle, handles()) { QPointF h = initialTransform.map(*handle); QRectF ellipse = QRectF(QPointF(h.x() -15, h.y() -15), QSizeF(30, 30)); QPainterPath pathCenter; pathCenter.addEllipse(ellipse); drawPath(gc, pathCenter, isSnappingActive()); }} if (handles().size() >= 2) { const QPointF p1 = *handles()[0]; const QPointF p2 = *handles()[1]; const QRect viewport= gc.viewport(); hl = QLineF(p1,p2); // the objective horizon line QLineF horizonLine = initialTransform.map(hl); // The apparent, SUBJECTIVE horizon line to draw KisAlgebra2D::intersectLineRect(horizonLine, viewport); QPainterPath path; // draw the horizon - if (assistantVisible == true - || isEditing == true) - { + if (assistantVisible == true || isEditing == true) { path.moveTo(horizonLine.p1()); path.lineTo(horizonLine.p2()); drawPath(gc, path, isSnappingActive()); } // draw the VP-->mousePos lines - if (isEditing == false - && previewVisible == true - && isSnappingActive() == true) - { + if (isEditing == false && previewVisible == true && isSnappingActive() == true) { QLineF snapMouse1 = QLineF(initialTransform.map(p1), mousePos); QLineF snapMouse2 = QLineF(initialTransform.map(p2), mousePos); KisAlgebra2D::intersectLineRect(snapMouse1, viewport); KisAlgebra2D::intersectLineRect(snapMouse2, viewport); path.moveTo(initialTransform.map(p1)); path.lineTo(snapMouse1.p1()); path.moveTo(initialTransform.map(p2)); path.lineTo(snapMouse2.p1()); drawPreview(gc, path); } QPointF p3; - if (handles().size() >= 3) { - p3 = *handles()[2]; - - QLineF norm = hl.normalVector(); // objective normal to get objective cov - norm.translate(-norm.p1()+p3); // make normal start on p3 - hl.intersect(norm,&cov); // set objective cov here - - // p3 is invalid if cov doesnt lie somewhere between p1 and p2 - if(!((p1.y() < p2.y() && cov.y() > p1.y() && cov.y() < p2.y()) || - (p1.y() > p2.y() && cov.y() < p1.y() && cov.y() > p2.y()) || - (p1.x() < p2.x() && cov.x() > p1.x() && cov.x() < p2.x()) || - (p1.x() > p2.x() && cov.x() < p1.x() && cov.x() > p2.x()))) - { - qDebug() << "p3 IS INVALID !! !! !!"; + QLineF norm = hl.normalVector(); + norm.translate(-norm.p1()+p3); + hl.intersect(norm,&cov); + + // p3 is invalid if cov doesnt lie somewhere between p1 and p2, so set a valid cov + if(!((p1.y() <= p2.y() && cov.y() >= p1.y() && cov.y() <= p2.y()) || + (p1.y() >= p2.y() && cov.y() <= p1.y() && cov.y() >= p2.y()) || + (p1.x() <= p2.x() && cov.x() >= p1.x() && cov.x() <= p2.x()) || + (p1.x() >= p2.x() && cov.x() <= p1.x() && cov.x() >= p2.x()))) { cov = QLineF(p1,p2).center(); p3 = QLineF(p1,p2).center(); norm.translate(-norm.p1()+p3); + *handles()[2] = norm.p2(); } QLineF normalLine = initialTransform.map(norm); // subjective normal line for drawing - - // now we draw the normal line + + // draw the vertical normal line if (assistantVisible == true || isEditing == true) { KisAlgebra2D::intersectLineRect(normalLine, viewport); path.moveTo(normalLine.p1()); path.lineTo(normalLine.p2()); drawPath(gc, path, isSnappingActive()); - }} - - if (isAssistantComplete() == true) { // ie handles().size() >= 4 - QPointF p4 = *handles()[3]; - - float radius = QLineF(p1,p2).length()/2; - QLineF distanceLine(cov,p3); - - float gap = QLineF(cov,QLineF(p1,p2).center()).length(); - float distance = sqrt((radius*radius) - (gap*gap)); - distanceLine.setLength(distance); - - setStationPoint(distanceLine.p2()); // now we have a valid station point - - // all good now, so we create the side handles if they dont already exist - if (sideHandles().isEmpty()) { - QLineF workingLine; - QLineF distance; - - distance=QLineF(p3,cov); - workingLine= QLineF(distance.p1(), p1); - workingLine.setLength(distance.length()); - addHandle(new KisPaintingAssistantHandle(workingLine.p2()), HandleType::SIDE); - workingLine.setLength(distance.length() * 0.5); - addHandle(new KisPaintingAssistantHandle(workingLine.p2()), HandleType::SIDE); - workingLine= QLineF(distance.p1(), p2); - workingLine.setLength(distance.length()); - addHandle(new KisPaintingAssistantHandle(workingLine.p2()), HandleType::SIDE); - workingLine.setLength(distance.length() * 0.5); - addHandle(new KisPaintingAssistantHandle(workingLine.p2()), HandleType::SIDE); - - distance=QLineF(p4,cov); - workingLine= QLineF(distance.p1(), p1); - workingLine.setLength(distance.length()); - addHandle(new KisPaintingAssistantHandle(workingLine.p2()), HandleType::SIDE); - workingLine.setLength(distance.length() * 0.5); - addHandle(new KisPaintingAssistantHandle(workingLine.p2()), HandleType::SIDE); - workingLine= QLineF(distance.p1(), p2); - workingLine.setLength(distance.length()); - addHandle(new KisPaintingAssistantHandle(workingLine.p2()), HandleType::SIDE); - workingLine.setLength(distance.length() * 0.5); - addHandle(new KisPaintingAssistantHandle(workingLine.p2()), HandleType::SIDE); - } - - // draw the side handles - if (isEditing == true) { - path.moveTo(initialTransform.map(p1)); - path.lineTo(initialTransform.map(*sideHandles()[0])); - path.lineTo(initialTransform.map(*sideHandles()[1])); - path.moveTo(initialTransform.map(p2)); - path.lineTo(initialTransform.map(*sideHandles()[2])); - path.lineTo(initialTransform.map(*sideHandles()[3])); - path.moveTo(initialTransform.map(p1)); - path.lineTo(initialTransform.map(*sideHandles()[4])); - path.lineTo(initialTransform.map(*sideHandles()[5])); - path.moveTo(initialTransform.map(p2)); - path.lineTo(initialTransform.map(*sideHandles()[6])); - path.lineTo(initialTransform.map(*sideHandles()[7])); - drawPreview(gc,path); } } + + // draw the side handle bars + if (isEditing == true && !sideHandles().isEmpty()) { + path.moveTo(initialTransform.map(p1)); + path.lineTo(initialTransform.map(*sideHandles()[0])); + path.lineTo(initialTransform.map(*sideHandles()[1])); + path.moveTo(initialTransform.map(p2)); + path.lineTo(initialTransform.map(*sideHandles()[2])); + path.lineTo(initialTransform.map(*sideHandles()[3])); + path.moveTo(initialTransform.map(p1)); + path.lineTo(initialTransform.map(*sideHandles()[4])); + path.lineTo(initialTransform.map(*sideHandles()[5])); + path.moveTo(initialTransform.map(p2)); + path.lineTo(initialTransform.map(*sideHandles()[6])); + path.lineTo(initialTransform.map(*sideHandles()[7])); + drawPreview(gc,path); + } } gc.restore(); //KisPaintingAssistant::drawAssistant(gc, updateRect, converter, cached, canvas, assistantVisible, previewVisible); } void ConjugateAssistant::drawCache(QPainter& gc, const KisCoordinatesConverter *converter, bool assistantVisible) { if (!m_canvas || !isAssistantComplete()) { return; } if (assistantVisible == false || m_canvas->paintingAssistantsDecoration()->isEditingAssistants()) { return; } QTransform initialTransform = converter->documentToWidgetTransform(); QPainterPath path; QPointF centerOfVision = initialTransform.map(cov); path.moveTo(QPointF(centerOfVision.x() - 10.0, centerOfVision.y() - 10.0)); path.lineTo(QPointF(centerOfVision.x() + 10.0, centerOfVision.y() + 10.0)); path.moveTo(QPointF(centerOfVision.x() - 10.0, centerOfVision.y() + 10.0)); path.lineTo(QPointF(centerOfVision.x() + 10.0, centerOfVision.y() - 10.0)); drawPath(gc, path, isSnappingActive()); } QPointF ConjugateAssistant::getEditorPosition() const { if (sideHandles().isEmpty()) { return (*handles()[0] + *handles()[1]) * 0.5; } else { return *sideHandles()[0]; } } void ConjugateAssistant::setReferenceLineDensity(float value) { } float ConjugateAssistant::referenceLineDensity() { float f = 0.0; return f; } bool ConjugateAssistant::isAssistantComplete() const { - return handles().size() >= 4; + return handles().size() >= 3; } void ConjugateAssistant::saveCustomXml(QXmlStreamWriter* xml) { } bool ConjugateAssistant::loadCustomXml(QXmlStreamReader* xml) { bool b = true; return b; } QPointF ConjugateAssistant::stationPoint() { return sp; } void ConjugateAssistant::setStationPoint(QPointF p) { sp = p; } QPointF ConjugateAssistant::centerOfVision() { return cov; } void ConjugateAssistant::setCenterOfVision(QPointF c) { cov = c; } QLineF ConjugateAssistant::horizonLine() { return hl; } void ConjugateAssistant::setHorizonLine(QLineF l) { hl = l; } ConjugateAssistantFactory::ConjugateAssistantFactory() { } ConjugateAssistantFactory::~ConjugateAssistantFactory() { } QString ConjugateAssistantFactory::id() const { return "conjugate"; } QString ConjugateAssistantFactory::name() const { return i18n("Conjugate"); } KisPaintingAssistant* ConjugateAssistantFactory::createPaintingAssistant() const { return new ConjugateAssistant; } qreal ConjugateAssistant::spacing() { return m_spacing; } void ConjugateAssistant::setSpacing(qreal value) { if (value < 0.0) { value = 1.0; } m_spacing = value; } qreal ConjugateAssistant::tilt() { return m_spacingTilt; } void ConjugateAssistant::setTilt(qreal value) { m_spacingTilt = value; } qreal ConjugateAssistant::fade() { return m_fade; } void ConjugateAssistant::setFade(qreal value) { m_fade = value; } qreal ConjugateAssistant::count() { return m_count; } void ConjugateAssistant::setCount(int value) { m_count = value; } diff --git a/plugins/assistants/Assistants/ConjugateAssistant.h b/plugins/assistants/Assistants/ConjugateAssistant.h index e1c7e904c4..74bbe49288 100644 --- a/plugins/assistants/Assistants/ConjugateAssistant.h +++ b/plugins/assistants/Assistants/ConjugateAssistant.h @@ -1,77 +1,77 @@ #ifndef _CONJUGATE_ASSISTANT_H_ #define _CONJUGATE_ASSISTANT_H_ #include "kis_painting_assistant.h" #include #include #include #include class ConjugateAssistant : public KisPaintingAssistant { public: ConjugateAssistant(); QPointF adjustPosition(const QPointF& point, const QPointF& strokeBegin) override; KisPaintingAssistantSP clone(QMap &handleMap) const override; //virtual void endStroke(); QPointF getEditorPosition() const override; - int numHandles() const override { return 4; } + int numHandles() const override { return 3; } float referenceLineDensity(); void setReferenceLineDensity(float value); qreal spacing(); void setSpacing(qreal value); qreal tilt(); void setTilt(qreal value); qreal fade(); void setFade(qreal value); qreal count(); void setCount(int value); QPointF stationPoint(); void setStationPoint(QPointF p); QLineF horizonLine(); void setHorizonLine(QLineF l); QPointF centerOfVision(); void setCenterOfVision(QPointF c); bool isAssistantComplete() const override; void saveCustomXml(QXmlStreamWriter* xml) override; bool loadCustomXml(QXmlStreamReader* xml) override; protected: void drawAssistant(QPainter& gc, const QRectF& updateRect, const KisCoordinatesConverter* converter, bool cached = true,KisCanvas2* canvas=0, bool assistantVisible=true, bool previewVisible=true) override; void drawCache(QPainter& gc, const KisCoordinatesConverter *converter, bool assistantVisible=true) override; private: QPointF project(const QPointF& pt, const QPointF& strokeBegin); explicit ConjugateAssistant(const ConjugateAssistant &rhs, QMap &handleMap); KisCanvas2 *m_canvas; float m_referenceLineDensity = 15.0; double m_spacing = 1.0; float m_spacingTilt = 0; double m_fade = 0.01; int m_count = 25; bool m_useSpacing = false; QPointF sp = QPointF(0,0); QLineF hl = QLineF(); QPointF cov = QPointF(0,0); QLineF m_snapLine; }; class ConjugateAssistantFactory : public KisPaintingAssistantFactory { public: ConjugateAssistantFactory(); ~ConjugateAssistantFactory() override; QString id() const override; QString name() const override; KisPaintingAssistant* createPaintingAssistant() const override; }; #endif diff --git a/plugins/assistants/Assistants/kis_assistant_tool.cc b/plugins/assistants/Assistants/kis_assistant_tool.cc index e0b548b705..d399c7b596 100644 --- a/plugins/assistants/Assistants/kis_assistant_tool.cc +++ b/plugins/assistants/Assistants/kis_assistant_tool.cc @@ -1,1156 +1,1272 @@ /* * Copyright (c) 2008 Cyrille Berger * Copyright (c) 2010 Geoffry Song * Copyright (c) 2017 Scott Petrovic * * 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 of the License, or * (at your option) any later version. * * 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 #include #include #include #include #include #include #include #include #include #include "kis_dom_utils.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "kis_global.h" #include "VanishingPointAssistant.h" #include "EditAssistantsCommand.h" #include #include "ConjugateAssistant.h" #include #include KisAssistantTool::KisAssistantTool(KoCanvasBase * canvas) : KisTool(canvas, KisCursor::arrowCursor()), m_canvas(dynamic_cast(canvas)), m_assistantDrag(0), m_newAssistant(0), m_optionsWidget(0) { Q_ASSERT(m_canvas); setObjectName("tool_assistanttool"); } KisAssistantTool::~KisAssistantTool() { } void KisAssistantTool::activate(ToolActivation toolActivation, const QSet &shapes) { KisTool::activate(toolActivation, shapes); m_canvas->paintingAssistantsDecoration()->activateAssistantsEditor(); m_handles = m_canvas->paintingAssistantsDecoration()->handles(); m_handleDrag = 0; m_internalMode = MODE_CREATION; m_assistantHelperYOffset = 10; m_handleSize = 17; m_canvas->paintingAssistantsDecoration()->setHandleSize(m_handleSize); if (m_optionsWidget) { m_canvas->paintingAssistantsDecoration()->deselectAssistant(); updateToolOptionsUI(); } m_canvas->updateCanvas(); } void KisAssistantTool::deactivate() { m_canvas->paintingAssistantsDecoration()->deactivateAssistantsEditor(); m_canvas->updateCanvas(); KisTool::deactivate(); } void KisAssistantTool::beginPrimaryAction(KoPointerEvent *event) { setMode(KisTool::PAINT_MODE); m_origAssistantList = KisPaintingAssistant::cloneAssistantList(m_canvas->paintingAssistantsDecoration()->assistants()); bool newAssistantAllowed = true; KisPaintingAssistantsDecorationSP canvasDecoration = m_canvas->paintingAssistantsDecoration(); if (m_newAssistant) { m_internalMode = MODE_CREATION; *m_newAssistant->handles().back() = canvasDecoration->snapToGuide(event, QPointF(), false); - if (m_newAssistant->handles().size() == m_newAssistant->numHandles()) { - addAssistant(); - } else if (m_newAssistant->id() == "conjugate" && m_newAssistant->handles().size() == 3){ - // conjugate assistant's 4th point is to be placed automaticlly if 3rd one is already placed + // give conjugate assistant side handles once it is completed + if (m_newAssistant->id() == "conjugate" && m_newAssistant->handles().size() == m_newAssistant->numHandles() && m_newAssistant->sideHandles().isEmpty()){ + QList handles = m_newAssistant->handles(); + const QLineF horizon = QLineF(*handles[0],*handles[1]); + QLineF vertical = horizon.normalVector(); + vertical.translate(*handles[2] - vertical.p1()) ; QPointF cov; - QLineF hl; - QLineF normal; - - hl = QLineF(*m_newAssistant->handles()[0],*m_newAssistant->handles()[1]); - normal = hl.normalVector(); - normal.translate(-normal.p1() + *m_newAssistant->handles()[2]); - hl.intersect(normal, &cov); + horizon.intersect(vertical, &cov); + QLineF distance = QLineF(*handles[2],cov); + distance.setLength(distance.length() * 2.0); // Double it, we will ise both p1() and p2() + const qreal length = QLineF(*handles[2],cov).length(); + + QLineF bar; + bar= QLineF(distance.p1(), *handles[0]); + bar.setLength(length); + m_newAssistant->addHandle(new KisPaintingAssistantHandle(bar.p2()), HandleType::SIDE); + bar.setLength(length * 0.5); + m_newAssistant->addHandle(new KisPaintingAssistantHandle(bar.p2()), HandleType::SIDE); + bar= QLineF(distance.p1(), *handles[1]); + bar.setLength(length); + m_newAssistant->addHandle(new KisPaintingAssistantHandle(bar.p2()), HandleType::SIDE); + bar.setLength(length * 0.5); + m_newAssistant->addHandle(new KisPaintingAssistantHandle(bar.p2()), HandleType::SIDE); + + bar= QLineF(distance.p2(), *handles[0]); + bar.setLength(length); + m_newAssistant->addHandle(new KisPaintingAssistantHandle(bar.p2()), HandleType::SIDE); + bar.setLength(length * 0.5); + m_newAssistant->addHandle(new KisPaintingAssistantHandle(bar.p2()), HandleType::SIDE); + bar= QLineF(distance.p2(), *handles[1]); + bar.setLength(length); + m_newAssistant->addHandle(new KisPaintingAssistantHandle(bar.p2()), HandleType::SIDE); + bar.setLength(length * 0.5); + m_newAssistant->addHandle(new KisPaintingAssistantHandle(bar.p2()), HandleType::SIDE); + } - QLineF distance = QLineF(*m_newAssistant->handles()[2], cov); - distance.setLength(distance.length() * 2.0); - m_newAssistant->addHandle(new KisPaintingAssistantHandle(distance.p2()), HandleType::NORMAL); + if (m_newAssistant->handles().size() == m_newAssistant->numHandles()) { addAssistant(); } else { m_newAssistant->addHandle(new KisPaintingAssistantHandle(canvasDecoration->snapToGuide(event, QPointF(), false)), HandleType::NORMAL); } m_canvas->updateCanvas(); return; } m_handleDrag = 0; double minDist = 81.0; QPointF mousePos = m_canvas->viewConverter()->documentToView(canvasDecoration->snapToGuide(event, QPointF(), false));//m_canvas->viewConverter()->documentToView(event->point); // syncs the assistant handles to the handles reference we store in this tool // they can get out of sync with the way the actions and paintevents occur // we probably need to stop storing a reference in m_handles and call the assistants directly m_handles = m_canvas->paintingAssistantsDecoration()->handles(); Q_FOREACH (KisPaintingAssistantSP assistant, m_canvas->paintingAssistantsDecoration()->assistants()) { // find out which handle on all assistants is closest to the mouse position // vanishing points have "side handles", so make sure to include that { QList allAssistantHandles; allAssistantHandles.append(assistant->handles()); allAssistantHandles.append(assistant->sideHandles()); Q_FOREACH (const KisPaintingAssistantHandleSP handle, allAssistantHandles) { double dist = KisPaintingAssistant::norm2(mousePos - m_canvas->viewConverter()->documentToView(*handle)); if (dist < minDist) { minDist = dist; m_handleDrag = handle; assistantSelected(assistant); // whatever handle is the closest contains the selected assistant } } } if(m_handleDrag && assistant->id() == "perspective") { // Look for the handle which was pressed if (m_handleDrag == assistant->topLeft()) { double dist = KisPaintingAssistant::norm2(mousePos - m_canvas->viewConverter()->documentToView(*m_handleDrag)); if (dist < minDist) { minDist = dist; } m_dragStart = QPointF(assistant->topRight().data()->x(),assistant->topRight().data()->y()); m_internalMode = MODE_DRAGGING_NODE; } else if (m_handleDrag == assistant->topRight()) { double dist = KisPaintingAssistant::norm2(mousePos - m_canvas->viewConverter()->documentToView(*m_handleDrag)); if (dist < minDist) { minDist = dist; } m_internalMode = MODE_DRAGGING_NODE; m_dragStart = QPointF(assistant->topLeft().data()->x(),assistant->topLeft().data()->y()); } else if (m_handleDrag == assistant->bottomLeft()) { double dist = KisPaintingAssistant::norm2(mousePos - m_canvas->viewConverter()->documentToView(*m_handleDrag)); if (dist < minDist) { minDist = dist; } m_internalMode = MODE_DRAGGING_NODE; m_dragStart = QPointF(assistant->bottomRight().data()->x(),assistant->bottomRight().data()->y()); } else if (m_handleDrag == assistant->bottomRight()) { double dist = KisPaintingAssistant::norm2(mousePos - m_canvas->viewConverter()->documentToView(*m_handleDrag)); if (dist < minDist) { minDist = dist; } m_internalMode = MODE_DRAGGING_NODE; m_dragStart = QPointF(assistant->bottomLeft().data()->x(),assistant->bottomLeft().data()->y()); } else if (m_handleDrag == assistant->leftMiddle()) { m_internalMode = MODE_DRAGGING_TRANSLATING_TWONODES; m_dragStart = QPointF((assistant->bottomLeft().data()->x()+assistant->topLeft().data()->x())*0.5, (assistant->bottomLeft().data()->y()+assistant->topLeft().data()->y())*0.5); m_selectedNode1 = new KisPaintingAssistantHandle(assistant->topLeft().data()->x(),assistant->topLeft().data()->y()); m_selectedNode2 = new KisPaintingAssistantHandle(assistant->bottomLeft().data()->x(),assistant->bottomLeft().data()->y()); m_newAssistant = toQShared(KisPaintingAssistantFactoryRegistry::instance()->get("perspective")->createPaintingAssistant()); m_newAssistant->addHandle(assistant->topLeft(), HandleType::NORMAL ); m_newAssistant->addHandle(m_selectedNode1, HandleType::NORMAL); m_newAssistant->addHandle(m_selectedNode2, HandleType::NORMAL); m_newAssistant->addHandle(assistant->bottomLeft(), HandleType::NORMAL); m_dragEnd = event->point; m_handleDrag = 0; m_canvas->updateCanvas(); // TODO update only the relevant part of the canvas return; } else if (m_handleDrag == assistant->rightMiddle()) { m_dragStart = QPointF((assistant->topRight().data()->x()+assistant->bottomRight().data()->x())*0.5, (assistant->topRight().data()->y()+assistant->bottomRight().data()->y())*0.5); m_internalMode = MODE_DRAGGING_TRANSLATING_TWONODES; m_selectedNode1 = new KisPaintingAssistantHandle(assistant->topRight().data()->x(),assistant->topRight().data()->y()); m_selectedNode2 = new KisPaintingAssistantHandle(assistant->bottomRight().data()->x(),assistant->bottomRight().data()->y()); m_newAssistant = toQShared(KisPaintingAssistantFactoryRegistry::instance()->get("perspective")->createPaintingAssistant()); m_newAssistant->addHandle(assistant->topRight(), HandleType::NORMAL); m_newAssistant->addHandle(m_selectedNode1, HandleType::NORMAL); m_newAssistant->addHandle(m_selectedNode2, HandleType::NORMAL); m_newAssistant->addHandle(assistant->bottomRight(), HandleType::NORMAL); m_dragEnd = event->point; m_handleDrag = 0; m_canvas->updateCanvas(); // TODO update only the relevant part of the canvas return; } else if (m_handleDrag == assistant->topMiddle()) { m_dragStart = QPointF((assistant->topLeft().data()->x()+assistant->topRight().data()->x())*0.5, (assistant->topLeft().data()->y()+assistant->topRight().data()->y())*0.5); m_internalMode = MODE_DRAGGING_TRANSLATING_TWONODES; m_selectedNode1 = new KisPaintingAssistantHandle(assistant->topLeft().data()->x(),assistant->topLeft().data()->y()); m_selectedNode2 = new KisPaintingAssistantHandle(assistant->topRight().data()->x(),assistant->topRight().data()->y()); m_newAssistant = toQShared(KisPaintingAssistantFactoryRegistry::instance()->get("perspective")->createPaintingAssistant()); m_newAssistant->addHandle(m_selectedNode1, HandleType::NORMAL); m_newAssistant->addHandle(m_selectedNode2, HandleType::NORMAL); m_newAssistant->addHandle(assistant->topRight(), HandleType::NORMAL); m_newAssistant->addHandle(assistant->topLeft(), HandleType::NORMAL); m_dragEnd = event->point; m_handleDrag = 0; m_canvas->updateCanvas(); // TODO update only the relevant part of the canvas return; } else if (m_handleDrag == assistant->bottomMiddle()) { m_dragStart = QPointF((assistant->bottomLeft().data()->x()+assistant->bottomRight().data()->x())*0.5, (assistant->bottomLeft().data()->y()+assistant->bottomRight().data()->y())*0.5); m_internalMode = MODE_DRAGGING_TRANSLATING_TWONODES; m_selectedNode1 = new KisPaintingAssistantHandle(assistant->bottomLeft().data()->x(),assistant->bottomLeft().data()->y()); m_selectedNode2 = new KisPaintingAssistantHandle(assistant->bottomRight().data()->x(),assistant->bottomRight().data()->y()); m_newAssistant = toQShared(KisPaintingAssistantFactoryRegistry::instance()->get("perspective")->createPaintingAssistant()); m_newAssistant->addHandle(assistant->bottomLeft(), HandleType::NORMAL); m_newAssistant->addHandle(assistant->bottomRight(), HandleType::NORMAL); m_newAssistant->addHandle(m_selectedNode2, HandleType::NORMAL); m_newAssistant->addHandle(m_selectedNode1, HandleType::NORMAL); m_dragEnd = event->point; m_handleDrag = 0; m_canvas->updateCanvas(); // TODO update only the relevant part of the canvas return; } m_snapIsRadial = false; } else if (m_handleDrag && assistant->handles().size()>1 && (assistant->id() == "ruler" || assistant->id() == "parallel ruler" || assistant->id() == "infinite ruler" || assistant->id() == "spline")){ if (m_handleDrag == assistant->handles()[0]) { m_dragStart = *assistant->handles()[1]; } else if (m_handleDrag == assistant->handles()[1]) { m_dragStart = *assistant->handles()[0]; } else if(assistant->handles().size()==4){ if (m_handleDrag == assistant->handles()[2]) { m_dragStart = *assistant->handles()[0]; } else if (m_handleDrag == assistant->handles()[3]) { m_dragStart = *assistant->handles()[1]; } } m_snapIsRadial = false; } else if (m_handleDrag && assistant->handles().size()>2 && (assistant->id() == "ellipse" || assistant->id() == "concentric ellipse" || assistant->id() == "fisheye-point" || assistant->id() == "conjugate")){ m_snapIsRadial = false; if (m_handleDrag == assistant->handles()[0]) { m_dragStart = *assistant->handles()[1]; } else if (m_handleDrag == assistant->handles()[1]) { m_dragStart = *assistant->handles()[0]; } else if (m_handleDrag == assistant->handles()[2]) { m_dragStart = assistant->getEditorPosition(); m_radius = QLineF(m_dragStart, *assistant->handles()[0]); m_snapIsRadial = true; } } else { m_dragStart = assistant->getEditorPosition(); m_snapIsRadial = false; } if (assistant->id() == "conjugate") { // QSharedPointer assis = qSharedPointerCast(assistant); // QPointF h1 = *assis->handles()[0]; // QPointF h2 = *assis->handles()[1]; // QPointF h3 = *assis->handles()[2]; // QLineF horiz = QLineF(h1,h2); // QLineF norm = horiz.normalVector(); // norm.translate(h3 - h1); // QPointF inter; // norm.intersect(horiz,&inter); // qreal h1dst = QLineF(h1,inter).length(); // qreal h2dst = QLineF(h2,inter).length(); // qreal radius = (h1dst + h2dst) / 2; // qreal spdst = qSqrt(qPow(radius,2) - qPow(radius-qMin(h1dst,h2dst),2)); // norm.setP1(inter); // norm.setLength(spdst); // assis->setStationPoint(norm.p2()); } } if (m_handleDrag) { // TODO: Shift-press should now be handled using the alternate actions // if (event->modifiers() & Qt::ShiftModifier) { // m_handleDrag->uncache(); // m_handleDrag = m_handleDrag->split()[0]; // m_handles = m_canvas->view()->paintingAssistantsDecoration()->handles(); // } m_canvas->updateCanvas(); // TODO update only the relevant part of the canvas return; } m_assistantDrag.clear(); Q_FOREACH (KisPaintingAssistantSP assistant, m_canvas->paintingAssistantsDecoration()->assistants()) { AssistantEditorData editorShared; // shared position data between assistant tool and decoration const KisCoordinatesConverter *converter = m_canvas->coordinatesConverter(); // This code contains the click event behavior. QTransform initialTransform = converter->documentToWidgetTransform(); QPointF actionsPosition = initialTransform.map(assistant->viewportConstrainedEditorPosition(converter, editorShared.boundingSize)); // for UI editor widget controls with move, show, and delete -- disregard document transforms like rotating and mirroring. // otherwise the UI controls get awkward to use when they are at 45 degree angles or the order of controls gets flipped backwards QPointF uiMousePosition = initialTransform.map(canvasDecoration->snapToGuide(event, QPointF(), false)); QPointF iconMovePosition(actionsPosition + editorShared.moveIconPosition); QPointF iconSnapPosition(actionsPosition + editorShared.snapIconPosition); QPointF iconDeletePosition(actionsPosition + editorShared.deleteIconPosition); QRectF deleteRect(iconDeletePosition, QSizeF(editorShared.deleteIconSize, editorShared.deleteIconSize)); QRectF visibleRect(iconSnapPosition, QSizeF(editorShared.snapIconSize, editorShared.snapIconSize)); QRectF moveRect(iconMovePosition, QSizeF(editorShared.moveIconSize, editorShared.moveIconSize)); if (moveRect.contains(uiMousePosition)) { m_assistantDrag = assistant; m_cursorStart = event->point; m_currentAdjustment = QPointF(); m_internalMode = MODE_EDITING; assistantSelected(assistant); // whatever handle is the closest contains the selected assistant return; } if (deleteRect.contains(uiMousePosition)) { removeAssistant(assistant); if(m_canvas->paintingAssistantsDecoration()->assistants().isEmpty()) { m_internalMode = MODE_CREATION; } else m_internalMode = MODE_EDITING; m_canvas->updateCanvas(); return; } if (visibleRect.contains(uiMousePosition)) { newAssistantAllowed = false; assistant->setSnappingActive(!assistant->isSnappingActive()); // toggle assistant->uncache();//this updates the chache of the assistant, very important. assistantSelected(assistant); // whatever handle is the closest contains the selected assistant } } if (newAssistantAllowed==true){//don't make a new assistant when I'm just toogling visibility// QString key = m_options.availableAssistantsComboBox->model()->index( m_options.availableAssistantsComboBox->currentIndex(), 0 ).data(Qt::UserRole).toString(); m_newAssistant = toQShared(KisPaintingAssistantFactoryRegistry::instance()->get(key)->createPaintingAssistant()); m_internalMode = MODE_CREATION; m_newAssistant->addHandle(new KisPaintingAssistantHandle(canvasDecoration->snapToGuide(event, QPointF(), false)), HandleType::NORMAL); if (m_newAssistant->numHandles() <= 1) { addAssistant(); } else { m_newAssistant->addHandle(new KisPaintingAssistantHandle(canvasDecoration->snapToGuide(event, QPointF(), false)), HandleType::NORMAL); } } if (m_newAssistant) { m_newAssistant->setAssistantGlobalColorCache(m_canvas->paintingAssistantsDecoration()->globalAssistantsColor()); } m_canvas->updateCanvas(); } void KisAssistantTool::continuePrimaryAction(KoPointerEvent *event) { KisPaintingAssistantsDecorationSP canvasDecoration = m_canvas->paintingAssistantsDecoration(); if (m_handleDrag) { *m_handleDrag = event->point; //ported from the gradient tool... we need to think about this more in the future. if (event->modifiers() == Qt::ShiftModifier && m_snapIsRadial) { QLineF dragRadius = QLineF(m_dragStart, event->point); dragRadius.setLength(m_radius.length()); *m_handleDrag = dragRadius.p2(); } else if (event->modifiers() == Qt::ShiftModifier ) { QPointF move = snapToClosestAxis(event->point - m_dragStart); *m_handleDrag = m_dragStart + move; } else { *m_handleDrag = canvasDecoration->snapToGuide(event, QPointF(), false); } m_handleDrag->uncache(); m_handleCombine = 0; if (!(event->modifiers() & Qt::ShiftModifier)) { double minDist = 49.0; QPointF mousePos = m_canvas->viewConverter()->documentToView(event->point); Q_FOREACH (const KisPaintingAssistantHandleSP handle, m_handles) { if (handle == m_handleDrag) continue; double dist = KisPaintingAssistant::norm2(mousePos - m_canvas->viewConverter()->documentToView(*handle)); if (dist < minDist) { minDist = dist; m_handleCombine = handle; } } } m_canvas->updateCanvas(); } else if (m_assistantDrag) { QPointF newAdjustment = canvasDecoration->snapToGuide(event, QPointF(), false) - m_cursorStart; if (event->modifiers() == Qt::ShiftModifier ) { newAdjustment = snapToClosestAxis(newAdjustment); } Q_FOREACH (KisPaintingAssistantHandleSP handle, m_assistantDrag->handles()) { *handle += (newAdjustment - m_currentAdjustment); } - if (m_assistantDrag->id()== "vanishing point"){ + if (m_assistantDrag->id()== "vanishing point" || m_assistantDrag->id()== "conjugate"){ Q_FOREACH (KisPaintingAssistantHandleSP handle, m_assistantDrag->sideHandles()) { *handle += (newAdjustment - m_currentAdjustment); } } m_assistantDrag->uncache(); m_currentAdjustment = newAdjustment; m_canvas->updateCanvas(); } else { event->ignore(); } bool wasHiglightedNode = m_higlightedNode != 0; QPointF mousep = m_canvas->viewConverter()->documentToView(event->point); QList pAssistant= m_canvas->paintingAssistantsDecoration()->assistants(); Q_FOREACH (KisPaintingAssistantSP assistant, pAssistant) { if(assistant->id() == "perspective") { if ((m_higlightedNode = assistant->closestCornerHandleFromPoint(mousep))) { if (m_higlightedNode == m_selectedNode1 || m_higlightedNode == m_selectedNode2) { m_higlightedNode = 0; } else { m_canvas->updateCanvas(); // TODO update only the relevant part of the canvas break; } } } //this following bit sets the translations for the vanishing-point handles. if(m_handleDrag && assistant->id() == "vanishing point" && assistant->sideHandles().size()==4) { //for inner handles, the outer handle gets translated. if (m_handleDrag == assistant->sideHandles()[0]) { QLineF perspectiveline = QLineF(*assistant->handles()[0], *assistant->sideHandles()[0]); qreal length = QLineF(*assistant->sideHandles()[0], *assistant->sideHandles()[1]).length(); if (length < 2.0){ length = 2.0; } length += perspectiveline.length(); perspectiveline.setLength(length); *assistant->sideHandles()[1] = perspectiveline.p2(); } else if (m_handleDrag == assistant->sideHandles()[2]){ QLineF perspectiveline = QLineF(*assistant->handles()[0], *assistant->sideHandles()[2]); qreal length = QLineF(*assistant->sideHandles()[2], *assistant->sideHandles()[3]).length(); if (length<2.0){ length=2.0; } length += perspectiveline.length(); perspectiveline.setLength(length); *assistant->sideHandles()[3] = perspectiveline.p2(); } // for outer handles, only the vanishing point is translated, but only if there's an intersection. else if (m_handleDrag == assistant->sideHandles()[1]|| m_handleDrag == assistant->sideHandles()[3]){ QPointF vanishingpoint(0,0); QLineF perspectiveline = QLineF(*assistant->sideHandles()[0], *assistant->sideHandles()[1]); QLineF perspectiveline2 = QLineF(*assistant->sideHandles()[2], *assistant->sideHandles()[3]); if (QLineF(perspectiveline2).intersect(QLineF(perspectiveline), &vanishingpoint) != QLineF::NoIntersection){ *assistant->handles()[0] = vanishingpoint; } }// and for the vanishing point itself, only the outer handles get translated. else if (m_handleDrag == assistant->handles()[0]){ QLineF perspectiveline = QLineF(*assistant->handles()[0], *assistant->sideHandles()[0]); QLineF perspectiveline2 = QLineF(*assistant->handles()[0], *assistant->sideHandles()[2]); qreal length = QLineF(*assistant->sideHandles()[0], *assistant->sideHandles()[1]).length(); qreal length2 = QLineF(*assistant->sideHandles()[2], *assistant->sideHandles()[3]).length(); if (length < 2.0) { length = 2.0; } if (length2 < 2.0) { length2=2.0; } length += perspectiveline.length(); length2 += perspectiveline2.length(); perspectiveline.setLength(length); perspectiveline2.setLength(length2); *assistant->sideHandles()[1] = perspectiveline.p2(); *assistant->sideHandles()[3] = perspectiveline2.p2(); } } - if (m_handleDrag && - assistant->id() == "conjugate" && - assistant->handles().size() == 4) { + if (m_handleDrag && assistant->id() == "conjugate" && assistant->handles().size() >= 3 && + assistant->sideHandles().size() == 8) { QSharedPointer assis = qSharedPointerCast(assistant); - - int working_handle_id; - int other_handle_id; - - if (m_handleDrag == assistant->handles()[2]) { - QPointF sp = assis->stationPoint(); - assistant->handles()[2]->setX(sp.x()); - assistant->handles()[2]->setY(sp.y()); + QList hndl = assistant->handles(); + QList side_hndl = assistant->sideHandles(); + KisPaintingAssistantHandleSP vp_dragged; + KisPaintingAssistantHandleSP vp_opp; + QPointF vp_dragged_original_pos; + + bool vp_is_dragged = m_handleDrag == hndl[0] || m_handleDrag == hndl[1]; + bool near_handle_is_dragged = m_handleDrag == side_hndl[0] || m_handleDrag == side_hndl[2] || + m_handleDrag == side_hndl[4] || m_handleDrag == side_hndl[6] ; + bool far_handle_is_dragged = m_handleDrag == side_hndl[1] || m_handleDrag == side_hndl[3] || + m_handleDrag == side_hndl[5] || m_handleDrag == side_hndl[7] ; + + // A valid horizon line will be needed for later + QLineF horizon; + + // Here we will attempt to get a valid horizon + if (vp_is_dragged) { + // If either VP got dragged, we need its original location to get a correct horizon + // The side handle bars can be used to derive the original VP position + QLineF arm_a, arm_b; + if (m_handleDrag == hndl[0]) { + vp_dragged = hndl[0]; vp_opp = hndl[1]; + arm_a = QLineF(*side_hndl[0],*side_hndl[1]); + arm_b = QLineF(*side_hndl[4],*side_hndl[5]); + } else if (m_handleDrag == hndl[1]){ + vp_dragged = hndl[1]; vp_opp = hndl[0]; + arm_a = QLineF(*side_hndl[3],*side_hndl[2]); + arm_b = QLineF(*side_hndl[6],*side_hndl[7]); + } + arm_a.intersect(arm_b, &vp_dragged_original_pos); + horizon = QLineF(*vp_opp, vp_dragged_original_pos); } else { - if (m_handleDrag == assistant->handles()[0]) { - working_handle_id = 0; - other_handle_id = 1; - } else { - working_handle_id = 1; - other_handle_id = 0; + // First calcuate relevant VP's new position if any far handles got dragged + if (far_handle_is_dragged ){ + QLineF arm_a, arm_b; + QPointF vp_new_pos; + KisPaintingAssistantHandleSP vp_moved; + if (m_handleDrag == side_hndl[1] || m_handleDrag == side_hndl[5]) { + vp_moved = hndl[0]; + arm_a = QLineF(*side_hndl[0],*side_hndl[1]); + arm_b = QLineF(*side_hndl[4],*side_hndl[5]); + } else if (m_handleDrag == side_hndl[3] || m_handleDrag == side_hndl[7]) { + vp_moved = hndl[1]; + arm_a = QLineF(*side_hndl[3],*side_hndl[2]); + arm_b = QLineF(*side_hndl[6],*side_hndl[7]); + } + arm_a.intersect(arm_b, &vp_new_pos); + *vp_moved = vp_new_pos; } + horizon = QLineF(*hndl[0],*hndl[1]); + } - QPointF working_handle = *assistant->handles()[working_handle_id]; - - QLineF arm = QLineF(assis->stationPoint(), working_handle); - QPointF new_other; - arm.normalVector().intersect(assis->horizonLine(), &new_other); - assis->handles()[other_handle_id]->setX(new_other.x()); - assis->handles()[other_handle_id]->setY(new_other.y()); - - arm = QLineF(assis->stationPoint(), new_other); - QPointF new_working; - arm.normalVector().intersect(assis->horizonLine(), &new_working); - assis->handles()[working_handle_id]->setX(new_working.x()); - assis->handles()[working_handle_id]->setY(new_working.y()); + QLineF vertical; + QPointF cov; + vertical = horizon.normalVector(); + vertical.translate(*hndl[2] - vertical.p1()); + horizon.intersect(vertical,&cov); + + const qreal radius = horizon.length() / 2.0; + const qreal gap = QLineF(horizon.center(),cov).length(); + vertical.translate(cov - vertical.p1()); + vertical.setLength(sqrt((radius*radius) - (gap*gap))); + const QPointF sp = vertical.p2(); + + // Set both VP's new locations + if (vp_is_dragged) { + QPointF new_dragged_vp; + QPointF new_opp_vp; + QLineF dragged_arm; + QLineF opp_arm; + + dragged_arm = QLineF(sp,*vp_dragged); + dragged_arm.intersect(horizon, &new_dragged_vp); + opp_arm = dragged_arm.normalVector(); + opp_arm.translate(sp - opp_arm.p1()); + opp_arm.intersect(horizon, &new_opp_vp); + + if (new_dragged_vp == new_opp_vp) { + new_opp_vp = *vp_opp; + } + + // Several contingencies to avoid edge-case + if (new_dragged_vp == cov) { + opp_arm = QLineF(sp,*vp_opp); + opp_arm.intersect(horizon, &new_opp_vp); + dragged_arm = opp_arm.normalVector(); + dragged_arm.translate(sp - dragged_arm.p1()); + dragged_arm.intersect(horizon, &new_dragged_vp); + if (new_dragged_vp == cov) { + new_dragged_vp = vp_dragged_original_pos; + if (new_dragged_vp == cov) { + QLineF dst = QLineF(cov,*vp_dragged); + QLineF hor = QLineF(*vp_opp,cov); + hor.setLength(dst.length()); + hor.translate(cov-hor.p1()); + new_dragged_vp = hor.p2(); + } + } + } + *vp_dragged = new_dragged_vp; + *vp_opp = new_opp_vp; } + // recalculate side handle bars + if (vp_is_dragged || near_handle_is_dragged) { + QLineF arm_a1; + QLineF arm_b1; + QLineF arm_a2; + QLineF arm_b2; + + arm_a1 = QLineF(*hndl[0], *side_hndl[0]); + arm_a1.setLength(QLineF(*side_hndl[0],*side_hndl[1]).length()); + arm_a1.translate(*side_hndl[0] - arm_a1.p1()); + *side_hndl[1] = arm_a1.p2(); + arm_b1 = QLineF(*hndl[0], *side_hndl[4]); + arm_b1.setLength(QLineF(*side_hndl[4],*side_hndl[5]).length()); + arm_b1.translate(*side_hndl[4] - arm_b1.p1()); + *side_hndl[5] = arm_b1.p2(); + + arm_a2 = QLineF(*hndl[1], *side_hndl[2]); + arm_a2.setLength(QLineF(*side_hndl[2],*side_hndl[3]).length()); + arm_a2.translate(*side_hndl[2] - arm_a2.p1()); + *side_hndl[3] = arm_a2.p2(); + arm_b2 = QLineF(*hndl[1], *side_hndl[6]); + arm_b2.setLength(QLineF(*side_hndl[6],*side_hndl[7]).length()); + arm_b2.translate(*side_hndl[6] - arm_b2.p1()); + *side_hndl[7] = arm_b2.p2(); + } } } if (wasHiglightedNode && !m_higlightedNode) { m_canvas->updateCanvas(); // TODO update only the relevant part of the canvas } } void KisAssistantTool::endPrimaryAction(KoPointerEvent *event) { setMode(KisTool::HOVER_MODE); if (m_handleDrag || m_assistantDrag) { if (m_handleDrag) { if (!(event->modifiers() & Qt::ShiftModifier) && m_handleCombine) { m_handleCombine->mergeWith(m_handleDrag); m_handleCombine->uncache(); m_handles = m_canvas->paintingAssistantsDecoration()->handles(); } m_handleDrag = m_handleCombine = 0; } else { m_assistantDrag.clear(); } dbgUI << "creating undo command..."; KUndo2Command *command = new EditAssistantsCommand(m_canvas, m_origAssistantList, KisPaintingAssistant::cloneAssistantList(m_canvas->paintingAssistantsDecoration()->assistants())); m_canvas->viewManager()->undoAdapter()->addCommand(command); dbgUI << "done"; } else if(m_internalMode == MODE_DRAGGING_TRANSLATING_TWONODES) { addAssistant(); m_internalMode = MODE_CREATION; } else { event->ignore(); } m_canvas->updateCanvas(); // TODO update only the relevant part of the canvas } void KisAssistantTool::addAssistant() { m_canvas->paintingAssistantsDecoration()->addAssistant(m_newAssistant); KisAbstractPerspectiveGrid* grid = dynamic_cast(m_newAssistant.data()); if (grid) { m_canvas->viewManager()->canvasResourceProvider()->addPerspectiveGrid(grid); } QList assistants = m_canvas->paintingAssistantsDecoration()->assistants(); KUndo2Command *addAssistantCmd = new EditAssistantsCommand(m_canvas, m_origAssistantList, KisPaintingAssistant::cloneAssistantList(assistants), EditAssistantsCommand::ADD, assistants.indexOf(m_newAssistant)); m_canvas->viewManager()->undoAdapter()->addCommand(addAssistantCmd); m_handles = m_canvas->paintingAssistantsDecoration()->handles(); m_canvas->paintingAssistantsDecoration()->setSelectedAssistant(m_newAssistant); updateToolOptionsUI(); // vanishing point assistant will get an extra option m_newAssistant.clear(); } void KisAssistantTool::removeAssistant(KisPaintingAssistantSP assistant) { QList assistants = m_canvas->paintingAssistantsDecoration()->assistants(); KisAbstractPerspectiveGrid* grid = dynamic_cast(assistant.data()); if (grid) { m_canvas->viewManager()->canvasResourceProvider()->removePerspectiveGrid(grid); } m_canvas->paintingAssistantsDecoration()->removeAssistant(assistant); KUndo2Command *removeAssistantCmd = new EditAssistantsCommand(m_canvas, m_origAssistantList, KisPaintingAssistant::cloneAssistantList(m_canvas->paintingAssistantsDecoration()->assistants()), EditAssistantsCommand::REMOVE, assistants.indexOf(assistant)); m_canvas->viewManager()->undoAdapter()->addCommand(removeAssistantCmd); m_handles = m_canvas->paintingAssistantsDecoration()->handles(); m_canvas->paintingAssistantsDecoration()->deselectAssistant(); updateToolOptionsUI(); } void KisAssistantTool::assistantSelected(KisPaintingAssistantSP assistant) { m_canvas->paintingAssistantsDecoration()->setSelectedAssistant(assistant); updateToolOptionsUI(); } void KisAssistantTool::updateToolOptionsUI() { KisPaintingAssistantSP m_selectedAssistant = m_canvas->paintingAssistantsDecoration()->selectedAssistant(); bool hasActiveAssistant = m_selectedAssistant ? true : false; if (m_selectedAssistant) { bool isVanishingPointAssistant = m_selectedAssistant->id() == "vanishing point"; m_options.vanishingPointAngleSpinbox->setVisible(isVanishingPointAssistant); if (isVanishingPointAssistant) { QSharedPointer assis = qSharedPointerCast(m_selectedAssistant); m_options.vanishingPointAngleSpinbox->setValue(assis->referenceLineDensity()); } // load custom color settings from assistant (this happens when changing assistant m_options.useCustomAssistantColor->setChecked(m_selectedAssistant->useCustomColor()); m_options.customAssistantColorButton->setColor(m_selectedAssistant->assistantCustomColor()); double opacity = (double)m_selectedAssistant->assistantCustomColor().alpha()/(double)255.00 * (double)100.00 ; opacity = ceil(opacity); // helps keep the 0-100% slider from shifting m_options.customColorOpacitySlider->blockSignals(true); m_options.customColorOpacitySlider->setValue((double)opacity); m_options.customColorOpacitySlider->blockSignals(false); } else { m_options.vanishingPointAngleSpinbox->setVisible(false); // } // show/hide elements if an assistant is selected or not m_options.assistantsGlobalOpacitySlider->setVisible(hasActiveAssistant); m_options.assistantsColor->setVisible(hasActiveAssistant); m_options.globalColorLabel->setVisible(hasActiveAssistant); m_options.useCustomAssistantColor->setVisible(hasActiveAssistant); // hide custom color options if use custom color is not selected bool showCustomColorSettings = m_options.useCustomAssistantColor->isChecked() && hasActiveAssistant; m_options.customColorOpacitySlider->setVisible(showCustomColorSettings); m_options.customAssistantColorButton->setVisible(showCustomColorSettings); // disable global color settings if we are using the custom color m_options.assistantsGlobalOpacitySlider->setEnabled(!showCustomColorSettings); m_options.assistantsColor->setEnabled(!showCustomColorSettings); m_options.globalColorLabel->setEnabled(!showCustomColorSettings); } void KisAssistantTool::slotChangeVanishingPointAngle(double value) { if ( m_canvas->paintingAssistantsDecoration()->assistants().length() == 0) { return; } // get the selected assistant and change the angle value KisPaintingAssistantSP m_selectedAssistant = m_canvas->paintingAssistantsDecoration()->selectedAssistant(); if (m_selectedAssistant) { bool isVanishingPointAssistant = m_selectedAssistant->id() == "vanishing point"; if (isVanishingPointAssistant) { QSharedPointer assis = qSharedPointerCast(m_selectedAssistant); assis->setReferenceLineDensity((float)value); } } m_canvas->canvasWidget()->update(); } void KisAssistantTool::mouseMoveEvent(KoPointerEvent *event) { if (m_newAssistant && m_internalMode == MODE_CREATION) { *m_newAssistant->handles().back() = event->point; } else if (m_newAssistant && m_internalMode == MODE_DRAGGING_TRANSLATING_TWONODES) { QPointF translate = event->point - m_dragEnd; m_dragEnd = event->point; m_selectedNode1.data()->operator = (QPointF(m_selectedNode1.data()->x(),m_selectedNode1.data()->y()) + translate); m_selectedNode2.data()->operator = (QPointF(m_selectedNode2.data()->x(),m_selectedNode2.data()->y()) + translate); } m_canvas->updateCanvas(); } void KisAssistantTool::paint(QPainter& _gc, const KoViewConverter &_converter) { QRectF canvasSize = QRectF(QPointF(0, 0), QSizeF(m_canvas->image()->size())); // show special display while a new assistant is in the process of being created if (m_newAssistant) { QColor assistantColor = m_newAssistant->effectiveAssistantColor(); assistantColor.setAlpha(80); m_newAssistant->drawAssistant(_gc, canvasSize, m_canvas->coordinatesConverter(), false, m_canvas, true, false); Q_FOREACH (const KisPaintingAssistantHandleSP handle, m_newAssistant->handles()) { QPainterPath path; path.addEllipse(QRectF(_converter.documentToView(*handle) - QPointF(m_handleSize * 0.5, m_handleSize * 0.5), QSizeF(m_handleSize, m_handleSize))); _gc.save(); _gc.setPen(Qt::NoPen); _gc.setBrush(assistantColor); _gc.drawPath(path); _gc.restore(); } } Q_FOREACH (KisPaintingAssistantSP assistant, m_canvas->paintingAssistantsDecoration()->assistants()) { QColor assistantColor = assistant->effectiveAssistantColor(); assistantColor.setAlpha(80); Q_FOREACH (const KisPaintingAssistantHandleSP handle, m_handles) { QRectF ellipse(_converter.documentToView(*handle) - QPointF(m_handleSize * 0.5, m_handleSize * 0.5), QSizeF(m_handleSize, m_handleSize)); // render handles differently if it is the one being dragged. if (handle == m_handleDrag || handle == m_handleCombine) { QPen stroke(assistantColor, 4); _gc.save(); _gc.setPen(stroke); _gc.setBrush(Qt::NoBrush); _gc.drawEllipse(ellipse); _gc.restore(); } } } } void KisAssistantTool::removeAllAssistants() { m_canvas->viewManager()->canvasResourceProvider()->clearPerspectiveGrids(); m_canvas->paintingAssistantsDecoration()->removeAll(); m_handles = m_canvas->paintingAssistantsDecoration()->handles(); m_canvas->updateCanvas(); m_canvas->paintingAssistantsDecoration()->deselectAssistant(); updateToolOptionsUI(); } void KisAssistantTool::loadAssistants() { KoFileDialog dialog(m_canvas->viewManager()->mainWindow(), KoFileDialog::OpenFile, "OpenAssistant"); dialog.setCaption(i18n("Select an Assistant")); dialog.setDefaultDir(QStandardPaths::writableLocation(QStandardPaths::PicturesLocation)); dialog.setMimeTypeFilters(QStringList() << "application/x-krita-assistant", "application/x-krita-assistant"); QString filename = dialog.filename(); if (filename.isEmpty()) return; if (!QFileInfo(filename).exists()) return; QFile file(filename); file.open(QIODevice::ReadOnly); QByteArray data = file.readAll(); QXmlStreamReader xml(data); QMap handleMap; KisPaintingAssistantSP assistant; bool errors = false; while (!xml.atEnd()) { switch (xml.readNext()) { case QXmlStreamReader::StartElement: if (xml.name() == "handle") { if (assistant && !xml.attributes().value("ref").isEmpty()) { KisPaintingAssistantHandleSP handle = handleMap.value(xml.attributes().value("ref").toString().toInt()); if (handle) { assistant->addHandle(handle, HandleType::NORMAL); } else { errors = true; } } else { QString strId = xml.attributes().value("id").toString(), strX = xml.attributes().value("x").toString(), strY = xml.attributes().value("y").toString(); if (!strId.isEmpty() && !strX.isEmpty() && !strY.isEmpty()) { int id = strId.toInt(); double x = strX.toDouble(), y = strY.toDouble(); if (!handleMap.contains(id)) { handleMap.insert(id, new KisPaintingAssistantHandle(x, y)); } else { errors = true; } } else { errors = true; } } } else if (xml.name() == "assistant") { const KisPaintingAssistantFactory* factory = KisPaintingAssistantFactoryRegistry::instance()->get(xml.attributes().value("type").toString()); if (factory) { if (assistant) { errors = true; assistant.clear(); } assistant = toQShared(factory->createPaintingAssistant()); } else { errors = true; } if (assistant) { // load custom shared assistant properties if (xml.attributes().hasAttribute("useCustomColor")) { QStringRef useCustomColor = xml.attributes().value("useCustomColor"); bool usingColor = false; if (useCustomColor.toString() == "1") { usingColor = true; } assistant->setUseCustomColor(usingColor); } if ( xml.attributes().hasAttribute("useCustomColor")) { QStringRef customColor = xml.attributes().value("customColor"); assistant->setAssistantCustomColor( KisDomUtils::qStringToQColor(customColor.toString()) ); } } } if (assistant) { assistant->loadCustomXml(&xml); } break; case QXmlStreamReader::EndElement: if (xml.name() == "assistant") { if (assistant) { if (assistant->handles().size() == assistant->numHandles()) { if (assistant->id() == "vanishing point"){ //ideally we'd save and load side-handles as well, but this is all I've got// QPointF pos = *assistant->handles()[0]; assistant->addHandle(new KisPaintingAssistantHandle(pos+QPointF(-70,0)), HandleType::SIDE); assistant->addHandle(new KisPaintingAssistantHandle(pos+QPointF(-140,0)), HandleType::SIDE); assistant->addHandle(new KisPaintingAssistantHandle(pos+QPointF(70,0)), HandleType::SIDE); assistant->addHandle(new KisPaintingAssistantHandle(pos+QPointF(140,0)), HandleType::SIDE); } m_canvas->paintingAssistantsDecoration()->addAssistant(assistant); KisAbstractPerspectiveGrid* grid = dynamic_cast(assistant.data()); if (grid) { m_canvas->viewManager()->canvasResourceProvider()->addPerspectiveGrid(grid); } } else { errors = true; } assistant.clear(); } } break; default: break; } } if (assistant) { errors = true; assistant.clear(); } if (xml.hasError()) { QMessageBox::warning(0, i18nc("@title:window", "Krita"), xml.errorString()); } if (errors) { QMessageBox::warning(0, i18nc("@title:window", "Krita"), i18n("Errors were encountered. Not all assistants were successfully loaded.")); } m_handles = m_canvas->paintingAssistantsDecoration()->handles(); m_canvas->updateCanvas(); } void KisAssistantTool::saveAssistants() { if (m_handles.isEmpty()) return; QByteArray data; QXmlStreamWriter xml(&data); xml.writeStartDocument(); xml.writeStartElement("paintingassistant"); xml.writeAttribute("color", KisDomUtils::qColorToQString( m_canvas->paintingAssistantsDecoration()->globalAssistantsColor())); // global color if no custom color used xml.writeStartElement("handles"); QMap handleMap; Q_FOREACH (const KisPaintingAssistantHandleSP handle, m_handles) { int id = handleMap.size(); handleMap.insert(handle, id); xml.writeStartElement("handle"); //xml.writeAttribute("type", handle->handleType()); xml.writeAttribute("id", QString::number(id)); xml.writeAttribute("x", QString::number(double(handle->x()), 'f', 3)); xml.writeAttribute("y", QString::number(double(handle->y()), 'f', 3)); xml.writeEndElement(); } xml.writeEndElement(); xml.writeStartElement("assistants"); Q_FOREACH (const KisPaintingAssistantSP assistant, m_canvas->paintingAssistantsDecoration()->assistants()) { xml.writeStartElement("assistant"); xml.writeAttribute("type", assistant->id()); xml.writeAttribute("useCustomColor", QString::number(assistant->useCustomColor())); xml.writeAttribute("customColor", KisDomUtils::qColorToQString(assistant->assistantCustomColor())); // custom assistant properties like angle density on vanishing point assistant->saveCustomXml(&xml); // handle information xml.writeStartElement("handles"); Q_FOREACH (const KisPaintingAssistantHandleSP handle, assistant->handles()) { xml.writeStartElement("handle"); xml.writeAttribute("ref", QString::number(handleMap.value(handle))); xml.writeEndElement(); } xml.writeEndElement(); xml.writeEndElement(); } xml.writeEndElement(); xml.writeEndElement(); xml.writeEndDocument(); KoFileDialog dialog(m_canvas->viewManager()->mainWindow(), KoFileDialog::SaveFile, "OpenAssistant"); dialog.setCaption(i18n("Save Assistant")); dialog.setDefaultDir(QStandardPaths::writableLocation(QStandardPaths::PicturesLocation)); dialog.setMimeTypeFilters(QStringList() << "application/x-krita-assistant", "application/x-krita-assistant"); QString filename = dialog.filename(); if (filename.isEmpty()) return; QFile file(filename); file.open(QIODevice::WriteOnly); file.write(data); } QWidget *KisAssistantTool::createOptionWidget() { if (!m_optionsWidget) { m_optionsWidget = new QWidget; m_options.setupUi(m_optionsWidget); // See https://bugs.kde.org/show_bug.cgi?id=316896 QWidget *specialSpacer = new QWidget(m_optionsWidget); specialSpacer->setObjectName("SpecialSpacer"); specialSpacer->setFixedSize(0, 0); m_optionsWidget->layout()->addWidget(specialSpacer); m_options.loadAssistantButton->setIcon(KisIconUtils::loadIcon("document-open")); m_options.saveAssistantButton->setIcon(KisIconUtils::loadIcon("document-save")); m_options.deleteAllAssistantsButton->setIcon(KisIconUtils::loadIcon("edit-delete")); QList assistants; Q_FOREACH (const QString& key, KisPaintingAssistantFactoryRegistry::instance()->keys()) { QString name = KisPaintingAssistantFactoryRegistry::instance()->get(key)->name(); assistants << KoID(key, name); } std::sort(assistants.begin(), assistants.end(), KoID::compareNames); Q_FOREACH(const KoID &id, assistants) { m_options.availableAssistantsComboBox->addItem(id.name(), id.id()); } connect(m_options.saveAssistantButton, SIGNAL(clicked()), SLOT(saveAssistants())); connect(m_options.loadAssistantButton, SIGNAL(clicked()), SLOT(loadAssistants())); connect(m_options.deleteAllAssistantsButton, SIGNAL(clicked()), SLOT(removeAllAssistants())); connect(m_options.assistantsColor, SIGNAL(changed(QColor)), SLOT(slotGlobalAssistantsColorChanged(QColor))); connect(m_options.assistantsGlobalOpacitySlider, SIGNAL(valueChanged(int)), SLOT(slotGlobalAssistantOpacityChanged())); connect(m_options.vanishingPointAngleSpinbox, SIGNAL(valueChanged(double)), this, SLOT(slotChangeVanishingPointAngle(double))); //ENTER_FUNCTION() << ppVar(m_canvas) << ppVar(m_canvas && m_canvas->paintingAssistantsDecoration()); // initialize UI elements with existing data if possible if (m_canvas && m_canvas->paintingAssistantsDecoration()) { const QColor color = m_canvas->paintingAssistantsDecoration()->globalAssistantsColor(); QColor opaqueColor = color; opaqueColor.setAlpha(255); //ENTER_FUNCTION() << ppVar(opaqueColor); m_options.assistantsColor->setColor(opaqueColor); m_options.customAssistantColorButton->setColor(opaqueColor); m_options.assistantsGlobalOpacitySlider->setValue(color.alphaF() * 100.0); } else { m_options.assistantsColor->setColor(QColor(176, 176, 176, 255)); // grey default for all assistants m_options.assistantsGlobalOpacitySlider->setValue(100); // 100% } m_options.assistantsGlobalOpacitySlider->setPrefix(i18n("Opacity: ")); m_options.assistantsGlobalOpacitySlider->setSuffix(" %"); // custom color of selected assistant m_options.customColorOpacitySlider->setValue(100); // 100% m_options.customColorOpacitySlider->setPrefix(i18n("Opacity: ")); m_options.customColorOpacitySlider->setSuffix(" %"); connect(m_options.useCustomAssistantColor, SIGNAL(clicked(bool)), this, SLOT(slotUpdateCustomColor())); connect(m_options.customAssistantColorButton, SIGNAL(changed(QColor)), this, SLOT(slotUpdateCustomColor())); connect(m_options.customColorOpacitySlider, SIGNAL(valueChanged(int)), SLOT(slotCustomOpacityChanged())); m_options.vanishingPointAngleSpinbox->setPrefix(i18n("Density: ")); m_options.vanishingPointAngleSpinbox->setSuffix(QChar(Qt::Key_degree)); m_options.vanishingPointAngleSpinbox->setRange(1.0, 180.0); m_options.vanishingPointAngleSpinbox->setSingleStep(0.5); m_options.vanishingPointAngleSpinbox->setVisible(false); } updateToolOptionsUI(); return m_optionsWidget; } void KisAssistantTool::slotGlobalAssistantsColorChanged(const QColor& setColor) { // color and alpha are stored separately, so we need to merge the values before sending it on int oldAlpha = m_canvas->paintingAssistantsDecoration()->globalAssistantsColor().alpha(); QColor newColor = setColor; newColor.setAlpha(oldAlpha); m_canvas->paintingAssistantsDecoration()->setGlobalAssistantsColor(newColor); m_canvas->paintingAssistantsDecoration()->uncache(); m_canvas->canvasWidget()->update(); } void KisAssistantTool::slotGlobalAssistantOpacityChanged() { QColor newColor = m_canvas->paintingAssistantsDecoration()->globalAssistantsColor(); qreal newOpacity = m_options.assistantsGlobalOpacitySlider->value() * 0.01 * 255.0; newColor.setAlpha(int(newOpacity)); m_canvas->paintingAssistantsDecoration()->setGlobalAssistantsColor(newColor); m_canvas->paintingAssistantsDecoration()->uncache(); m_canvas->canvasWidget()->update(); } void KisAssistantTool::slotUpdateCustomColor() { // get the selected assistant and change the angle value KisPaintingAssistantSP m_selectedAssistant = m_canvas->paintingAssistantsDecoration()->selectedAssistant(); if (m_selectedAssistant) { m_selectedAssistant->setUseCustomColor(m_options.useCustomAssistantColor->isChecked()); // changing color doesn't keep alpha, so update that before we send it on QColor newColor = m_options.customAssistantColorButton->color(); newColor.setAlpha(m_selectedAssistant->assistantCustomColor().alpha()); m_selectedAssistant->setAssistantCustomColor(newColor); m_selectedAssistant->uncache(); } updateToolOptionsUI(); m_canvas->canvasWidget()->update(); } void KisAssistantTool::slotCustomOpacityChanged() { KisPaintingAssistantSP m_selectedAssistant = m_canvas->paintingAssistantsDecoration()->selectedAssistant(); if (m_selectedAssistant) { QColor newColor = m_selectedAssistant->assistantCustomColor(); qreal newOpacity = m_options.customColorOpacitySlider->value() * 0.01 * 255.0; newColor.setAlpha(int(newOpacity)); m_selectedAssistant->setAssistantCustomColor(newColor); m_selectedAssistant->uncache(); } // this forces the canvas to refresh to see the changes immediately m_canvas->paintingAssistantsDecoration()->uncache(); m_canvas->canvasWidget()->update(); }