[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra] krita/plugins/paintops: Spread the Mirror option among all the brush-based paint ops
From: Dmitry Kazakov <dimula73 () gmail ! com>
Date: 2013-08-05 20:15:21
Message-ID: E1V6RBZ-0005yM-AT () scm ! kde ! org
[Download RAW message or body]
Git commit 65a3d33f428a8ec2273b73cad0195aa974f6ddd8 by Dmitry Kazakov.
Committed on 05/08/2013 at 19:48.
Pushed by dkazakov into branch 'master'.
Spread the Mirror option among all the brush-based paint ops
This also fixes mirroring of the brush on the mirrored canvas for
these very paint ops.
M +3 -1 krita/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp
M +0 -3 krita/plugins/paintops/defaultpaintops/brush/kis_brushop.cpp
M +0 -2 krita/plugins/paintops/defaultpaintops/brush/kis_brushop.h
M +2 -2 krita/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp
M +2 -1 krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings_widget.cpp
M +1 -1 krita/plugins/paintops/deform/kis_deform_paintop_settings_widget.cpp
M +1 -0 krita/plugins/paintops/filterop/kis_filterop_settings_widget.cpp
M +1 -1 krita/plugins/paintops/hairy/kis_hairy_paintop_settings_widget.cpp
M +2 -1 krita/plugins/paintops/hatching/kis_hatching_paintop_settings_widget.cpp
M +3 -0 krita/plugins/paintops/libpaintop/kis_brush_based_paintop.cpp
M +2 -0 krita/plugins/paintops/libpaintop/kis_brush_based_paintop.h
M +6 -0 krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.cpp
M +1 -0 krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.h
M +1 -1 krita/plugins/paintops/sketch/kis_sketch_paintop_settings_widget.cpp
M +3 -2 krita/plugins/paintops/spray/kis_spray_paintop_settings_widget.cpp
http://commits.kde.org/calligra/65a3d33f428a8ec2273b73cad0195aa974f6ddd8
diff --git a/krita/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp \
b/krita/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp \
index 354ecc1..1af6884 100644
--- a/krita/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp
+++ b/krita/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp
@@ -43,9 +43,11 @@ KisColorSmudgeOpSettingsWidget::KisColorSmudgeOpSettingsWidget(QWidget* \
parent): setPrecisionEnabled(true);
addPaintOpOption(new KisCompositeOpOption(true));
- addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureSizeOption()));
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureOpacityOption())); + addPaintOpOption(new \
KisCurveOptionWidget(new KisPressureSizeOption())); addPaintOpOption(new \
KisPressureSpacingOptionWidget()); + addMirrorOption();
+
addPaintOpOption(new KisSmudgeOptionWidget(i18n("Smudge Rate"), \
i18n("Rate: "), "SmudgeRate", true));
addPaintOpOption(new KisRateOptionWidget(i18n("Color Rate") , \
i18n("Rate: "), "ColorRate" , false));
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureRotationOption()));
diff --git a/krita/plugins/paintops/defaultpaintops/brush/kis_brushop.cpp \
b/krita/plugins/paintops/defaultpaintops/brush/kis_brushop.cpp index \
dc07180..9870642 100644
--- a/krita/plugins/paintops/defaultpaintops/brush/kis_brushop.cpp
+++ b/krita/plugins/paintops/defaultpaintops/brush/kis_brushop.cpp
@@ -69,7 +69,6 @@ KisBrushOp::KisBrushOp(const KisBrushBasedPaintOpSettings \
*settings, KisPainter m_opacityOption.readOptionSetting(settings);
m_sizeOption.readOptionSetting(settings);
m_spacingOption.readOptionSetting(settings);
- m_mirrorOption.readOptionSetting(settings);
m_softnessOption.readOptionSetting(settings);
m_sharpnessOption.readOptionSetting(settings);
m_darkenOption.readOptionSetting(settings);
@@ -79,14 +78,12 @@ KisBrushOp::KisBrushOp(const \
KisBrushBasedPaintOpSettings *settings, KisPainter
m_opacityOption.sensor()->reset();
m_sizeOption.sensor()->reset();
- m_mirrorOption.sensor()->reset();
m_softnessOption.sensor()->reset();
m_sharpnessOption.sensor()->reset();
m_darkenOption.sensor()->reset();
m_rotationOption.sensor()->reset();
m_scatterOption.sensor()->reset();
- m_dabCache->setMirrorPostprocessing(&m_mirrorOption);
m_dabCache->setSharpnessPostprocessing(&m_sharpnessOption);
}
diff --git a/krita/plugins/paintops/defaultpaintops/brush/kis_brushop.h \
b/krita/plugins/paintops/defaultpaintops/brush/kis_brushop.h index \
a07dc09..16336e1 100644
--- a/krita/plugins/paintops/defaultpaintops/brush/kis_brushop.h
+++ b/krita/plugins/paintops/defaultpaintops/brush/kis_brushop.h
@@ -30,7 +30,6 @@
#include <kis_pressure_rotation_option.h>
#include <kis_pressure_mix_option.h>
#include <kis_pressure_hsv_option.h>
-#include <kis_pressure_mirror_option.h>
#include <kis_pressure_scatter_option.h>
#include <kis_pressure_softness_option.h>
#include <kis_pressure_sharpness_option.h>
@@ -61,7 +60,6 @@ private:
KisColorSource *m_colorSource;
KisPressureSizeOption m_sizeOption;
KisPressureSpacingOption m_spacingOption;
- KisPressureMirrorOption m_mirrorOption;
KisFlowOpacityOption m_opacityOption;
KisPressureSoftnessOption m_softnessOption;
KisPressureSharpnessOption m_sharpnessOption;
diff --git a/krita/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp \
b/krita/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp
index cc047ec..ec531ec 100644
--- a/krita/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp
+++ b/krita/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp
@@ -31,7 +31,6 @@
#include <kis_curve_option_widget.h>
#include <kis_pressure_hsv_option.h>
#include <kis_airbrush_option.h>
-#include <kis_pressure_mirror_option_widget.h>
#include <kis_pressure_scatter_option_widget.h>
#include <kis_pressure_softness_option.h>
#include <kis_pressure_sharpness_option_widget.h>
@@ -52,7 +51,8 @@ KisBrushOpSettingsWidget::KisBrushOpSettingsWidget(QWidget* \
parent) addPaintOpOption(new KisFlowOpacityOptionWidget());
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureSizeOption())); addPaintOpOption(new \
KisPressureSpacingOptionWidget());
- addPaintOpOption(new KisPressureMirrorOptionWidget());
+ addMirrorOption();
+
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureSoftnessOption())); addPaintOpOption(new \
KisPressureSharpnessOptionWidget());
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureRotationOption()));
diff --git a/krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings_widget.cpp \
b/krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings_widget.cpp
index 72d5fdf..21e2524 100644
--- a/krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings_widget.cpp
+++ b/krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings_widget.cpp
@@ -41,8 +41,9 @@ KisDuplicateOpSettingsWidget::KisDuplicateOpSettingsWidget(QWidget* \
parent)
m_duplicateOption = new KisDuplicateOpOption;
addPaintOpOption(new KisCompositeOpOption(true));
- addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureSizeOption()));
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureOpacityOption())); + addPaintOpOption(new \
KisCurveOptionWidget(new KisPressureSizeOption())); + addMirrorOption();
addPaintOpOption(m_duplicateOption);
addTextureOptions();
diff --git a/krita/plugins/paintops/deform/kis_deform_paintop_settings_widget.cpp \
b/krita/plugins/paintops/deform/kis_deform_paintop_settings_widget.cpp \
index e3a28ca..89144b3 100644
--- a/krita/plugins/paintops/deform/kis_deform_paintop_settings_widget.cpp
+++ b/krita/plugins/paintops/deform/kis_deform_paintop_settings_widget.cpp
@@ -38,8 +38,8 @@ KisDeformPaintOpSettingsWidget::KisDeformPaintOpSettingsWidget(QWidget* \
parent)
addPaintOpOption(m_brushSizeOption);
addPaintOpOption(m_deformOption);
- addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureOpacityOption())); addPaintOpOption(new \
KisCompositeOpOption(true)); + addPaintOpOption(new \
KisCurveOptionWidget(new KisPressureOpacityOption()));
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureSizeOption()));
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureRotationOption())); addPaintOpOption(new KisAirbrushOption());
diff --git a/krita/plugins/paintops/filterop/kis_filterop_settings_widget.cpp \
b/krita/plugins/paintops/filterop/kis_filterop_settings_widget.cpp index \
23fec33..b2916e8 100644
--- a/krita/plugins/paintops/filterop/kis_filterop_settings_widget.cpp
+++ b/krita/plugins/paintops/filterop/kis_filterop_settings_widget.cpp
@@ -46,6 +46,7 @@ KisFilterOpSettingsWidget::KisFilterOpSettingsWidget(QWidget* \
parent)
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureOpacityOption()));
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureSizeOption()));
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureRotationOption())); + addMirrorOption();
m_filterOption = new KisFilterOption();
addPaintOpOption(m_filterOption);
diff --git a/krita/plugins/paintops/hairy/kis_hairy_paintop_settings_widget.cpp \
b/krita/plugins/paintops/hairy/kis_hairy_paintop_settings_widget.cpp index \
eda5f99..9235722 100644
--- a/krita/plugins/paintops/hairy/kis_hairy_paintop_settings_widget.cpp
+++ b/krita/plugins/paintops/hairy/kis_hairy_paintop_settings_widget.cpp
@@ -39,8 +39,8 @@ KisHairyPaintOpSettingsWidget:: \
KisHairyPaintOpSettingsWidget(QWidget* parent) addPaintOpOption(new \
KisHairyBristleOption()); addPaintOpOption(new KisHairyInkOption());
addPaintOpOption(new KisCompositeOpOption(true));
- addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureSizeOption()));
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureOpacityOption())); + addPaintOpOption(new \
KisCurveOptionWidget(new KisPressureSizeOption()));
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureRotationOption())); addPaintOpOption(new \
KisPaintActionTypeOption()); }
diff --git a/krita/plugins/paintops/hatching/kis_hatching_paintop_settings_widget.cpp \
b/krita/plugins/paintops/hatching/kis_hatching_paintop_settings_widget.cpp \
index 7e9cf9a..58a8881 100644
--- a/krita/plugins/paintops/hatching/kis_hatching_paintop_settings_widget.cpp
+++ b/krita/plugins/paintops/hatching/kis_hatching_paintop_settings_widget.cpp
@@ -51,8 +51,9 @@ KisHatchingPaintOpSettingsWidget:: \
KisHatchingPaintOpSettingsWidget(QWidget* par
addPaintOpOption(new KisCurveOptionWidget(new \
KisHatchingPressureSeparationOption()));
addPaintOpOption(new KisCurveOptionWidget(new \
KisHatchingPressureThicknessOption()));
addPaintOpOption(new KisCurveOptionWidget(new \
KisHatchingPressureCrosshatchingOption()));
- addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureSizeOption()));
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureOpacityOption())); + addPaintOpOption(new \
KisCurveOptionWidget(new KisPressureSizeOption())); + addMirrorOption();
addPaintOpOption(new KisPaintActionTypeOption());
addTextureOptions();
diff --git a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.cpp \
b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.cpp index \
9fc4def..dffad0e 100644
--- a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.cpp
+++ b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.cpp
@@ -37,6 +37,9 @@ KisBrushBasedPaintOp::KisBrushBasedPaintOp(const \
KisPropertiesConfiguration* set m_dabCache = new KisDabCache(m_brush);
m_dabCache->setPrecisionOption(&m_precisionOption);
+ m_mirrorOption.readOptionSetting(settings);
+ m_dabCache->setMirrorPostprocessing(&m_mirrorOption);
+
m_textureProperties.fillProperties(settings);
m_dabCache->setTexturePostprocessing(&m_textureProperties);
}
diff --git a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.h \
b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.h index \
140aa11..c10d50f 100644
--- a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.h
+++ b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.h
@@ -24,6 +24,7 @@
#include "kis_brush.h"
#include "kis_texture_option.h"
#include "kis_precision_option.h"
+#include "kis_pressure_mirror_option.h"
class KisPropertiesConfiguration;
@@ -55,6 +56,7 @@ protected: // XXX: make private!
KisBrushSP m_brush;
KisTextureProperties m_textureProperties;
+ KisPressureMirrorOption m_mirrorOption;
KisPrecisionOption m_precisionOption;
KisDabCache *m_dabCache;
};
diff --git a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.cpp \
b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.cpp
index 10750cc..1b7a6d7 100644
--- a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.cpp
+++ b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.cpp
@@ -21,6 +21,7 @@
#include "krita_export.h"
#include "kis_texture_option.h"
#include "kis_curve_option_widget.h"
+#include <kis_pressure_mirror_option_widget.h>
#include "kis_pressure_texture_strength_option.h"
@@ -46,6 +47,11 @@ void \
KisBrushBasedPaintopOptionWidget::addTextureOptions()
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureTextureStrengthOption())); }
+void KisBrushBasedPaintopOptionWidget::addMirrorOption()
+{
+ addPaintOpOption(new KisPressureMirrorOptionWidget());
+}
+
KisBrushSP KisBrushBasedPaintopOptionWidget::brush()
{
return m_brushOption->brush();
diff --git a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.h \
b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.h
index d6ca3ac..1a88bf2 100644
--- a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.h
+++ b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.h
@@ -34,6 +34,7 @@ public:
void setPrecisionEnabled(bool value);
void addTextureOptions();
+ void addMirrorOption();
KisBrushSP brush();
diff --git a/krita/plugins/paintops/sketch/kis_sketch_paintop_settings_widget.cpp \
b/krita/plugins/paintops/sketch/kis_sketch_paintop_settings_widget.cpp \
index 086bee5..8220f5a 100644
--- a/krita/plugins/paintops/sketch/kis_sketch_paintop_settings_widget.cpp
+++ b/krita/plugins/paintops/sketch/kis_sketch_paintop_settings_widget.cpp
@@ -43,8 +43,8 @@ KisSketchPaintOpSettingsWidget::KisSketchPaintOpSettingsWidget(QWidget* \
parent)
addPaintOpOption(m_sketchOption);
addPaintOpOption(new KisCompositeOpOption(true));
- addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureSizeOption()));
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureOpacityOption())); + addPaintOpOption(new \
KisCurveOptionWidget(new KisPressureSizeOption()));
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureRotationOption())); addPaintOpOption(new \
KisCurveOptionWidget(new KisLineWidthOption()));
addPaintOpOption(new KisCurveOptionWidget(new \
KisOffsetScaleOption()));
diff --git a/krita/plugins/paintops/spray/kis_spray_paintop_settings_widget.cpp \
b/krita/plugins/paintops/spray/kis_spray_paintop_settings_widget.cpp index \
a6c126a..c042107 100644
--- a/krita/plugins/paintops/spray/kis_spray_paintop_settings_widget.cpp
+++ b/krita/plugins/paintops/spray/kis_spray_paintop_settings_widget.cpp
@@ -43,6 +43,9 @@ KisSprayPaintOpSettingsWidget:: \
KisSprayPaintOpSettingsWidget(QWidget* parent) m_ColorOption = new \
KisColorOption(); m_brushOption = new KisBrushOptionWidget();
+ addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureOpacityOption())); + addPaintOpOption(new \
KisCurveOptionWidget(new KisPressureSizeOption())); +
addPaintOpOption(m_brushOption);
addPaintOpOption(new KisCompositeOpOption(true));
addPaintOpOption(m_sprayOption);
@@ -51,8 +54,6 @@ KisSprayPaintOpSettingsWidget:: \
KisSprayPaintOpSettingsWidget(QWidget* parent) \
addPaintOpOption(m_ColorOption);
addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureRotationOption()));
- addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureSizeOption()));
- addPaintOpOption(new KisCurveOptionWidget(new \
KisPressureOpacityOption())); addPaintOpOption(new KisAirbrushOption());
addPaintOpOption(new KisPaintActionTypeOption());
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic