Domů » Jabiertxo Arraiza Cenoz » Resources » PasteBin » Backport to 0.92.xRC5. Fix undo inconsistences on LPE V.05
  1. === modified file 'src/live_effects/lpe-copy_rotate.cpp'
  2. --- src/live_effects/lpe-copy_rotate.cpp 2016-12-20 00:54:38 +0000
  3. +++ src/live_effects/lpe-copy_rotate.cpp 2016-12-20 19:50:25 +0000
  4. @@ -113,7 +113,7 @@
  6. A = Point(boundingbox_X.min(), boundingbox_Y.middle());
  7. B = Point(boundingbox_X.middle(), boundingbox_Y.middle());
  8. - origin.param_setValue(A);
  9. + origin.param_setValue(A, true);
  10. origin.param_update_default(A);
  11. dist_angle_handle = L2(B - A);
  12. dir = unit_vector(B - A);
  13. @@ -171,7 +171,7 @@
  14. start_pos = origin + dir * Rotate(-rad_from_deg(starting_angle)) * dist_angle_handle;
  15. rot_pos = origin + dir * Rotate(-rad_from_deg(rotation_angle+starting_angle)) * dist_angle_handle;
  16. if (near) {
  17. - starting_point.param_setValue(start_pos);
  18. + starting_point.param_setValue(start_pos, true);
  19. }
  20. previous_start_point = (Geom::Point)starting_point;
  21. if ( fuse_paths || copies_to_360 ) {
  23. === modified file 'src/live_effects/lpe-mirror_symmetry.cpp'
  24. --- src/live_effects/lpe-mirror_symmetry.cpp 2016-12-20 00:54:38 +0000
  25. +++ src/live_effects/lpe-mirror_symmetry.cpp 2016-12-20 20:44:11 +0000
  26. @@ -113,46 +113,47 @@
  27. point_a = Geom::Point(center_point[X],boundingbox_Y.min());
  28. point_b = Geom::Point(center_point[X],boundingbox_Y.max());
  29. }
  30. - if (Geom::are_near((Geom::Point)start_point, (Geom::Point)end_point, 0.01)) {
  31. - start_point.param_setValue(point_a);
  32. - end_point.param_setValue(point_b);
  33. + if ((Geom::Point)start_point == (Geom::Point)end_point && (Geom::Point)start_point == Geom::Point(0,0)) {
  34. + start_point.param_setValue(point_a, true);
  35. + end_point.param_setValue(point_b, true);
  36. + previous_center = Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point);
  37. + center_point.param_setValue(previous_center, true);
  38. }
  39. if ( mode == MT_X || mode == MT_Y ) {
  40. start_point.param_setValue(point_a, true);
  41. end_point.param_setValue(point_b, true);
  42. + center_point.param_setValue(Geom::middle_point(point_a, point_b), true);
  43. } else if ( mode == MT_FREE) {
  44. - if(!are_near(previous_center,center_point, 0.01)) {
  45. - Geom::Point trans = center_point - previous_center;
  46. + if (are_near(previous_center, (Geom::Point)center_point, 0.01)) {
  47. + center_point.param_setValue(Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point), true);
  48. + } else {
  49. + Geom::Point trans = center_point - Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point);
  50. start_point.param_setValue(start_point * trans, true);
  51. end_point.param_setValue(end_point * trans, true);
  52. }
  53. } else if ( mode == MT_V){
  54. - if(SP_ACTIVE_DESKTOP){
  55. - SPDocument * doc = SP_ACTIVE_DESKTOP->getDocument();
  56. - Geom::Rect view_box_rect = doc->getViewBox();
  57. - Geom::Point sp = Geom::Point(view_box_rect.width()/2.0, 0);
  58. - sp *= i2anc_affine(SP_OBJECT(lpeitem), SP_OBJECT(SP_ACTIVE_DESKTOP->currentLayer()->parent)) .inverse();
  59. - start_point.param_setValue(sp, true);
  60. - Geom::Point ep = Geom::Point(view_box_rect.width()/2.0, view_box_rect.height());
  61. - ep *= i2anc_affine(SP_OBJECT(lpeitem), SP_OBJECT(SP_ACTIVE_DESKTOP->currentLayer()->parent)) .inverse();
  62. - end_point.param_setValue(ep, true);
  63. - }
  64. + SPDocument * document = SP_ACTIVE_DOCUMENT;
  65. + Geom::Affine transform = i2anc_affine(SP_OBJECT(lpeitem), NULL).inverse();
  66. + Geom::Point sp = Geom::Point(document->getWidth().value("px")/2.0, 0) * transform;
  67. + start_point.param_setValue(sp, true);
  68. + Geom::Point ep = Geom::Point(document->getWidth().value("px")/2.0, document->getHeight().value("px")) * transform;
  69. + end_point.param_setValue(ep, true);
  70. + center_point.param_setValue(Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point), true);
  71. + previous_center = center_point;
  72. } else { //horizontal page
  73. - if(SP_ACTIVE_DESKTOP){
  74. - SPDocument * doc = SP_ACTIVE_DESKTOP->getDocument();
  75. - Geom::Rect view_box_rect = doc->getViewBox();
  76. - Geom::Point sp = Geom::Point(0, view_box_rect.height()/2.0);
  77. - sp *= i2anc_affine(SP_OBJECT(lpeitem), SP_OBJECT(SP_ACTIVE_DESKTOP->currentLayer()->parent)) .inverse();
  78. - start_point.param_setValue(sp, true);
  79. - Geom::Point ep = Geom::Point(view_box_rect.width(), view_box_rect.height()/2.0);
  80. - ep *= i2anc_affine(SP_OBJECT(lpeitem), SP_OBJECT(SP_ACTIVE_DESKTOP->currentLayer()->parent)) .inverse();
  81. - end_point.param_setValue(ep, true);
  82. - }
  83. - }
  84. - previous_center = Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point);
  85. - if (!are_near(previous_center, center_point,0.01)) {
  86. - center_point.param_setValue(previous_center);
  87. - }
  88. + SPDocument * document = SP_ACTIVE_DOCUMENT;
  89. + Geom::Affine transform = i2anc_affine(SP_OBJECT(lpeitem), NULL).inverse();
  90. + Geom::Point sp = Geom::Point(0, document->getHeight().value("px")/2.0) * transform;
  91. + start_point.param_setValue(sp, true);
  92. + Geom::Point ep = Geom::Point(document->getWidth().value("px"), document->getHeight().value("px")/2.0) * transform;
  93. + end_point.param_setValue(ep, true);
  94. + center_point.param_setValue(Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point), true);
  95. + previous_center = center_point;
  96. + }
  97. + if (!are_near(previous_center, (Geom::Point)center_point, 0.01)) {
  98. + center_point.param_setValue(Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point), true);
  99. + }
  100. + previous_center = center_point;
  101. }
  103. void
  104. @@ -180,7 +181,7 @@
  105. start_point.param_update_default(point_a);
  106. end_point.param_setValue(point_b, true);
  107. end_point.param_update_default(point_b);
  108. - center_point.param_setValue(point_c);
  109. + center_point.param_setValue(point_c, true);
  110. previous_center = center_point;
  111. }
 
 

29

 

873

Backport to 0.92.xRC5. Fix undo inconsistences on LPE V.05

od Jabiertxo Arraiza Cenoz

I want to apply this patch. Any problem. This fix the bugs noticed by suv on IRC and the patch is landed now in trunk.

PasteBin

Lines
112
Words
451
Size
6,1 KB
Created
Revisions
4
Typ
text/plain
General Public License v2 (GPLv2)
Please log in to leave a comment!

Inkscape je svobodný a otevřený software licencovaný pod licencí GPL.