From fa7e842c8c8565d478ffcdc466df3b249cdbafc4 Mon Sep 17 00:00:00 2001 From: John Beard Date: Sat, 4 May 2024 15:41:21 +0800 Subject: [PATCH] Rework item distribution This splits the tool into two separate tools: by center and by even gaps. Previously, this was automatically decided, based on if the items could have any gaps between them. This was unintuitive as it would appear to arrange by centre point sometimes but not others. When items aren't all the same width, the results can then be very different, based only on the starting positions. The new behaviour is to have a dedicated tool for each, which echos how graphical programs like Inkscape manage this. The by-gaps method is then extended to work for overlapping items (when items overlap, the overlaps are made equal). The logic is centralised in kimath/geometry, and some QA is added. This should make it easier to extend to eeschema, for example. This also (attempts to) address some rounding issues which could cause minor, but compounding, errors to build up along the list of items. Also, fix bugs in the collection filtering - previously items like markers were filtered out only after the selection size was used to compute the gaps between items. --- common/bitmap_info.cpp | 60 ++-- include/bitmaps/bitmaps_list.h | 6 +- libs/kimath/CMakeLists.txt | 1 + libs/kimath/include/geometry/distribute.h | 43 +++ libs/kimath/src/geometry/distribute.cpp | 89 +++++ pcbnew/tools/pcb_actions.cpp | 37 +- pcbnew/tools/pcb_actions.h | 6 +- pcbnew/tools/placement_tool.cpp | 324 ++++++------------ pcbnew/tools/placement_tool.h | 46 +-- qa/tests/libs/kimath/CMakeLists.txt | 1 + .../libs/kimath/geometry/test_distribute.cpp | 169 +++++++++ resources/bitmaps_png/CMakeLists.txt | 6 +- .../png/distribute_horizontal_16.png | Bin 158 -> 0 bytes .../png/distribute_horizontal_24.png | Bin 142 -> 0 bytes .../png/distribute_horizontal_32.png | Bin 197 -> 0 bytes .../png/distribute_horizontal_48.png | Bin 258 -> 0 bytes .../png/distribute_horizontal_64.png | Bin 303 -> 0 bytes .../png/distribute_horizontal_centers_16.png | Bin 0 -> 165 bytes .../png/distribute_horizontal_centers_24.png | Bin 0 -> 145 bytes .../png/distribute_horizontal_centers_32.png | Bin 0 -> 216 bytes .../png/distribute_horizontal_centers_48.png | Bin 0 -> 235 bytes .../png/distribute_horizontal_centers_64.png | Bin 0 -> 398 bytes .../distribute_horizontal_centers_dark_16.png | Bin 0 -> 173 bytes .../distribute_horizontal_centers_dark_24.png | Bin 0 -> 154 bytes .../distribute_horizontal_centers_dark_32.png | Bin 0 -> 274 bytes .../distribute_horizontal_centers_dark_48.png | Bin 0 -> 242 bytes .../distribute_horizontal_centers_dark_64.png | Bin 0 -> 334 bytes .../png/distribute_horizontal_dark_16.png | Bin 166 -> 0 bytes .../png/distribute_horizontal_dark_24.png | Bin 151 -> 0 bytes .../png/distribute_horizontal_dark_32.png | Bin 206 -> 0 bytes .../png/distribute_horizontal_dark_48.png | Bin 264 -> 0 bytes .../png/distribute_horizontal_dark_64.png | Bin 316 -> 0 bytes .../png/distribute_horizontal_gaps_16.png | Bin 0 -> 243 bytes .../png/distribute_horizontal_gaps_24.png | Bin 0 -> 197 bytes .../png/distribute_horizontal_gaps_32.png | Bin 0 -> 371 bytes .../png/distribute_horizontal_gaps_48.png | Bin 0 -> 325 bytes .../png/distribute_horizontal_gaps_64.png | Bin 0 -> 575 bytes .../distribute_horizontal_gaps_dark_16.png | Bin 0 -> 251 bytes .../distribute_horizontal_gaps_dark_24.png | Bin 0 -> 201 bytes .../distribute_horizontal_gaps_dark_32.png | Bin 0 -> 378 bytes .../distribute_horizontal_gaps_dark_48.png | Bin 0 -> 333 bytes .../distribute_horizontal_gaps_dark_64.png | Bin 0 -> 592 bytes .../png/distribute_vertical_16.png | Bin 159 -> 0 bytes .../png/distribute_vertical_24.png | Bin 151 -> 0 bytes .../png/distribute_vertical_32.png | Bin 215 -> 0 bytes .../png/distribute_vertical_48.png | Bin 246 -> 0 bytes .../png/distribute_vertical_64.png | Bin 314 -> 0 bytes .../png/distribute_vertical_centers_16.png | Bin 0 -> 169 bytes .../png/distribute_vertical_centers_24.png | Bin 0 -> 141 bytes .../png/distribute_vertical_centers_32.png | Bin 0 -> 227 bytes .../png/distribute_vertical_centers_48.png | Bin 0 -> 258 bytes .../png/distribute_vertical_centers_64.png | Bin 0 -> 432 bytes .../distribute_vertical_centers_dark_16.png | Bin 0 -> 176 bytes .../distribute_vertical_centers_dark_24.png | Bin 0 -> 143 bytes .../distribute_vertical_centers_dark_32.png | Bin 0 -> 237 bytes .../distribute_vertical_centers_dark_48.png | Bin 0 -> 257 bytes .../distribute_vertical_centers_dark_64.png | Bin 0 -> 338 bytes .../png/distribute_vertical_dark_16.png | Bin 165 -> 0 bytes .../png/distribute_vertical_dark_24.png | Bin 154 -> 0 bytes .../png/distribute_vertical_dark_32.png | Bin 227 -> 0 bytes .../png/distribute_vertical_dark_48.png | Bin 246 -> 0 bytes .../png/distribute_vertical_dark_64.png | Bin 324 -> 0 bytes .../png/distribute_vertical_gaps_16.png | Bin 0 -> 245 bytes .../png/distribute_vertical_gaps_24.png | Bin 0 -> 183 bytes .../png/distribute_vertical_gaps_32.png | Bin 0 -> 365 bytes .../png/distribute_vertical_gaps_48.png | Bin 0 -> 277 bytes .../png/distribute_vertical_gaps_64.png | Bin 0 -> 597 bytes .../png/distribute_vertical_gaps_dark_16.png | Bin 0 -> 258 bytes .../png/distribute_vertical_gaps_dark_24.png | Bin 0 -> 187 bytes .../png/distribute_vertical_gaps_dark_32.png | Bin 0 -> 390 bytes .../png/distribute_vertical_gaps_dark_48.png | Bin 0 -> 282 bytes .../png/distribute_vertical_gaps_dark_64.png | Bin 0 -> 619 bytes ....svg => distribute_horizontal_centers.svg} | 41 ++- .../dark/distribute_horizontal_gaps.svg | 146 ++++++++ ...al.svg => distribute_vertical_centers.svg} | 41 ++- .../sources/dark/distribute_vertical_gaps.svg | 146 ++++++++ ....svg => distribute_horizontal_centers.svg} | 41 ++- .../light/distribute_horizontal_gaps.svg | 146 ++++++++ ...al.svg => distribute_vertical_centers.svg} | 41 ++- .../light/distribute_vertical_gaps.svg | 146 ++++++++ 80 files changed, 1179 insertions(+), 357 deletions(-) create mode 100644 libs/kimath/include/geometry/distribute.h create mode 100644 libs/kimath/src/geometry/distribute.cpp create mode 100644 qa/tests/libs/kimath/geometry/test_distribute.cpp delete mode 100644 resources/bitmaps_png/png/distribute_horizontal_16.png delete mode 100644 resources/bitmaps_png/png/distribute_horizontal_24.png delete mode 100644 resources/bitmaps_png/png/distribute_horizontal_32.png delete mode 100644 resources/bitmaps_png/png/distribute_horizontal_48.png delete mode 100644 resources/bitmaps_png/png/distribute_horizontal_64.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_centers_16.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_centers_24.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_centers_32.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_centers_48.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_centers_64.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_centers_dark_16.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_centers_dark_24.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_centers_dark_32.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_centers_dark_48.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_centers_dark_64.png delete mode 100644 resources/bitmaps_png/png/distribute_horizontal_dark_16.png delete mode 100644 resources/bitmaps_png/png/distribute_horizontal_dark_24.png delete mode 100644 resources/bitmaps_png/png/distribute_horizontal_dark_32.png delete mode 100644 resources/bitmaps_png/png/distribute_horizontal_dark_48.png delete mode 100644 resources/bitmaps_png/png/distribute_horizontal_dark_64.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_gaps_16.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_gaps_24.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_gaps_32.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_gaps_48.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_gaps_64.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_gaps_dark_16.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_gaps_dark_24.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_gaps_dark_32.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_gaps_dark_48.png create mode 100644 resources/bitmaps_png/png/distribute_horizontal_gaps_dark_64.png delete mode 100644 resources/bitmaps_png/png/distribute_vertical_16.png delete mode 100644 resources/bitmaps_png/png/distribute_vertical_24.png delete mode 100644 resources/bitmaps_png/png/distribute_vertical_32.png delete mode 100644 resources/bitmaps_png/png/distribute_vertical_48.png delete mode 100644 resources/bitmaps_png/png/distribute_vertical_64.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_centers_16.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_centers_24.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_centers_32.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_centers_48.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_centers_64.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_centers_dark_16.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_centers_dark_24.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_centers_dark_32.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_centers_dark_48.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_centers_dark_64.png delete mode 100644 resources/bitmaps_png/png/distribute_vertical_dark_16.png delete mode 100644 resources/bitmaps_png/png/distribute_vertical_dark_24.png delete mode 100644 resources/bitmaps_png/png/distribute_vertical_dark_32.png delete mode 100644 resources/bitmaps_png/png/distribute_vertical_dark_48.png delete mode 100644 resources/bitmaps_png/png/distribute_vertical_dark_64.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_gaps_16.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_gaps_24.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_gaps_32.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_gaps_48.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_gaps_64.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_gaps_dark_16.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_gaps_dark_24.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_gaps_dark_32.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_gaps_dark_48.png create mode 100644 resources/bitmaps_png/png/distribute_vertical_gaps_dark_64.png rename resources/bitmaps_png/sources/dark/{distribute_horizontal.svg => distribute_horizontal_centers.svg} (85%) create mode 100644 resources/bitmaps_png/sources/dark/distribute_horizontal_gaps.svg rename resources/bitmaps_png/sources/dark/{distribute_vertical.svg => distribute_vertical_centers.svg} (85%) create mode 100644 resources/bitmaps_png/sources/dark/distribute_vertical_gaps.svg rename resources/bitmaps_png/sources/light/{distribute_horizontal.svg => distribute_horizontal_centers.svg} (85%) create mode 100644 resources/bitmaps_png/sources/light/distribute_horizontal_gaps.svg rename resources/bitmaps_png/sources/light/{distribute_vertical.svg => distribute_vertical_centers.svg} (85%) create mode 100644 resources/bitmaps_png/sources/light/distribute_vertical_gaps.svg diff --git a/common/bitmap_info.cpp b/common/bitmap_info.cpp index 1bda9c334b..81cd4becd7 100644 --- a/common/bitmap_info.cpp +++ b/common/bitmap_info.cpp @@ -446,8 +446,10 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::directory].emplace_back( BITMAPS::directory, wxT( "directory_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::directory_browser].emplace_back( BITMAPS::directory_browser, wxT( "directory_browser_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::directory_open].emplace_back( BITMAPS::directory_open, wxT( "directory_open_24.png" ), 24, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_24.png" ), 24, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_24.png" ), 24, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_centers].emplace_back( BITMAPS::distribute_horizontal_centers, wxT( "distribute_horizontal_centers_24.png" ), 24, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_gaps].emplace_back( BITMAPS::distribute_horizontal_gaps, wxT( "distribute_horizontal_gaps_24.png" ), 24, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_centers].emplace_back( BITMAPS::distribute_vertical_centers, wxT( "distribute_vertical_centers_24.png" ), 24, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_gaps].emplace_back( BITMAPS::distribute_vertical_gaps, wxT( "distribute_vertical_gaps_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_24.png" ), 24, wxT( "light" ) ); @@ -852,8 +854,10 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::directory].emplace_back( BITMAPS::directory, wxT( "directory_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::directory_browser].emplace_back( BITMAPS::directory_browser, wxT( "directory_browser_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::directory_open].emplace_back( BITMAPS::directory_open, wxT( "directory_open_dark_24.png" ), 24, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_dark_24.png" ), 24, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_dark_24.png" ), 24, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_centers].emplace_back( BITMAPS::distribute_horizontal_centers, wxT( "distribute_horizontal_centers_dark_24.png" ), 24, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_gaps].emplace_back( BITMAPS::distribute_horizontal_gaps, wxT( "distribute_horizontal_gaps_dark_24.png" ), 24, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_centers].emplace_back( BITMAPS::distribute_vertical_centers, wxT( "distribute_vertical_centers_dark_24.png" ), 24, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_gaps].emplace_back( BITMAPS::distribute_vertical_gaps, wxT( "distribute_vertical_gaps_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_dark_24.png" ), 24, wxT( "dark" ) ); @@ -1258,8 +1262,10 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::directory].emplace_back( BITMAPS::directory, wxT( "directory_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::directory_browser].emplace_back( BITMAPS::directory_browser, wxT( "directory_browser_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::directory_open].emplace_back( BITMAPS::directory_open, wxT( "directory_open_16.png" ), 16, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_16.png" ), 16, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_16.png" ), 16, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_centers].emplace_back( BITMAPS::distribute_horizontal_centers, wxT( "distribute_horizontal_centers_16.png" ), 16, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_gaps].emplace_back( BITMAPS::distribute_horizontal_gaps, wxT( "distribute_horizontal_gaps_16.png" ), 16, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_centers].emplace_back( BITMAPS::distribute_vertical_centers, wxT( "distribute_vertical_centers_16.png" ), 16, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_gaps].emplace_back( BITMAPS::distribute_vertical_gaps, wxT( "distribute_vertical_gaps_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_16.png" ), 16, wxT( "light" ) ); @@ -1664,8 +1670,10 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::directory].emplace_back( BITMAPS::directory, wxT( "directory_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::directory_browser].emplace_back( BITMAPS::directory_browser, wxT( "directory_browser_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::directory_open].emplace_back( BITMAPS::directory_open, wxT( "directory_open_dark_16.png" ), 16, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_dark_16.png" ), 16, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_dark_16.png" ), 16, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_centers].emplace_back( BITMAPS::distribute_horizontal_centers, wxT( "distribute_horizontal_centers_dark_16.png" ), 16, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_gaps].emplace_back( BITMAPS::distribute_horizontal_gaps, wxT( "distribute_horizontal_gaps_dark_16.png" ), 16, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_centers].emplace_back( BITMAPS::distribute_vertical_centers, wxT( "distribute_vertical_centers_dark_16.png" ), 16, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_gaps].emplace_back( BITMAPS::distribute_vertical_gaps, wxT( "distribute_vertical_gaps_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_dark_16.png" ), 16, wxT( "dark" ) ); @@ -2070,8 +2078,10 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::directory].emplace_back( BITMAPS::directory, wxT( "directory_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::directory_browser].emplace_back( BITMAPS::directory_browser, wxT( "directory_browser_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::directory_open].emplace_back( BITMAPS::directory_open, wxT( "directory_open_32.png" ), 32, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_32.png" ), 32, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_32.png" ), 32, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_centers].emplace_back( BITMAPS::distribute_horizontal_centers, wxT( "distribute_horizontal_centers_32.png" ), 32, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_gaps].emplace_back( BITMAPS::distribute_horizontal_gaps, wxT( "distribute_horizontal_gaps_32.png" ), 32, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_centers].emplace_back( BITMAPS::distribute_vertical_centers, wxT( "distribute_vertical_centers_32.png" ), 32, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_gaps].emplace_back( BITMAPS::distribute_vertical_gaps, wxT( "distribute_vertical_gaps_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_32.png" ), 32, wxT( "light" ) ); @@ -2476,8 +2486,10 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::directory].emplace_back( BITMAPS::directory, wxT( "directory_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::directory_browser].emplace_back( BITMAPS::directory_browser, wxT( "directory_browser_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::directory_open].emplace_back( BITMAPS::directory_open, wxT( "directory_open_dark_32.png" ), 32, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_dark_32.png" ), 32, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_dark_32.png" ), 32, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_centers].emplace_back( BITMAPS::distribute_horizontal_centers, wxT( "distribute_horizontal_centers_dark_32.png" ), 32, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_gaps].emplace_back( BITMAPS::distribute_horizontal_gaps, wxT( "distribute_horizontal_gaps_dark_32.png" ), 32, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_centers].emplace_back( BITMAPS::distribute_vertical_centers, wxT( "distribute_vertical_centers_dark_32.png" ), 32, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_gaps].emplace_back( BITMAPS::distribute_vertical_gaps, wxT( "distribute_vertical_gaps_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_dark_32.png" ), 32, wxT( "dark" ) ); @@ -2882,8 +2894,10 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::directory].emplace_back( BITMAPS::directory, wxT( "directory_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::directory_browser].emplace_back( BITMAPS::directory_browser, wxT( "directory_browser_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::directory_open].emplace_back( BITMAPS::directory_open, wxT( "directory_open_48.png" ), 48, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_48.png" ), 48, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_48.png" ), 48, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_centers].emplace_back( BITMAPS::distribute_horizontal_centers, wxT( "distribute_horizontal_centers_48.png" ), 48, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_gaps].emplace_back( BITMAPS::distribute_horizontal_gaps, wxT( "distribute_horizontal_gaps_48.png" ), 48, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_centers].emplace_back( BITMAPS::distribute_vertical_centers, wxT( "distribute_vertical_centers_48.png" ), 48, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_gaps].emplace_back( BITMAPS::distribute_vertical_gaps, wxT( "distribute_vertical_gaps_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_48.png" ), 48, wxT( "light" ) ); @@ -3288,8 +3302,10 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::directory].emplace_back( BITMAPS::directory, wxT( "directory_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::directory_browser].emplace_back( BITMAPS::directory_browser, wxT( "directory_browser_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::directory_open].emplace_back( BITMAPS::directory_open, wxT( "directory_open_dark_48.png" ), 48, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_dark_48.png" ), 48, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_dark_48.png" ), 48, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_centers].emplace_back( BITMAPS::distribute_horizontal_centers, wxT( "distribute_horizontal_centers_dark_48.png" ), 48, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_gaps].emplace_back( BITMAPS::distribute_horizontal_gaps, wxT( "distribute_horizontal_gaps_dark_48.png" ), 48, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_centers].emplace_back( BITMAPS::distribute_vertical_centers, wxT( "distribute_vertical_centers_dark_48.png" ), 48, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_gaps].emplace_back( BITMAPS::distribute_vertical_gaps, wxT( "distribute_vertical_gaps_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_dark_48.png" ), 48, wxT( "dark" ) ); @@ -3694,8 +3710,10 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::directory].emplace_back( BITMAPS::directory, wxT( "directory_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::directory_browser].emplace_back( BITMAPS::directory_browser, wxT( "directory_browser_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::directory_open].emplace_back( BITMAPS::directory_open, wxT( "directory_open_64.png" ), 64, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_64.png" ), 64, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_64.png" ), 64, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_centers].emplace_back( BITMAPS::distribute_horizontal_centers, wxT( "distribute_horizontal_centers_64.png" ), 64, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_gaps].emplace_back( BITMAPS::distribute_horizontal_gaps, wxT( "distribute_horizontal_gaps_64.png" ), 64, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_centers].emplace_back( BITMAPS::distribute_vertical_centers, wxT( "distribute_vertical_centers_64.png" ), 64, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_gaps].emplace_back( BITMAPS::distribute_vertical_gaps, wxT( "distribute_vertical_gaps_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_64.png" ), 64, wxT( "light" ) ); @@ -4100,8 +4118,10 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::directory].emplace_back( BITMAPS::directory, wxT( "directory_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::directory_browser].emplace_back( BITMAPS::directory_browser, wxT( "directory_browser_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::directory_open].emplace_back( BITMAPS::directory_open, wxT( "directory_open_dark_64.png" ), 64, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_dark_64.png" ), 64, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_dark_64.png" ), 64, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_centers].emplace_back( BITMAPS::distribute_horizontal_centers, wxT( "distribute_horizontal_centers_dark_64.png" ), 64, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_horizontal_gaps].emplace_back( BITMAPS::distribute_horizontal_gaps, wxT( "distribute_horizontal_gaps_dark_64.png" ), 64, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_centers].emplace_back( BITMAPS::distribute_vertical_centers, wxT( "distribute_vertical_centers_dark_64.png" ), 64, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::distribute_vertical_gaps].emplace_back( BITMAPS::distribute_vertical_gaps, wxT( "distribute_vertical_gaps_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_dark_64.png" ), 64, wxT( "dark" ) ); diff --git a/include/bitmaps/bitmaps_list.h b/include/bitmaps/bitmaps_list.h index dba30cc731..a4f3fcbc4e 100644 --- a/include/bitmaps/bitmaps_list.h +++ b/include/bitmaps/bitmaps_list.h @@ -155,8 +155,10 @@ enum class BITMAPS : unsigned int directory_browser, directory_open, display_options, - distribute_horizontal, - distribute_vertical, + distribute_horizontal_centers, + distribute_horizontal_gaps, + distribute_vertical_centers, + distribute_vertical_gaps, down, drag, drag_segment, diff --git a/libs/kimath/CMakeLists.txt b/libs/kimath/CMakeLists.txt index 869a19edd5..c587c8e532 100644 --- a/libs/kimath/CMakeLists.txt +++ b/libs/kimath/CMakeLists.txt @@ -12,6 +12,7 @@ set( KIMATH_SRCS src/trigo.cpp src/geometry/chamfer.cpp + src/geometry/distribute.cpp src/geometry/eda_angle.cpp src/geometry/ellipse.cpp src/geometry/circle.cpp diff --git a/libs/kimath/include/geometry/distribute.h b/libs/kimath/include/geometry/distribute.h new file mode 100644 index 0000000000..a2be7e4408 --- /dev/null +++ b/libs/kimath/include/geometry/distribute.h @@ -0,0 +1,43 @@ +/* + * This program source code file is part of KiCad, a free EDA CAD application. + * + * Copyright (C) 2024 KiCad Developers, see AUTHORS.txt for contributors. + * + * 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 3 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, see . + */ + +#ifndef DISTRIBUTE_H +#define DISTRIBUTE_H + +#include +#include + +/** + * Given a list of 'n' item spans (e.g. left-right edge positions), return the deltas for + * each item to produce even gaps between each item. + * + * The first and last items will not be moved. + * + * @param aItemExtents a list of 'n' item spans, each a pair of integers representing the + * extents of an item. This should be sorted in a meaningful way to + * the caller, for example, left-right based on the item's left edge + * or by anchor. + * + * @return a vector of n deltas, the first and last will be 0. + */ +std::vector GetDeltasForDistributeByGaps( const std::vector>& aItemExtents); + +std::vector GetDeltasForDistributeByPoints( const std::vector& aItemPositions ); + +#endif // DISTRIBUTE_H \ No newline at end of file diff --git a/libs/kimath/src/geometry/distribute.cpp b/libs/kimath/src/geometry/distribute.cpp new file mode 100644 index 0000000000..b8dc3cfd10 --- /dev/null +++ b/libs/kimath/src/geometry/distribute.cpp @@ -0,0 +1,89 @@ +/* + * This program source code file is part of KiCad, a free EDA CAD application. + * + * Copyright (C) 2024 KiCad Developers, see AUTHORS.txt for contributors. + * + * 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 3 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, see . + */ + +#include + +#include + + +std::vector GetDeltasForDistributeByGaps(const std::vector>& aItemExtents) +{ + std::vector deltas(aItemExtents.size(), 0); + + // This only makes sense for 3 or more items + if (aItemExtents.size() < 3) + return deltas; + + // The space between the first and last items' inner edges + const int totalSpace = aItemExtents.back().first - aItemExtents.front().second; + int totalGap = totalSpace; + + for( size_t i = 1; i < aItemExtents.size() - 1; ++i ) + { + const auto& [start, end] = aItemExtents[i]; + totalGap -= end - start; + } + + const double perItemGap = totalGap / double( aItemExtents.size() - 1 ); + + // Start counting at the end of the first item + int targetPos = aItemExtents.begin()->second; + + // End-cap items don't need to be changed + for( size_t i = 1; i < aItemExtents.size() - 1; ++i ) + { + const auto& [start, end] = aItemExtents[i]; + + // Take care not to stack rounding errors by keeping the integer accumulator + // separate and always re-multiplying the gap + const double accumulatedGaps = i * perItemGap; + const int delta = targetPos - start + KiROUND(accumulatedGaps); + + deltas[i] = delta; + + // Step over one item span (width or height) + targetPos += end - start; + } + + return deltas; +} + +std::vector GetDeltasForDistributeByPoints( const std::vector& aItemPositions ) +{ + std::vector deltas(aItemPositions.size(), 0); + + // This only makes sense for 3 or more items + if (aItemPositions.size() < 3) + return deltas; + + const int startPos = aItemPositions.front(); + const int totalGaps = aItemPositions.back() - startPos; + const double itemGap = totalGaps / double( aItemPositions.size() - 1 ); + + // End-cap items don't need to be changed + for( size_t i = 1; i < aItemPositions.size() - 1; ++i ) + { + const int targetPos = startPos + KiROUND( i * itemGap ); + const int delta = targetPos - aItemPositions[i]; + + deltas[i] = delta; + } + + return deltas; +} \ No newline at end of file diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp index ac57d69daa..96ff01a05a 100644 --- a/pcbnew/tools/pcb_actions.cpp +++ b/pcbnew/tools/pcb_actions.cpp @@ -1936,20 +1936,37 @@ TOOL_ACTION PCB_ACTIONS::alignCenterX( TOOL_ACTION_ARGS() .Tooltip( _( "Aligns selected items to the horizontal center of the item under the cursor" ) ) .Icon( BITMAPS::align_items_middle ) ); -TOOL_ACTION PCB_ACTIONS::distributeHorizontally( TOOL_ACTION_ARGS() - .Name( "pcbnew.AlignAndDistribute.distributeHorizontally" ) +TOOL_ACTION PCB_ACTIONS::distributeHorizontallyCenters( TOOL_ACTION_ARGS() + .Name( "pcbnew.AlignAndDistribute.distributeHorizontallyCenters" ) .Scope( AS_GLOBAL ) - .FriendlyName( _( "Distribute Horizontally" ) ) - .Tooltip( _( "Distributes selected items between the left-most item and the right-most item" ) ) - .Icon( BITMAPS::distribute_horizontal ) ); + .FriendlyName( _( "Distribute Horizontally by Centers" ) ) + .Tooltip( _( "Distributes selected items between the left-most item and the right-most item" + "so that the item centers are equally distributed" ) ) + .Icon( BITMAPS::distribute_horizontal_centers ) ); -TOOL_ACTION PCB_ACTIONS::distributeVertically( TOOL_ACTION_ARGS() - .Name( "pcbnew.AlignAndDistribute.distributeVertically" ) +TOOL_ACTION PCB_ACTIONS::distributeHorizontallyGaps( TOOL_ACTION_ARGS() + .Name( "pcbnew.AlignAndDistribute.distributeHorizontallyGaps" ) .Scope( AS_GLOBAL ) - .FriendlyName( _( "Distribute Vertically" ) ) - .Tooltip( _( "Distributes selected items between the top-most item and the bottom-most item" ) ) - .Icon( BITMAPS::distribute_vertical ) ); + .FriendlyName( _( "Distribute Horizontally with Even Gaps" ) ) + .Tooltip( _( "Distributes selected items between the left-most item and the right-most item " + "so that the gaps between items are equal" ) ) + .Icon( BITMAPS::distribute_horizontal_gaps ) ); +TOOL_ACTION PCB_ACTIONS::distributeVerticallyGaps( TOOL_ACTION_ARGS() + .Name( "pcbnew.AlignAndDistribute.distributeVerticallyGaps" ) + .Scope( AS_GLOBAL ) + .FriendlyName( _( "Distribute Vertically with Even Gaps" ) ) + .Tooltip( _( "Distributes selected items between the top-most item and the bottom-most item " + "so that the gaps between items are equal" ) ) + .Icon( BITMAPS::distribute_vertical_gaps ) ); + +TOOL_ACTION PCB_ACTIONS::distributeVerticallyCenters( TOOL_ACTION_ARGS() + .Name( "pcbnew.AlignAndDistribute.distributeVerticallyCenters" ) + .Scope( AS_GLOBAL ) + .FriendlyName( _( "Distribute Vertically by Centers" ) ) + .Tooltip( _( "Distributes selected items between the top-most item and the bottom-most item " + "so that the item centers are equally distributed" ) ) + .Icon( BITMAPS::distribute_vertical_centers ) ); // PCB_POINT_EDITOR // diff --git a/pcbnew/tools/pcb_actions.h b/pcbnew/tools/pcb_actions.h index 8495ad3b93..5d10826047 100644 --- a/pcbnew/tools/pcb_actions.h +++ b/pcbnew/tools/pcb_actions.h @@ -309,8 +309,10 @@ public: static TOOL_ACTION alignRight; static TOOL_ACTION alignCenterX; static TOOL_ACTION alignCenterY; - static TOOL_ACTION distributeHorizontally; - static TOOL_ACTION distributeVertically; + static TOOL_ACTION distributeHorizontallyCenters; + static TOOL_ACTION distributeHorizontallyGaps; + static TOOL_ACTION distributeVerticallyCenters; + static TOOL_ACTION distributeVerticallyGaps; // Position Relative Tool /// Activation of the position relative tool diff --git a/pcbnew/tools/placement_tool.cpp b/pcbnew/tools/placement_tool.cpp index 6d121b59fe..3d1b0f8c29 100644 --- a/pcbnew/tools/placement_tool.cpp +++ b/pcbnew/tools/placement_tool.cpp @@ -30,10 +30,11 @@ #include #include -#include #include #include #include +#include +#include #include @@ -73,8 +74,10 @@ bool ALIGN_DISTRIBUTE_TOOL::Init() m_placementMenu->Add( PCB_ACTIONS::alignBottom ); m_placementMenu->AppendSeparator(); - m_placementMenu->Add( PCB_ACTIONS::distributeHorizontally ); - m_placementMenu->Add( PCB_ACTIONS::distributeVertically ); + m_placementMenu->Add( PCB_ACTIONS::distributeHorizontallyCenters ); + m_placementMenu->Add( PCB_ACTIONS::distributeHorizontallyGaps ); + m_placementMenu->Add( PCB_ACTIONS::distributeVerticallyCenters ); + m_placementMenu->Add( PCB_ACTIONS::distributeVerticallyGaps ); CONDITIONAL_MENU& selToolMenu = m_selectionTool->GetToolMenu().GetMenu(); selToolMenu.AddMenu( m_placementMenu, SELECTION_CONDITIONS::MoreThan( 1 ), 100 ); @@ -476,253 +479,136 @@ int ALIGN_DISTRIBUTE_TOOL::AlignCenterY( const TOOL_EVENT& aEvent ) } -int ALIGN_DISTRIBUTE_TOOL::DistributeHorizontally( const TOOL_EVENT& aEvent ) +int ALIGN_DISTRIBUTE_TOOL::DistributeItems( const TOOL_EVENT& aEvent ) { PCB_SELECTION& selection = m_selectionTool->RequestSelection( - []( const VECTOR2I& aPt, GENERAL_COLLECTOR& aCollector, PCB_SELECTION_TOOL* sTool ) + []( const VECTOR2I& aPt, GENERAL_COLLECTOR& aCollector, + PCB_SELECTION_TOOL* sTool ) { - // Iterate from the back so we don't have to worry about removals. - for( int i = aCollector.GetCount() - 1; i >= 0; --i ) - { - BOARD_ITEM* item = aCollector[i]; - - if( item->Type() == PCB_MARKER_T ) - aCollector.Remove( item ); - } + sTool->FilterCollectorForMarkers( aCollector ); + sTool->FilterCollectorForHierarchy( aCollector, true ); + sTool->FilterCollectorForFreePads( aCollector ); }, - m_frame->IsType( FRAME_PCB_EDITOR ) /* prompt user regarding locked items */ ); + m_frame->IsType( FRAME_PCB_EDITOR ) /* prompt user regarding locked items */ + ); - if( selection.Size() <= 1 ) + // Need at least 3 items to distribute - one at each end and at least on in the middle + if( selection.Size() < 3 ) return 0; BOARD_COMMIT commit( m_frame ); + wxString commitMsg; std::vector> itemsToDistribute = GetBoundingBoxes( selection ); - // find the last item by reverse sorting - std::sort( itemsToDistribute.begin(), itemsToDistribute.end(), - []( const std::pair& lhs, const std::pair& rhs ) - { - return ( lhs.second.GetRight() > rhs.second.GetRight() ); - } ); - - BOARD_ITEM* lastItem = itemsToDistribute.begin()->first; - const int maxRight = itemsToDistribute.begin()->second.GetRight(); - - // sort to get starting order - std::sort( itemsToDistribute.begin(), itemsToDistribute.end(), - []( const std::pair& lhs, const std::pair& rhs ) - { - return ( lhs.second.GetX() < rhs.second.GetX() ); - } ); - - const int minX = itemsToDistribute.begin()->second.GetX(); - int totalGap = maxRight - minX; - int totalWidth = 0; - - for( const auto& [ item, rect ] : itemsToDistribute ) - totalWidth += rect.GetWidth(); - - if( totalGap < totalWidth ) + if( aEvent.Matches( PCB_ACTIONS::distributeHorizontallyCenters.MakeEvent() ) ) { - // the width of the items exceeds the gap (overlapping items) -> use center point spacing - doDistributeCentersHorizontally( itemsToDistribute, commit ); + doDistributeCenters( true, itemsToDistribute, commit ); + commitMsg = PCB_ACTIONS::distributeHorizontallyCenters.GetFriendlyName(); + } + else if( aEvent.Matches( PCB_ACTIONS::distributeHorizontallyGaps.MakeEvent() ) ) + { + doDistributeGaps( true, itemsToDistribute, commit ); + commitMsg = PCB_ACTIONS::distributeHorizontallyGaps.GetFriendlyName(); + } + else if( aEvent.Matches( PCB_ACTIONS::distributeVerticallyCenters.MakeEvent() ) ) + { + doDistributeCenters( false, itemsToDistribute, commit ); + commitMsg = PCB_ACTIONS::distributeVerticallyCenters.GetFriendlyName(); } else { - totalGap -= totalWidth; - doDistributeGapsHorizontally( itemsToDistribute, commit, lastItem, totalGap ); + doDistributeGaps( false, itemsToDistribute, commit ); + commitMsg = PCB_ACTIONS::distributeVerticallyGaps.GetFriendlyName(); } - commit.Push( _( "Distribute Horizontally" ) ); + commit.Push( commitMsg ); return 0; } -void ALIGN_DISTRIBUTE_TOOL::doDistributeGapsHorizontally( std::vector>& aItems, - BOARD_COMMIT& aCommit, - const BOARD_ITEM* lastItem, - int totalGap ) const -{ - const int itemGap = totalGap / ( aItems.size() - 1 ); - int targetX = aItems.begin()->second.GetX(); - - for( const std::pair& i : aItems ) - { - BOARD_ITEM* item = i.first; - - // cover the corner case where the last item is wider than the previous item and gap - if( lastItem == item ) - continue; - - if( item->GetParent() && item->GetParent()->IsSelected() ) - continue; - - // Don't move a pad by itself unless editing the footprint - if( item->Type() == PCB_PAD_T && m_frame->IsType( FRAME_PCB_EDITOR ) ) - item = item->GetParent(); - - int difference = targetX - i.second.GetX(); - aCommit.Stage( item, CHT_MODIFY ); - item->Move( VECTOR2I( difference, 0 ) ); - targetX += ( i.second.GetWidth() + itemGap ); - } -} - - -void ALIGN_DISTRIBUTE_TOOL::doDistributeCentersHorizontally( std::vector> &aItems, - BOARD_COMMIT& aCommit ) const +void ALIGN_DISTRIBUTE_TOOL::doDistributeGaps( bool aIsXAxis, + std::vector>& aItems, + BOARD_COMMIT& aCommit ) const { + // Sort by start position. + // This is a simple way to get the items in a sensible order but it's not perfect. + // It will fail if, say, there's a huge items that's bigger than the total span of + // all the other items, but at that point a gap-equalising algorithm probably isn't + // well-defined anyway. std::sort( aItems.begin(), aItems.end(), - []( const std::pair& lhs, const std::pair& rhs ) - { - return ( lhs.second.Centre().x < rhs.second.Centre().x ); - } ); + [&]( const std::pair& a, const std::pair& b ) + { + return aIsXAxis ? a.second.GetLeft() < b.second.GetLeft() + : a.second.GetTop() < b.second.GetTop(); + } ); - const int totalGap = ( aItems.end()-1 )->second.Centre().x - aItems.begin()->second.Centre().x; - const int itemGap = totalGap / ( aItems.size() - 1 ); - int targetX = aItems.begin()->second.Centre().x; + // Consruct list of item spans in the relevant axis + std::vector> itemSpans; + itemSpans.reserve( aItems.size() ); - for( const std::pair& i : aItems ) + for( const auto& [item, box] : aItems ) { - BOARD_ITEM* item = i.first; - - if( item->GetParent() && item->GetParent()->IsSelected() ) - continue; - - // Don't move a pad by itself unless editing the footprint - if( item->Type() == PCB_PAD_T && m_frame->IsType( FRAME_PCB_EDITOR ) ) - item = item->GetParent(); - - int difference = targetX - i.second.Centre().x; - aCommit.Stage( item, CHT_MODIFY ); - item->Move( VECTOR2I( difference, 0 ) ); - targetX += ( itemGap ); - } -} - - -int ALIGN_DISTRIBUTE_TOOL::DistributeVertically( const TOOL_EVENT& aEvent ) -{ - PCB_SELECTION& selection = m_selectionTool->RequestSelection( - []( const VECTOR2I& aPt, GENERAL_COLLECTOR& aCollector, PCB_SELECTION_TOOL* sTool ) - { - // Iterate from the back so we don't have to worry about removals. - for( int i = aCollector.GetCount() - 1; i >= 0; --i ) - { - BOARD_ITEM* item = aCollector[i]; - - if( item->Type() == PCB_MARKER_T ) - aCollector.Remove( item ); - } - }, - m_frame->IsType( FRAME_PCB_EDITOR ) /* prompt user regarding locked items */ ); - - if( selection.Size() <= 1 ) - return 0; - - BOARD_COMMIT commit( m_frame ); - std::vector> itemsToDistribute = GetBoundingBoxes( selection ); - - // find the last item by reverse sorting - std::sort( itemsToDistribute.begin(), itemsToDistribute.end(), - []( const std::pair& lhs, const std::pair& rhs ) - { - return ( lhs.second.GetBottom() > rhs.second.GetBottom() ); - } ); - - BOARD_ITEM* lastItem = itemsToDistribute.begin()->first; - const int maxBottom = itemsToDistribute.begin()->second.GetBottom(); - - // sort to get starting order - std::sort( itemsToDistribute.begin(), itemsToDistribute.end(), - []( const std::pair& lhs, const std::pair& rhs ) - { - return ( lhs.second.Centre().y < rhs.second.Centre().y ); - } ); - - int minY = itemsToDistribute.begin()->second.GetY(); - int totalGap = maxBottom - minY; - int totalHeight = 0; - - for( const std::pair& i : itemsToDistribute ) - totalHeight += i.second.GetHeight(); - - if( totalGap < totalHeight ) - { - // the width of the items exceeds the gap (overlapping items) -> use center point spacing - doDistributeCentersVertically( itemsToDistribute, commit ); - } - else - { - totalGap -= totalHeight; - doDistributeGapsVertically( itemsToDistribute, commit, lastItem, totalGap ); + const int start = aIsXAxis ? box.GetLeft() : box.GetTop(); + const int end = aIsXAxis ? box.GetRight() : box.GetBottom(); + itemSpans.emplace_back( start, end ); } - commit.Push( _( "Distribute Vertically" ) ); - return 0; -} + // Get the deltas needed to distribute the items evenly + const std::vector deltas = GetDeltasForDistributeByGaps( itemSpans ); - -void ALIGN_DISTRIBUTE_TOOL::doDistributeGapsVertically( std::vector>& aItems, - BOARD_COMMIT& aCommit, - const BOARD_ITEM* lastItem, - int totalGap ) const -{ - const int itemGap = totalGap / ( aItems.size() - 1 ); - int targetY = aItems.begin()->second.GetY(); - - for( std::pair& i : aItems ) + // Apply the deltas to the items + for( size_t i = 1; i < aItems.size() - 1; ++i ) { - BOARD_ITEM* item = i.first; + const auto& [item, box] = aItems[i]; + const int delta = deltas[i]; - // cover the corner case where the last item is wider than the previous item and gap - if( lastItem == item ) - continue; - - if( item->GetParent() && item->GetParent()->IsSelected() ) - continue; - - // Don't move a pad by itself unless editing the footprint - if( item->Type() == PCB_PAD_T && m_frame->IsType( FRAME_PCB_EDITOR ) ) - item = item->GetParent(); - - int difference = targetY - i.second.GetY(); - aCommit.Stage( item, CHT_MODIFY ); - item->Move( VECTOR2I( 0, difference ) ); - targetY += ( i.second.GetHeight() + itemGap ); - } -} - - -void ALIGN_DISTRIBUTE_TOOL::doDistributeCentersVertically( std::vector>& aItems, - BOARD_COMMIT& aCommit ) const -{ - std::sort( aItems.begin(), aItems.end(), - [] ( const std::pair& lhs, const std::pair& rhs) + if( delta != 0 ) { - return ( lhs.second.Centre().y < rhs.second.Centre().y ); - } ); + const VECTOR2I deltaVec = aIsXAxis ? VECTOR2I( delta, 0 ) : VECTOR2I( 0, delta ); - const int totalGap = ( aItems.end() - 1 )->second.Centre().y - - aItems.begin()->second.Centre().y; - const int itemGap = totalGap / ( aItems.size() - 1 ); - int targetY = aItems.begin()->second.Centre().y; + aCommit.Stage( item, CHT_MODIFY ); + item->Move( deltaVec ); + } + } +} - for( const std::pair& i : aItems ) + +void ALIGN_DISTRIBUTE_TOOL::doDistributeCenters( bool aIsXAxis, + std::vector>& aItems, + BOARD_COMMIT& aCommit ) const +{ + std::sort( + aItems.begin(), aItems.end(), + [&]( const std::pair& lhs, const std::pair& rhs ) + { + const int lhsPos = aIsXAxis ? lhs.second.Centre().x : lhs.second.Centre().y; + const int rhsPos = aIsXAxis ? rhs.second.Centre().x : rhs.second.Centre().y; + return lhsPos < rhsPos; + } ); + + std::vector itemCenters; + itemCenters.reserve( aItems.size() ); + + for( const auto& [item, box] : aItems ) { - BOARD_ITEM* item = i.first; + itemCenters.push_back( aIsXAxis ? box.Centre().x : box.Centre().y ); + } - if( item->GetParent() && item->GetParent()->IsSelected() ) - continue; + const std::vector deltas = GetDeltasForDistributeByPoints( itemCenters ); - // Don't move a pad by itself unless editing the footprint - if( item->Type() == PCB_PAD_T && m_frame->IsType( FRAME_PCB_EDITOR ) ) - item = item->GetParent(); + // Apply the deltas to the items + for( size_t i = 1; i < aItems.size() - 1; ++i ) + { + const auto& [item, box] = aItems[i]; + const int delta = deltas[i]; - int difference = targetY - i.second.Centre().y; - aCommit.Stage( item, CHT_MODIFY ); - item->Move( VECTOR2I( 0, difference ) ); - targetY += ( itemGap ); + if ( delta != 0) + { + const VECTOR2I deltaVec = aIsXAxis ? VECTOR2I( delta, 0 ) : VECTOR2I( 0, delta ); + + aCommit.Stage( item, CHT_MODIFY ); + item->Move( deltaVec ); + } } } @@ -736,8 +622,12 @@ void ALIGN_DISTRIBUTE_TOOL::setTransitions() Go( &ALIGN_DISTRIBUTE_TOOL::AlignCenterX, PCB_ACTIONS::alignCenterX.MakeEvent() ); Go( &ALIGN_DISTRIBUTE_TOOL::AlignCenterY, PCB_ACTIONS::alignCenterY.MakeEvent() ); - Go( &ALIGN_DISTRIBUTE_TOOL::DistributeHorizontally, - PCB_ACTIONS::distributeHorizontally.MakeEvent() ); - Go( &ALIGN_DISTRIBUTE_TOOL::DistributeVertically, - PCB_ACTIONS::distributeVertically.MakeEvent() ); + Go( &ALIGN_DISTRIBUTE_TOOL::DistributeItems, + PCB_ACTIONS::distributeHorizontallyCenters.MakeEvent() ); + Go( &ALIGN_DISTRIBUTE_TOOL::DistributeItems, + PCB_ACTIONS::distributeHorizontallyGaps.MakeEvent() ); + Go( &ALIGN_DISTRIBUTE_TOOL::DistributeItems, + PCB_ACTIONS::distributeVerticallyCenters.MakeEvent() ); + Go( &ALIGN_DISTRIBUTE_TOOL::DistributeItems, + PCB_ACTIONS::distributeVerticallyGaps.MakeEvent() ); } diff --git a/pcbnew/tools/placement_tool.h b/pcbnew/tools/placement_tool.h index 7a26ab3a9b..9b93762f5d 100644 --- a/pcbnew/tools/placement_tool.h +++ b/pcbnew/tools/placement_tool.h @@ -85,14 +85,9 @@ public: int AlignCenterY( const TOOL_EVENT& aEvent ); /** - * Distribute the selected items along the X axis. + * Distribute the selected items in some way */ - int DistributeHorizontally( const TOOL_EVENT& aEvent ); - - /** - * Distribute the selected items along the Y axis. - */ - int DistributeVertically( const TOOL_EVENT& aEvent ); + int DistributeItems( const TOOL_EVENT& aEvent ); ///< Set up handlers for various events. void setTransitions() override; @@ -129,17 +124,6 @@ private: */ int doAlignRight(); - /** - * Distribute selected items using an even spacing between the centers of their bounding - * boxes. - * - * @note Using the centers of bounding box of items can give unsatisfactory visual results - * since items of differing widths will be placed with different gaps. Is only used if - * items overlap. - */ - void doDistributeCentersHorizontally( std::vector>& aItems, - BOARD_COMMIT& aCommit ) const; - /** * Distribute selected items using an even spacing between the centers of their bounding * boxes. @@ -148,28 +132,18 @@ private: * since items of differing widths will be placed with different gaps. Is only used * if items overlap */ - void doDistributeCentersVertically( std::vector>& aItems, - BOARD_COMMIT& aCommit ) const; + void doDistributeCenters( bool aIsXAxis, std::vector>& aItems, + BOARD_COMMIT& aCommit ) const; /** - * Distributes selected items using an even spacing between their bounding boxes + * Distributes selected items using an even spacing between their bounding boxe + * in the x or y axis. * - * @note Using the edges of bounding box of items is only possible if there is enough space - * between them. If this is not the case, use the center spacing method + * @note If the total item widths exceed the available space, the overlaps will be + * distributed evenly. */ - void doDistributeGapsHorizontally( std::vector>& aItems, - BOARD_COMMIT& aCommit, const BOARD_ITEM* lastItem, - int totalGap ) const; - - /** - * Distributes selected items using an even spacing between their bounding boxes - * - * @note Using the edges of bounding box of items is only possible if there is enough space - * between them. If this is not the case, use the center spacing method - */ - void doDistributeGapsVertically( std::vector>& aItems, - BOARD_COMMIT& aCommit, const BOARD_ITEM* lastItem, - int totalGap ) const; + void doDistributeGaps( bool aIsXAxis, std::vector>& aItems, + BOARD_COMMIT& aCommit ) const; private: PCB_SELECTION_TOOL* m_selectionTool; diff --git a/qa/tests/libs/kimath/CMakeLists.txt b/qa/tests/libs/kimath/CMakeLists.txt index 8b5f39c113..713ec4ae6f 100644 --- a/qa/tests/libs/kimath/CMakeLists.txt +++ b/qa/tests/libs/kimath/CMakeLists.txt @@ -28,6 +28,7 @@ set( QA_KIMATH_SRCS test_kimath.cpp geometry/test_chamfer.cpp + geometry/test_distribute.cpp geometry/test_eda_angle.cpp geometry/test_ellipse_to_bezier.cpp geometry/test_fillet.cpp diff --git a/qa/tests/libs/kimath/geometry/test_distribute.cpp b/qa/tests/libs/kimath/geometry/test_distribute.cpp new file mode 100644 index 0000000000..7a7b37b7a3 --- /dev/null +++ b/qa/tests/libs/kimath/geometry/test_distribute.cpp @@ -0,0 +1,169 @@ +/* + * This program source code file is part of KiCad, a free EDA CAD application. + * + * Copyright (C) 2018-2023 KiCad Developers, see AUTHORS.TXT for contributors. + * + * 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, you may find one here: + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * or you may search the http://www.gnu.org website for the version 2 license, + * or you may write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include + +#include + +#include "geom_test_utils.h" + +struct DistributeFixture +{ +}; + +/** + * Declares the FilletFixture struct as the boost test fixture. + */ +BOOST_FIXTURE_TEST_SUITE( Distribute, DistributeFixture ) + +struct DISTRIBUTE_GAPS_TEST_CASE +{ + std::vector> m_extents; + std::vector m_expectedDeltas; +}; + +static void DoDistributeGapsTestChecks( const DISTRIBUTE_GAPS_TEST_CASE& aTestCase ) +{ + // Actally do the chamfer + const std::vector deltas = GetDeltasForDistributeByGaps( aTestCase.m_extents ); + + BOOST_REQUIRE_EQUAL( deltas.size(), aTestCase.m_expectedDeltas.size() ); + + // First and last items should not be moved + BOOST_CHECK_EQUAL( deltas.front(), 0 ); + BOOST_CHECK_EQUAL( deltas.back(), 0 ); + + for( size_t i = 0; i < deltas.size(); ++i ) + { + BOOST_CHECK_EQUAL( deltas[i], aTestCase.m_expectedDeltas[i] ); + } +} + +BOOST_AUTO_TEST_CASE( DistributeGapsNoChangeNeeded ) +{ + const DISTRIBUTE_GAPS_TEST_CASE testcase{ + { + // Already evenly spaced (100 gaps) + { 0, 100 }, + { 200, 300 }, + { 400, 500 }, + }, + { 0, 0, 0 }, + }; + + DoDistributeGapsTestChecks( testcase ); +} + +BOOST_AUTO_TEST_CASE( DistributeGapsSimpleShiftNeeded ) +{ + const DISTRIBUTE_GAPS_TEST_CASE testcase{ + { + // Need to move item 1 51 to the right + { 0, 100 }, + { 149, 249 }, + { 400, 500 }, + }, + { 0, 51, 0 }, + }; + + DoDistributeGapsTestChecks( testcase ); +} + +BOOST_AUTO_TEST_CASE( DistributeGapsRounding ) +{ + const DISTRIBUTE_GAPS_TEST_CASE testcase{ + { + // Have to fit 3 gaps into total sum of gaps of 100 + // so 33.333333 per gap + // (note one rounds up, the other down) + { -100, 0 }, + { 0, 100 }, // Move this to 33 .. 133 + { 0, 100 }, // Move this to 167 .. 267 + { 300, 400 }, + }, + { 0, 33, 167, 0 }, + }; + + DoDistributeGapsTestChecks( testcase ); +} + + +struct DISTRIBUTE_POINTS_TEST_CASE +{ + std::vector m_points; + std::vector m_expectedDeltas; +}; + +static void DoDistributePointsTestChecks( const DISTRIBUTE_POINTS_TEST_CASE& aTestCase ) +{ + // Actally do the chamfer + const std::vector deltas = GetDeltasForDistributeByPoints( aTestCase.m_points ); + + BOOST_REQUIRE_EQUAL( deltas.size(), aTestCase.m_expectedDeltas.size() ); + + // First and last items should not be moved + BOOST_CHECK_EQUAL( deltas.front(), 0 ); + BOOST_CHECK_EQUAL( deltas.back(), 0 ); + + for( size_t i = 0; i < deltas.size(); ++i ) + { + BOOST_CHECK_EQUAL( deltas[i], aTestCase.m_expectedDeltas[i] ); + } +} + +BOOST_AUTO_TEST_CASE( DistributePointsNoChangeNeeded ) +{ + const DISTRIBUTE_POINTS_TEST_CASE testcase{ + // Already evenly spaced (100 gaps) + { 0, 100, 200, 300, 400 }, + { 0, 0, 0, 0, 0 }, + }; + + DoDistributePointsTestChecks( testcase ); +} + +BOOST_AUTO_TEST_CASE( DistributePointsSimpleShiftNeeded ) +{ + const DISTRIBUTE_POINTS_TEST_CASE testcase{ + // Need to move item 1 51 to the right + { 0, 49, 200 }, + { 0, 51, 0 }, + }; + + DoDistributePointsTestChecks( testcase ); +} + +BOOST_AUTO_TEST_CASE( DistributePointsRounding ) +{ + const DISTRIBUTE_POINTS_TEST_CASE testcase{ + // Have to fit 3 gaps into total sum of gaps of 100 + // so 33.333333 per gap + // (note one rounds up, the other down) + { 0, 0, 0, 100 }, + { 0, 33, 67, 0 }, + }; + + DoDistributePointsTestChecks( testcase ); +} + +BOOST_AUTO_TEST_SUITE_END() diff --git a/resources/bitmaps_png/CMakeLists.txt b/resources/bitmaps_png/CMakeLists.txt index 81b28f5314..b2de647797 100644 --- a/resources/bitmaps_png/CMakeLists.txt +++ b/resources/bitmaps_png/CMakeLists.txt @@ -247,8 +247,10 @@ set( BMAPS_MID directory directory_browser directory_open - distribute_horizontal - distribute_vertical + distribute_horizontal_centers + distribute_horizontal_gaps + distribute_vertical_centers + distribute_vertical_gaps down drag drag_segment diff --git a/resources/bitmaps_png/png/distribute_horizontal_16.png b/resources/bitmaps_png/png/distribute_horizontal_16.png deleted file mode 100644 index f9eda22c091c36fdf1249031953b5f9e43ffe415..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`sh%#5Ar_~T6C9X?c#n%Z%wS|! zP&uz~wV=Y1W3rCClvI|akdRQ;6ziuF9L+Zz9Ua9a*i7VNSr19DF_^Aldh|b|LiH*S z!=~`$iSf2s2Tm9@BsejtMt@nt<8{wP+MzIQk%~1lgY<5Wq>8fZcYzi%c)I$ztaD0e F0st+REiC{5 diff --git a/resources/bitmaps_png/png/distribute_horizontal_24.png b/resources/bitmaps_png/png/distribute_horizontal_24.png deleted file mode 100644 index b6521a18a2d69b40b8008ee88d8cff8596ad8a50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjp`I>|As)w*Qx+H|98uG_TJgky znVI?U<|^svB%XuI<)*X#UnnKfxrJeQ)vrhaA)!z5^A)qNtx1%L6BAfnccm$i+f7$u qYr`}#o_&`}UR=*8S^H%rC&T=y8zglr>o))`VDNPHb6Mw<&;$UbsxTJ- diff --git a/resources/bitmaps_png/png/distribute_horizontal_32.png b/resources/bitmaps_png/png/distribute_horizontal_32.png deleted file mode 100644 index d8edcee2993122740ecf06ab964b19a7b6b985ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ9#0p?kch*{2@+ctB-(eUJbox9 zz_#(_y7)yOJC=t$p7>vZC+TvueRIj=A~v3kX@syg8c<6=IE(gQ1)-DC}3H3YKrRI>B@6%*9# vy>#J1!0CtAb>vIbP0l+XkKEe1@b diff --git a/resources/bitmaps_png/png/distribute_horizontal_48.png b/resources/bitmaps_png/png/distribute_horizontal_48.png deleted file mode 100644 index 6e0920883a0d5da0b5caeec682d199293337dece..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtlb$Y)AsP4H-Z&`OWFXM`aQhU& z=!<+dmzv8I%M@*&WU$}j+OjcjM@52~TB5_V`sKC;()%WyW$aud?Oprf!rpUv*Ssg~ zjBk7QWzA2eoquOvVZHN4QPYDfIMx)%i#N+$w(gr?(J%A=cFYWB<=k6yU#o7GNIr9G zNbP0l+XkKb=zg6 diff --git a/resources/bitmaps_png/png/distribute_horizontal_64.png b/resources/bitmaps_png/png/distribute_horizontal_64.png deleted file mode 100644 index 436aefaf2b8e5dc9c2931ee07d120eac54a09e88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=-#lF$Ln>~)y}g(Bkbyv3qBxI( ztd!V-g-w%0b&T0~xmE5p&NH)jUQ(E0JZWQKm&YFtMJ11Swl60ud7qpsx7~87#;eVz zUfn#jE7qq*>}vhYtDleTGCNY9`FQ4(e_9)TZ)M+G>bdj_Kl6@1bqv$JU&`k%s3~Ax zI^`b&gFz|7+ONkXHrG%4`miKY_WZv272jUX{c-jpLrY_~!2hQrK-U4mp6mOi7Syvs zIE2U#%`6}#2NL$5YP;3P_TWA{h+D^d;L?;gTP;6!Pu@OhkCnIYigkiIHwvvnt{ntP Nd%F6$taD0e0stqDZx{do diff --git a/resources/bitmaps_png/png/distribute_horizontal_centers_16.png b/resources/bitmaps_png/png/distribute_horizontal_centers_16.png new file mode 100644 index 0000000000000000000000000000000000000000..eb22aaa5596a163ede3d6bb6beed29da78caf4fb GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ii4<#Ar_~TfBgS%&&=a(A`{M# zm}2PkNrP*N6rVnOVhmftWOm_&3l~mPR8(B(wllb|(V#VL tKyEkP1xs0**PF=xGL?$euFYa%xcBe-#jA(UEeG1c;OXk;vd$@?2>{ZFG&=wQ literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_horizontal_centers_32.png b/resources/bitmaps_png/png/distribute_horizontal_centers_32.png new file mode 100644 index 0000000000000000000000000000000000000000..9627945267a095a68e58f64b8939b9f97c1145cf GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ`JOJ0ArXg@fBgS%f7l`Eju7wf zNEK=R?F|MUzMBrZygHuQ;PP0|f8{ad|Bezz)UGlf0ST2nei$%=QNe5_pF-IG2Zas+ z0TWz3JWgmyeCzbGd^RKIr+kZJPKxD(s8!Ys83h^w|J8-s`>Yu5DinR~w@SFexR_6( z^uP*cH(7&M4G$kTEWEFzv@}pkN-E3p&#b4-=NOsqnM!{+r@7aFp__f06!Tv}Eud2w NJYD@<);T3K0RUDYQoH~F literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_horizontal_centers_48.png b/resources/bitmaps_png/png/distribute_horizontal_centers_48.png new file mode 100644 index 0000000000000000000000000000000000000000..f637d49c7eaa933bfb728c2118c83ab6a3e9790b GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtO`a}}AsP4H-a5#8$bhFcakl9# z-%}hh#>~+o2gS}j&{jU6c2?%uC2l8=2~sT&zv~8ln&jVAbx{< zpv5-pT7M>`f!u}$6yz2D9u;daXMXqX#c{@q!VC-_oEz@&-+j4XswR6WdkiDTd!_xy S6golPVeoYIb6Mw<&;$T&l~rH> literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_horizontal_centers_64.png b/resources/bitmaps_png/png/distribute_horizontal_centers_64.png new file mode 100644 index 0000000000000000000000000000000000000000..010c9afbcb6a380eb48bbc6ea64f9786fb1fb9a0 GIT binary patch literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU<~ziaSW-r_4c-**AWMiV;{{A z-nen&RMJBA4Oc`J=PCBRHr?Z}=_6Cz;j=T0B?Mx<{TH;dMN3O7OG2t~aDYMJed!uWQRLPQTu4ed;~ShRIWB&)3=`IC1a% zYmaxW?Vo@7#ogn_cb|FBVz6t6zw4VVTd!{MIyRG^Vfs&5#&_#nQZ8kkU-jg}8UBXd zf7Y2Rh;Q7rb?VAVA6G7yexM@{bpH=tf#V8B z{k&6JOXEJ<%>T}G;5j2uq`{8Kz{K>;#+?WG{knK+O1{}&eZaVnaeGJFy4au7q(Me| My85}Sb4q9e0OX{ar2qf` literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_horizontal_centers_dark_16.png b/resources/bitmaps_png/png/distribute_horizontal_centers_dark_16.png new file mode 100644 index 0000000000000000000000000000000000000000..4cb7522f20fd21b34ffed8b9024ec1c8f83683b3 GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`C7v#hAr_~TfBgS%&&*?;Q@@Vk z(21m$CxIdsx%GQxS_&l_eC2#>c9h)ybZ=?(!nN-6YP)e3U42+Dc7#J8B82=$?q9wi%E0)46;a;%&lskttGIg90mwq+ z>K}E$r~^hFFzSF&2aGyk)B(fC0YkqEFM8d0my`!>d_7_#80MU9$o2oYD&b Y0A%bI-yxD+jQ{`u07*qoM6N<$g1I|;J^%m! literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_horizontal_centers_dark_48.png b/resources/bitmaps_png/png/distribute_horizontal_centers_dark_48.png new file mode 100644 index 0000000000000000000000000000000000000000..c4ef7943c0fc61533fe45fb2885419b22bea4642 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtot`d^AsP4H-rC4}$Uva=p>~{V{^-H}TXo;m=f>O!GoE~6X+3j9X=SpS zwV+_=O}X1!zTff4{FiZH)9G--nf7TX*XCb7BpfiyUasJTKlAU>pm2voI|hb(4X0n) zJdN49YGpdm{)$-P&r7qiSbB3Fb!ug`z>A9sP+x{8Ej>I{|7PWx)J!06 sfj9$??@v3k=YJn8`M!8FkNFVdQ&MBb@03H~9kN^Mx literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_horizontal_dark_16.png b/resources/bitmaps_png/png/distribute_horizontal_dark_16.png deleted file mode 100644 index 42f9b9310eabfd3a1b7405f1e754f6cfb3ab1412..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`xt=bLAr_~T6C9ZMZqL_lFkt3$ z@R)Zn^Y`ng3O<|uG<$E?eIL6^{8rVIpN0Z#8{fz8$!|hO2#c9s8p zS07T7u6mVcNBPTlSv-{sZmeKbKF!d?$vGwG;$$O@O5t3Fqcb}vz2RZly!qUnv)_z@ Qffh4(y85}Sb4q9e0K}Ld`2zcWugT4hn36cvwqjR|F{3VfNE^&v4^RQ z8(+EWN^DKI(iF&@k$Lcewr_h~uiJI6`Lh@p63=gtWd7um1hk34)78&qol`;+0C3(q A1ONa4 diff --git a/resources/bitmaps_png/png/distribute_horizontal_dark_32.png b/resources/bitmaps_png/png/distribute_horizontal_dark_32.png deleted file mode 100644 index 0a5220c80401267859921b719281488bf89309e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJsh%#5ArXg@6C~CgNc>+fwp=zp z%0c4Dvh8(j%jd4QnOnB!AOA52v%O!9EpqEcxy%_(0HuCeKlpd_x7hb}cVbx&tDn1X zzwOnP!~Yd{l9W$3UJ1I(_+9TV_ulfK@9GyB1iW3ryy9JBAbXEh!WG8Fd=jMxRxrEC z8a$CT_!8~1#KcQJW>>D|pIJ|v&oeULHI@EwPIE5YA;S+nkTI9h2npIMi_F_ABu-b#ZCtt|}&L*Sv3^9liN` zT)L;x<%j#u>S@-iT)F=>_QBH0OJaiVo%0lZ^`0#!qV(KLj;23%_m?v?+`Q}b{`u+S zDmz!4THqWRKYRY({@64Zjt12-g-h|Sp;CfOKqsMt4zc{jE*WVIW|izg=~MU^Hb^jB yUS8~X{g^_%`GU9Zo?Dmfnj3syZSk+g8^5py?{N*SI+c|KGQ`u>&t;ucLK6UgyJ>^~ diff --git a/resources/bitmaps_png/png/distribute_horizontal_dark_64.png b/resources/bitmaps_png/png/distribute_horizontal_dark_64.png deleted file mode 100644 index cdc3677c5d3c12092c36bd1964408066c0fc492b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU}W}maSW-r_4c+Q*C7LuV;_0s z4m^Hw?V53gXt?_Oq}QykLRbn#Z(lSkeLbPcy@PX6$D)pqEoc89Z2q+1=OO)UB^KA( zkhn$Fiz9w+d%HdOXI#;n*$;9Bv~zFQ-JYraQz>HAOVvNO(w=$k`;ct9|9->Vos;tY z7WB#aFX)Ro$)+SfAv_|6Lw*w6al;*{6tpUtVasJz#5*gt(G a-&IbN_F3(!E9y-_3Orr?T-G@yGywoQH+W+J diff --git a/resources/bitmaps_png/png/distribute_horizontal_gaps_16.png b/resources/bitmaps_png/png/distribute_horizontal_gaps_16.png new file mode 100644 index 0000000000000000000000000000000000000000..3513e99bc40c389eb43bb91ccbd61d8f71b1d111 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`yF6VSLo7}w|M>sko|(tnL?)ae zQ6PHP%N0wV4%hKX=-%5qIeOE_8P=Ps1l%5an99WQ9ZD#BJn{Y{UiYSiEh&#LCMf*o zuVa?#zr*n8zk$x(k{xU_`43g_PROy?CA#9pjFQI>112QRoThv+p;@Z`OQV4!vxAhQ z#H(3)0Tl-_B&1g}E?l_KRZ&rKwWCBVqau&mf?5BY4SbkR@U?aw7&qByP76NDRI>L( tmYc4`)`Tlf3zH5$(0G#(7jqft%+O`p4=i^)jt07m!PC{xWt~$(697@IO!oi) literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_horizontal_gaps_32.png b/resources/bitmaps_png/png/distribute_horizontal_gaps_32.png new file mode 100644 index 0000000000000000000000000000000000000000..4fbd6162fb5686a9e02ab5201b31e80c7d13800d GIT binary patch literal 371 zcmV-(0gV2MP)F4gj%{9Pl4v;gOZt z_>fRJvJxgvwgaS^j-d4orRsG#qZhXRvg`k-Ic?05EYyAPhQs42V}j zFx>DhXbyOUq~;OjAu!Ns0F;%02K)tK5F5z>H=u?$VdF!^nxJAg$aVlEAs#aXVPrA! zhNEJjYzZqH(D|@31SAHMBiaE$K|wMhAt9mYm~JH@)WZL0_}`#(08o52n!3VV literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_horizontal_gaps_48.png b/resources/bitmaps_png/png/distribute_horizontal_gaps_48.png new file mode 100644 index 0000000000000000000000000000000000000000..41bbc02459087c844a6ef61ef0de618890f7738a GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezr3(F!Ff1IEG~0dpmtE?;!($)?z{C zfPh3bMz;lLc`jTqa0swr;N?9tVH%@GgC|G!4C5UO49$KzZu_JZTXX5D>c3BaCQk^` z>ip^9{GvtUoU&}`mM5+N;JL+uu;?Yd{d(2&9S zCE{<-y3zuN{Wd^_*RO8nKJfZ&*X(w_$<1Rs>xNJc23zI|rn-nV3(oHro()p! M>FVdQ&MBb@0EqF09smFU literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_horizontal_gaps_64.png b/resources/bitmaps_png/png/distribute_horizontal_gaps_64.png new file mode 100644 index 0000000000000000000000000000000000000000..21987a7012e37576736ea2b5c7f922b563f1b4ee GIT binary patch literal 575 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU}E!haSW-r^>&uNKeM64F>$9R z)q^?ZY>iCKDvrGUH{Tg}G#zY=FSGsEqM#=5n_)$vu!V|unJ%O0X8r~T-=t*=wmgy8 z9^L+-D`LQzvD?XUklOZ>bx+sE?H ze$};;er&(C?)`MG7TH;Rw$uMEV@tT2sVm)5)>5&cPbZk~T%xtoKe117y~6()&xyOd zQGD{a?X~<;rUMFVtfrip9ufL>>D?9P?=SJ*{c+&=w(ah}m#o)hT)^vU)GP76`il0y zQg3s+8Jc=`gTI`-Jd1H&5?h5KgWIHO%@=!_9m*J9XmcL0@XF?`n5FeGxN1Ts1FKW~ zGVeS4&-~y?xSKgiZ_dWaIm`t&@6K7zc*^y|MU{QBS6y~9EZll=TL$lK1%^NKb2qH> zSSI)Qt>&_dKyy0=g;OH6-+~ww=3O;+ef~E;R5vQV)FdrmaRy|Jr>mdKI;Vst0QWuW-2eap literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_horizontal_gaps_dark_16.png b/resources/bitmaps_png/png/distribute_horizontal_gaps_dark_16.png new file mode 100644 index 0000000000000000000000000000000000000000..a5f6bf4dbbd8bbaf7abe6c85b9dd746b5097e09a GIT binary patch literal 251 zcmV}$46CGx4 zW@hHYlF4oNZ#zopr08JTD ACIA2c literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_horizontal_gaps_dark_32.png b/resources/bitmaps_png/png/distribute_horizontal_gaps_dark_32.png new file mode 100644 index 0000000000000000000000000000000000000000..6e3e3609bb05440087994eb500de0f1c6578e3eb GIT binary patch literal 378 zcmV-=0fqjFP)U6ROx$_rn*gBLJhz=M6tVHadUw4taN7BLtJBUmnPfY_ zY3D0XryZ~VgE5c|7vJ&vGf2#N$D6s>_)xJ$P`y9Mcfj^np>PKP*+_=}hvJpk_)xKx zFmdu7u;XL&cnTyxxNB z0AON#1XBZMQyc;Vod&>JX~*loAPiz78GZvA0!`TX;LroIp$@n~wgW)eW!o!55JnaQ z=65krwuF@p=zMq?0u%$u5$%B67jMhlyL2xU9n-BO1Y3Cd?te7=Z%{hm-le;%QPfco zQZ#eG{fqZ4!0NDIkQ~h&fWtft^`j0Lb-<_tMjbHffZ^+a0k4dPUV~)7n`DEocT6t~ Y0NIZ`3a}>kPXGV_07*qoM6N<$f<%z0X8-^I literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_horizontal_gaps_dark_48.png b/resources/bitmaps_png/png/distribute_horizontal_gaps_dark_48.png new file mode 100644 index 0000000000000000000000000000000000000000..27b0166a4c8ac0f8c5ab18dab00b31c09721889e GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezr3(Fp7A(IEG~0dpq5hugO86HNBI4 z!vQz#wR>9*COo#?vhgE_+<{|m?;VvVMn_~X6)S2lb>QMI2(LSnS23H%`s9a%{d@j0 zDlS!-Jv;f3g4)5uzKeRoURW9MKDNAH<>A^SrhcEdaSic-LN;VsN7%a^ww9YrCaAS-)Q|;DinWydj7N% z4=bJ=V4N(gacQ$3hz{7Z{e$I?8O%VBqks3itPiF+4{K^ TWz+iuKuSGb{an^LB{Ts5qYQ-B literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_horizontal_gaps_dark_64.png b/resources/bitmaps_png/png/distribute_horizontal_gaps_dark_64.png new file mode 100644 index 0000000000000000000000000000000000000000..80cac6fc92e148cfa1484f17a0969f432f37205f GIT binary patch literal 592 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=sIqaSW-r^>)^N|3eNU$2$!R zO+W6xaP;Dl)@_rUXK%2O5;wousiSu6;6(cd&ccGl_DLzmc`hlJ!`Q{&d-+7n*mAG2 z^_KjW))`U1WcPU%zrVY;e7<#5T(#xtO+}Gmd<enp5(-;S7&=ReAmnMomzLN z&f5Dm^3ArgS^nCKocLLf+B_{3W}c8=yJi#1Egi}3?)cAU_VIzHuFo#Z|6cXQrtfap z(j;BO-)r9JD2)?5o=$*!$Ge`#%b{Y`YrJ-3kEx{lTNzjgkc#=+pYur&YD z7CD9om)~lyOwnIeD>PZemSKj_EylFNyQR{U85*9px^@M=WtbqvU?{?-&^L*xz~28- zC+{p>&Pu$;9HRAcQ=V^p}z{XSw1Z@(kM z4|N8SsIQ*Oq#k(N)R)RmjhRs!W4Os|{tT6wSpmwkb$%R}c%orD>lNPA>rZZ-`(%0M zo!0)_>wYbsbLV%1Aj>}CRgRP8*U$6%J~O^Iyr(X;c*fnxw*MiEOz*Mhw=g{DXLupI zH>KpO+X}h)`r<+dGKzMII>rMd?jn<<>|%pb9Wh}B28CM@`uzIQhd(BDe2cQ@|Gq_JMo54fZ%}U`mL)Tu1tqv;U3=C#G91+jwbVLDdWbkzLb6Mw< G&;$Uw8Z6CS!2jcInxzbS#g1is za_l@6B0bNV4!&z>)a`OVc!Fi&!iCeOsM(e97)_osWq;SDH|?zJrAiqtzGa-hVoLIr zGKLdAi*7Ubot%2*o9zt{v!wh$gZse@J&6)N4lb@u5*HR#xG*y8+WLD+!Hnd!K$kLj My85}Sb4q9e0MD6FO#lD@ diff --git a/resources/bitmaps_png/png/distribute_vertical_48.png b/resources/bitmaps_png/png/distribute_vertical_48.png deleted file mode 100644 index 611272e7e9159c081ce28eb9726491feafb39f10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUty`C?MS{Vqj!p46zmNiJ>1%`2%m*?~GPs@>DEMr=BHBIs(Z!^aE6j`K zK(>kWGzA)Pv3d9BEQp#vWt*S-Y$2e;*8>Hbtp&Z@7pr7C1P&PanONzWSbRRPK~`L9 nZKr$p#Xx?bdq7$poEaD*R@+z$dPVL9dW6B#)z4*}Q$iB}!bDmw diff --git a/resources/bitmaps_png/png/distribute_vertical_64.png b/resources/bitmaps_png/png/distribute_vertical_64.png deleted file mode 100644 index 147f682cb37325d4a2526fa0612c3d3f345d4f74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU}W@kaSW-r^>&saUz34Io1{&H zu~h}5xcc2MTrF~kk8%gRd+<(2uIb>b4tJ-lJ0{DHPE!9-ds5!)()Wqm0^&p%862uF zndqu~=4Q$|sldR<;lRKoAkZ;W?|5O|$)w!Avs()~w=i5Uw97t~)BAq)^`{!=e6KF~ z*13n_@$A`azb^f^(r$h9oi+VTuRQb2I1;!vaBSjLf*SK-Z^Psii)kRoHuQN;O3}Q_ z{Xok4n%=#iQ@^zLyNfUhG%&CL?VMNh%XHg~ck62f6OK#mu}|1%{pIOP`(q%c1JkXq z>^yM??)x)}Ic{?VsRp^Qtw3Ydl&HcUUWNw;WTh_Lm}&BI&TXJI44$rjF6*2UngF6t BdOZLD diff --git a/resources/bitmaps_png/png/distribute_vertical_centers_16.png b/resources/bitmaps_png/png/distribute_vertical_centers_16.png new file mode 100644 index 0000000000000000000000000000000000000000..18f854f06ccee73cb9ec9574bdbdfbc96d669a58 GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`1)eUBAr_~TfBgS%&#Wrpte~Qj zVru8p!}$MWA`i2QRG+qosZ5;S)rt~P4q+pPWqeE6mrO5W*7(MBm3iW$43*mr3l=DF zFAxqFY|T<15MTqoA!W)vyL^LLI-iLQca5vS`ngN+P3S1h=~ o)RZddt0U2yGD%0G$WoFavHK8D+#!?MK=Tvw^Iexc?3iBi_+dba&r0SEGdVYLr>Ngy4C-~C)$qgK z3@BDGlY3L~2aALQixW)5dCJ&%asq9lr2Bl>TiV*9f@b}=V0gl3ku1ZN4PBSsw6m_4 zDrLC%mT~@yDalvL7=SXjnfp#oz4FcW28dZwexSkqV1}MV2_FX+*CvSziz-~MwlNqw WO!M0>#k2_MY6eeNKbLh*2~7aHUs=8Y literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_vertical_centers_48.png b/resources/bitmaps_png/png/distribute_vertical_centers_48.png new file mode 100644 index 0000000000000000000000000000000000000000..8f30689a0485cb912f1116c26a2fc1850f924d93 GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtlb$Y)AsP3Q|NQ@Ne>i~6hsRl_ zrz&9qqw>m11rw7g%Vws1eRZ{Gv1i5==EZUnol7V9JQke)zo*Bz(MPjJYK@-%f|bpE zFU16cKJmPG@kRZsS#&@W!;2r1Ei(2V4I)?89@gP!Sggt{V(Wb1?D++GvTHltyDtXv z1MSfG#_pD!05gTe~DWM4fFuh{> literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_vertical_centers_64.png b/resources/bitmaps_png/png/distribute_vertical_centers_64.png new file mode 100644 index 0000000000000000000000000000000000000000..8d2d4d1b39122cbc0f417d29ded7bab13d506ffa GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@Z4^aSW-r_4by%_hAPKwh!NV zZ-qLti;9Z42*_A*L`{G2N@897VSD)llk^k5X5X23ai`>wu5Kqs0Y}F!D~%UXs_Tm< zW?g3K^PZRPqvw9_eqs3pnQo4$mOMZ!7#JcKO}S*oZE);LE^|jJ1IStsP+)IZYB29j zVQRn2wT{Xaec5xDZQ?B0SeMY2rJ;1BCVJw%m&u3!|6o0kXk&K#akxu}?`Nj1=QwY& z-thl@;_T*{T#v*5-!VsUod4UhbLuv8cE*m*vR&@Cbr}-45(JN!aX@Tga4=&?mUM_@ zEwF_OfT?}y=V8tp4Z=h zBw8=zzrpM6@yl1=-Pav?p53SR-sM-9X9^##-@e29y|8w3UVoY00tbf0bNMxF99}MW zcq#6f(+sner^j2~b>_~MTl1cC1zZ7%YM3A3U&F^V-$hKI0>t-p^>bP0l+XkKs5PB} literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_vertical_centers_dark_16.png b/resources/bitmaps_png/png/distribute_vertical_centers_dark_16.png new file mode 100644 index 0000000000000000000000000000000000000000..dc10fe5b4dc1845e7f660dd7a44f3d6aa4350589 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`<(@8%Ar_~TfBgS%&#Wrp{NUcw z-K#$)9%75x_gh~6n8AU>-^HxU->#o-{kCQ^R|}^kLooX#=1bl?8AYlaUp0CZnoP<) z@VEQB?z`BXySpTKg1QqA?DhWc#L224!+bSqN%J-3^ZkO^3?8~}RtmQny7oG3bx;v! ZW@xgNJ@uq;i6GDk44$rjF6*2UngB}}K_vhH literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_vertical_centers_dark_24.png b/resources/bitmaps_png/png/distribute_vertical_centers_dark_24.png new file mode 100644 index 0000000000000000000000000000000000000000..d237b9aa9e293b67088af756bf22e201470ec79a GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjVV*9IAs)w*fBgS%&#Y^BxFNFO z{inPCmpn+!Ykb^yy?t)ko`3y4o?97W?N9jpiZqZqnG$L6rTEi@tqoUBsEXV?e1z%A sqNX5jj%ltY8xu?>d2UKL@ic`&LE321frCn#KpPl5UHx3vIVCg!0D!+Zo&W#< literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_vertical_centers_dark_32.png b/resources/bitmaps_png/png/distribute_vertical_centers_dark_32.png new file mode 100644 index 0000000000000000000000000000000000000000..6d510c9baa2b128a94bb01ccf13f1bb1e70fa06a GIT binary patch literal 237 zcmVj>fRVX^9)B)Jc1la|$ z6Yc=#9j}|5cD(+N4O8p@9Oi=T96Syf@F*C~1%ulG16>r4)`la~0S_+Swxl%ip<|Gl zL_6T#mAk7b&3+gdXy&K`h;9#@IDh{bwH*L5lj!!qs#6dDQ`-R`Gl^~w(A@z89tESh nV9+_>{>A$i16mZ1sM-(!w00000NkvXXu0mjf7_ehj literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_vertical_centers_dark_48.png b/resources/bitmaps_png/png/distribute_vertical_centers_dark_48.png new file mode 100644 index 0000000000000000000000000000000000000000..293e9242066e0297c9b537ce9f4ba973849dc85c GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt6P_-PAsP3Q|NQ@Ne>i~6hsRl_ zrz&9qqw>ni2mhv4o18W2vhwO#?3rC=h6wM*O}WnJo8Zq=9=GTd1-#es|8b* z*R)KrNlr=exc^vf6RRp)!@U`fCq6c_csSm*I`fHP!?zO*uIB{`J{zxycF%rvF{uP> zR@dLgixLuF53FE!vo(0tI5Cv}!mh8LnXgMsID4xSt}q{7DssqF&*gQYf)m4Oi;FLI zTzGJX`EXfG#uha>T{m}-p2oNQJ;#6swC!YP2&(qAmH4!2GSE*9p00i_>zopr0MT1& AApigX literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_vertical_centers_dark_64.png b/resources/bitmaps_png/png/distribute_vertical_centers_dark_64.png new file mode 100644 index 0000000000000000000000000000000000000000..bedf3edcaeb76fd7ac17b8b66d297aa9e56b49ff GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV3hQ9aSW-r_4bw_Uz35zu|hWf z2ZbfhU%29qPCa>e1-pP+Qj(16qS=ghC9)m~YW3z>iL9(-{C9Y};HP`~nX}E#UyiDd z?PCX;#}J_Y(=yu2P42;z%#$EK5Hu(=*jIjOj%amUBIZ~Vf6GPcz_xSY{#qusb*vwR z?`qrMntm}kZxtxOQK(M@T=QS1p4e;w(%;}ZFV+3^w(@;via=aX LS3j3^P69d9=@vB;@k_h8H4uSLt}=7%*JC^9F!a;S2s(ll>K(hsl|VCTEDzvBL*dsBC> z?l`EhHR4a5{*(ZQLxusmZdMt#pZ-W}WNWyRw1jyR?}8iLA>1xSj11m+=l)n8e9r{5 Om%-E3&t;ucLK6V69zL@G diff --git a/resources/bitmaps_png/png/distribute_vertical_dark_24.png b/resources/bitmaps_png/png/distribute_vertical_dark_24.png deleted file mode 100644 index 6e8bd36894051c20cb803f0e0bfb44938c6a02af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjiJmTwAs)w*6C_?W2u?q;_jLLH z$w?C?tuqSSJR{>Rv)V3}iI4lPw>R=gr*v9gn(twx@l;cuOI~81`?u^;MAgv9&&XI42PVRq=kx}YzA7!;OXk;vd$@?2>@u% BH^l$| diff --git a/resources/bitmaps_png/png/distribute_vertical_dark_32.png b/resources/bitmaps_png/png/distribute_vertical_dark_32.png deleted file mode 100644 index 5dde2851cdf65902fce6b1d0603e138f00ce47fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJRh}-6ArXg@6C_w!4(#>*?xcBe ziuHp}cmGd$5Xdf&+Ijfjf1SSD@s*aj^`c#Unxzb8#*Sr;Z(6JmR33k=wp@1o|K!6W z)(q`C6|C9&nb~Z(+=>rAC_CUFespm{N)!9^yy&1=KQ0)a@Oc#cZ|d&V8fWVyBr=|@ zVD8A{pJP$~Ut+5)gVE#{-wvz_=Kmjjn^D2IGmrnmT}Ea(*2Oy$E?7SJcl5UybCgKG b1_MK$@z(@X#|4jou4eFb^>bP0l+XkKRbE-J diff --git a/resources/bitmaps_png/png/distribute_vertical_dark_48.png b/resources/bitmaps_png/png/distribute_vertical_dark_48.png deleted file mode 100644 index 38cc2a02df5374f5fcabc4e36cbfad737a4d4bbf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUty`CuS9Zyg)jpGE&uFXS>8VP%!mNCk`Gd^+J)gIp|No!IxY0+mM(UYI{i2o4LGwNd z27T(8I8m{7{q7fHQzRIs^%`?n)=gm0ToK(KDaWvEDNn!`9!7Kf=3S**)Z}#C+-(hB zH3k}RxgFF1S-RoN3AR;VJu_dIY|%6XO7Qbc58}AKLtyRkMh-@u$1aN>J2e~g^V}|6 ocyU(6775v}2Uf6ywVJRn%vLe7Hs@TR1M~=kr>mdKI;Vst0B|*1oB#j- diff --git a/resources/bitmaps_png/png/distribute_vertical_dark_64.png b/resources/bitmaps_png/png/distribute_vertical_dark_64.png deleted file mode 100644 index a02877f6e606e955e9d87ef3fc5917d235bbeb32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC436aSW-r^>&saUz3A?tFBGM z@r!&HwJSuUwfL3g99HynZoJY_#sko>^65xl2I6 z1XmA_6InSDD()8;790vt_}9b;6TeFF` zx!lXi85Zjtf)un&-aMa>V>vk!$pEJY`*S?Jp4Kp)V)n*;`p}ywYZ?Y@QGA`^QMO{!X_|Y`0>x5Vg0e0 sLYig@CMH`r!nIlwCrIt7Y>ePx;Acp7k~E)rALtJTPgg&ebxsLQ0ICsKasU7T literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_vertical_gaps_24.png b/resources/bitmaps_png/png/distribute_vertical_gaps_24.png new file mode 100644 index 0000000000000000000000000000000000000000..c26e05c82a0a6c2cdcf456559fbe0a32f1080b0e GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjb)GJcAs)w*|NQ@N&#cS%c)>;m z6O$<#t*gV=r^#$>FyWSv`nK7_a8q1LLc#^7;OZxtbGPc=)mh-BH7U>P*ZjuD#)p}6 zO_hBoX`a=YkY`mjqp|T|TbiTG38o}viD(z$sXm(98lKrLsFdkZ3+~cUFm1Z1JS)LS gc56f7iS1epetTA4j27UY2y_X9r>mdKI;Vst034Y@dH?_b literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_vertical_gaps_32.png b/resources/bitmaps_png/png/distribute_vertical_gaps_32.png new file mode 100644 index 0000000000000000000000000000000000000000..486c287402eb4b4acd954bac8ca7f87fc7aa5f2d GIT binary patch literal 365 zcmV-z0h0cSP)42c1Ad8TYkWf-ENDtK<05otl5dS9;uO4;4r~`01K)Ug0rc~pRA3*#c z3%()Va8!(@4v=a(vJ;2p5ZrLo4OvrYXsBgyaBvtY7^DY}1CAL2Em|Vgcytw##g9OI z>4qb%3=R8P=vELRe0^l)fRuy-;sEjHgNi^4=VOZk$;QJiG>-zH<+F)RgrwF1=op6s z4g~-$`hvp&H^o{{h$A`RKP8yrf`}##KuH4)hmT4&9=R{sbYv^GG(ZyvkeCKmQ-Uc@ z1EU2IO&kD9WHJp$yrdfshax%P7?=;NCur^fpoL9%65(IzhNA`p?f_^>_Mb{P6n7Lf z97>UFJk$oHBaowjrVb#o1RQn1z&ZffwUVKn4fw literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_vertical_gaps_48.png b/resources/bitmaps_png/png/distribute_vertical_gaps_48.png new file mode 100644 index 0000000000000000000000000000000000000000..c659b85eeeacd5529629334313de1ae30e723d69 GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtJDx6%AsP4HUfalf$bpCT!uyVS zT}*njTLd$VnMJi(1i8`@+P35{Bu-NC4wx}Z%WWfjCJu?n Z{Ls+G4W`w9Q-S_u@O1TaS?83{1OQX?Y4QL7 literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_vertical_gaps_64.png b/resources/bitmaps_png/png/distribute_vertical_gaps_64.png new file mode 100644 index 0000000000000000000000000000000000000000..52de91ad0ec377c255314df0e9a4fb461e5bab8f GIT binary patch literal 597 zcmV-b0;>IqP)&>Z*rf=q8SY8iq35+wKQ|aPQFSad_tJZWIc+4+&74V&!q`&jTE$hl!{x zyIj(Ggj)A2*yWYe=5x4OaaeieUml3S&5%EUq^UR&LI4CvA;2W7%)*wKOXVU+m^=x& z4L(`F4Vrg8)s2wLiVNAJ7O9atpS|f-9=Kt&jK82UrCVMIT@dKvaEzH2_id0p=_)$t2zf zSTzeo(Ffo-i~tCL00>|Uz;xkp%&h28n6-QcZHm@9>DbTrlk$p z2YkU6I&b%h5DYbawZia8NH+ji7ahl7dcacbLhS?i!&4vxKmY_l00cmQv;t5{_mcimv@_;4 j;os&E009sH0Xp&vhgHW8v`1^q00000NkvXXu0mjf!tM68 literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_vertical_gaps_dark_16.png b/resources/bitmaps_png/png/distribute_vertical_gaps_dark_16.png new file mode 100644 index 0000000000000000000000000000000000000000..e267bd86880fc310c92242bced01dd8f2aa46f35 GIT binary patch literal 258 zcmV+d0sa1oP)g{Y?T6KFp^Uu$jQLKTMjm0=d0sR+h2u} zYrqYl0b4-^fa9A$7=YB^OoeufSO5S3 literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_vertical_gaps_dark_24.png b/resources/bitmaps_png/png/distribute_vertical_gaps_dark_24.png new file mode 100644 index 0000000000000000000000000000000000000000..ff75a400f6c57bc706591534c00164842752652e GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjO`a}}As)w*|NQ@N&#cS%c)`X8 z|E5;EXog$~Op@8!V8Si)?SFdWub@}FMi~GA literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/distribute_vertical_gaps_dark_32.png b/resources/bitmaps_png/png/distribute_vertical_gaps_dark_32.png new file mode 100644 index 0000000000000000000000000000000000000000..5b2c13a2de8c6fb4de576217a8fa07a7eea3482e GIT binary patch literal 390 zcmV;10eSw3P)45te?_1ovbT5mNY;9}B+Ww)2G;Z5^=v)lLkHw&y@^x)EM%X^pag^_|mdT=_xW!o!5$L+6| z07GIG%u?qaZytg8jyvA8I_&??LbrklDHK)?NJ%ge-HMW-Ea=3|Qjpm+<-qX1~( zY+@53sdWH4#_9m)oo@nw7Jb2y4R1Q{c_|Ke0IAsz4O3hY(Zm6$Y2eLKAinRk^YvD2 zX@DjUz?uej;7S9)Qjh{naT*vch-l&fP$F~O{>lqjDTN{&@ah;fB+Bx0`Nm+wYZ=cw2U7r zJ(TAE8~{D9C-l5#`65-1BLD<|01yBIKmZ5;0U!V;0C>sV6lCKWWI2$*%f=4#00hMp z92VZDsA8;aH?C?-M(00D#$KvaC4 z=H<#tD4QTy+C!H<;Ewrikly)F8zJ!W%U)Pvzs>@BX{@qKZ)=W^fh?##Dqq;OLq+B0eCYAK>%z4X!QZjP$ZIdc+?Nzk>6_ld=MYN6aX)L z05br*@&W7s@X80&W`V&ea38=_7VyFcU>rsO2mk>f09F9RuHGhSM+ZlE20KDV$bxJ; zzj;%;4vH!y1=e|nc>vVUQ%md82Yhf@GRyWv2tv(pr^6%_Y5<_)wlP@18K7HF>Ap*V z9&)-Y{ + sodipodi:docname="distribute_horizontal_centers.svg" + inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + inkscape:current-layer="Слой_1" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1"> + empspacing="2" + originx="0" + originy="0" + units="px" + visible="true" /> - image/svg+xml - add_arc + distribute_horizontal_centers + @@ -78,7 +85,7 @@ id="style116572">.cls-1,.cls-3{fill:none;stroke-linecap:round;stroke-linejoin:round;}.cls-1{stroke:#42B8EB;stroke-width:1.0035px;}.cls-2{fill:#8f8f8f;}.cls-3{stroke:#DED3DD;}.cls-4{fill:#DED3DD;} distribute_horizontal + id="title116576">distribute_horizontal_centers + + + + + + + + image/svg+xml + + distribute_horizontal_gaps + + + + + + + + + + + + + + + + distribute_horizontal_gaps + + + + + + + + + + diff --git a/resources/bitmaps_png/sources/dark/distribute_vertical.svg b/resources/bitmaps_png/sources/dark/distribute_vertical_centers.svg similarity index 85% rename from resources/bitmaps_png/sources/dark/distribute_vertical.svg rename to resources/bitmaps_png/sources/dark/distribute_vertical_centers.svg index eead78aed9..103ab09be5 100644 --- a/resources/bitmaps_png/sources/dark/distribute_vertical.svg +++ b/resources/bitmaps_png/sources/dark/distribute_vertical_centers.svg @@ -1,18 +1,18 @@ + sodipodi:docname="distribute_vertical_centers.svg" + inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + inkscape:current-layer="Слой_1" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1"> + empspacing="2" + originx="0" + originy="0" + units="px" + visible="true" /> - image/svg+xml - distribute_horizontal + distribute_vertical_centers + @@ -78,7 +85,7 @@ id="style116572">.cls-1,.cls-3{fill:none;stroke-linecap:round;stroke-linejoin:round;}.cls-1{stroke:#42B8EB;stroke-width:1.0035px;}.cls-2{fill:#8f8f8f;}.cls-3{stroke:#DED3DD;}.cls-4{fill:#DED3DD;} distribute_horizontal + id="title116576">distribute_vertical_centers + + + + + + + + image/svg+xml + + distribute_vertical_gaps + + + + + + + + + + + + + + + + distribute_vertical_gaps + + + + + + + + + + diff --git a/resources/bitmaps_png/sources/light/distribute_horizontal.svg b/resources/bitmaps_png/sources/light/distribute_horizontal_centers.svg similarity index 85% rename from resources/bitmaps_png/sources/light/distribute_horizontal.svg rename to resources/bitmaps_png/sources/light/distribute_horizontal_centers.svg index 4a846b2d92..17e4ccf5c4 100644 --- a/resources/bitmaps_png/sources/light/distribute_horizontal.svg +++ b/resources/bitmaps_png/sources/light/distribute_horizontal_centers.svg @@ -1,18 +1,18 @@ + sodipodi:docname="distribute_horizontal_centers.svg" + inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + inkscape:current-layer="Слой_1" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1"> + empspacing="2" + originx="0" + originy="0" + units="px" + visible="true" /> - image/svg+xml - add_arc + distribute_horizontal_centers + @@ -78,7 +85,7 @@ id="style116572">.cls-1,.cls-3{fill:none;stroke-linecap:round;stroke-linejoin:round;}.cls-1{stroke:#1a81c4;stroke-width:1.0035px;}.cls-2{fill:#b9b9b9;}.cls-3{stroke:#545454;}.cls-4{fill:#545454;} distribute_horizontal + id="title116576">distribute_horizontal_centers + + + + + + + + image/svg+xml + + distribute_horizontal_gaps + + + + + + + + + + + + + + + + distribute_horizontal_gaps + + + + + + + + + + diff --git a/resources/bitmaps_png/sources/light/distribute_vertical.svg b/resources/bitmaps_png/sources/light/distribute_vertical_centers.svg similarity index 85% rename from resources/bitmaps_png/sources/light/distribute_vertical.svg rename to resources/bitmaps_png/sources/light/distribute_vertical_centers.svg index ef1b62f2db..3fe18c571f 100644 --- a/resources/bitmaps_png/sources/light/distribute_vertical.svg +++ b/resources/bitmaps_png/sources/light/distribute_vertical_centers.svg @@ -1,18 +1,18 @@ + sodipodi:docname="distribute_vertical_centers.svg" + inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + inkscape:current-layer="Слой_1" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1"> + empspacing="2" + originx="0" + originy="0" + units="px" + visible="true" /> - image/svg+xml - distribute_horizontal + distribute_vertical_centers + @@ -78,7 +85,7 @@ id="style116572">.cls-1,.cls-3{fill:none;stroke-linecap:round;stroke-linejoin:round;}.cls-1{stroke:#1a81c4;stroke-width:1.0035px;}.cls-2{fill:#b9b9b9;}.cls-3{stroke:#545454;}.cls-4{fill:#545454;} distribute_horizontal + id="title116576">distribute_vertical_centers + + + + + + + + image/svg+xml + + distribute_vertical_gaps + + + + + + + + + + + + + + + + distribute_vertical_gaps + + + + + + + + + +