Revision c29817f...

Go back to digest for 16th February 2014

Bug Fixes in Office

Boudewijn Rempt committed changes in [calligra] /:

Save multi-sensor configuration correctly

Big rewrite & cleanup of the sensors/libpaintop code...

The KisDynamicSensorList class is gone and KisCurveOption now tracks
all sensors. The KisMultiSensorModel doesn't own the data it is a model
for anymore everything is tracked by KisCurveOption.

Conflicts:
krita/plugins/paintops/spray/kis_spray_paintop_settings_widget.cpp
krita/plugins/paintops/spray/kis_sprayop_option.cpp
krita/plugins/paintops/spray/spray_brush.cpp
krita/plugins/paintops/spray/spray_brush.h

Bug 330661: [ brush editor / sensors ] 'Use the same curves' is always on loading Krita
 
11 days

File Changes

Deleted 2 files
  • /plugins/paintops/libpaintop/sensors
  •   krita/kis_dynamic_sensor_list.cc
  •   krita/kis_dynamic_sensor_list.h
Modified 272 files
  •   krita/image/kis_cubic_curve.cpp
  •   krita/ui/kis_paintop_option.cpp
  •   krita/ui/kis_paintop_option.h
  •   krita/plugins/paintops/chalk/chalk_brush.cpp
  •   krita/plugins/paintops/chalk/chalk_paintop_plugin.cpp
  •   krita/plugins/paintops/chalk/kis_chalk_paintop.cpp
  •   krita/plugins/paintops/chalk/kis_chalk_paintop_settings.cpp
  •   krita/plugins/paintops/chalk/kis_chalk_paintop_settings_widget.cpp
  •   krita/plugins/paintops/chalk/kis_chalkop_option.cpp
  •   krita/plugins/paintops/chalk/kis_chalkop_option.h
  •   krita/plugins/paintops/colorsmudge/colorsmudge_paintop_plugin.cpp
  •   krita/plugins/paintops/colorsmudge/kis_colorsmudgeop.cpp
  •   krita/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.h
  •   krita/plugins/paintops/colorsmudge/kis_overlay_mode_option.h
  •   krita/plugins/paintops/colorsmudge/kis_rate_option.cpp
  •   krita/plugins/paintops/colorsmudge/kis_rate_option.h
  •   krita/plugins/paintops/colorsmudge/kis_rate_option_widget.cpp
  •   krita/plugins/paintops/colorsmudge/kis_rate_option_widget.h
  •   krita/plugins/paintops/colorsmudge/kis_smudge_option.cpp
  •   krita/plugins/paintops/colorsmudge/kis_smudge_option.h
  •   krita/plugins/paintops/colorsmudge/kis_smudge_option_widget.cpp
  •   krita/plugins/paintops/colorsmudge/kis_smudge_option_widget.h
  •   krita/plugins/paintops/curvebrush/curve_brush.cpp
  •   krita/plugins/paintops/curvebrush/curve_brush.h
  •   krita/plugins/paintops/curvebrush/curve_paintop_plugin.cpp
  •   krita/plugins/paintops/curvebrush/kis_curve_line_option.cpp
  •   krita/plugins/paintops/curvebrush/kis_curve_line_option.h
  •   krita/plugins/paintops/curvebrush/kis_curve_paintop.cpp
  •   krita/plugins/paintops/curvebrush/kis_curve_paintop_settings_widget.cpp
  •   krita/plugins/paintops/curvebrush/kis_curves_opacity_option.cpp
  •   krita/plugins/paintops/curvebrush/kis_linewidth_option.cpp
  •   krita/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
  •   krita/plugins/paintops/deform/deform_brush.cpp
  •   krita/plugins/paintops/deform/deform_brush.h
  •   krita/plugins/paintops/deform/deform_paintop_plugin.cpp
  •   krita/plugins/paintops/deform/kis_deform_option.cpp
  •   krita/plugins/paintops/deform/kis_deform_option.h
  •   krita/plugins/paintops/deform/kis_deform_paintop.cpp
  •   krita/plugins/paintops/deform/kis_deform_paintop.h
  •   krita/plugins/paintops/deform/kis_deform_paintop_factory.h
  •   krita/plugins/paintops/deform/kis_deform_paintop_settings.cpp
  •   krita/plugins/paintops/deform/kis_deform_paintop_settings_widget.cpp
  •   krita/plugins/paintops/dynadraw/dyna_brush.cpp
  •   krita/plugins/paintops/dynadraw/dyna_brush.h
  •   krita/plugins/paintops/dynadraw/dyna_paintop_plugin.cpp
  •   krita/plugins/paintops/dynadraw/filter.h
  •   krita/plugins/paintops/dynadraw/kis_dyna_paintop.cpp
  •   krita/plugins/paintops/dynadraw/kis_dyna_paintop_settings_widget.cpp
  •   krita/plugins/paintops/dynadraw/kis_dynaop_option.cpp
  •   krita/plugins/paintops/dynadraw/kis_dynaop_option.h
  •   krita/plugins/paintops/experiment/experiment_paintop_plugin.cpp
  •   krita/plugins/paintops/experiment/kis_experiment_paintop.cpp
  •   krita/plugins/paintops/experiment/kis_experiment_paintop_settings_widget.cpp
  •   krita/plugins/paintops/experiment/kis_experiment_shape_option.cpp
  •   krita/plugins/paintops/experiment/kis_experiment_shape_option.h
  •   krita/plugins/paintops/experiment/kis_experimentop_option.cpp
  •   krita/plugins/paintops/experiment/kis_experimentop_option.h
  •   krita/plugins/paintops/filterop/filterop.cpp
  •   krita/plugins/paintops/filterop/kis_filterop.cpp
  •   krita/plugins/paintops/filterop/kis_filterop_settings.cpp
  •   krita/plugins/paintops/filterop/kis_filterop_settings_widget.cpp
  •   krita/plugins/paintops/gridbrush/grid_paintop_plugin.cpp
  •   krita/plugins/paintops/gridbrush/kis_grid_paintop.cpp
  •   krita/plugins/paintops/gridbrush/kis_grid_paintop.h
  •   krita/plugins/paintops/gridbrush/kis_grid_paintop_settings_widget.cpp
  •   krita/plugins/paintops/gridbrush/kis_grid_shape_option.cpp
  •   krita/plugins/paintops/gridbrush/kis_grid_shape_option.h
  •   krita/plugins/paintops/gridbrush/kis_gridop_option.cpp
  •   krita/plugins/paintops/gridbrush/kis_gridop_option.h
  •   krita/plugins/paintops/gridbrush/random_gauss.cpp
  •   krita/plugins/paintops/gridbrush/random_gauss.h
  •   krita/plugins/paintops/hairy/bristle.cpp
  •   krita/plugins/paintops/hairy/bristle.h
  •   krita/plugins/paintops/hairy/gauss.cpp
  •   krita/plugins/paintops/hairy/hairy_brush.cpp
  •   krita/plugins/paintops/hairy/hairy_brush.h
  •   krita/plugins/paintops/hairy/hairy_paintop_plugin.cpp
  •   krita/plugins/paintops/hairy/kis_hairy_bristle_option.cpp
  •   krita/plugins/paintops/hairy/kis_hairy_bristle_option.h
  •   krita/plugins/paintops/hairy/kis_hairy_ink_option.cpp
  •   krita/plugins/paintops/hairy/kis_hairy_paintop.cpp
  •   krita/plugins/paintops/hairy/kis_hairy_paintop.h
  •   krita/plugins/paintops/hairy/kis_hairy_paintop_settings.cpp
  •   krita/plugins/paintops/hairy/kis_hairy_paintop_settings_widget.cpp
  •   krita/plugins/paintops/hairy/kis_hairy_shape_option.cpp
  •   krita/plugins/paintops/hairy/kis_hairy_shape_option.h
  •   krita/plugins/paintops/hairy/trajectory.cpp
  •   krita/plugins/paintops/hairy/trajectory.h
  •   krita/plugins/paintops/hatching/hatching_brush.cpp
  •   krita/plugins/paintops/hatching/hatching_brush.h
  •   krita/plugins/paintops/hatching/hatching_paintop_plugin.cpp
  •   krita/plugins/paintops/hatching/kis_hatching_options.cpp
  •   krita/plugins/paintops/hatching/kis_hatching_options.h
  •   krita/plugins/paintops/hatching/kis_hatching_paintop.cpp
  •   krita/plugins/paintops/hatching/kis_hatching_paintop.h
  •   krita/plugins/paintops/hatching/kis_hatching_paintop_settings.cpp
  •   krita/plugins/paintops/hatching/kis_hatching_paintop_settings.h
  •   krita/plugins/paintops/hatching/kis_hatching_paintop_settings_widget.cpp
  •   krita/plugins/paintops/hatching/kis_hatching_preferences.cpp
  •   krita/plugins/paintops/hatching/kis_hatching_preferences.h
  •   krita/plugins/paintops/hatching/kis_hatching_pressure_crosshatching_option.cpp
  •   krita/plugins/paintops/hatching/kis_hatching_pressure_crosshatching_option.h
  •   krita/plugins/paintops/hatching/kis_hatching_pressure_separation_option.cpp
  •   krita/plugins/paintops/hatching/kis_hatching_pressure_thickness_option.cpp
  •   krita/plugins/paintops/libbrush/abr_struct_parser.cpp
  •   krita/plugins/paintops/libbrush/abr_struct_parser.h
  •   krita/plugins/paintops/libbrush/abrbrush.cpp
  •   krita/plugins/paintops/libbrush/abrStructv2.cpp
  •   krita/plugins/paintops/libbrush/kis_abr_brush_collection.cpp
  •   krita/plugins/paintops/libbrush/kis_abr_brush_collection.h
  •   krita/plugins/paintops/libbrush/kis_abr_translator.cpp
  •   krita/plugins/paintops/libbrush/kis_abr_translator.h
  •   krita/plugins/paintops/libbrush/kis_auto_brush.cpp
  •   krita/plugins/paintops/libbrush/kis_auto_brush_factory.cpp
  •   krita/plugins/paintops/libbrush/kis_boundary.cc
  •   krita/plugins/paintops/libbrush/kis_boundary.h
  •   krita/plugins/paintops/libbrush/kis_brush.cpp
  •   krita/plugins/paintops/libbrush/kis_brush.h
  •   krita/plugins/paintops/libbrush/kis_brush_registry.cpp
  •   krita/plugins/paintops/libbrush/kis_brush_server.cpp
  •   krita/plugins/paintops/libbrush/kis_brushes_pipe.h
  •   krita/plugins/paintops/libbrush/kis_gbr_brush.cpp
  •   krita/plugins/paintops/libbrush/kis_gbr_brush.h
  •   krita/plugins/paintops/libbrush/kis_imagepipe_brush.cpp
  •   krita/plugins/paintops/libbrush/kis_imagepipe_brush.h
  •   krita/plugins/paintops/libbrush/kis_imagepipe_brush_p.cpp
  •   krita/plugins/paintops/libbrush/kis_imagepipe_brush_p.h
  •   krita/plugins/paintops/libbrush/kis_png_brush.cpp
  •   krita/plugins/paintops/libbrush/kis_predefined_brush_factory.cpp
  •   krita/plugins/paintops/libbrush/kis_qimage_pyramid.cpp
  •   krita/plugins/paintops/libbrush/kis_svg_brush.cpp
  •   krita/plugins/paintops/libbrush/kis_text_brush.cpp
  •   krita/plugins/paintops/libpaintop/CMakeLists.txt
  •   krita/plugins/paintops/libpaintop/kis_airbrush_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_auto_brush_widget.cpp
  •   krita/plugins/paintops/libpaintop/kis_bidirectional_mixing_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_bidirectional_mixing_option.h
  •   krita/plugins/paintops/libpaintop/kis_bidirectional_mixing_option_widget.cpp
  •   krita/plugins/paintops/libpaintop/kis_bidirectional_mixing_option_widget.h
  •   krita/plugins/paintops/libpaintop/kis_brush_based_paintop.cpp
  •   krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.cpp
  •   krita/plugins/paintops/libpaintop/kis_brush_based_paintop_settings.cpp
  •   krita/plugins/paintops/libpaintop/kis_brush_chooser.cpp
  •   krita/plugins/paintops/libpaintop/kis_brush_chooser.h
  •   krita/plugins/paintops/libpaintop/kis_brush_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_brush_option_widget.cpp
  •   krita/plugins/paintops/libpaintop/kis_brush_selection_widget.cpp
  •   krita/plugins/paintops/libpaintop/kis_brush_selection_widget.h
  •   krita/plugins/paintops/libpaintop/kis_brush_size_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_brush_size_option.h
  •   krita/plugins/paintops/libpaintop/kis_clipboard_brush_widget.cpp
  •   krita/plugins/paintops/libpaintop/kis_clipboard_brush_widget.h
  •   krita/plugins/paintops/libpaintop/kis_color_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_color_option.h
  •   krita/plugins/paintops/libpaintop/kis_color_source.cpp
  •   krita/plugins/paintops/libpaintop/kis_color_source_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_color_source_option.h
  •   krita/plugins/paintops/libpaintop/kis_color_source_option_widget.cpp
  •   krita/plugins/paintops/libpaintop/kis_color_source_option_widget.h
  •   krita/plugins/paintops/libpaintop/kis_compositeop_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_compositeop_option.h
  •   krita/plugins/paintops/libpaintop/kis_current_outline_fetcher.cpp
  •   krita/plugins/paintops/libpaintop/kis_curve_label.cpp
  •   krita/plugins/paintops/libpaintop/kis_curve_label.h
  •   krita/plugins/paintops/libpaintop/kis_curve_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_curve_option.h
  •   krita/plugins/paintops/libpaintop/kis_curve_option_widget.cpp
  •   krita/plugins/paintops/libpaintop/kis_curve_option_widget.h
  •   krita/plugins/paintops/libpaintop/kis_custom_brush_widget.cpp
  •   krita/plugins/paintops/libpaintop/kis_custom_brush_widget.h
  •   krita/plugins/paintops/libpaintop/kis_dab_cache.cpp
  •   krita/plugins/paintops/libpaintop/kis_dab_cache.h
  •   krita/plugins/paintops/libpaintop/kis_dynamic_sensor.cc
  •   krita/plugins/paintops/libpaintop/kis_dynamic_sensor.h
  •   krita/plugins/paintops/libpaintop/kis_embedded_pattern_manager.cpp
  •   krita/plugins/paintops/libpaintop/kis_filter_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_multi_sensors_model_p.cpp
  •   krita/plugins/paintops/libpaintop/kis_multi_sensors_model_p.h
  •   krita/plugins/paintops/libpaintop/kis_multi_sensors_selector.cpp
  •   krita/plugins/paintops/libpaintop/kis_multi_sensors_selector.h
  •   krita/plugins/paintops/libpaintop/kis_outline_generation_policy.h
  •   krita/plugins/paintops/libpaintop/kis_paint_action_type_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_darken_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_flow_opacity_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_flow_opacity_option.h
  •   krita/plugins/paintops/libpaintop/kis_pressure_flow_opacity_option_widget.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_flow_opacity_option_widget.h
  •   krita/plugins/paintops/libpaintop/kis_pressure_gradient_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_mirror_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_mirror_option.h
  •   krita/plugins/paintops/libpaintop/kis_pressure_mirror_option_widget.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_mirror_option_widget.h
  •   krita/plugins/paintops/libpaintop/kis_pressure_mix_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_opacity_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_opacity_option.h
  •   krita/plugins/paintops/libpaintop/kis_pressure_rate_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_rate_option.h
  •   krita/plugins/paintops/libpaintop/kis_pressure_rate_option_widget.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_rate_option_widget.h
  •   krita/plugins/paintops/libpaintop/kis_pressure_rotation_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_scatter_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_scatter_option.h
  •   krita/plugins/paintops/libpaintop/kis_pressure_scatter_option_widget.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_scatter_option_widget.h
  •   krita/plugins/paintops/libpaintop/kis_pressure_sharpness_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_sharpness_option.h
  •   krita/plugins/paintops/libpaintop/kis_pressure_sharpness_option_widget.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_sharpness_option_widget.h
  •   krita/plugins/paintops/libpaintop/kis_pressure_size_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_softness_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_softness_option.h
  •   krita/plugins/paintops/libpaintop/kis_pressure_spacing_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_pressure_spacing_option_widget.h
  •   krita/plugins/paintops/libpaintop/kis_simple_paintop_factory.h
  •   krita/plugins/paintops/libpaintop/kis_text_brush_chooser.cpp
  •   krita/plugins/paintops/libpaintop/kis_texture_option.cpp
  •   krita/plugins/paintops/libpaintop/kis_texture_option.h
  •   krita/plugins/paintops/particle/kis_particle_paintop.cpp
  •   krita/plugins/paintops/particle/kis_particle_paintop_settings_widget.cpp
  •   krita/plugins/paintops/particle/kis_particleop_option.cpp
  •   krita/plugins/paintops/particle/kis_particleop_option.h
  •   krita/plugins/paintops/particle/particle_brush.cpp
  •   krita/plugins/paintops/particle/particle_brush.h
  •   krita/plugins/paintops/particle/particle_paintop_plugin.cpp
  •   krita/plugins/paintops/sketch/kis_density_option.cpp
  •   krita/plugins/paintops/sketch/kis_linewidth_option.cpp
  •   krita/plugins/paintops/sketch/kis_offset_scale_option.cpp
  •   krita/plugins/paintops/sketch/kis_sketch_paintop.cpp
  •   krita/plugins/paintops/sketch/kis_sketch_paintop_settings.cpp
  •   krita/plugins/paintops/sketch/kis_sketch_paintop_settings_widget.cpp
  •   krita/plugins/paintops/sketch/kis_sketchop_option.cpp
  •   krita/plugins/paintops/sketch/kis_sketchop_option.h
  •   krita/plugins/paintops/sketch/sketch_paintop_plugin.cpp
  •   krita/plugins/paintops/softbrush/kis_alpha_mask.h
  •   krita/plugins/paintops/spray/kis_spray_paintop.cpp
  •   krita/plugins/paintops/spray/kis_spray_paintop_settings.cpp
  •   krita/plugins/paintops/spray/kis_spray_paintop_settings.h
  •   krita/plugins/paintops/spray/kis_spray_paintop_settings_widget.cpp
  •   krita/plugins/paintops/spray/kis_spray_shape_dynamics.cpp
  •   krita/plugins/paintops/spray/kis_spray_shape_dynamics.h
  •   krita/plugins/paintops/spray/kis_spray_shape_option.cpp
  •   krita/plugins/paintops/spray/kis_spray_shape_option.h
  •   krita/plugins/paintops/spray/kis_sprayop_option.cpp
  •   krita/plugins/paintops/spray/kis_sprayop_option.h
  •   krita/plugins/paintops/spray/metaball.h
  •   krita/plugins/paintops/spray/spray_brush.cpp
  •   krita/plugins/paintops/spray/spray_brush.h
  •   krita/plugins/paintops/spray/spray_paintop_plugin.cpp
  •   krita/plugins/paintops/defaultpaintops/brush/kis_brushop.cpp
  •   krita/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp
  •   krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop.cpp
  •   krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_factory.h
  •   krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.cpp
  •   krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.h
  •   krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.cpp
  •   krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings_widget.cpp
  •   krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings_widget.h
  •   krita/plugins/paintops/libbrush/tests/kis_auto_brush_test.cpp
  •   krita/plugins/paintops/libbrush/tests/kis_brush_test.cpp
  •   krita/plugins/paintops/libbrush/tests/kis_imagepipe_brush_test.cpp
  •   krita/plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_distance.cc
  •   krita/plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_fade.cpp
  •   krita/plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_fuzzy.cpp
  •   krita/plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_fuzzy.h
  •   krita/plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_time.cc
  •   krita/plugins/paintops/libpaintop/sensors/kis_dynamic_sensors.cc
  •   krita/plugins/paintops/libpaintop/sensors/kis_dynamic_sensors.h
  •   krita/plugins/paintops/libpaintop/tests/kis_embedded_pattern_manager_test.cpp
  •   krita/plugins/paintops/libpaintop/tests/kis_sensors_test.cpp
  •   krita/plugins/paintops/libpaintop/tests/kis_sensors_test.h
  •   krita/plugins/paintops/defaultpaintops/brush/tests/kis_brushop_test.cpp
274 files changed in total