Fix coding style issues in lattice2 LPE

(bzr r14047)

2 files changed, 310 insertions, 313 deletions

diff --git a/src/live_effects/lpe-lattice2.cpp b/src/live_effects/lpe-lattice2.cpp
index 08bbbd504..abd6e7786 100644
--- a/src/live_effects/lpe-lattice2.cpp
+++ b/src/live_effects/lpe-lattice2.cpp
@@ -1,6 +1,6 @@
 /** \file
  * LPE <lattice2> implementation
- 
+
  */
 /*
  * Authors:
@@ -11,7 +11,7 @@
  *   ~suv
  *   Jabiertxo Arraiza
 *
-* Copyright (C) 2007-2008 Authors 
+* Copyright (C) 2007-2008 Authors
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
@@ -42,63 +42,63 @@ namespace LivePathEffect {
 
 LPELattice2::LPELattice2(LivePathEffectObject *lpeobject) :
     Effect(lpeobject),
-    horizontalMirror(_("Mirror movements in horizontal"), _("Mirror movements in horizontal"), "horizontalMirror", &wr, this, false),
-    verticalMirror(_("Mirror movements in vertical"), _("Mirror movements in vertical"), "verticalMirror", &wr, this, false),
-    grid_point0(_("Control 0:"), _("Control 0 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint0", &wr, this),
-    grid_point1(_("Control 1:"), _("Control 1 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint1", &wr, this),
-    grid_point2(_("Control 2:"), _("Control 2 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint2", &wr, this),
-    grid_point3(_("Control 3:"), _("Control 3 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint3", &wr, this),
-    grid_point4(_("Control 4:"), _("Control 4 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint4", &wr, this),
-    grid_point5(_("Control 5:"), _("Control 5 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint5", &wr, this),
-    grid_point6(_("Control 6:"), _("Control 6 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint6", &wr, this),
-    grid_point7(_("Control 7:"), _("Control 7 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint7", &wr, this),
-    grid_point8x9(_("Control 8x9:"), _("Control 8x9 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint8x9", &wr, this),
-    grid_point10x11(_("Control 10x11:"), _("Control 10x11 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint10x11", &wr, this),
-    grid_point12(_("Control 12:"), _("Control 12 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint12", &wr, this),
-    grid_point13(_("Control 13:"), _("Control 13 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint13", &wr, this),
-    grid_point14(_("Control 14:"), _("Control 14 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint14", &wr, this),
-    grid_point15(_("Control 15:"), _("Control 15 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint15", &wr, this),
-    grid_point16(_("Control 16:"), _("Control 16 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint16", &wr, this),
-    grid_point17(_("Control 17:"), _("Control 17 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint17", &wr, this),
-    grid_point18(_("Control 18:"), _("Control 18 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint18", &wr, this),
-    grid_point19(_("Control 19:"), _("Control 19 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint19", &wr, this),
-    grid_point20x21(_("Control 20x21:"), _("Control 20x21 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint20x21", &wr, this),
-    grid_point22x23(_("Control 22x23:"), _("Control 22x23 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint22x23", &wr, this),
-    grid_point24x26(_("Control 24x26:"), _("Control 24x26 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint24x26", &wr, this),
-    grid_point25x27(_("Control 25x27:"), _("Control 25x27 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint25x27", &wr, this),
-    grid_point28x30(_("Control 28x30:"), _("Control 28x30 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint28x30", &wr, this),
-    grid_point29x31(_("Control 29x31:"), _("Control 29x31 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint29x31", &wr, this),
-    grid_point32x33x34x35(_("Control 32x33x34x35:"), _("Control 32x33x34x35 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint32x33x34x35", &wr, this),
+    horizontal_mirror(_("Mirror movements in horizontal"), _("Mirror movements in horizontal"), "horizontal_mirror", &wr, this, false),
+    vertical_mirror(_("Mirror movements in vertical"), _("Mirror movements in vertical"), "vertical_mirror", &wr, this, false),
+    grid_point_0(_("Control 0:"), _("Control 0 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint0", &wr, this),
+    grid_point_1(_("Control 1:"), _("Control 1 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint1", &wr, this),
+    grid_point_2(_("Control 2:"), _("Control 2 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint2", &wr, this),
+    grid_point_3(_("Control 3:"), _("Control 3 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint3", &wr, this),
+    grid_point_4(_("Control 4:"), _("Control 4 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint4", &wr, this),
+    grid_point_5(_("Control 5:"), _("Control 5 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint5", &wr, this),
+    grid_point_6(_("Control 6:"), _("Control 6 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint6", &wr, this),
+    grid_point_7(_("Control 7:"), _("Control 7 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint7", &wr, this),
+    grid_point_8x9(_("Control 8x9:"), _("Control 8x9 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint8x9", &wr, this),
+    grid_point_10x11(_("Control 10x11:"), _("Control 10x11 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint10x11", &wr, this),
+    grid_point_12(_("Control 12:"), _("Control 12 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint12", &wr, this),
+    grid_point_13(_("Control 13:"), _("Control 13 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint13", &wr, this),
+    grid_point_14(_("Control 14:"), _("Control 14 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint14", &wr, this),
+    grid_point_15(_("Control 15:"), _("Control 15 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint15", &wr, this),
+    grid_point_16(_("Control 16:"), _("Control 16 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint16", &wr, this),
+    grid_point_17(_("Control 17:"), _("Control 17 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint17", &wr, this),
+    grid_point_18(_("Control 18:"), _("Control 18 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint18", &wr, this),
+    grid_point_19(_("Control 19:"), _("Control 19 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint19", &wr, this),
+    grid_point_20x21(_("Control 20x21:"), _("Control 20x21 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint20x21", &wr, this),
+    grid_point_22x23(_("Control 22x23:"), _("Control 22x23 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint22x23", &wr, this),
+    grid_point_24x26(_("Control 24x26:"), _("Control 24x26 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint24x26", &wr, this),
+    grid_point_25x27(_("Control 25x27:"), _("Control 25x27 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint25x27", &wr, this),
+    grid_point_28x30(_("Control 28x30:"), _("Control 28x30 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint28x30", &wr, this),
+    grid_point_29x31(_("Control 29x31:"), _("Control 29x31 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint29x31", &wr, this),
+    grid_point_32x33x34x35(_("Control 32x33x34x35:"), _("Control 32x33x34x35 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"), "gridpoint32x33x34x35", &wr, this),
     expanded(false)
 {
     // register all your parameters here, so Inkscape knows which parameters this effect has:
-    registerParameter(&horizontalMirror);
-    registerParameter(&verticalMirror);
-    registerParameter(&grid_point0);
-    registerParameter(&grid_point1);
-    registerParameter(&grid_point2);
-    registerParameter(&grid_point3);
-    registerParameter(&grid_point4);
-    registerParameter(&grid_point5);
-    registerParameter(&grid_point6);
-    registerParameter(&grid_point7);
-    registerParameter(&grid_point8x9);
-    registerParameter(&grid_point10x11);
-    registerParameter(&grid_point12);
-    registerParameter(&grid_point13);
-    registerParameter(&grid_point14);
-    registerParameter(&grid_point15);
-    registerParameter(&grid_point16);
-    registerParameter(&grid_point17);
-    registerParameter(&grid_point18);
-    registerParameter(&grid_point19);
-    registerParameter(&grid_point20x21);
-    registerParameter(&grid_point22x23);
-    registerParameter(&grid_point24x26);
-    registerParameter(&grid_point25x27);
-    registerParameter(&grid_point28x30);
-    registerParameter(&grid_point29x31);
-    registerParameter(&grid_point32x33x34x35);
+    registerParameter(&horizontal_mirror);
+    registerParameter(&vertical_mirror);
+    registerParameter(&grid_point_0);
+    registerParameter(&grid_point_1);
+    registerParameter(&grid_point_2);
+    registerParameter(&grid_point_3);
+    registerParameter(&grid_point_4);
+    registerParameter(&grid_point_5);
+    registerParameter(&grid_point_6);
+    registerParameter(&grid_point_7);
+    registerParameter(&grid_point_8x9);
+    registerParameter(&grid_point_10x11);
+    registerParameter(&grid_point_12);
+    registerParameter(&grid_point_13);
+    registerParameter(&grid_point_14);
+    registerParameter(&grid_point_15);
+    registerParameter(&grid_point_16);
+    registerParameter(&grid_point_17);
+    registerParameter(&grid_point_18);
+    registerParameter(&grid_point_19);
+    registerParameter(&grid_point_20x21);
+    registerParameter(&grid_point_22x23);
+    registerParameter(&grid_point_24x26);
+    registerParameter(&grid_point_25x27);
+    registerParameter(&grid_point_28x30);
+    registerParameter(&grid_point_29x31);
+    registerParameter(&grid_point_32x33x34x35);
 }
 
 LPELattice2::~LPELattice2()
@@ -113,7 +113,7 @@ LPELattice2::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd
     PathVector cubic = pathv_to_cubicbezier(pathv);
     Geom::Piecewise<Geom::D2<Geom::SBasis> > const &pwd2_in_linear_and_cubic = paths_to_pw(cubic);
     D2<SBasis2d> sb2;
-    
+
     //Initialisation of the sb2
     for(unsigned dim = 0; dim < 2; dim++) {
         sb2[dim].us = 3;
@@ -125,46 +125,46 @@ LPELattice2::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd
     //Grouping the point params in a convenient vector
 
     std::vector<Geom::Point > handles(36);
-    
-    handles[0] = grid_point0;
-    handles[1] = grid_point1;
-    handles[2] = grid_point2;
-    handles[3] = grid_point3;
-    handles[4] = grid_point4;
-    handles[5] = grid_point5;
-    handles[6] = grid_point6;
-    handles[7] = grid_point7;
-    handles[8] = grid_point8x9;
-    handles[9] = grid_point8x9;
-    handles[10] = grid_point10x11;
-    handles[11] = grid_point10x11;
-    handles[12] = grid_point12;
-    handles[13] = grid_point13;
-    handles[14] = grid_point14;
-    handles[15] = grid_point15;
-    handles[16] = grid_point16;
-    handles[17] = grid_point17;
-    handles[18] = grid_point18;
-    handles[19] = grid_point19;
-    handles[20] = grid_point20x21;
-    handles[21] = grid_point20x21;
-    handles[22] = grid_point22x23;
-    handles[23] = grid_point22x23;
-    handles[24] = grid_point24x26;
-    handles[25] = grid_point25x27;
-    handles[26] = grid_point24x26;
-    handles[27] = grid_point25x27;
-    handles[28] = grid_point28x30;
-    handles[29] = grid_point29x31;
-    handles[30] = grid_point28x30;
-    handles[31] = grid_point29x31;
-    handles[32] = grid_point32x33x34x35;
-    handles[33] = grid_point32x33x34x35;
-    handles[34] = grid_point32x33x34x35;
-    handles[35] = grid_point32x33x34x35;
+
+    handles[0] = grid_point_0;
+    handles[1] = grid_point_1;
+    handles[2] = grid_point_2;
+    handles[3] = grid_point_3;
+    handles[4] = grid_point_4;
+    handles[5] = grid_point_5;
+    handles[6] = grid_point_6;
+    handles[7] = grid_point_7;
+    handles[8] = grid_point_8x9;
+    handles[9] = grid_point_8x9;
+    handles[10] = grid_point_10x11;
+    handles[11] = grid_point_10x11;
+    handles[12] = grid_point_12;
+    handles[13] = grid_point_13;
+    handles[14] = grid_point_14;
+    handles[15] = grid_point_15;
+    handles[16] = grid_point_16;
+    handles[17] = grid_point_17;
+    handles[18] = grid_point_18;
+    handles[19] = grid_point_19;
+    handles[20] = grid_point_20x21;
+    handles[21] = grid_point_20x21;
+    handles[22] = grid_point_22x23;
+    handles[23] = grid_point_22x23;
+    handles[24] = grid_point_24x26;
+    handles[25] = grid_point_25x27;
+    handles[26] = grid_point_24x26;
+    handles[27] = grid_point_25x27;
+    handles[28] = grid_point_28x30;
+    handles[29] = grid_point_29x31;
+    handles[30] = grid_point_28x30;
+    handles[31] = grid_point_29x31;
+    handles[32] = grid_point_32x33x34x35;
+    handles[33] = grid_point_32x33x34x35;
+    handles[34] = grid_point_32x33x34x35;
+    handles[35] = grid_point_32x33x34x35;
 
     Geom::Point origin = Geom::Point(boundingbox_X.min(),boundingbox_Y.min());
-      
+
     double width = boundingbox_X.extent();
     double height = boundingbox_Y.extent();
 
@@ -178,16 +178,16 @@ LPELattice2::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd
                     for(unsigned iu = 0; iu < 2; iu++) {
                         unsigned corner = iu + 2*iv;
                         unsigned i = ui + vi*sb2[dim].us;
-                        
+
                         //This is the offset from the Upperleft point
                         Geom::Point base(   (ui + iu*(4-2*ui))*width/4.,
                                             (vi + iv*(4-2*vi))*height/4.);
-                        
+
                         //Special action for corners
                         if(vi == 0 && ui == 0) {
                             base = Geom::Point(0,0);
                         }
-                        
+
                         // i = Upperleft corner of the considerated rectangle
                         // corner = actual corner of the rectangle
                         // origin = Upperleft point
@@ -198,7 +198,7 @@ LPELattice2::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd
             }
         }
     }
-   
+
     Piecewise<D2<SBasis> >  output;
     output.push_cut(0.);
     for(unsigned i = 0; i < pwd2_in_linear_and_cubic.size(); i++) {
@@ -228,28 +228,28 @@ LPELattice2::newWidget()
     vbox->set_homogeneous(false);
     vbox->set_spacing(6);
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false,0));
-    Gtk::VBox * vboxExpander = Gtk::manage( new Gtk::VBox(Effect::newWidget()) );
-    vboxExpander->set_border_width(0);
-    vboxExpander->set_spacing(2);
-    Gtk::Button * resetButton = Gtk::manage(new Gtk::Button(Glib::ustring(_("Reset grid"))));
-    resetButton->signal_clicked().connect(sigc::mem_fun (*this,&LPELattice2::resetGrid));
-    resetButton->set_size_request(140,30);
+    Gtk::VBox * vbox_expander = Gtk::manage( new Gtk::VBox(Effect::newWidget()) );
+    vbox_expander->set_border_width(0);
+    vbox_expander->set_spacing(2);
+    Gtk::Button * reset_button = Gtk::manage(new Gtk::Button(Glib::ustring(_("Reset grid"))));
+    reset_button->signal_clicked().connect(sigc::mem_fun (*this,&LPELattice2::resetGrid));
+    reset_button->set_size_request(140,30);
     vbox->pack_start(*hbox, true,true,2);
-    hbox->pack_start(*resetButton, false, false,2);
+    hbox->pack_start(*reset_button, false, false,2);
     std::vector<Parameter *>::iterator it = param_vector.begin();
     while (it != param_vector.end()) {
         if ((*it)->widget_is_visible) {
             Parameter * param = *it;
             Gtk::Widget * widg = dynamic_cast<Gtk::Widget *>(param->param_newWidget());
-            if(param->param_key == "grid"){
+            if(param->param_key == "grid") {
                 widg = NULL;
             }
             Glib::ustring * tip = param->param_getTooltip();
             if (widg) {
-                if (param->param_key == "horizontalMirror" || param->param_key == "verticalMirror") {
+                if (param->param_key == "horizontal_mirror" || param->param_key == "vertical_mirror") {
                     vbox->pack_start(*widg, true, true, 2);
                 } else {
-                    vboxExpander->pack_start(*widg, true, true, 2);
+                    vbox_expander->pack_start(*widg, true, true, 2);
                 }
                 if (tip) {
                     widg->set_tooltip_text(*tip);
@@ -262,63 +262,65 @@ LPELattice2::newWidget()
 
         ++it;
     }
-     
+
     expander = Gtk::manage(new Gtk::Expander(Glib::ustring(_("Show Points"))));
-    expander->add(*vboxExpander);
+    expander->add(*vbox_expander);
     expander->set_expanded(expanded);
     vbox->pack_start(*expander, true, true, 2);
-    expander->property_expanded().signal_changed().connect(sigc::mem_fun(*this, &LPELattice2::on_expander_changed) );
+    expander->property_expanded().signal_changed().connect(sigc::mem_fun(*this, &LPELattice2::onExpanderChanged) );
     return dynamic_cast<Gtk::Widget *>(vbox);
 }
 
 void
-LPELattice2::on_expander_changed()
+LPELattice2::onExpanderChanged()
 {
     expanded = expander->get_expanded();
-    if(expander->get_expanded()){
+    if(expander->get_expanded()) {
         expander->set_label (Glib::ustring(_("Hide Points")));
     } else {
         expander->set_label (Glib::ustring(_("Show Points")));
     }
 }
 void
-LPELattice2::vertical(PointParam &paramA, PointParam &paramB, Geom::Line vert){
-    Geom::Point A = paramA;
-    Geom::Point B = paramB;
+LPELattice2::vertical(PointParam &param_one, PointParam &param_two, Geom::Line vert)
+{
+    Geom::Point A = param_one;
+    Geom::Point B = param_two;
     double Y = (A[Geom::Y] + B[Geom::Y])/2;
     A[Geom::Y] = Y;
     B[Geom::Y] = Y;
     Geom::Point nearest = vert.pointAt(vert.nearestPoint(A));
-    double distA = Geom::distance(A,nearest);
-    double distB = Geom::distance(B,nearest);
-    double distanceMed = (distA + distB)/2;
-    if(A[Geom::X] > B[Geom::X]){
-        distanceMed *= -1;
+    double distance_one = Geom::distance(A,nearest);
+    double distance_two = Geom::distance(B,nearest);
+    double distance_middle = (distance_one + distance_two)/2;
+    if(A[Geom::X] > B[Geom::X]) {
+        distance_middle *= -1;
     }
-    A[Geom::X] = nearest[Geom::X] - distanceMed;
-    B[Geom::X] = nearest[Geom::X] + distanceMed;
-    paramA.param_setValue(A, true);
-    paramB.param_setValue(B, true);
+    A[Geom::X] = nearest[Geom::X] - distance_middle;
+    B[Geom::X] = nearest[Geom::X] + distance_middle;
+    param_one.param_setValue(A, true);
+    param_two.param_setValue(B, true);
 }
 
 void
-LPELattice2::horizontal(PointParam &paramA, PointParam &paramB, Geom::Line horiz){
-    Geom::Point A = paramA;
-    Geom::Point B = paramB;
+LPELattice2::horizontal(PointParam &param_one, PointParam &param_two, Geom::Line horiz)
+{
+    Geom::Point A = param_one;
+    Geom::Point B = param_two;
     double X = (A[Geom::X] + B[Geom::X])/2;
     A[Geom::X] = X;
     B[Geom::X] = X;
     Geom::Point nearest = horiz.pointAt(horiz.nearestPoint(A));
-    double distA = Geom::distance(A,nearest);
-    double distB = Geom::distance(B,nearest);
-    double distanceMed = (distA + distB)/2;
-    if(A[Geom::Y] > B[Geom::Y]){
-        distanceMed *= -1;
+    double distance_one = Geom::distance(A,nearest);
+    double distance_two = Geom::distance(B,nearest);
+    double distance_middle = (distance_one + distance_two)/2;
+    if(A[Geom::Y] > B[Geom::Y]) {
+        distance_middle *= -1;
     }
-    A[Geom::Y] = nearest[Geom::Y] - distanceMed;
-    B[Geom::Y] = nearest[Geom::Y] + distanceMed;
-    paramA.param_setValue(A, true);
-    paramB.param_setValue(B, true);
+    A[Geom::Y] = nearest[Geom::Y] - distance_middle;
+    B[Geom::Y] = nearest[Geom::Y] + distance_middle;
+    param_one.param_setValue(A, true);
+    param_two.param_setValue(B, true);
 }
 
 void
@@ -326,31 +328,31 @@ LPELattice2::doBeforeEffect (SPLPEItem const* lpeitem)
 {
     original_bbox(lpeitem);
     setDefaults();
-    Geom::Line vert(grid_point8x9.param_get_default(),grid_point10x11.param_get_default());
-    Geom::Line horiz(grid_point24x26.param_get_default(),grid_point25x27.param_get_default());
-    if(verticalMirror){
-        vertical(grid_point0, grid_point1,vert);
-        vertical(grid_point2, grid_point3,vert);
-        vertical(grid_point4, grid_point5,vert);
-        vertical(grid_point6, grid_point7,vert);
-        vertical(grid_point12, grid_point13,vert);
-        vertical(grid_point14, grid_point15,vert);
-        vertical(grid_point16, grid_point17,vert);
-        vertical(grid_point18, grid_point19,vert);
-        vertical(grid_point24x26, grid_point25x27,vert);
-        vertical(grid_point28x30, grid_point29x31,vert);
+    Geom::Line vert(grid_point_8x9.param_get_default(),grid_point_10x11.param_get_default());
+    Geom::Line horiz(grid_point_24x26.param_get_default(),grid_point_25x27.param_get_default());
+    if(vertical_mirror) {
+        vertical(grid_point_0, grid_point_1,vert);
+        vertical(grid_point_2, grid_point_3,vert);
+        vertical(grid_point_4, grid_point_5,vert);
+        vertical(grid_point_6, grid_point_7,vert);
+        vertical(grid_point_12, grid_point_13,vert);
+        vertical(grid_point_14, grid_point_15,vert);
+        vertical(grid_point_16, grid_point_17,vert);
+        vertical(grid_point_18, grid_point_19,vert);
+        vertical(grid_point_24x26, grid_point_25x27,vert);
+        vertical(grid_point_28x30, grid_point_29x31,vert);
     }
-    if(horizontalMirror){
-        horizontal(grid_point0, grid_point2,horiz);
-        horizontal(grid_point1, grid_point3,horiz);
-        horizontal(grid_point4, grid_point6,horiz);
-        horizontal(grid_point5, grid_point7,horiz);
-        horizontal(grid_point8x9, grid_point10x11,horiz);
-        horizontal(grid_point12, grid_point14,horiz);
-        horizontal(grid_point13, grid_point15,horiz);
-        horizontal(grid_point16, grid_point18,horiz);
-        horizontal(grid_point17, grid_point19,horiz);
-        horizontal(grid_point20x21, grid_point22x23,horiz);
+    if(horizontal_mirror) {
+        horizontal(grid_point_0, grid_point_2,horiz);
+        horizontal(grid_point_1, grid_point_3,horiz);
+        horizontal(grid_point_4, grid_point_6,horiz);
+        horizontal(grid_point_5, grid_point_7,horiz);
+        horizontal(grid_point_8x9, grid_point_10x11,horiz);
+        horizontal(grid_point_12, grid_point_14,horiz);
+        horizontal(grid_point_13, grid_point_15,horiz);
+        horizontal(grid_point_16, grid_point_18,horiz);
+        horizontal(grid_point_17, grid_point_19,horiz);
+        horizontal(grid_point_20x21, grid_point_22x23,horiz);
     }
     SPLPEItem * item = const_cast<SPLPEItem*>(lpeitem);
     item->apply_to_clippath(item);
@@ -385,111 +387,111 @@ LPELattice2::setDefaults()
                     (boundingbox_Y.max()-boundingbox_Y.min())/4*4+boundingbox_Y.min());
 
     Geom::Point gp8x9((boundingbox_X.max()-boundingbox_X.min())/4*2+boundingbox_X.min(),
-                    (boundingbox_Y.max()-boundingbox_Y.min())/4*0+boundingbox_Y.min());
+                      (boundingbox_Y.max()-boundingbox_Y.min())/4*0+boundingbox_Y.min());
 
     Geom::Point gp10x11((boundingbox_X.max()-boundingbox_X.min())/4*2+boundingbox_X.min(),
-                    (boundingbox_Y.max()-boundingbox_Y.min())/4*4+boundingbox_Y.min());
+                        (boundingbox_Y.max()-boundingbox_Y.min())/4*4+boundingbox_Y.min());
 
     Geom::Point gp12((boundingbox_X.max()-boundingbox_X.min())/4*0+boundingbox_X.min(),
-                    (boundingbox_Y.max()-boundingbox_Y.min())/4*1+boundingbox_Y.min());
+                     (boundingbox_Y.max()-boundingbox_Y.min())/4*1+boundingbox_Y.min());
 
     Geom::Point gp13((boundingbox_X.max()-boundingbox_X.min())/4*4+boundingbox_X.min(),
-                    (boundingbox_Y.max()-boundingbox_Y.min())/4*1+boundingbox_Y.min());
+                     (boundingbox_Y.max()-boundingbox_Y.min())/4*1+boundingbox_Y.min());
 
     Geom::Point gp14((boundingbox_X.max()-boundingbox_X.min())/4*0+boundingbox_X.min(),
-                    (boundingbox_Y.max()-boundingbox_Y.min())/4*3+boundingbox_Y.min());
+                     (boundingbox_Y.max()-boundingbox_Y.min())/4*3+boundingbox_Y.min());
 
     Geom::Point gp15((boundingbox_X.max()-boundingbox_X.min())/4*4+boundingbox_X.min(),
-                    (boundingbox_Y.max()-boundingbox_Y.min())/4*3+boundingbox_Y.min());
+                     (boundingbox_Y.max()-boundingbox_Y.min())/4*3+boundingbox_Y.min());
 
     Geom::Point gp16((boundingbox_X.max()-boundingbox_X.min())/4*1+boundingbox_X.min(),
-                    (boundingbox_Y.max()-boundingbox_Y.min())/4*1+boundingbox_Y.min());
+                     (boundingbox_Y.max()-boundingbox_Y.min())/4*1+boundingbox_Y.min());
 
     Geom::Point gp17((boundingbox_X.max()-boundingbox_X.min())/4*3+boundingbox_X.min(),
-                    (boundingbox_Y.max()-boundingbox_Y.min())/4*1+boundingbox_Y.min());
+                     (boundingbox_Y.max()-boundingbox_Y.min())/4*1+boundingbox_Y.min());
 
     Geom::Point gp18((boundingbox_X.max()-boundingbox_X.min())/4*1+boundingbox_X.min(),
-                    (boundingbox_Y.max()-boundingbox_Y.min())/4*3+boundingbox_Y.min());
+                     (boundingbox_Y.max()-boundingbox_Y.min())/4*3+boundingbox_Y.min());
 
     Geom::Point gp19((boundingbox_X.max()-boundingbox_X.min())/4*3+boundingbox_X.min(),
-                    (boundingbox_Y.max()-boundingbox_Y.min())/4*3+boundingbox_Y.min());
+                     (boundingbox_Y.max()-boundingbox_Y.min())/4*3+boundingbox_Y.min());
 
     Geom::Point gp20x21((boundingbox_X.max()-boundingbox_X.min())/4*2+boundingbox_X.min(),
-                    (boundingbox_Y.max()-boundingbox_Y.min())/4*1+boundingbox_Y.min());
+                        (boundingbox_Y.max()-boundingbox_Y.min())/4*1+boundingbox_Y.min());
 
     Geom::Point gp22x23((boundingbox_X.max()-boundingbox_X.min())/4*2+boundingbox_X.min(),
-                    (boundingbox_Y.max()-boundingbox_Y.min())/4*3+boundingbox_Y.min());
+                        (boundingbox_Y.max()-boundingbox_Y.min())/4*3+boundingbox_Y.min());
 
     Geom::Point gp24x26((boundingbox_X.max()-boundingbox_X.min())/4*0+boundingbox_X.min(),
-                    (boundingbox_Y.max()-boundingbox_Y.min())/4*2+boundingbox_Y.min());
+                        (boundingbox_Y.max()-boundingbox_Y.min())/4*2+boundingbox_Y.min());
 
     Geom::Point gp25x27((boundingbox_X.max()-boundingbox_X.min())/4*4+boundingbox_X.min(),
-                    (boundingbox_Y.max()-boundingbox_Y.min())/4*2+boundingbox_Y.min());
+                        (boundingbox_Y.max()-boundingbox_Y.min())/4*2+boundingbox_Y.min());
 
     Geom::Point gp28x30((boundingbox_X.max()-boundingbox_X.min())/4*1+boundingbox_X.min(),
-                    (boundingbox_Y.max()-boundingbox_Y.min())/4*2+boundingbox_Y.min());
+                        (boundingbox_Y.max()-boundingbox_Y.min())/4*2+boundingbox_Y.min());
 
     Geom::Point gp29x31((boundingbox_X.max()-boundingbox_X.min())/4*3+boundingbox_X.min(),
-                    (boundingbox_Y.max()-boundingbox_Y.min())/4*2+boundingbox_Y.min());
+                        (boundingbox_Y.max()-boundingbox_Y.min())/4*2+boundingbox_Y.min());
 
     Geom::Point gp32x33x34x35((boundingbox_X.max()-boundingbox_X.min())/4*2+boundingbox_X.min(),
-                    (boundingbox_Y.max()-boundingbox_Y.min())/4*2+boundingbox_Y.min());
-
-    grid_point0.param_update_default(gp0);
-    grid_point1.param_update_default(gp1);
-    grid_point2.param_update_default(gp2);
-    grid_point3.param_update_default(gp3);
-    grid_point4.param_update_default(gp4);
-    grid_point5.param_update_default(gp5);
-    grid_point6.param_update_default(gp6);
-    grid_point7.param_update_default(gp7);
-    grid_point8x9.param_update_default(gp8x9);
-    grid_point10x11.param_update_default(gp10x11);
-    grid_point12.param_update_default(gp12);
-    grid_point13.param_update_default(gp13);
-    grid_point14.param_update_default(gp14);
-    grid_point15.param_update_default(gp15);
-    grid_point16.param_update_default(gp16);
-    grid_point17.param_update_default(gp17);
-    grid_point18.param_update_default(gp18);
-    grid_point19.param_update_default(gp19);
-    grid_point20x21.param_update_default(gp20x21);
-    grid_point22x23.param_update_default(gp22x23);
-    grid_point24x26.param_update_default(gp24x26);
-    grid_point25x27.param_update_default(gp25x27);
-    grid_point28x30.param_update_default(gp28x30);
-    grid_point29x31.param_update_default(gp29x31);
-    grid_point32x33x34x35.param_update_default(gp32x33x34x35);
+                              (boundingbox_Y.max()-boundingbox_Y.min())/4*2+boundingbox_Y.min());
+
+    grid_point_0.param_update_default(gp0);
+    grid_point_1.param_update_default(gp1);
+    grid_point_2.param_update_default(gp2);
+    grid_point_3.param_update_default(gp3);
+    grid_point_4.param_update_default(gp4);
+    grid_point_5.param_update_default(gp5);
+    grid_point_6.param_update_default(gp6);
+    grid_point_7.param_update_default(gp7);
+    grid_point_8x9.param_update_default(gp8x9);
+    grid_point_10x11.param_update_default(gp10x11);
+    grid_point_12.param_update_default(gp12);
+    grid_point_13.param_update_default(gp13);
+    grid_point_14.param_update_default(gp14);
+    grid_point_15.param_update_default(gp15);
+    grid_point_16.param_update_default(gp16);
+    grid_point_17.param_update_default(gp17);
+    grid_point_18.param_update_default(gp18);
+    grid_point_19.param_update_default(gp19);
+    grid_point_20x21.param_update_default(gp20x21);
+    grid_point_22x23.param_update_default(gp22x23);
+    grid_point_24x26.param_update_default(gp24x26);
+    grid_point_25x27.param_update_default(gp25x27);
+    grid_point_28x30.param_update_default(gp28x30);
+    grid_point_29x31.param_update_default(gp29x31);
+    grid_point_32x33x34x35.param_update_default(gp32x33x34x35);
 }
 
 void
 LPELattice2::resetGrid()
 {
-    grid_point0.param_set_default();
-    grid_point1.param_set_default();
-    grid_point2.param_set_default();
-    grid_point3.param_set_default();
-    grid_point4.param_set_default();
-    grid_point5.param_set_default();
-    grid_point6.param_set_default();
-    grid_point7.param_set_default();
-    grid_point8x9.param_set_default();
-    grid_point10x11.param_set_default();
-    grid_point12.param_set_default();
-    grid_point13.param_set_default();
-    grid_point14.param_set_default();
-    grid_point15.param_set_default();
-    grid_point16.param_set_default();
-    grid_point17.param_set_default();
-    grid_point18.param_set_default();
-    grid_point19.param_set_default();
-    grid_point20x21.param_set_default();
-    grid_point22x23.param_set_default();
-    grid_point24x26.param_set_default();
-    grid_point25x27.param_set_default();
-    grid_point28x30.param_set_default();
-    grid_point29x31.param_set_default();
-    grid_point32x33x34x35.param_set_default();
+    grid_point_0.param_set_default();
+    grid_point_1.param_set_default();
+    grid_point_2.param_set_default();
+    grid_point_3.param_set_default();
+    grid_point_4.param_set_default();
+    grid_point_5.param_set_default();
+    grid_point_6.param_set_default();
+    grid_point_7.param_set_default();
+    grid_point_8x9.param_set_default();
+    grid_point_10x11.param_set_default();
+    grid_point_12.param_set_default();
+    grid_point_13.param_set_default();
+    grid_point_14.param_set_default();
+    grid_point_15.param_set_default();
+    grid_point_16.param_set_default();
+    grid_point_17.param_set_default();
+    grid_point_18.param_set_default();
+    grid_point_19.param_set_default();
+    grid_point_20x21.param_set_default();
+    grid_point_22x23.param_set_default();
+    grid_point_24x26.param_set_default();
+    grid_point_25x27.param_set_default();
+    grid_point_28x30.param_set_default();
+    grid_point_29x31.param_set_default();
+    grid_point_32x33x34x35.param_set_default();
 }
 
 void
@@ -519,55 +521,55 @@ LPELattice2::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom:
     hp_vec.clear();
 
     SPCurve *c = new SPCurve();
-    calculateCurve(grid_point0,grid_point4, c,true, true);
-    calculateCurve(grid_point4,grid_point8x9, c,true, false);
-    calculateCurve(grid_point8x9,grid_point5, c,true, false);
-    calculateCurve(grid_point5,grid_point1, c,true, false);
-
-    calculateCurve(grid_point12,grid_point16, c,true, true);
-    calculateCurve(grid_point16,grid_point20x21, c,true, false);
-    calculateCurve(grid_point20x21,grid_point17, c,true, false);
-    calculateCurve(grid_point17,grid_point13, c,true, false);
-
-    calculateCurve(grid_point24x26,grid_point28x30, c,true, true);
-    calculateCurve(grid_point28x30,grid_point32x33x34x35, c,true, false);
-    calculateCurve(grid_point32x33x34x35,grid_point29x31, c,true, false);
-    calculateCurve(grid_point29x31,grid_point25x27, c,true, false);
-
-    calculateCurve(grid_point14,grid_point18, c,true, true);
-    calculateCurve(grid_point18,grid_point22x23, c,true, false);
-    calculateCurve(grid_point22x23,grid_point19, c,true, false);
-    calculateCurve(grid_point19,grid_point15, c,true, false);
-
-    calculateCurve(grid_point2,grid_point6, c,true, true);
-    calculateCurve(grid_point6,grid_point10x11, c,true, false);
-    calculateCurve(grid_point10x11,grid_point7, c,true, false);
-    calculateCurve(grid_point7,grid_point3, c,true, false);
-
-    calculateCurve(grid_point0,grid_point12, c,false, true);
-    calculateCurve(grid_point12,grid_point24x26, c,false, false);
-    calculateCurve(grid_point24x26,grid_point14, c,false, false);
-    calculateCurve(grid_point14,grid_point2, c,false, false);
-
-    calculateCurve(grid_point4,grid_point16, c,false, true);
-    calculateCurve(grid_point16,grid_point28x30, c,false, false);
-    calculateCurve(grid_point28x30,grid_point18, c,false, false);
-    calculateCurve(grid_point18,grid_point6, c,false, false);
-
-    calculateCurve(grid_point8x9,grid_point20x21, c,false, true);
-    calculateCurve(grid_point20x21,grid_point32x33x34x35, c,false, false);
-    calculateCurve(grid_point32x33x34x35,grid_point22x23, c,false, false);
-    calculateCurve(grid_point22x23,grid_point10x11, c,false, false);
-
-    calculateCurve(grid_point5,grid_point17, c, false, true);
-    calculateCurve(grid_point17,grid_point29x31, c,false, false);
-    calculateCurve(grid_point29x31,grid_point19, c,false, false);
-    calculateCurve(grid_point19,grid_point7, c,false, false);
-
-    calculateCurve(grid_point1,grid_point13, c, false, true);
-    calculateCurve(grid_point13,grid_point25x27, c,false, false);
-    calculateCurve(grid_point25x27,grid_point15, c,false, false);
-    calculateCurve(grid_point15,grid_point3, c, false, false);
+    calculateCurve(grid_point_0,grid_point_4, c,true, true);
+    calculateCurve(grid_point_4,grid_point_8x9, c,true, false);
+    calculateCurve(grid_point_8x9,grid_point_5, c,true, false);
+    calculateCurve(grid_point_5,grid_point_1, c,true, false);
+
+    calculateCurve(grid_point_12,grid_point_16, c,true, true);
+    calculateCurve(grid_point_16,grid_point_20x21, c,true, false);
+    calculateCurve(grid_point_20x21,grid_point_17, c,true, false);
+    calculateCurve(grid_point_17,grid_point_13, c,true, false);
+
+    calculateCurve(grid_point_24x26,grid_point_28x30, c,true, true);
+    calculateCurve(grid_point_28x30,grid_point_32x33x34x35, c,true, false);
+    calculateCurve(grid_point_32x33x34x35,grid_point_29x31, c,true, false);
+    calculateCurve(grid_point_29x31,grid_point_25x27, c,true, false);
+
+    calculateCurve(grid_point_14,grid_point_18, c,true, true);
+    calculateCurve(grid_point_18,grid_point_22x23, c,true, false);
+    calculateCurve(grid_point_22x23,grid_point_19, c,true, false);
+    calculateCurve(grid_point_19,grid_point_15, c,true, false);
+
+    calculateCurve(grid_point_2,grid_point_6, c,true, true);
+    calculateCurve(grid_point_6,grid_point_10x11, c,true, false);
+    calculateCurve(grid_point_10x11,grid_point_7, c,true, false);
+    calculateCurve(grid_point_7,grid_point_3, c,true, false);
+
+    calculateCurve(grid_point_0,grid_point_12, c,false, true);
+    calculateCurve(grid_point_12,grid_point_24x26, c,false, false);
+    calculateCurve(grid_point_24x26,grid_point_14, c,false, false);
+    calculateCurve(grid_point_14,grid_point_2, c,false, false);
+
+    calculateCurve(grid_point_4,grid_point_16, c,false, true);
+    calculateCurve(grid_point_16,grid_point_28x30, c,false, false);
+    calculateCurve(grid_point_28x30,grid_point_18, c,false, false);
+    calculateCurve(grid_point_18,grid_point_6, c,false, false);
+
+    calculateCurve(grid_point_8x9,grid_point_20x21, c,false, true);
+    calculateCurve(grid_point_20x21,grid_point_32x33x34x35, c,false, false);
+    calculateCurve(grid_point_32x33x34x35,grid_point_22x23, c,false, false);
+    calculateCurve(grid_point_22x23,grid_point_10x11, c,false, false);
+
+    calculateCurve(grid_point_5,grid_point_17, c, false, true);
+    calculateCurve(grid_point_17,grid_point_29x31, c,false, false);
+    calculateCurve(grid_point_29x31,grid_point_19, c,false, false);
+    calculateCurve(grid_point_19,grid_point_7, c,false, false);
+
+    calculateCurve(grid_point_1,grid_point_13, c, false, true);
+    calculateCurve(grid_point_13,grid_point_25x27, c,false, false);
+    calculateCurve(grid_point_25x27,grid_point_15, c,false, false);
+    calculateCurve(grid_point_15,grid_point_3, c, false, false);
     hp_vec.push_back(c->get_pathvector());
 }
 
diff --git a/src/live_effects/lpe-lattice2.h b/src/live_effects/lpe-lattice2.h
index 086bdab7e..ff2e75641 100644
--- a/src/live_effects/lpe-lattice2.h
+++ b/src/live_effects/lpe-lattice2.h
@@ -34,7 +34,7 @@ public:
     virtual ~LPELattice2();
 
     virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in);
-    
+
     virtual void resetDefaults(SPItem const* item);
 
     virtual void doBeforeEffect(SPLPEItem const* lpeitem);
@@ -49,46 +49,41 @@ public:
 
     virtual void setDefaults();
 
-    virtual void on_expander_changed();
+    virtual void onExpanderChanged();
 
     virtual void resetGrid();
 
-    //virtual void original_bbox(SPLPEItem const* lpeitem, bool absolute = false);
-
-    //virtual void addCanvasIndicators(SPLPEItem const*/*lpeitem*/, std::vector<Geom::PathVector> &/*hp_vec*/);
-
-    //virtual std::vector<Geom::PathVector> getHelperPaths(SPLPEItem const* lpeitem);
 protected:
     void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec);
 private:
 
-    BoolParam horizontalMirror;
-    BoolParam verticalMirror;
-    PointParam grid_point0;
-    PointParam grid_point1;
-    PointParam grid_point2;
-    PointParam grid_point3;
-    PointParam grid_point4;
-    PointParam grid_point5;
-    PointParam grid_point6;
-    PointParam grid_point7;
-    PointParam grid_point8x9;
-    PointParam grid_point10x11;
-    PointParam grid_point12;
-    PointParam grid_point13;
-    PointParam grid_point14;
-    PointParam grid_point15;
-    PointParam grid_point16;
-    PointParam grid_point17;
-    PointParam grid_point18;
-    PointParam grid_point19;
-    PointParam grid_point20x21;
-    PointParam grid_point22x23;
-    PointParam grid_point24x26;
-    PointParam grid_point25x27;
-    PointParam grid_point28x30;
-    PointParam grid_point29x31;
-    PointParam grid_point32x33x34x35; 
+    BoolParam horizontal_mirror;
+    BoolParam vertical_mirror;
+    PointParam grid_point_0;
+    PointParam grid_point_1;
+    PointParam grid_point_2;
+    PointParam grid_point_3;
+    PointParam grid_point_4;
+    PointParam grid_point_5;
+    PointParam grid_point_6;
+    PointParam grid_point_7;
+    PointParam grid_point_8x9;
+    PointParam grid_point_10x11;
+    PointParam grid_point_12;
+    PointParam grid_point_13;
+    PointParam grid_point_14;
+    PointParam grid_point_15;
+    PointParam grid_point_16;
+    PointParam grid_point_17;
+    PointParam grid_point_18;
+    PointParam grid_point_19;
+    PointParam grid_point_20x21;
+    PointParam grid_point_22x23;
+    PointParam grid_point_24x26;
+    PointParam grid_point_25x27;
+    PointParam grid_point_28x30;
+    PointParam grid_point_29x31;
+    PointParam grid_point_32x33x34x35;
 
     bool expanded;
     Gtk::Expander * expander;