diff --git a/plugins/paintops/deform/CMakeLists.txt b/plugins/paintops/deform/CMakeLists.txt index b5cf407fc4..8ea628adc7 100644 --- a/plugins/paintops/deform/CMakeLists.txt +++ b/plugins/paintops/deform/CMakeLists.txt @@ -1,17 +1,18 @@ set(kritadeformpaintop_SOURCES deform_brush.cpp deform_paintop_plugin.cpp kis_deform_paintop.cpp kis_deform_paintop_settings.cpp kis_deform_option.cpp kis_deform_paintop_settings_widget.cpp + kis_brush_size_option.cpp ) ki18n_wrap_ui(kritadeformpaintop_SOURCES wdgdeformoptions.ui ) add_library(kritadeformpaintop MODULE ${kritadeformpaintop_SOURCES}) target_link_libraries(kritadeformpaintop kritaui kritalibpaintop) install(TARGETS kritadeformpaintop DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) install( FILES krita-deform.png DESTINATION ${DATA_INSTALL_DIR}/krita/images ) diff --git a/plugins/paintops/libpaintop/kis_brush_size_option.cpp b/plugins/paintops/deform/kis_brush_size_option.cpp similarity index 100% rename from plugins/paintops/libpaintop/kis_brush_size_option.cpp rename to plugins/paintops/deform/kis_brush_size_option.cpp diff --git a/plugins/paintops/libpaintop/kis_brush_size_option.h b/plugins/paintops/deform/kis_brush_size_option.h similarity index 95% rename from plugins/paintops/libpaintop/kis_brush_size_option.h rename to plugins/paintops/deform/kis_brush_size_option.h index cf7de86831..3727dc205d 100644 --- a/plugins/paintops/libpaintop/kis_brush_size_option.h +++ b/plugins/paintops/deform/kis_brush_size_option.h @@ -1,96 +1,95 @@ /* * Copyright (c) 2009,2010 Lukáš Tvrdý * * 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. */ #ifndef KIS_SIZE_OPTION_H_ #define KIS_SIZE_OPTION_H_ #include #include #include -#include class KisBrushSizeOptionsWidget; const QString BRUSH_SHAPE = "Brush/shape"; const QString BRUSH_DIAMETER = "Brush/diameter"; const QString BRUSH_ASPECT = "Brush/aspect"; const QString BRUSH_SCALE = "Brush/scale"; const QString BRUSH_ROTATION = "Brush/rotation"; const QString BRUSH_SPACING = "Brush/spacing"; const QString BRUSH_DENSITY = "Brush/density"; const QString BRUSH_JITTER_MOVEMENT = "Brush/jitterMovement"; const QString BRUSH_JITTER_MOVEMENT_ENABLED = "Brush/jitterMovementEnabled"; -class PAINTOP_EXPORT KisBrushSizeOption : public KisPaintOpOption +class KisBrushSizeOption : public KisPaintOpOption { public: KisBrushSizeOption(); ~KisBrushSizeOption(); int diameter() const; void setDiameter(int diameter); void setSpacing(qreal spacing); qreal spacing() const; qreal brushAspect() const; void writeOptionSetting(KisPropertiesConfiguration* setting) const; void readOptionSetting(const KisPropertiesConfiguration* setting); private: KisBrushSizeOptionsWidget * m_options; }; -class PAINTOP_EXPORT KisBrushSizeProperties +class KisBrushSizeProperties { public: quint16 shape; quint16 diameter; qreal aspect; qreal scale; qreal rotation; qreal spacing; qreal density; qreal jitterMovementAmount; bool jitterEnabled; public: void readOptionSetting(const KisPropertiesConfiguration * settings) { //TODO: shape shape = 0; diameter = quint16(settings->getDouble(BRUSH_DIAMETER)); aspect = settings->getDouble(BRUSH_ASPECT); rotation = settings->getDouble(BRUSH_ROTATION) * (M_PI / 180.0); scale = settings->getDouble(BRUSH_SCALE); density = settings->getDouble(BRUSH_DENSITY) * 0.01; spacing = settings->getDouble(BRUSH_SPACING); if ((jitterEnabled = settings->getBool(BRUSH_JITTER_MOVEMENT_ENABLED))) { jitterMovementAmount = settings->getDouble(BRUSH_JITTER_MOVEMENT); } else { jitterMovementAmount = 0.0; } } }; #endif diff --git a/plugins/paintops/libpaintop/CMakeLists.txt b/plugins/paintops/libpaintop/CMakeLists.txt index 6275b75e88..37c63befbd 100644 --- a/plugins/paintops/libpaintop/CMakeLists.txt +++ b/plugins/paintops/libpaintop/CMakeLists.txt @@ -1,97 +1,96 @@ set(kritalibpaintop_LIB_SRCS kis_airbrush_option.cpp kis_auto_brush_widget.cpp kis_spacing_selection_widget.cpp kis_bidirectional_mixing_option.cpp kis_bidirectional_mixing_option_widget.cpp kis_brush_based_paintop.cpp kis_brush_chooser.cpp kis_brush_option_widget.cpp - kis_brush_size_option.cpp kis_brush_option.cpp kis_brush_selection_widget.cpp kis_color_option.cpp kis_color_source.cpp kis_color_source_option.cpp kis_color_source_option_widget.cpp kis_curve_option.cpp kis_curve_option_widget.cpp kis_custom_brush_widget.cpp kis_clipboard_brush_widget.cpp kis_dynamic_sensor.cc kis_dab_cache.cpp kis_filter_option.cpp kis_multi_sensors_model_p.cpp kis_multi_sensors_selector.cpp kis_paint_action_type_option.cpp kis_precision_option.cpp kis_pressure_darken_option.cpp kis_pressure_hsv_option.cpp kis_pressure_opacity_option.cpp kis_pressure_flow_option.cpp kis_pressure_mirror_option.cpp kis_pressure_scatter_option.cpp kis_pressure_scatter_option_widget.cpp kis_pressure_sharpness_option.cpp kis_pressure_sharpness_option_widget.cpp kis_pressure_mirror_option_widget.cpp kis_pressure_rotation_option.cpp kis_pressure_size_option.cpp kis_pressure_spacing_option.cpp kis_pressure_softness_option.cpp kis_pressure_mix_option.cpp kis_pressure_gradient_option.cpp kis_pressure_flow_opacity_option.cpp kis_pressure_flow_opacity_option_widget.cpp kis_pressure_spacing_option_widget.cpp kis_current_outline_fetcher.cpp kis_text_brush_chooser.cpp kis_brush_based_paintop_options_widget.cpp kis_brush_based_paintop_settings.cpp kis_compositeop_option.cpp kis_texture_option.cpp kis_pressure_texture_strength_option.cpp kis_embedded_pattern_manager.cpp sensors/kis_dynamic_sensors.cc sensors/kis_dynamic_sensor_drawing_angle.cpp sensors/kis_dynamic_sensor_distance.cc sensors/kis_dynamic_sensor_time.cc sensors/kis_dynamic_sensor_fade.cpp sensors/kis_dynamic_sensor_fuzzy.cpp ) ki18n_wrap_ui(kritalibpaintop_LIB_SRCS forms/wdgautobrush.ui forms/wdgBrushSizeOptions.ui forms/wdgcurveoption.ui forms/wdgcustombrush.ui forms/wdgclipboardbrush.ui forms/wdgtextbrush.ui forms/wdgincremental.ui forms/wdgmultisensorsselector.ui forms/wdgairbrush.ui forms/wdgfilteroption.ui forms/wdgcoloroptions.ui forms/wdgbrushchooser.ui forms/wdgCompositeOpOption.ui forms/wdgflowopacityoption.ui sensors/SensorDistanceConfiguration.ui sensors/SensorTimeConfiguration.ui sensors/SensorFadeConfiguration.ui ) add_library(kritalibpaintop SHARED ${kritalibpaintop_LIB_SRCS} ) generate_export_header(kritalibpaintop BASE_NAME kritapaintop EXPORT_MACRO_NAME PAINTOP_EXPORT) target_link_libraries(kritalibpaintop kritaui kritalibbrush kritawidgetutils) target_link_libraries(kritalibpaintop LINK_INTERFACE_LIBRARIES kritaui kritalibbrush) set_target_properties(kritalibpaintop PROPERTIES VERSION ${GENERIC_KRITA_LIB_VERSION} SOVERSION ${GENERIC_KRITA_LIB_SOVERSION} ) install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS}) add_subdirectory(tests)