-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/110244/#review32713
-----------------------------------------------------------
Ship it!
Okay -- looks good! You'll need this patch, too, though, before pushing the
commit to master, because the new canvas decoration Dmitry created didn't use
the update api yet:
diff --git a/krita/ui/canvas/kis_infinity_manager.cpp
b/krita/ui/canvas/kis_infinity_manager.cpp
index 513b1b4..f2d3884 100644
--- a/krita/ui/canvas/kis_infinity_manager.cpp
+++ b/krita/ui/canvas/kis_infinity_manager.cpp
@@ -116,10 +116,11 @@ void KisInfinityManager::imagePositionChanged()
}
}
-void KisInfinityManager::drawDecoration(QPainter& gc, const QRectF&
updateArea, const KisCoordinatesConverter *converter)
+void KisInfinityManager::drawDecoration(QPainter& gc, const QRectF&
updateArea, const KisCoordinatesConverter *converter, KisCanvas2 *canvas)
{
Q_UNUSED(updateArea);
Q_UNUSED(converter);
+ Q_UNUSED(canvas);
gc.save();
gc.setTransform(QTransform(), false);
diff --git a/krita/ui/canvas/kis_infinity_manager.h
b/krita/ui/canvas/kis_infinity_manager.h
index eecc54b..591ce0f 100644
--- a/krita/ui/canvas/kis_infinity_manager.h
+++ b/krita/ui/canvas/kis_infinity_manager.h
@@ -23,7 +23,6 @@
#include <QPainterPath>
#include <QCursor>
-class KisCanvas2;
static const QString INFINITY_DECORATION_ID = "infinity-decorations";
@@ -35,7 +34,7 @@ public:
KisInfinityManager(KisView2 *view, KisCanvas2 *canvas);
protected:
- void drawDecoration(QPainter& gc, const QRectF& updateArea, const
KisCoordinatesConverter *converter);
+ void drawDecoration(QPainter& gc, const QRectF& updateArea, const
KisCoordinatesConverter *converter, KisCanvas2 *canvas);
bool eventFilter(QObject *obj, QEvent *event);
public slots:
lines 1-38/38 (END)
- Boudewijn Rempt
On May 14, 2013, 5:46 p.m., Shivaraman Aiyer wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/110244/
> -----------------------------------------------------------
>
> (Updated May 14, 2013, 5:46 p.m.)
>
>
> Review request for Calligra.
>
>
> Description
> -------
>
> Perspective Grid has a feature of creating a new grid from its side handles,
> snapping two of the handles to the parent grid. As Perspective Assistant is
> more flexible, it was a better option to put the side handle feature to it.
> This diff enables the Perspective Assistant to create new Perspective
> Assistant from the current Assistants.
>
>
> Diffs
> -----
>
> krita/plugins/assistants/RulerAssistant/PerspectiveAssistant.h 16cd814
> krita/plugins/assistants/RulerAssistant/PerspectiveAssistant.cc 13e8f32
> krita/plugins/assistants/RulerAssistant/kis_ruler_assistant_tool.h e3bee14
> krita/plugins/assistants/RulerAssistant/kis_ruler_assistant_tool.cc 34b8a71
> krita/plugins/assistants/RulerAssistant/ruler_assistant_tool.cc fc9ab85
> krita/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
> 4f6dee4
> krita/ui/CMakeLists.txt 37e4635
> krita/ui/canvas/kis_canvas_decoration.h c9ed223
> krita/ui/canvas/kis_canvas_decoration.cc 5157679
> krita/ui/canvas/kis_canvas_widget_base.cpp 166a529
> krita/ui/canvas/kis_grid_manager.h ada17a6
> krita/ui/canvas/kis_grid_manager.cpp efd6c7b
> krita/ui/canvas/kis_perspective_grid_manager.h 5a4753e
> krita/ui/canvas/kis_perspective_grid_manager.cpp 2d6d339
> krita/ui/kis_painting_assistant.h 2fb513c
> krita/ui/kis_painting_assistant.cc 9fd2ec3
> krita/ui/kis_painting_assistants_manager.h 7ca4119
> krita/ui/kis_painting_assistants_manager.cc 6f9ddbb
> krita/ui/kis_selection_decoration.h cf86ada
> krita/ui/kis_selection_decoration.cc d442729
> krita/ui/kra/kis_kra_saver.cpp c84b0c7
>
> Diff: http://git.reviewboard.kde.org/r/110244/diff/
>
>
> Testing
> -------
>
> Basic preliminary testing done include:
> 1) Test if rest of the Assistants are working - done, passed
> 2) Test the working of the side handles - done, passed
> 3) Test if all the assistants working together - done, passed
> 4) Test if the special cases are also working - done, passed
>
>
> Thanks,
>
> Shivaraman Aiyer
>
>
_______________________________________________
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel
