From 3ed9b4ff7ebbae3ba6446d911001688bcbbdc847 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 10 Nov 2013 12:17:23 +0100
Subject: Update to trunk

(bzr r11950.1.196)
---
 src/ui/tools/node-tool.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/node-tool.h b/src/ui/tools/node-tool.h
index 4d15ab70e..b3acb79ad 100644
--- a/src/ui/tools/node-tool.h
+++ b/src/ui/tools/node-tool.h
@@ -14,6 +14,7 @@
 #include <boost/ptr_container/ptr_map.hpp>
 #include <glib.h>
 #include "ui/tools/tool-base.h"
+#include "selection.h"
 
 namespace Inkscape {
 	namespace Display {
-- 
cgit v1.2.3


From fb006b59b6d7b6d059dffe3389a829d2213f648d Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 28 Dec 2013 23:34:45 +0100
Subject: Fix crash bug continuing empty paths

(bzr r11950.1.210)
---
 src/ui/tools/pen-tool.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index ebbc533b8..178a940a2 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1648,6 +1648,7 @@ static void bspline_spiro_end_anchor_on(PenTool *const pc)
     Geom::Point C(0,0);
     if(!pc->sa || pc->sa->curve->is_empty()){
         tmpCurve = pc->green_curve->create_reverse();
+        if(pc->green_curve->get_segment_count()==0)return;
         Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
         if(pc->bspline){
             C = tmpCurve->last_segment()->finalPoint() + (1./3)*(tmpCurve->last_segment()->initialPoint() - tmpCurve->last_segment()->finalPoint());
@@ -1715,6 +1716,7 @@ static void bspline_spiro_end_anchor_off(PenTool *const pc)
     SPCurve *lastSeg = new SPCurve();
     if(!pc->sa || pc->sa->curve->is_empty()){
         tmpCurve = pc->green_curve->create_reverse();
+        if(pc->green_curve->get_segment_count()==0)return;
         Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
         if(cubic){
             lastSeg->moveto((*cubic)[0]);
-- 
cgit v1.2.3


From 4c6918c72721a35e0347e9e087396238e72eb62e Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 30 Dec 2013 20:41:32 +0100
Subject: Refactorizing

(bzr r11950.1.212)
---
 src/ui/tools/freehand-base.cpp |  8 -----
 src/ui/tools/freehand-base.h   |  2 --
 src/ui/tools/node-tool.h       |  1 -
 src/ui/tools/pen-tool.cpp      | 74 ++++++++----------------------------------
 src/ui/tools/pen-tool.h        |  2 --
 src/ui/tools/pencil-tool.cpp   |  8 -----
 6 files changed, 13 insertions(+), 82 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 14a5b5b35..b6efaebd9 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -247,12 +247,10 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
         if (prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1) {
             Effect::createAndApply(SPIRO, dc->desktop->doc(), item);
         }
-        //BSpline
         //Añadimos el modo BSpline a los efectos en espera
         if (prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2) {
             Effect::createAndApply(BSPLINE, dc->desktop->doc(), item);
         }
-        //BSPline End
 
         int shape = prefs->getInt(tool_name(dc) + "/shape", 0);
         bool shape_applied = false;
@@ -489,7 +487,6 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     dc->red_curve->reset();
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->red_bpath), NULL);
 
-
     if (c->is_empty()) {
         c->unref();
         return;
@@ -520,7 +517,6 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
         dc->sa->curve->append_continuous(c, 0.0625);
         c->unref();
         dc->sa->curve->closepath_current();
-        //BSpline
         //Si la curva tiene un LPE del tipo BSpline ejecutamos spdc_flush_white
         //pasándole la curva de inicio necesaria
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -529,7 +525,6 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
             dc->white_curves = g_slist_remove(dc->white_curves, dc->sa->curve);
             spdc_flush_white(dc, dc->sa->curve);
         }else
-        //BSpline End
             spdc_flush_white(dc, NULL);
         return;
     }
@@ -657,7 +652,6 @@ SPDrawAnchor *spdc_test_inside(FreehandBase *dc, Geom::Point p)
         }
     }
 
-    //BSpline
     //Modificamos la curva del "anchor" final para que sea igual que la curva de inicio.
     //Esta curva fue modificada al continuar la curva y necesitamos que sea igual que la curva en
     //la que cerramos el trazado.
@@ -670,7 +664,6 @@ SPDrawAnchor *spdc_test_inside(FreehandBase *dc, Geom::Point p)
             active->curve->ref();
         }
     }
-    //BSpline End
 
     return active;
 }
@@ -815,4 +808,3 @@ void spdc_create_single_dot(ToolBase *ec, Geom::Point const &pt, char const *too
   End:
 */
 // vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
-
diff --git a/src/ui/tools/freehand-base.h b/src/ui/tools/freehand-base.h
index 7d60e217f..7e53684e3 100644
--- a/src/ui/tools/freehand-base.h
+++ b/src/ui/tools/freehand-base.h
@@ -57,7 +57,6 @@ public:
     SPCanvasItem *blue_bpath;
     SPCurve *blue_curve;
 
-
     // Green
     GSList *green_bpaths;
     SPCurve *green_curve;
@@ -143,4 +142,3 @@ void spdc_create_single_dot(ToolBase *ec, Geom::Point const &pt, char const *too
   End:
 */
 // vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
-
diff --git a/src/ui/tools/node-tool.h b/src/ui/tools/node-tool.h
index b3acb79ad..4d15ab70e 100644
--- a/src/ui/tools/node-tool.h
+++ b/src/ui/tools/node-tool.h
@@ -14,7 +14,6 @@
 #include <boost/ptr_container/ptr_map.hpp>
 #include <glib.h>
 #include "ui/tools/tool-base.h"
-#include "selection.h"
 
 namespace Inkscape {
 	namespace Display {
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 178a940a2..f8d8d4c90 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1,4 +1,4 @@
-        /** \file
+/** \file
  * Pen event context implementation.
  */
 
@@ -20,7 +20,6 @@
 #include <cstring>
 #include <string>
 
-
 #include "ui/tools/pen-tool.h"
 #include "sp-namedview.h"
 #include "desktop.h"
@@ -43,7 +42,6 @@
 #include "context-fns.h"
 #include "tools-switch.h"
 #include "ui/control-manager.h"
-//BSpline
 //Incluimos los archivos necesarios para las BSpline y Spiro
 #define INKSCAPE_LPE_SPIRO_C
 #include "live_effects/lpe-spiro.h"
@@ -64,11 +62,9 @@
 
 #include "live_effects/spiro.h"
 
-
 #define INKSCAPE_LPE_BSPLINE_C
 #include "live_effects/lpe-bspline.h"
 #include <2geom/nearest-point.h>
-//BSpline End
 
 #include "tool-factory.h"
 
@@ -80,10 +76,6 @@ namespace UI {
 namespace Tools {
 
 static void spdc_pen_set_initial_point(PenTool *pc, Geom::Point const p);
-/*
- *BSpline
- *Added functions
-*/
 //Añade los modos spiro y bspline
 static void sp_pen_context_set_mode(PenTool *const pc, guint mode);
 //Esta función cambia los colores rojo,verde y azul haciendolos transparentes o no en función de si se usa spiro
@@ -112,7 +104,7 @@ static void bspline_spiro_build(PenTool *const pc);
 static void bspline_doEffect(SPCurve * curve);
 //function spiro cloned from lpe-spiro.cpp
 static void spiro_doEffect(SPCurve * curve);
-//BSpline end
+
 static void spdc_pen_set_subsequent_point(PenTool *const pc, Geom::Point const p, bool statusbar, guint status = 0);
 static void spdc_pen_set_ctrl(PenTool *pc, Geom::Point const p, guint state);
 static void spdc_pen_finish_segment(PenTool *pc, Geom::Point p, guint state);
@@ -205,14 +197,11 @@ void sp_pen_context_set_polyline_mode(PenTool *const pc) {
     guint mode = prefs->getInt("/tools/freehand/pen/freehand-mode", 0);
     pc->polylines_only = (mode == 3 || mode == 4);
     pc->polylines_paraxial = (mode == 4);
-    //BSpline
     //we call the function which defines the Spiro modes and the BSpline
     //todo: merge to one function only
     sp_pen_context_set_mode(pc, mode);
-    //BSpline End
 }
 
-//BSpline
 /*
 *.Set the mode of draw spiro, and bsplines
 */
@@ -220,7 +209,6 @@ void sp_pen_context_set_mode(PenTool *const pc, guint mode) {
     pc->spiro = (mode == 1);
     pc->bspline = (mode == 2);
 }
-//BSpline End
 
 /**
  * Callback to initialize PenTool object.
@@ -422,12 +410,11 @@ static gint pen_handle_button_press(PenTool *const pc, GdkEventButton const &bev
     if(!bevent.button == 3 && (pc->spiro || pc->bspline) && pc->npoints > 0 && pc->p[0] == pc->p[3]){
         return FALSE;
     } 
-    //BSpline end
 
     gint ret = FALSE;
     if (bevent.button == 1 && !event_context->space_panning
         // make sure this is not the last click for a waiting LPE (otherwise we want to finish the path)
-        && (pc->expecting_clicks_for_LPE != 1)) {
+        && pc->expecting_clicks_for_LPE != 1) {
 
         if (Inkscape::have_viable_layer(desktop, dc->message_context) == false) {
             return TRUE;
@@ -487,12 +474,10 @@ static gint pen_handle_button_press(PenTool *const pc, GdkEventButton const &bev
 
                             // Set start anchor
                             pc->sa = anchor;
-                            //BSpline
                             //Continuamos una curva existente
                             if(anchor){
                                 bspline_spiro_start_anchor(pc,(bevent.state & GDK_SHIFT_MASK));
                             }
-                            //BSpline End
                             if (anchor && !sp_pen_context_has_waiting_LPE(pc)) {
                                 // Adjust point to anchor if needed; if we have a waiting LPE, we need
                                 // a fresh path to be created so don't continue an existing one
@@ -544,10 +529,8 @@ static gint pen_handle_button_press(PenTool *const pc, GdkEventButton const &bev
                             }
                         }
 
-                        //BSpline
                         //Evitamos la creación de un punto de control para que se cree el nodo en el evento de soltar
                         pc->state = (pc->spiro || pc->bspline || pc->polylines_only) ? PenTool::POINT : PenTool::CONTROL;
-                        //BSpline End
 
                         ret = TRUE;
                         break;
@@ -585,6 +568,7 @@ static gint pen_handle_button_press(PenTool *const pc, GdkEventButton const &bev
     if (pc->expecting_clicks_for_LPE > 0) {
         --pc->expecting_clicks_for_LPE;
     }
+
     return ret;
 }
 
@@ -609,8 +593,7 @@ static gint pen_handle_motion_notify(PenTool *const pc, GdkEventMotion const &me
     }
 
     Geom::Point const event_w(mevent.x,
-                              mevent.y);
-    //BSpline
+                            mevent.y);
     //we take out the function the const "tolerance" because we need it later
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     gint const tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
@@ -620,7 +603,6 @@ static gint pen_handle_motion_notify(PenTool *const pc, GdkEventMotion const &me
             return FALSE;   // Do not drag if we're within tolerance from origin.
         }
     }
-    //BSpline END
     // Once the user has moved farther than tolerance from the original location
     // (indicating they intend to move the object, not click), then always process the
     // motion notify coordinates as given (no snapping back to origin)
@@ -736,7 +718,6 @@ static gint pen_handle_motion_notify(PenTool *const pc, GdkEventMotion const &me
         default:
             break;
     }
-    //BSpline
     //Lanzamos la función "bspline_spiro_motion" al moverse el ratón o cuando se para.
     if(pc->bspline){
         bspline_spiro_color(pc);
@@ -748,7 +729,7 @@ static gint pen_handle_motion_notify(PenTool *const pc, GdkEventMotion const &me
             pen_drag_origin_w = event_w;
         }
     }
-    //BSpline End
+
     return ret;
 }
 
@@ -761,7 +742,7 @@ static gint pen_handle_button_release(PenTool *const pc, GdkEventButton const &r
         // skip event processing if events are disabled
         return FALSE;
     }
-    
+
     gint ret = FALSE;
 
     ToolBase *event_context = SP_EVENT_CONTEXT(pc);
@@ -776,7 +757,6 @@ static gint pen_handle_button_release(PenTool *const pc, GdkEventButton const &r
 
         // Test whether we hit any anchor.
         SPDrawAnchor *anchor = spdc_test_inside(pc, event_w);
-        //BSpline
         //with this we avoid creating a new point over the existing one
         if(pc->spiro || pc->bspline){
             //Si intentamos crear un nodo en el mismo sitio que el origen, paramos.
@@ -784,7 +764,7 @@ static gint pen_handle_button_release(PenTool *const pc, GdkEventButton const &r
                 return FALSE;
             }
         }
-        //BSpline End
+
         switch (pc->mode) {
             case PenTool::MODE_CLICK:
                 switch (pc->state) {
@@ -795,14 +775,12 @@ static gint pen_handle_button_release(PenTool *const pc, GdkEventButton const &r
                                 p = anchor->dp;
                             }
                             pc->sa = anchor;
-                            //BSpline
                             //continuamos una curva existente
                             if (anchor) {
                                 if(pc->bspline || pc->spiro){
                                     bspline_spiro_start_anchor(pc,(revent.state & GDK_SHIFT_MASK));
                                 }
                             }
-                            //BSpline End
                             spdc_pen_set_initial_point(pc, p);
                         } else {
                             // Set end anchor here
@@ -827,12 +805,10 @@ static gint pen_handle_button_release(PenTool *const pc, GdkEventButton const &r
                             spdc_endpoint_snap(pc, p, revent.state);
                         }
                         spdc_pen_finish_segment(pc, p, revent.state);
-                        //BSpline
                         //Ocultamos la guia del penultimo nodo al cerrar la curva
                         if(pc->spiro){
                             sp_canvas_item_hide(pc->c1);
                         }
-                        //BSpline End
                         spdc_pen_finish(pc, TRUE);
                         pc->state = PenTool::POINT;
                         ret = TRUE;
@@ -856,12 +832,10 @@ static gint pen_handle_button_release(PenTool *const pc, GdkEventButton const &r
                     case PenTool::CLOSE:
                         spdc_endpoint_snap(pc, p, revent.state);
                         spdc_pen_finish_segment(pc, p, revent.state);
-                        //BSpline
                         //Ocultamos la guia del penultimo nodo al cerrar la curva
                         if(pc->spiro){
                             sp_canvas_item_hide(pc->c1);
                         }
-                        //BSpline End
                         if (pc->green_closed) {
                             // finishing at the start anchor, close curve
                             spdc_pen_finish(pc, TRUE);
@@ -873,7 +847,7 @@ static gint pen_handle_button_release(PenTool *const pc, GdkEventButton const &r
                     case PenTool::STOP:
                         // This is allowed, if we just cancelled curve
                         break;
-                    default:    
+                    default:
                         break;
                 }
                 pc->state = PenTool::POINT;
@@ -911,6 +885,7 @@ static gint pen_handle_button_release(PenTool *const pc, GdkEventButton const &r
             // handled in spdc_check_for_and_apply_waiting_LPE() in draw-context.cpp
         }
     }
+
     return ret;
 }
 
@@ -938,20 +913,20 @@ static void pen_redraw_all (PenTool *const pc)
         SPCanvasItem *cshape = sp_canvas_bpath_new(sp_desktop_sketch(pc->desktop), pc->green_curve);
         sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cshape), pc->green_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
         sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(cshape), 0, SP_WIND_RULE_NONZERO);
+
         pc->green_bpaths = g_slist_prepend(pc->green_bpaths, cshape);
     }
     if (pc->green_anchor)
         SP_CTRL(pc->green_anchor->ctrl)->moveto(pc->green_anchor->dp);
+
     pc->red_curve->reset();
     pc->red_curve->moveto(pc->p[0]);
     pc->red_curve->curveto(pc->p[1], pc->p[2], pc->p[3]);
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), pc->red_curve);
 
     // handles
-    //BSpline
     //Ocultamos los tiradores en modo BSpline y spiro
     if (pc->p[0] != pc->p[1] && !pc->spiro && !pc->bspline) {
-    //BSpline End
         SP_CTRL(pc->c1)->moveto(pc->p[1]);
         pc->cl1->setCoords(pc->p[0], pc->p[1]);
         sp_canvas_item_show(pc->c1);
@@ -964,12 +939,10 @@ static void pen_redraw_all (PenTool *const pc)
     Geom::Curve const * last_seg = pc->green_curve->last_segment();
     if (last_seg) {
         Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const *>( last_seg );
-        //BSpline
         //Ocultamos los tiradores en modo BSpline y spiro
         if ( cubic &&
              (*cubic)[2] != pc->p[0] && !pc->spiro && !pc->bspline )
         {
-        //BSpline End
             Geom::Point p2 = (*cubic)[2];
             SP_CTRL(pc->c0)->moveto(p2);
             pc->cl0->setCoords(p2, pc->p[0]);
@@ -980,15 +953,12 @@ static void pen_redraw_all (PenTool *const pc)
             sp_canvas_item_hide(pc->cl0);
         }
     }
-    //BSpline
+
     //Simplemente redibujamos la spiro teniendo en cuenta si el nodo es cusp o symm.
     //como es un redibujo simplemente no llamamos a la función global
     //sino al final de esta
-
-    //BSpline
     //Lanzamos solamente el redibujado
      bspline_spiro_build(pc);
-    //BSpline End
 }
 
 static void pen_lastpoint_move (PenTool *const pc, gdouble x, gdouble y)
@@ -1019,11 +989,9 @@ static void pen_lastpoint_move_screen (PenTool *const pc, gdouble x, gdouble y)
 
 static void pen_lastpoint_tocurve (PenTool *const pc)
 {
-    //BSpline
     //Evitamos que si la "red_curve" tiene solo dos puntos -recta- no se pare aqui.
     if (pc->npoints != 5 && !pc->spiro && !pc->bspline)
         return;
-    //BSpline
     Geom::CubicBezier const * cubic;
     pc->p[1] = pc->red_curve->last_segment()->initialPoint() + (1./3)* (Geom::Point)(pc->red_curve->last_segment()->finalPoint() - pc->red_curve->last_segment()->initialPoint());
     //Modificamos el último segmento de la curva verde para que forme el tipo de nodo que deseamos
@@ -1070,13 +1038,11 @@ static void pen_lastpoint_tocurve (PenTool *const pc)
         }
     }
 
-    //Spiro Live
     pen_redraw_all(pc);
 }
 
 static void pen_lastpoint_toline (PenTool *const pc)
 {
-    //BSpline
     //Evitamos que si la "red_curve" tiene solo dos puntos -recta- no se pare aqui.
     if (pc->npoints != 5 && !pc->bspline)
         return;
@@ -1312,7 +1278,6 @@ static gint pen_handle_key_press(PenTool *const pc, GdkEvent *event)
                                      : pc->p[3]));
                 
                 pc->npoints = 2;
-                //BSpline
                 //Eliminamos el último segmento de la curva verde
                 if( pc->green_curve->get_segment_count() == 1){
                     pc->npoints = 5;
@@ -1335,16 +1300,13 @@ static gint pen_handle_key_press(PenTool *const pc, GdkEvent *event)
                         pc->p[1] = pc->p[0];
                     }
                 }
-                //BSpline End
                 sp_canvas_item_hide(pc->cl0);
                 sp_canvas_item_hide(pc->cl1);
                 pc->state = PenTool::POINT;
                 spdc_pen_set_subsequent_point(pc, pt, true);
                 pen_last_paraxial_dir = !pen_last_paraxial_dir;
-                //BSpline
                 //Redibujamos
                 bspline_spiro_build(pc);
-                //BSpline End
                 ret = TRUE;
             }
             break;
@@ -1358,12 +1320,10 @@ static void spdc_reset_colors(PenTool *pc)
 {
     // Red
     pc->red_curve->reset();
-    
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), NULL);
     // Blue
     pc->blue_curve->reset();
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->blue_bpath), NULL);
-
     // Green
     while (pc->green_bpaths) {
         sp_canvas_item_destroy(SP_CANVAS_ITEM(pc->green_bpaths->data));
@@ -2111,8 +2071,6 @@ static void spiro_doEffect(SPCurve * curve)
     g_free (path);
 }
 
-//BSpline end
-
 static void spdc_pen_set_subsequent_point(PenTool *const pc, Geom::Point const p, bool statusbar, guint status)
 {
     g_assert( pc->npoints != 0 );
@@ -2139,9 +2097,7 @@ static void spdc_pen_set_subsequent_point(PenTool *const pc, Geom::Point const p
         is_curve = false;
     } else {
         // one of the 'regular' modes
-        //SpiroLive
         if (pc->p[1] != pc->p[0] || pc->spiro) {
-        //SpiroLive End
             pc->red_curve->curveto(pc->p[1], p, p);
             is_curve = true;
         } else {
@@ -2156,13 +2112,11 @@ static void spdc_pen_set_subsequent_point(PenTool *const pc, Geom::Point const p
         gchar *message = is_curve ?
             _("<b>Curve segment</b>: angle %3.2f&#176;, distance %s; with <b>Ctrl</b> to snap angle, <b>Enter</b> to finish the path" ):
             _("<b>Line segment</b>: angle %3.2f&#176;, distance %s; with <b>Ctrl</b> to snap angle, <b>Enter</b> to finish the path");
-        //BSpline
         if(pc->spiro || pc->bspline){
             message = is_curve ?
             _("<b>Curve segment</b>: angle %3.2f&#176;, distance %s; with <b>Shift</b> to cusp node, <b>Enter</b> to finish the path" ):
             _("<b>Line segment</b>: angle %3.2f&#176;, distance %s; with <b>Shift</b> to cusp node, <b>Enter</b> to finish the path");        
         }
-        //BSpline End
         spdc_pen_set_angle_distance_status_message(pc, p, 0, message);
     }
 }
@@ -2369,5 +2323,3 @@ void pen_set_to_nearest_horiz_vert(const PenTool *const pc, Geom::Point &pt, gui
   End:
 */
 // vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
-
-
diff --git a/src/ui/tools/pen-tool.h b/src/ui/tools/pen-tool.h
index 553e4c557..b0b56feb4 100644
--- a/src/ui/tools/pen-tool.h
+++ b/src/ui/tools/pen-tool.h
@@ -48,11 +48,9 @@ public:
 
     bool polylines_only;
     bool polylines_paraxial;
-    //SpiroLive
     //Propiedad que guarda si el modo Spiro está activo o no
     bool spiro;
     bool bspline;
-    //SpiroLIve End
     int num_clicks;
 
     unsigned int expecting_clicks_for_LPE; // if positive, finish the path after this many clicks
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index c10bd15a3..2027f0981 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -692,10 +692,8 @@ interpolate(PencilTool *pc)
         return;
     }
 
-    //BSpline
     using Geom::X;
     using Geom::Y;
-    //BSpline end
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     double const tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0) * 0.4;
@@ -727,12 +725,9 @@ interpolate(PencilTool *pc)
     {
         /* Fit and draw and reset state */
         pc->green_curve->moveto(b[0]);
-        //BSpline
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         guint mode = prefs->getInt("/tools/freehand/pencil/freehand-mode", 0);
-        //BSpline End
         for (int c = 0; c < n_segs; c++) {
-            //BSpline
             //Si el modo es BSpline modificamos para que el trazado cree los nodos adhoc
             if(mode == 2){
                 Geom::Point BP = b[4*c+0] + (1./3)*(b[4*c+3] - b[4*c+0]);
@@ -743,7 +738,6 @@ interpolate(PencilTool *pc)
             }else{
                 pc->green_curve->curveto(b[4*c+1], b[4*c+2], b[4*c+3]);
             }
-            //BSpline
         }
 
         sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), pc->green_curve);
@@ -884,7 +878,6 @@ fit_and_split(PencilTool *pc)
         /* Fit and draw and reset state */
         pc->red_curve->reset();
         pc->red_curve->moveto(b[0]);
-        //BSpline
         using Geom::X;
         using Geom::Y;
         //Si el modo es BSpline modificamos para que el trazado cree los nodos adhoc
@@ -899,7 +892,6 @@ fit_and_split(PencilTool *pc)
         }else{
             pc->red_curve->curveto(b[1], b[2], b[3]);
         }
-        //BSpline End
         sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), pc->red_curve);
         pc->red_curve_is_valid = true;
     } else {
-- 
cgit v1.2.3


From 8c6ae51081f4d1d63ba84f9dd339b9f530f06c87 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 30 Dec 2013 21:30:44 +0100
Subject: Start refactor, simplify node.cpp operations,general cleanup, changed
 brehabiour to need 'Shift' Key to move handles because it handle better
 operations with small zoom

(bzr r11950.1.214)
---
 src/ui/tools/node-tool.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/node-tool.h b/src/ui/tools/node-tool.h
index 4d15ab70e..b3acb79ad 100644
--- a/src/ui/tools/node-tool.h
+++ b/src/ui/tools/node-tool.h
@@ -14,6 +14,7 @@
 #include <boost/ptr_container/ptr_map.hpp>
 #include <glib.h>
 #include "ui/tools/tool-base.h"
+#include "selection.h"
 
 namespace Inkscape {
 	namespace Display {
-- 
cgit v1.2.3


From c288aa062e611031f54f6ad8e5e3ee2f581cc783 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 31 Dec 2013 00:29:07 +0100
Subject: Spanish comment of freehand-base.cpp

(bzr r11950.1.224)
---
 src/ui/tools/freehand-base.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index b6efaebd9..5825a149c 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -247,7 +247,7 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
         if (prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1) {
             Effect::createAndApply(SPIRO, dc->desktop->doc(), item);
         }
-        //Añadimos el modo BSpline a los efectos en espera
+        //spanish: añadimos el modo bspline a los efectos en espera
         if (prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2) {
             Effect::createAndApply(BSPLINE, dc->desktop->doc(), item);
         }
@@ -517,7 +517,7 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
         dc->sa->curve->append_continuous(c, 0.0625);
         c->unref();
         dc->sa->curve->closepath_current();
-        //Si la curva tiene un LPE del tipo BSpline ejecutamos spdc_flush_white
+        //spanish: Si la curva tiene un LPE del tipo bspline o spiro ejecutamos spdc_flush_white
         //pasándole la curva de inicio necesaria
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
@@ -652,8 +652,8 @@ SPDrawAnchor *spdc_test_inside(FreehandBase *dc, Geom::Point p)
         }
     }
 
-    //Modificamos la curva del "anchor" final para que sea igual que la curva de inicio.
-    //Esta curva fue modificada al continuar la curva y necesitamos que sea igual que la curva en
+    //spanish: modificamos la curva de anclaje para que sea igual que la curva de inicio.
+    //esta curva fue modificada al continuar la curva y necesitamos que sea igual que la curva en
     //la que cerramos el trazado.
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if((prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
-- 
cgit v1.2.3


From cb0d2fad1fa3b8055b86f8d7e911b295e09cf27a Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 31 Dec 2013 00:31:15 +0100
Subject: Spanish comment of node-tool.cpp

(bzr r11950.1.225)
---
 src/ui/tools/node-tool.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/node-tool.h b/src/ui/tools/node-tool.h
index b3acb79ad..168ec995a 100644
--- a/src/ui/tools/node-tool.h
+++ b/src/ui/tools/node-tool.h
@@ -14,6 +14,7 @@
 #include <boost/ptr_container/ptr_map.hpp>
 #include <glib.h>
 #include "ui/tools/tool-base.h"
+//spanish: lo necesitamos para llamarlo desde el Live Effect
 #include "selection.h"
 
 namespace Inkscape {
-- 
cgit v1.2.3


From 14a50ad8c16b1d840e7a68ba8a75e2cec174a0a5 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 31 Dec 2013 01:02:40 +0100
Subject: Spanish comment of pencil-tool.cpp/.h

(bzr r11950.1.226)
---
 src/ui/tools/pen-tool.cpp | 150 ++++++++++++++++------------------------------
 src/ui/tools/pen-tool.h   |   2 +-
 2 files changed, 54 insertions(+), 98 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index f8d8d4c90..9b5acb6cc 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -42,7 +42,7 @@
 #include "context-fns.h"
 #include "tools-switch.h"
 #include "ui/control-manager.h"
-//Incluimos los archivos necesarios para las BSpline y Spiro
+//spanish: incluimos los archivos necesarios para las BSpline y Spiro
 #define INKSCAPE_LPE_SPIRO_C
 #include "live_effects/lpe-spiro.h"
 
@@ -76,29 +76,29 @@ namespace UI {
 namespace Tools {
 
 static void spdc_pen_set_initial_point(PenTool *pc, Geom::Point const p);
-//Añade los modos spiro y bspline
+//spanish: añade los modos spiro y bspline
 static void sp_pen_context_set_mode(PenTool *const pc, guint mode);
-//Esta función cambia los colores rojo,verde y azul haciendolos transparentes o no en función de si se usa spiro
+//spanish: esta función cambia los colores rojo,verde y azul haciendolos transparentes o no en función de si se usa spiro
 static void bspline_spiro_color(PenTool *const pc);
-//Crea un nodo en modo bspline o spiro
+//spanish: crea un nodo en modo bspline o spiro
 static void bspline_spiro(PenTool *const pc,bool shift);
-//Crea un nodo de modo spiro o bspline
+//spanish: crea un nodo de modo spiro o bspline
 static void bspline_spiro_on(PenTool *const pc);
-//Crea un nodo de tipo CUSP
+//spanish: crea un nodo de tipo CUSP
 static void bspline_spiro_off(PenTool *const pc);
-//Continua una curva existente en modo bspline o spiro
+//spanish: continua una curva existente en modo bspline o spiro
 static void bspline_spiro_start_anchor(PenTool *const pc,bool shift);
-//Continua una curva exsitente con el nodo de union en modo bspline o spiro
+//spanish: continua una curva exsitente con el nodo de union en modo bspline o spiro
 static void bspline_spiro_start_anchor_on(PenTool *const pc);
-//Continua una curva existente con el nodo de union en modo CUSP
+//spanish: continua una curva existente con el nodo de union en modo CUSP
 static void bspline_spiro_start_anchor_off(PenTool *const pc);
-//Modifica la "red_curve" cuando se detecta movimiento
+//spanish: modifica la "red_curve" cuando se detecta movimiento
 static void bspline_spiro_motion(PenTool *const pc,bool shift);
-//Cierra la curva con el último nodo en modo bspline o spiro
+//spanish: cierra la curva con el último nodo en modo bspline o spiro
 static void bspline_spiro_end_anchor_on(PenTool *const pc);
-//Cierra la curva con el último nodo en modo CUSP
+//spanish: cierra la curva con el último nodo en modo CUSP
 static void bspline_spiro_end_anchor_off(PenTool *const pc);
-//Unimos todas las curvas en juego y llamamos a la función doEffect.
+//spanish: unimos todas las curvas en juego y llamamos a la función doEffect.
 static void bspline_spiro_build(PenTool *const pc);
 //function bspline cloned from lpe-bspline.cpp
 static void bspline_doEffect(SPCurve * curve);
@@ -195,6 +195,7 @@ PenTool::~PenTool() {
 void sp_pen_context_set_polyline_mode(PenTool *const pc) {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     guint mode = prefs->getInt("/tools/freehand/pen/freehand-mode", 0);
+    //spanish: cambiamos los modos para dar cabida al modo bspline
     pc->polylines_only = (mode == 3 || mode == 4);
     pc->polylines_paraxial = (mode == 4);
     //we call the function which defines the Spiro modes and the BSpline
@@ -206,6 +207,7 @@ void sp_pen_context_set_polyline_mode(PenTool *const pc) {
 *.Set the mode of draw spiro, and bsplines
 */
 void sp_pen_context_set_mode(PenTool *const pc, guint mode) {
+    //spanish: definimos los modos
     pc->spiro = (mode == 1);
     pc->bspline = (mode == 2);
 }
@@ -474,7 +476,7 @@ static gint pen_handle_button_press(PenTool *const pc, GdkEventButton const &bev
 
                             // Set start anchor
                             pc->sa = anchor;
-                            //Continuamos una curva existente
+                            //spanish: continuamos una curva existente
                             if(anchor){
                                 bspline_spiro_start_anchor(pc,(bevent.state & GDK_SHIFT_MASK));
                             }
@@ -529,7 +531,7 @@ static gint pen_handle_button_press(PenTool *const pc, GdkEventButton const &bev
                             }
                         }
 
-                        //Evitamos la creación de un punto de control para que se cree el nodo en el evento de soltar
+                        //spanish: evitamos la creación de un punto de control para que se cree el nodo en el evento de soltar
                         pc->state = (pc->spiro || pc->bspline || pc->polylines_only) ? PenTool::POINT : PenTool::CONTROL;
 
                         ret = TRUE;
@@ -597,9 +599,8 @@ static gint pen_handle_motion_notify(PenTool *const pc, GdkEventMotion const &me
     //we take out the function the const "tolerance" because we need it later
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     gint const tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
-    //"spiro_color" lo ejecutamos siempre sea o no spiro
     if (pen_within_tolerance) {
-        if ( Geom::LInfty( event_w - pen_drag_origin_w ) < tolerance) {
+        if ( Geom::LInfty( event_w - pen_drag_origin_w ) < tolerance ) {
             return FALSE;   // Do not drag if we're within tolerance from origin.
         }
     }
@@ -610,8 +611,10 @@ static gint pen_handle_motion_notify(PenTool *const pc, GdkEventMotion const &me
 
     // Find desktop coordinates
     Geom::Point p = dt->w2d(event_w);
+
     // Test, whether we hit any anchor
     SPDrawAnchor *anchor = spdc_test_inside(pc, event_w);
+
     switch (pc->mode) {
         case PenTool::MODE_CLICK:
             switch (pc->state) {
@@ -691,7 +694,9 @@ static gint pen_handle_motion_notify(PenTool *const pc, GdkEventMotion const &me
                 case PenTool::CONTROL:
                 case PenTool::CLOSE:
                     // Placing controls is last operation in CLOSE state
+
                     // snap the handle
+
                     spdc_endpoint_snap_handle(pc, p, mevent.state);
                     if (!pc->polylines_only) {
                         spdc_pen_set_ctrl(pc, p, mevent.state);
@@ -718,7 +723,7 @@ static gint pen_handle_motion_notify(PenTool *const pc, GdkEventMotion const &me
         default:
             break;
     }
-    //Lanzamos la función "bspline_spiro_motion" al moverse el ratón o cuando se para.
+    //spanish: lanzamos la función "bspline_spiro_motion" al moverse el ratón o cuando se para.
     if(pc->bspline){
         bspline_spiro_color(pc);
         bspline_spiro_motion(pc,(mevent.state & GDK_SHIFT_MASK));
@@ -759,7 +764,7 @@ static gint pen_handle_button_release(PenTool *const pc, GdkEventButton const &r
         SPDrawAnchor *anchor = spdc_test_inside(pc, event_w);
         //with this we avoid creating a new point over the existing one
         if(pc->spiro || pc->bspline){
-            //Si intentamos crear un nodo en el mismo sitio que el origen, paramos.
+            //spanish: si intentamos crear un nodo en el mismo sitio que el origen, paramos.
             if(pc->npoints > 0 && pc->p[0] == pc->p[3]){
                 return FALSE;
             }
@@ -775,7 +780,7 @@ static gint pen_handle_button_release(PenTool *const pc, GdkEventButton const &r
                                 p = anchor->dp;
                             }
                             pc->sa = anchor;
-                            //continuamos una curva existente
+                            //spanish: continuamos una curva existente
                             if (anchor) {
                                 if(pc->bspline || pc->spiro){
                                     bspline_spiro_start_anchor(pc,(revent.state & GDK_SHIFT_MASK));
@@ -805,7 +810,7 @@ static gint pen_handle_button_release(PenTool *const pc, GdkEventButton const &r
                             spdc_endpoint_snap(pc, p, revent.state);
                         }
                         spdc_pen_finish_segment(pc, p, revent.state);
-                        //Ocultamos la guia del penultimo nodo al cerrar la curva
+                        //spanish: ocultamos la guia del penultimo nodo al cerrar la curva
                         if(pc->spiro){
                             sp_canvas_item_hide(pc->c1);
                         }
@@ -832,7 +837,7 @@ static gint pen_handle_button_release(PenTool *const pc, GdkEventButton const &r
                     case PenTool::CLOSE:
                         spdc_endpoint_snap(pc, p, revent.state);
                         spdc_pen_finish_segment(pc, p, revent.state);
-                        //Ocultamos la guia del penultimo nodo al cerrar la curva
+                        //spanish: ocultamos la guia del penultimo nodo al cerrar la curva
                         if(pc->spiro){
                             sp_canvas_item_hide(pc->c1);
                         }
@@ -925,7 +930,7 @@ static void pen_redraw_all (PenTool *const pc)
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), pc->red_curve);
 
     // handles
-    //Ocultamos los tiradores en modo BSpline y spiro
+    //spanish: ocultamos los tiradores en modo bspline y spiro
     if (pc->p[0] != pc->p[1] && !pc->spiro && !pc->bspline) {
         SP_CTRL(pc->c1)->moveto(pc->p[1]);
         pc->cl1->setCoords(pc->p[0], pc->p[1]);
@@ -939,7 +944,7 @@ static void pen_redraw_all (PenTool *const pc)
     Geom::Curve const * last_seg = pc->green_curve->last_segment();
     if (last_seg) {
         Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const *>( last_seg );
-        //Ocultamos los tiradores en modo BSpline y spiro
+        //spanish: ocultamos los tiradores en modo bspline y spiro
         if ( cubic &&
              (*cubic)[2] != pc->p[0] && !pc->spiro && !pc->bspline )
         {
@@ -954,9 +959,8 @@ static void pen_redraw_all (PenTool *const pc)
         }
     }
 
-    //Simplemente redibujamos la spiro teniendo en cuenta si el nodo es cusp o symm.
-    //como es un redibujo simplemente no llamamos a la función global
-    //sino al final de esta
+    //spanish: simplemente redibujamos la spiro teniendo en cuenta si el nodo es cusp o symm.
+    //como es un redibujo simplemente no llamamos a la función global sino al final de esta
     //Lanzamos solamente el redibujado
      bspline_spiro_build(pc);
 }
@@ -989,12 +993,12 @@ static void pen_lastpoint_move_screen (PenTool *const pc, gdouble x, gdouble y)
 
 static void pen_lastpoint_tocurve (PenTool *const pc)
 {
-    //Evitamos que si la "red_curve" tiene solo dos puntos -recta- no se pare aqui.
+    //spanish: evitamos que si la "red_curve" tiene solo dos puntos -recta- no se pare aqui.
     if (pc->npoints != 5 && !pc->spiro && !pc->bspline)
         return;
     Geom::CubicBezier const * cubic;
     pc->p[1] = pc->red_curve->last_segment()->initialPoint() + (1./3)* (Geom::Point)(pc->red_curve->last_segment()->finalPoint() - pc->red_curve->last_segment()->initialPoint());
-    //Modificamos el último segmento de la curva verde para que forme el tipo de nodo que deseamos
+    //spanish: modificamos el último segmento de la curva verde para que forme el tipo de nodo que deseamos
     if(pc->spiro||pc->bspline){
         if(!pc->green_curve->is_empty()){
             Geom::Point A(0,0);
@@ -1032,7 +1036,7 @@ static void pen_lastpoint_tocurve (PenTool *const pc)
                 pc->green_curve->append_continuous(previous, 0.0625);
             }
         }
-        //Si el último nodo es una union con otra curva
+        //spanish: si el último nodo es una union con otra curva
         if(pc->green_curve->is_empty() && pc->sa && !pc->sa->curve->is_empty()){
             bspline_spiro_start_anchor(pc, false); 
         }
@@ -1043,11 +1047,11 @@ static void pen_lastpoint_tocurve (PenTool *const pc)
 
 static void pen_lastpoint_toline (PenTool *const pc)
 {
-    //Evitamos que si la "red_curve" tiene solo dos puntos -recta- no se pare aqui.
+    //spanish: evitamos que si la "red_curve" tiene solo dos puntos -recta- no se pare aqui.
     if (pc->npoints != 5 && !pc->bspline)
         return;
 
-    //Modificamos el último segmento de la curva verde para que forme el tipo de nodo que deseamos
+    //spanish: modificamos el último segmento de la curva verde para que forme el tipo de nodo que deseamos
     if(pc->spiro || pc->bspline){
         if(!pc->green_curve->is_empty()){
             Geom::Point A(0,0);
@@ -1079,7 +1083,7 @@ static void pen_lastpoint_toline (PenTool *const pc)
                 pc->green_curve->append_continuous(previous, 0.0625);
             }
         }
-        //Si el último nodo es una union con otra curva
+        //spanish: si el último nodo es una union con otra curva
         if(pc->green_curve->is_empty() && pc->sa && !pc->sa->curve->is_empty()){
             bspline_spiro_start_anchor(pc, true);
         }
@@ -1268,7 +1272,7 @@ static gint pen_handle_key_press(PenTool *const pc, GdkEvent *event)
                 } else {
                     pc->p[1] = pc->p[0];
                 }
-                //Asignamos el valor a un tercio de distancia del último segmento.
+                //spanish: asignamos el valor a un tercio de distancia del último segmento.
                 if(pc->bspline){
                     pc->p[1] = pc->p[0] + (1./3)*(pc->p[3] - pc->p[0]);
                 }
@@ -1278,7 +1282,7 @@ static gint pen_handle_key_press(PenTool *const pc, GdkEvent *event)
                                      : pc->p[3]));
                 
                 pc->npoints = 2;
-                //Eliminamos el último segmento de la curva verde
+                //spanish: eliminamos el último segmento de la curva verde
                 if( pc->green_curve->get_segment_count() == 1){
                     pc->npoints = 5;
                     if (pc->green_bpaths) {
@@ -1290,7 +1294,7 @@ static gint pen_handle_key_press(PenTool *const pc, GdkEvent *event)
                 }else{
                     pc->green_curve->backspace();
                 }
-                //Asignamos el valor de pc->p[1] a el opuesto de el ultimo segmento de la línea verde
+                //spanish: asignamos el valor de pc->p[1] a el opuesto de el ultimo segmento de la línea verde
                 if(pc->spiro){
                     cubic = dynamic_cast<Geom::CubicBezier const *>(pc->green_curve->last_segment());
                     if ( cubic ) {
@@ -1305,7 +1309,7 @@ static gint pen_handle_key_press(PenTool *const pc, GdkEvent *event)
                 pc->state = PenTool::POINT;
                 spdc_pen_set_subsequent_point(pc, pt, true);
                 pen_last_paraxial_dir = !pen_last_paraxial_dir;
-                //Redibujamos
+                //spanish: redibujamos
                 bspline_spiro_build(pc);
                 ret = TRUE;
             }
@@ -1381,7 +1385,7 @@ static void spdc_pen_set_angle_distance_status_message(PenTool *const pc, Geom::
 }
 
 
-//Esta función cambia los colores rojo,verde y azul haciendolos transparentes o no en función de si se usa spiro
+//spanish: esta función cambia los colores rojo,verde y azul haciendolos transparentes o no en función de si se usa spiro
 static void bspline_spiro_color(PenTool *const pc)
 {
     bool remake_green_bpaths = false;
@@ -1719,7 +1723,7 @@ static void bspline_spiro_end_anchor_off(PenTool *const pc)
 }
 
 
-//preparates the curves for its trasformation into BSline curves.
+//spanish: preparates the curves for its trasformation into BSline curves.
 static void bspline_spiro_build(PenTool *const pc)
 {
     if(!pc->spiro && !pc->bspline)
@@ -1748,7 +1752,7 @@ static void bspline_spiro_build(PenTool *const pc)
     }
 
     if(!curve->is_empty()){
-        //cerramos la curva si estan cerca los puntos finales de la curva spiro
+        //spanish: cerramos la curva si estan cerca los puntos finales de la curva spiro
         if(Geom::are_near(curve->first_path()->initialPoint(), curve->last_path()->finalPoint())){
             curve->closepath_current();
         }
@@ -1787,26 +1791,19 @@ static void bspline_spiro_build(PenTool *const pc)
 
 static void bspline_doEffect(SPCurve * curve)
 {
+    //spanish: comentado en funcion "doEffect" de src/live_effects/lpe-bspline.cpp
     if(curve->get_segment_count() < 2)
         return;
-    // Make copy of old path as it is changed during processing
     Geom::PathVector const original_pathv = curve->get_pathvector();
     curve->reset();
 
-    //Recorremos todos los paths a los que queremos aplicar el efecto, hasta el penúltimo
     for(Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) {
-        //Si está vacío... 
         if (path_it->empty())
             continue;
-        //Itreadores
-        
+
         Geom::Path::const_iterator curve_it1 = path_it->begin();      // incoming curve
         Geom::Path::const_iterator curve_it2 = ++(path_it->begin());         // outgoing curve
         Geom::Path::const_iterator curve_endit = path_it->end_default(); // this determines when the loop has to stop
-        //Creamos las lineas rectas que unen todos los puntos del trazado y donde se calcularán
-        //los puntos clave para los manejadores. 
-        //Esto hace que la curva BSpline no pierda su condición aunque se trasladen
-        //dichos manejadores
         SPCurve *nCurve = new SPCurve();
         Geom::Point previousNode(0,0);
         Geom::Point node(0,0);
@@ -1820,23 +1817,13 @@ static void bspline_doEffect(SPCurve * curve)
         Geom::D2< Geom::SBasis > SBasisHelper;
         Geom::CubicBezier const *cubic = NULL;
         if (path_it->closed()) {
-            // if the path is closed, maybe we have to stop a bit earlier because the closing line segment has zerolength.
             const Geom::Curve &closingline = path_it->back_closed(); // the closing line segment is always of type Geom::LineSegment.
             if (are_near(closingline.initialPoint(), closingline.finalPoint())) {
-                // closingline.isDegenerate() did not work, because it only checks for *exact* zero length, which goes wrong for relative coordinates and rounding errors...
-                // the closing line segment has zero-length. So stop before that one!
                 curve_endit = path_it->end_open();
             }
         }
-        //Si la curva está cerrada calculamos el punto donde
-        //deveria estar el nodo BSpline de cierre/inicio de la curva
-        //en posible caso de que se cierre con una linea recta creando un nodo BSPline
-
-        //Recorremos todos los segmentos menos el último
         while ( curve_it2 != curve_endit )
         {
-            //previousPointAt3 = pointAt3;
-            //Calculamos los puntos que dividirían en tres segmentos iguales el path recto de entrada y de salida
             SPCurve * in = new SPCurve();
             in->moveto(curve_it1->initialPoint());
             in->lineto(curve_it1->finalPoint());
@@ -1851,8 +1838,6 @@ static void bspline_doEffect(SPCurve * curve)
             }
             in->reset();
             delete in;
-            //Y hacemos lo propio con el path de salida
-            //nextPointAt0 = curveOut.valueAt(0);
             SPCurve * out = new SPCurve();
             out->moveto(curve_it2->initialPoint());
             out->lineto(curve_it2->finalPoint());
@@ -1869,37 +1854,25 @@ static void bspline_doEffect(SPCurve * curve)
             }
             out->reset();
             delete out;
-            //La curva BSpline se forma calculando el centro del segmanto de unión
-            //de el punto situado en las 2/3 partes de el segmento de entrada
-            //con el punto situado en la posición 1/3 del segmento de salida
-            //Estos dos puntos ademas estan posicionados en el lugas correspondiente de
-            //los manejadores de la curva
             SPCurve *lineHelper = new SPCurve();
             lineHelper->moveto(pointAt2);
             lineHelper->lineto(nextPointAt1);
             SBasisHelper  = lineHelper->first_segment()->toSBasis();
             lineHelper->reset();
             delete lineHelper;
-            //almacenamos el punto del anterior bucle -o el de cierre- que nos hara de principio de curva
             previousNode = node;
-            //Y este hará de final de curva
             node = SBasisHelper.valueAt(0.5);
             SPCurve *curveHelper = new SPCurve();
             curveHelper->moveto(previousNode);
             curveHelper->curveto(pointAt1, pointAt2, node);
-            //añadimos la curva generada a la curva pricipal
             nCurve->append_continuous(curveHelper, 0.0625);
             curveHelper->reset();
             delete curveHelper;
-            //aumentamos los valores para el siguiente paso en el bucle
             ++curve_it1;
             ++curve_it2;
         }
-        //Aberiguamos la ultima parte de la curva correspondiente al último segmento
         SPCurve *curveHelper = new SPCurve();
         curveHelper->moveto(node);
-        //Si está cerrada la curva, la cerramos sobre  el valor guardado previamente
-        //Si no finalizamos en el punto final
         Geom::Point startNode(0,0);
         if (path_it->closed()) {
             SPCurve * start = new SPCurve();
@@ -1920,7 +1893,6 @@ static void bspline_doEffect(SPCurve * curve)
             end->moveto(curve_it1->initialPoint());
             end->lineto(curve_it1->finalPoint());
             Geom::D2< Geom::SBasis > SBasisEnd = end->first_segment()->toSBasis();
-            //Geom::BezierCurve const *bezier = dynamic_cast<Geom::BezierCurve const*>(&*curve_endit);
             cubic = dynamic_cast<Geom::CubicBezier const*>(&*curve_it1);
             if(cubic){
                 lineHelper->lineto(SBasisEnd.valueAt(Geom::nearest_point((*cubic)[2],*end->first_segment())));
@@ -1932,7 +1904,6 @@ static void bspline_doEffect(SPCurve * curve)
             SBasisHelper = lineHelper->first_segment()->toSBasis();
             lineHelper->reset();
             delete lineHelper;
-            //Guardamos el principio de la curva
             startNode = SBasisHelper.valueAt(0.5);
             curveHelper->curveto(nextPointAt1, nextPointAt2, startNode);
             nCurve->append_continuous(curveHelper, 0.0625);
@@ -1950,7 +1921,6 @@ static void bspline_doEffect(SPCurve * curve)
         }
         curveHelper->reset();
         delete curveHelper;
-        //y cerramos la curva
         if (path_it->closed()) {
             nCurve->closepath_current();
         }
@@ -1961,12 +1931,12 @@ static void bspline_doEffect(SPCurve * curve)
 }
 
 //Spiro function cloned from lpe-spiro.cpp
+//spanish: comentado en funcion "doEffect" de src/live_effects/lpe-spiro.cpp
 static void spiro_doEffect(SPCurve * curve)
 {
     using Geom::X;
     using Geom::Y;
 
-    // Make copy of old path as it is changed during processing
     Geom::PathVector const original_pathv = curve->get_pathvector();
     guint len = curve->get_segment_count() + 2;
 
@@ -1978,41 +1948,31 @@ static void spiro_doEffect(SPCurve * curve)
         if (path_it->empty())
             continue;
 
-        // start of path
         {
             Geom::Point p = path_it->front().pointAt(0);
             path[ip].x = p[X];
             path[ip].y = p[Y];
-            path[ip].ty = '{' ;  // for closed paths, this is overwritten
+            path[ip].ty = '{' ;
             ip++;
         }
 
-        // midpoints
-        Geom::Path::const_iterator curve_it1 = path_it->begin();      // incoming curve
-        Geom::Path::const_iterator curve_it2 = ++(path_it->begin());         // outgoing curve
+        Geom::Path::const_iterator curve_it1 = path_it->begin();
+        Geom::Path::const_iterator curve_it2 = ++(path_it->begin());
 
-        Geom::Path::const_iterator curve_endit = path_it->end_default(); // this determines when the loop has to stop
+        Geom::Path::const_iterator curve_endit = path_it->end_default();
         if (path_it->closed()) {
-            // if the path is closed, maybe we have to stop a bit earlier because the closing line segment has zerolength.
-            const Geom::Curve &closingline = path_it->back_closed(); // the closing line segment is always of type Geom::LineSegment.
+            const Geom::Curve &closingline = path_it->back_closed(); 
             if (are_near(closingline.initialPoint(), closingline.finalPoint())) {
-                // closingline.isDegenerate() did not work, because it only checks for *exact* zero length, which goes wrong for relative coordinates and rounding errors...
-                // the closing line segment has zero-length. So stop before that one!
                 curve_endit = path_it->end_open();
             }
         }
 
         while ( curve_it2 != curve_endit )
         {
-            /* This deals with the node between curve_it1 and curve_it2.
-             * Loop to end_default (so without last segment), loop ends when curve_it2 hits the end
-             * and then curve_it1 points to end or closing segment */
             Geom::Point p = curve_it1->finalPoint();
             path[ip].x = p[X];
             path[ip].y = p[Y];
 
-            // Determine type of spiro node this is, determined by the tangents (angles) of the curves
-            // TODO: see if this can be simplified by using /helpers/geom-nodetype.cpp:get_nodetype
             bool this_is_line = is_straight_curve(*curve_it1);
             bool next_is_line = is_straight_curve(*curve_it2);
 
@@ -2036,15 +1996,13 @@ static void spiro_doEffect(SPCurve * curve)
             ip++;
         }
 
-        // add last point to the spiropath
         Geom::Point p = curve_it1->finalPoint();
         path[ip].x = p[X];
         path[ip].y = p[Y];
         if (path_it->closed()) {
-            // curve_it1 points to the (visually) closing segment. determine the match between first and this last segment (the closing node)
             Geom::NodeType nodetype = Geom::get_nodetype(*curve_it1, path_it->front());
             switch (nodetype) {
-                case Geom::NODE_NONE: // can't happen! but if it does, it means the path isn't closed :-)
+                case Geom::NODE_NONE:
                     path[ip].ty = '}';
                     ip++;
                     break;
@@ -2057,12 +2015,10 @@ static void spiro_doEffect(SPCurve * curve)
                     break;
             }
         } else {
-            // set type to path closer
             path[ip].ty = '}';
             ip++;
         }
 
-        // run subpath through spiro
         int sp_len = ip;
         Spiro::spiro_run(path, sp_len, *curve);
         ip = 0;
diff --git a/src/ui/tools/pen-tool.h b/src/ui/tools/pen-tool.h
index b0b56feb4..4f87429f4 100644
--- a/src/ui/tools/pen-tool.h
+++ b/src/ui/tools/pen-tool.h
@@ -48,7 +48,7 @@ public:
 
     bool polylines_only;
     bool polylines_paraxial;
-    //Propiedad que guarda si el modo Spiro está activo o no
+    //spanish: propiedad que guarda si el modo Spiro está activo o no
     bool spiro;
     bool bspline;
     int num_clicks;
-- 
cgit v1.2.3


From d8a7188e7a73050e329103b79e769b8fa498ede5 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 31 Dec 2013 01:04:31 +0100
Subject: Spanish comment of pencil-tool.cpp

(bzr r11950.1.227)
---
 src/ui/tools/pencil-tool.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index 2027f0981..883b3fa36 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -728,7 +728,7 @@ interpolate(PencilTool *pc)
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         guint mode = prefs->getInt("/tools/freehand/pencil/freehand-mode", 0);
         for (int c = 0; c < n_segs; c++) {
-            //Si el modo es BSpline modificamos para que el trazado cree los nodos adhoc
+            //spanish: si el modo es BSpline modificamos para que el trazado cree los nodos adhoc
             if(mode == 2){
                 Geom::Point BP = b[4*c+0] + (1./3)*(b[4*c+3] - b[4*c+0]);
                 BP = Geom::Point(BP[X] + 0.0001,BP[Y] + 0.0001);
@@ -880,7 +880,7 @@ fit_and_split(PencilTool *pc)
         pc->red_curve->moveto(b[0]);
         using Geom::X;
         using Geom::Y;
-        //Si el modo es BSpline modificamos para que el trazado cree los nodos adhoc
+        //spanish: si el modo es BSpline modificamos para que el trazado cree los nodos adhoc
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         guint mode = prefs->getInt("/tools/freehand/pencil/freehand-mode", 0);
         if(mode == 2){
-- 
cgit v1.2.3


From c08c28e9a22f0fe5f06e9dc34430c3acb16f3c13 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Thu, 2 Jan 2014 16:15:27 +0100
Subject: Fixed a boring bug sometimes curves be converted to lines, increasing
 a bit the distance from the handle to the line

(bzr r11950.1.230)
---
 src/ui/tools/pen-tool.cpp | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 9b5acb6cc..a48f8911a 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -959,7 +959,7 @@ static void pen_redraw_all (PenTool *const pc)
         }
     }
 
-    //spanish: simplemente redibujamos la spiro teniendo en cuenta si el nodo es cusp o symm.
+    //spanish: simplemente redibujamos la spiro.
     //como es un redibujo simplemente no llamamos a la función global sino al final de esta
     //Lanzamos solamente el redibujado
      bspline_spiro_build(pc);
@@ -1451,7 +1451,7 @@ static void bspline_spiro_on(PenTool *const pc)
         pc->p[0] = pc->red_curve->first_segment()->initialPoint();
         pc->p[3] = pc->red_curve->first_segment()->finalPoint();
         pc->p[2] = pc->p[3] + (1./3)*(pc->p[0] - pc->p[3]);
-        pc->p[2] = Geom::Point(pc->p[2][X] + 0.0001,pc->p[2][Y] + 0.0001);
+        pc->p[2] = Geom::Point(pc->p[2][X] + 0.005,pc->p[2][Y] + 0.005);
     }
 }
 
@@ -1492,7 +1492,7 @@ static void bspline_spiro_start_anchor_on(PenTool *const pc)
     Geom::Point A = tmpCurve->last_segment()->initialPoint();
     Geom::Point D = tmpCurve->last_segment()->finalPoint();
     Geom::Point C = D + (1./3)*(A - D);
-    C = Geom::Point(C[X] + 0.0001,C[Y] + 0.0001);
+    C = Geom::Point(C[X] + 0.005,C[Y] + 0.005);
     if(cubic){
         lastSeg->moveto(A);
         lastSeg->curveto((*cubic)[1],C,D);
@@ -1549,19 +1549,23 @@ static void bspline_spiro_motion(PenTool *const pc, bool shift){
 
     using Geom::X;
     using Geom::Y;
+    if(pc->red_curve->is_empty()) return;
+    pc->npoints = 5;
     SPCurve *tmpCurve = new SPCurve();
     pc->p[2] = pc->p[3] + (1./3)*(pc->p[0] - pc->p[3]);
+    pc->p[2] = Geom::Point(pc->p[2][X] + 0.005,pc->p[2][Y] + 0.005);
     if(pc->green_curve->is_empty() && !pc->sa){
         pc->p[1] = pc->p[0] + (1./3)*(pc->p[3] - pc->p[0]);
+        pc->p[1] = Geom::Point(pc->p[1][X] + 0.005,pc->p[1][Y] + 0.005);
     }else if(!pc->green_curve->is_empty()){
         tmpCurve = pc->green_curve->copy();
     }else{
         tmpCurve = pc->sa->curve->copy();
         if(pc->sa->start)
             tmpCurve = tmpCurve->create_reverse();
-
     }
-    if(!tmpCurve->is_empty() && !pc->red_curve->is_empty()){
+
+    if(!tmpCurve->is_empty()){
         Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
         if(cubic){
             if(pc->bspline){
@@ -1577,16 +1581,17 @@ static void bspline_spiro_motion(PenTool *const pc, bool shift){
                 WPower->reset();
                 pc->p[1] = SBasisWPower.valueAt(WP);
                 if(!Geom::are_near(pc->p[1],pc->p[0]))
-                    pc->p[1] = Geom::Point(pc->p[1][X] + 0.0001,pc->p[1][Y] + 0.0001);
+                    pc->p[1] = Geom::Point(pc->p[1][X] + 0.005,pc->p[1][Y] + 0.005);
                 if(shift)
-                    pc->p[2]=pc->p[3];
-                else
-                    pc->p[2] = pc->p[3] + (1./3)*(pc->p[0] - pc->p[3]);
+                    pc->p[2] = pc->p[3];
             }else{
                 pc->p[1] =  (*cubic)[3] + (Geom::Point)((*cubic)[3] - (*cubic)[2] );
+                pc->p[1] = Geom::Point(pc->p[1][X] + 0.005,pc->p[1][Y] + 0.005);
             }
         }else{
             pc->p[1] = pc->p[0];
+            if(shift)
+                pc->p[2] = pc->p[3];
         }
     }
 
@@ -1606,7 +1611,7 @@ static void bspline_spiro_end_anchor_on(PenTool *const pc)
     using Geom::X;
     using Geom::Y;
     pc->p[2] = pc->p[3] + (1./3)*(pc->p[0] - pc->p[3]);
-    pc->p[2] = Geom::Point(pc->p[2][X] + 0.0001,pc->p[2][Y] + 0.0001);
+    pc->p[2] = Geom::Point(pc->p[2][X] + 0.005,pc->p[2][Y] + 0.005);
     SPCurve *tmpCurve = new SPCurve();
     SPCurve *lastSeg = new SPCurve();
     Geom::Point C(0,0);
@@ -1616,7 +1621,7 @@ static void bspline_spiro_end_anchor_on(PenTool *const pc)
         Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
         if(pc->bspline){
             C = tmpCurve->last_segment()->finalPoint() + (1./3)*(tmpCurve->last_segment()->initialPoint() - tmpCurve->last_segment()->finalPoint());
-            C = Geom::Point(C[X] + 0.0001,C[Y] + 0.0001);
+            C = Geom::Point(C[X] + 0.005,C[Y] + 0.005);
         }else{
             C =  pc->p[3] + (Geom::Point)(pc->p[3] - pc->p[2] );
         }
@@ -1645,7 +1650,7 @@ static void bspline_spiro_end_anchor_on(PenTool *const pc)
         Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
         if(pc->bspline){
             C = tmpCurve->last_segment()->finalPoint() + (1./3)*(tmpCurve->last_segment()->initialPoint() - tmpCurve->last_segment()->finalPoint());
-            C = Geom::Point(C[X] + 0.0001,C[Y] + 0.0001);
+            C = Geom::Point(C[X] + 0.005,C[Y] + 0.005);
         }else{
             C =  pc->p[3] + (Geom::Point)(pc->p[3] - pc->p[2] );
         }
-- 
cgit v1.2.3


From 1e8014478b4185861ec348250a88d8476140b35f Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 1 Feb 2014 12:33:03 +0100
Subject: Add correct preview for coninuing paths whith pencil and draw modes

(bzr r11950.1.245)
---
 src/ui/tools/pen-tool.cpp | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index a48f8911a..8c13a0584 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -43,6 +43,10 @@
 #include "tools-switch.h"
 #include "ui/control-manager.h"
 //spanish: incluimos los archivos necesarios para las BSpline y Spiro
+#include "live_effects/effect.h"
+#include "live_effects/lpeobject.h"
+#include "live_effects/lpeobject-reference.h"
+#include "live_effects/parameter/path.h"
 #define INKSCAPE_LPE_SPIRO_C
 #include "live_effects/lpe-spiro.h"
 
@@ -68,6 +72,8 @@
 
 #include "tool-factory.h"
 
+#include "live_effects/effect.h"
+
 
 using Inkscape::ControlManager;
 
@@ -1467,6 +1473,32 @@ static void bspline_spiro_off(PenTool *const pc)
 
 static void bspline_spiro_start_anchor(PenTool *const pc, bool shift)
 {
+    LivePathEffect::LPEBSpline *lpe_bsp = NULL;
+
+    if (SP_IS_LPE_ITEM(pc->white_item) && SP_LPE_ITEM(pc->white_item)->hasPathEffect()){
+        Inkscape::LivePathEffect::Effect* thisEffect = SP_LPE_ITEM(pc->white_item)->getPathEffectOfType(Inkscape::LivePathEffect::BSPLINE);
+        if(thisEffect){
+            lpe_bsp = dynamic_cast<LivePathEffect::LPEBSpline*>(thisEffect->getLPEObj()->get_lpe());
+        }
+    }
+    if(lpe_bsp){
+        pc->bspline = true;
+    }else{
+        pc->bspline = false;
+    }
+    LivePathEffect::LPESpiro *lpe_spi = NULL;
+
+    if (SP_IS_LPE_ITEM(pc->white_item) && SP_LPE_ITEM(pc->white_item)->hasPathEffect()){
+        Inkscape::LivePathEffect::Effect* thisEffect = SP_LPE_ITEM(pc->white_item)->getPathEffectOfType(Inkscape::LivePathEffect::SPIRO);
+        if(thisEffect){
+            lpe_spi = dynamic_cast<LivePathEffect::LPESpiro*>(thisEffect->getLPEObj()->get_lpe());
+        }
+    }
+    if(lpe_spi){
+        pc->spiro = true;
+    }else{
+        pc->spiro = false;
+    }
     if(!pc->spiro && !pc->bspline)
         return;
 
-- 
cgit v1.2.3


From b9f1c85c61ce91fedca5486ef371bf6301e76128 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 5 Feb 2014 17:31:55 +0100
Subject: fixing su_v advertising memory bug

(bzr r11950.1.247)
---
 src/ui/tools/freehand-base.cpp | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 5825a149c..6561a0c2f 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -531,22 +531,33 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
 
     // Step C - test start
     if (dc->sa) {
-        SPCurve *s = dc->sa->curve;
-        dc->white_curves = g_slist_remove(dc->white_curves, s);
-        if (dc->sa->start) {
-            s = reverse_then_unref(s);
+        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+        if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) != 1 && 
+           prefs->getInt(tool_name(dc) + "/freehand-mode", 0) != 2){
+            dc->sa->curve->unref()
+        }else{
+            SPCurve *s = dc->sa->curve;
+            dc->white_curves = g_slist_remove(dc->white_curves, s);
+            if (dc->sa->start) {
+                s = reverse_then_unref(s);
+            }
+            s->append_continuous(c, 0.0625);
+            c->unref();
+            c = s;
         }
-        s->append_continuous(c, 0.0625);
-        c->unref();
-        c = s;
     } else /* Step D - test end */ if (dc->ea) {
-        SPCurve *e = dc->ea->curve;
-        dc->white_curves = g_slist_remove(dc->white_curves, e);
-        if (!dc->ea->start) {
-            e = reverse_then_unref(e);
+        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+        if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) != 1 && 
+           prefs->getInt(tool_name(dc) + "/freehand-mode", 0) != 2){
+            dc->ea->curve->unref()
+            SPCurve *e = dc->ea->curve;
+            dc->white_curves = g_slist_remove(dc->white_curves, e);
+            if (!dc->ea->start) {
+                e = reverse_then_unref(e);
+            }
+            c->append_continuous(e, 0.0625);
+            e->unref();
         }
-        c->append_continuous(e, 0.0625);
-        e->unref();
     }
 
 
-- 
cgit v1.2.3


From 46c24197ff9e17b30d97cab8893d5017b9b99dc3 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 8 Feb 2014 20:10:00 +0100
Subject: update to trunk

(bzr r11950.1.249)
---
 src/ui/tools/freehand-base.cpp | 37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 6561a0c2f..5825a149c 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -531,33 +531,22 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
 
     // Step C - test start
     if (dc->sa) {
-        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-        if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) != 1 && 
-           prefs->getInt(tool_name(dc) + "/freehand-mode", 0) != 2){
-            dc->sa->curve->unref()
-        }else{
-            SPCurve *s = dc->sa->curve;
-            dc->white_curves = g_slist_remove(dc->white_curves, s);
-            if (dc->sa->start) {
-                s = reverse_then_unref(s);
-            }
-            s->append_continuous(c, 0.0625);
-            c->unref();
-            c = s;
+        SPCurve *s = dc->sa->curve;
+        dc->white_curves = g_slist_remove(dc->white_curves, s);
+        if (dc->sa->start) {
+            s = reverse_then_unref(s);
         }
+        s->append_continuous(c, 0.0625);
+        c->unref();
+        c = s;
     } else /* Step D - test end */ if (dc->ea) {
-        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-        if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) != 1 && 
-           prefs->getInt(tool_name(dc) + "/freehand-mode", 0) != 2){
-            dc->ea->curve->unref()
-            SPCurve *e = dc->ea->curve;
-            dc->white_curves = g_slist_remove(dc->white_curves, e);
-            if (!dc->ea->start) {
-                e = reverse_then_unref(e);
-            }
-            c->append_continuous(e, 0.0625);
-            e->unref();
+        SPCurve *e = dc->ea->curve;
+        dc->white_curves = g_slist_remove(dc->white_curves, e);
+        if (!dc->ea->start) {
+            e = reverse_then_unref(e);
         }
+        c->append_continuous(e, 0.0625);
+        e->unref();
     }
 
 
-- 
cgit v1.2.3


From be22cb94d23816986838e9636ce44ee8537a8570 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 26 Feb 2014 22:29:31 +0100
Subject: Fixed some/all bugs related to continuing bspline/spiro curves
 advertaising by suv

(bzr r11950.1.257)
---
 src/ui/tools/freehand-base.cpp | 37 +++++++++++++++++++++----------
 src/ui/tools/pen-tool.cpp      | 50 +++++++++++++++++++++++-------------------
 2 files changed, 52 insertions(+), 35 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 5e406a0d4..d8a8e901a 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -469,7 +469,7 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
 {
     // Concat RBG
     SPCurve *c = dc->green_curve;
-
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     // Green
     dc->green_curve = new SPCurve();
     while (dc->green_bpaths) {
@@ -490,12 +490,16 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->red_bpath), NULL);
 
     if (c->is_empty()) {
+        if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
+            SPDesktop *desktop = dc->desktop;
+            spdc_selection_modified(sp_desktop_selection(desktop), 0, dc);
+        }
         c->unref();
         return;
     }
 
     // Step A - test, whether we ended on green anchor
-    if ( forceclosed || ( dc->green_anchor && dc->green_anchor->active ) ) {
+    if ( forceclosed || (dc->green_anchor && dc->green_anchor->active) ) {
         // We hit green anchor, closing Green-Blue-Red
         dc->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Path is closed."));
         c->closepath_current();
@@ -513,21 +517,33 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     {
         // We hit bot start and end of single curve, closing paths
         dc->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Closing path."));
-        if (dc->sa->start && !(dc->sa->curve->is_closed()) ) {
-            c = reverse_then_unref(c);
+        if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
+           prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
+            if (dc->sa->start && !(dc->sa->curve->is_closed()) ) {
+                dc->sa->curve = reverse_then_unref(dc->sa->curve);
+            }
+            dc->sa->curve->append_continuous(c, 0.0625);
+            c->unref();
+            if(Geom::are_near(dc->sa->curve->first_path()->initialPoint(), dc->ea->dp)){
+                dc->sa->curve->closepath_current();
+            }
+        }else{
+            if (dc->sa->start && !(dc->sa->curve->is_closed()) ) {
+                c = reverse_then_unref(c);
+            }
+            dc->sa->curve->append_continuous(c, 0.0625);
+            c->unref();
+            dc->sa->curve->closepath_current();
         }
-        dc->sa->curve->append_continuous(c, 0.0625);
-        c->unref();
-        dc->sa->curve->closepath_current();
         //spanish: Si la curva tiene un LPE del tipo bspline o spiro ejecutamos spdc_flush_white
         //pasándole la curva de inicio necesaria
-        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
            prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
             dc->white_curves = g_slist_remove(dc->white_curves, dc->sa->curve);
             spdc_flush_white(dc, dc->sa->curve);
-        }else
+        }else{
             spdc_flush_white(dc, NULL);
+        }
         return;
     }
 
@@ -550,10 +566,7 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
         c->append_continuous(e, 0.0625);
         e->unref();
     }
-
-
     spdc_flush_white(dc, c);
-
     c->unref();
 }
 
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 8c13a0584..a344dc7a6 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -414,11 +414,18 @@ static gint pen_handle_button_press(PenTool *const pc, GdkEventButton const &bev
     ToolBase *event_context = SP_EVENT_CONTEXT(pc);
     //Test whether we hit any anchor.
     SPDrawAnchor * const anchor = spdc_test_inside(pc, event_w);
+
     //with this we avoid creating a new point over the existing one
-    if(!bevent.button == 3 && (pc->spiro || pc->bspline) && pc->npoints > 0 && pc->p[0] == pc->p[3]){
+    if(bevent.button != 3 && (pc->spiro || pc->bspline) && pc->npoints > 0 && pc->p[0] == pc->p[3]){
+        pc->state = PenTool::STOP;
+        if( anchor && anchor == pc->sa && pc->green_curve->is_empty()){
+            //spanish Borrar siguiente linea para evitar un nodo encima de otro
+            spdc_pen_finish_segment(pc, event_dt, bevent.state);
+            spdc_pen_finish(pc, FALSE);
+            return TRUE;
+        }
         return FALSE;
     } 
-
     gint ret = FALSE;
     if (bevent.button == 1 && !event_context->space_panning
         // make sure this is not the last click for a waiting LPE (otherwise we want to finish the path)
@@ -486,7 +493,7 @@ static gint pen_handle_button_press(PenTool *const pc, GdkEventButton const &bev
                             if(anchor){
                                 bspline_spiro_start_anchor(pc,(bevent.state & GDK_SHIFT_MASK));
                             }
-                            if (anchor && !sp_pen_context_has_waiting_LPE(pc)) {
+                            if (anchor && (!sp_pen_context_has_waiting_LPE(pc) || pc->bspline || pc->spiro)) {
                                 // Adjust point to anchor if needed; if we have a waiting LPE, we need
                                 // a fresh path to be created so don't continue an existing one
                                 p = anchor->dp;
@@ -755,7 +762,6 @@ static gint pen_handle_button_release(PenTool *const pc, GdkEventButton const &r
     }
 
     gint ret = FALSE;
-
     ToolBase *event_context = SP_EVENT_CONTEXT(pc);
     if ( revent.button == 1  && !event_context->space_panning) {
 
@@ -769,11 +775,10 @@ static gint pen_handle_button_release(PenTool *const pc, GdkEventButton const &r
         // Test whether we hit any anchor.
         SPDrawAnchor *anchor = spdc_test_inside(pc, event_w);
         //with this we avoid creating a new point over the existing one
-        if(pc->spiro || pc->bspline){
-            //spanish: si intentamos crear un nodo en el mismo sitio que el origen, paramos.
-            if(pc->npoints > 0 && pc->p[0] == pc->p[3]){
-                return FALSE;
-            }
+        //spanish: si intentamos crear un nodo en el mismo sitio que el origen, paramos.
+
+        if((!anchor || anchor == pc->sa) && (pc->spiro || pc->bspline) && pc->npoints > 0 && pc->p[0] == pc->p[3]){
+            return TRUE;
         }
 
         switch (pc->mode) {
@@ -1442,9 +1447,7 @@ static void bspline_spiro(PenTool *const pc, bool shift)
     if(!pc->spiro && !pc->bspline)
         return;
 
-    if(!pc->anchor_statusbar)
-        shift?bspline_spiro_off(pc):bspline_spiro_on(pc);
-
+    shift?bspline_spiro_off(pc):bspline_spiro_on(pc);
     bspline_spiro_build(pc);
 }
 
@@ -1628,10 +1631,11 @@ static void bspline_spiro_motion(PenTool *const pc, bool shift){
     }
 
     if(pc->anchor_statusbar && !pc->red_curve->is_empty()){
-        if(shift)
+        if(shift){
             bspline_spiro_end_anchor_off(pc);
-        else
+        }else{
             bspline_spiro_end_anchor_on(pc);
+        }
     }
 
     bspline_spiro_build(pc);
@@ -1675,10 +1679,9 @@ static void bspline_spiro_end_anchor_on(PenTool *const pc)
         tmpCurve = tmpCurve->create_reverse();
         pc->green_curve->reset();
         pc->green_curve = tmpCurve;
-    }else{
+    }else {
         tmpCurve = pc->sa->curve->copy();
-        if(!pc->sa->start)
-            tmpCurve = tmpCurve->create_reverse();
+        if(!pc->sa->start) tmpCurve = tmpCurve->create_reverse();
         Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
         if(pc->bspline){
             C = tmpCurve->last_segment()->finalPoint() + (1./3)*(tmpCurve->last_segment()->initialPoint() - tmpCurve->last_segment()->finalPoint());
@@ -1712,10 +1715,11 @@ static void bspline_spiro_end_anchor_on(PenTool *const pc)
 static void bspline_spiro_end_anchor_off(PenTool *const pc)
 {
 
-    pc->p[2] = pc->p[3];
     SPCurve *tmpCurve = new SPCurve();
     SPCurve *lastSeg = new SPCurve();
+    pc->p[2] = pc->p[3];
     if(!pc->sa || pc->sa->curve->is_empty()){
+
         tmpCurve = pc->green_curve->create_reverse();
         if(pc->green_curve->get_segment_count()==0)return;
         Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
@@ -1734,10 +1738,9 @@ static void bspline_spiro_end_anchor_off(PenTool *const pc)
             pc->green_curve->reset();
             pc->green_curve = tmpCurve;
         }
-    }else{
+    }else {
         tmpCurve = pc->sa->curve->copy();
-        if(!pc->sa->start)
-            tmpCurve = tmpCurve->create_reverse();
+        if(!pc->sa->start) tmpCurve = tmpCurve->create_reverse();
         Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
         if(cubic){
             lastSeg->moveto((*cubic)[0]);
@@ -1789,7 +1792,7 @@ static void bspline_spiro_build(PenTool *const pc)
     }
 
     if(!curve->is_empty()){
-        //spanish: cerramos la curva si estan cerca los puntos finales de la curva spiro
+        //spanish: cerramos la curva si estan cerca los puntos finales de la curva
         if(Geom::are_near(curve->first_path()->initialPoint(), curve->last_path()->finalPoint())){
             curve->closepath_current();
         }
@@ -2194,7 +2197,8 @@ static void spdc_pen_finish(PenTool *const pc, gboolean const closed)
     SPDesktop *const desktop = pc->desktop;
     pc->message_context->clear();
     desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Drawing finished"));
-
+    if(pc->spiro || pc->bspline) pc->blue_curve->reset();
+    //spanish para cancelar linea sin un segmento creado
     pc->red_curve->reset();
     spdc_concat_colors_and_flush(pc, closed);
     pc->sa = NULL;
-- 
cgit v1.2.3


From 1f76e96f90e3badb3b9693d477e6e75fbaaa1bd1 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 28 Feb 2014 20:12:44 +0100
Subject: adding some comments

(bzr r11950.1.260)
---
 src/ui/tools/freehand-base.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index c65d8133b..861ea0503 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -483,6 +483,9 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     dc->red_curve->reset();
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->red_bpath), NULL);
 
+    //spanish: si c esta vacio, puede ser que se haya tratado de contnuar una curva existente
+    //y se haya cancelado. Si es asi y el modo es bspline o spirolive la curva previa necesita volver a ser seleccionada
+    //porque la modificamos al continuar por un anchor
     if (c->is_empty()) {
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
             SPDesktop *desktop = dc->desktop;
@@ -493,7 +496,7 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     }
 
     // Step A - test, whether we ended on green anchor
-    if ( forceclosed || (dc->green_anchor && dc->green_anchor->active) ) {
+    if ( forceclosed || ( dc->green_anchor && dc->green_anchor->active ) ) {
         // We hit green anchor, closing Green-Blue-Red
         dc->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Path is closed."));
         c->closepath_current();
@@ -511,6 +514,8 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     {
         // We hit bot start and end of single curve, closing paths
         dc->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Closing path."));
+        //spanish: si estamos en modo bspline o spirolive, la curva de continuación y finalización es actualizada al continuar o finalizar la curva en un anchor
+        //esto proboca que la función original no detecte si es la misma curva en el caso de curvas con multiples partes -shift- y cierre de manera erronea una de las partes
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
            prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
             if (dc->sa->start && !(dc->sa->curve->is_closed()) ) {
-- 
cgit v1.2.3


From 9f066846c116c7a963bfaa805282b9b8d4c014e4 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 2 Mar 2014 03:07:44 +0100
Subject: =?UTF-8?q?Fixed=20update=20to=20trunk,=20lot=20of=20changes=20vin?=
 =?UTF-8?q?=C3=ADcius?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(bzr r11950.1.265)
---
 src/ui/tools/pen-tool.cpp | 122 +++++++++++++++-------------------------------
 src/ui/tools/pen-tool.h   |  29 ++++++++++-
 2 files changed, 66 insertions(+), 85 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index c6d87e2d8..65823b642 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -81,52 +81,6 @@ namespace Inkscape {
 namespace UI {
 namespace Tools {
 
-static void spdc_pen_set_initial_point(PenTool *pc, Geom::Point const p);
-//spanish: añade los modos spiro y bspline
-static void sp_pen_context_set_mode(PenTool *const pc, guint mode);
-//spanish: esta función cambia los colores rojo,verde y azul haciendolos transparentes o no en función de si se usa spiro
-static void bspline_spiro_color(PenTool *const pc);
-//spanish: crea un nodo en modo bspline o spiro
-static void bspline_spiro(PenTool *const pc,bool shift);
-//spanish: crea un nodo de modo spiro o bspline
-static void bspline_spiro_on(PenTool *const pc);
-//spanish: crea un nodo de tipo CUSP
-static void bspline_spiro_off(PenTool *const pc);
-//spanish: continua una curva existente en modo bspline o spiro
-static void bspline_spiro_start_anchor(PenTool *const pc,bool shift);
-//spanish: continua una curva exsitente con el nodo de union en modo bspline o spiro
-static void bspline_spiro_start_anchor_on(PenTool *const pc);
-//spanish: continua una curva existente con el nodo de union en modo CUSP
-static void bspline_spiro_start_anchor_off(PenTool *const pc);
-//spanish: modifica la "red_curve" cuando se detecta movimiento
-static void bspline_spiro_motion(PenTool *const pc,bool shift);
-//spanish: cierra la curva con el último nodo en modo bspline o spiro
-static void bspline_spiro_end_anchor_on(PenTool *const pc);
-//spanish: cierra la curva con el último nodo en modo CUSP
-static void bspline_spiro_end_anchor_off(PenTool *const pc);
-//spanish: unimos todas las curvas en juego y llamamos a la función doEffect.
-static void bspline_spiro_build(PenTool *const pc);
-//function bspline cloned from lpe-bspline.cpp
-static void bspline_doEffect(SPCurve * curve);
-//function spiro cloned from lpe-spiro.cpp
-static void spiro_doEffect(SPCurve * curve);
-
-static void spdc_pen_set_subsequent_point(PenTool *const pc, Geom::Point const p, bool statusbar, guint status = 0);
-static void spdc_pen_set_ctrl(PenTool *pc, Geom::Point const p, guint state);
-static void spdc_pen_finish_segment(PenTool *pc, Geom::Point p, guint state);
-
-static void spdc_pen_finish(PenTool *pc, gboolean closed);
-
-static gint pen_handle_button_press(PenTool *const pc, GdkEventButton const &bevent);
-static gint pen_handle_motion_notify(PenTool *const pc, GdkEventMotion const &mevent);
-static gint pen_handle_button_release(PenTool *const pc, GdkEventButton const &revent);
-static gint pen_handle_2button_press(PenTool *const pc, GdkEventButton const &bevent);
-static gint pen_handle_key_press(PenTool *const pc, GdkEvent *event);
-static void spdc_reset_colors(PenTool *pc);
-
-static void pen_disable_events(PenTool *const pc);
-static void pen_enable_events(PenTool *const pc);
-
 static Geom::Point pen_drag_origin_w(0, 0);
 static bool pen_within_tolerance = false;
 static int pen_last_paraxial_dir = 0; // last used direction in horizontal/vertical mode; 0 = horizontal, 1 = vertical
@@ -217,13 +171,13 @@ void PenTool::setPolylineMode() {
     this->polylines_paraxial = (mode == 4);
     //we call the function which defines the Spiro modes and the BSpline
     //todo: merge to one function only
-    sp_pen_context_set_mode(this, mode);
+    this->_pen_context_set_mode(mode);
 }
 
 /*
 *.Set the mode of draw spiro, and bsplines
 */
-void sp_pen_context_set_mode(PenTool *const pc, guint mode) {
+void PenTool::_pen_context_set_mode(guint mode) {
     //spanish: definimos los modos
     this->spiro = (mode == 1);
     this->bspline = (mode == 2);
@@ -425,7 +379,7 @@ gint PenTool::_handleButtonPress(GdkEventButton const &bevent) {
     Geom::Point const event_w(bevent.x, bevent.y);
     Geom::Point event_dt(desktop->w2d(event_w));
     //Test whether we hit any anchor.
-    SPDrawAnchor * const anchor = spdc_test_inside(pc, event_w);
+    SPDrawAnchor * const anchor = spdc_test_inside(this, event_w);
     ToolBase *event_context = SP_EVENT_CONTEXT(this);
 
     //with this we avoid creating a new point over the existing one
@@ -433,8 +387,8 @@ gint PenTool::_handleButtonPress(GdkEventButton const &bevent) {
         this->state = PenTool::STOP;
         if( anchor && anchor == this->sa && this->green_curve->is_empty()){
             //spanish Borrar siguiente linea para evitar un nodo encima de otro
-            spdc_pen_finish_segment(pc, event_dt, bevent.state);
-            spdc_pen_finish(pc, FALSE);
+            _finishSegment(event_dt, bevent.state);
+            _finish( FALSE);
             return TRUE;
         }
         return FALSE;
@@ -505,7 +459,7 @@ gint PenTool::_handleButtonPress(GdkEventButton const &bevent) {
 
                             this->sa = anchor;
                             if(anchor){
-                                bspline_spiro_start_anchor(pc,(bevent.state & GDK_SHIFT_MASK));
+                                this->_bspline_spiro_start_anchor(bevent.state & GDK_SHIFT_MASK);
                             }
                             if (anchor && (!this->hasWaitingLPE()|| this->bspline || this->spiro)) {
                                 // Adjust point to anchor if needed; if we have a waiting LPE, we need
@@ -753,12 +707,12 @@ gint PenTool::_handleMotionNotify(GdkEventMotion const &mevent) {
     }
     //spanish: lanzamos la función "bspline_spiro_motion" al moverse el ratón o cuando se para.
     if(this->bspline){
-        bspline_spiro_color(pc);
-        bspline_spiro_motion(pc,(mevent.state & GDK_SHIFT_MASK));
+        this->_bspline_spiro_color();
+        this->_bspline_spiro_motion(mevent.state & GDK_SHIFT_MASK);
     }else{
         if ( Geom::LInfty( event_w - pen_drag_origin_w ) > tolerance || mevent.time == 0) {
-            bspline_spiro_color(pc);
-            bspline_spiro_motion(pc,(mevent.state & GDK_SHIFT_MASK));
+            this->_bspline_spiro_color();
+            this->_bspline_spiro_motion(mevent.state & GDK_SHIFT_MASK);
             pen_drag_origin_w = event_w;
         }
     }
@@ -809,7 +763,7 @@ gint PenTool::_handleButtonRelease(GdkEventButton const &revent) {
                             //spanish: continuamos una curva existente
                             if (anchor) {
                                 if(this->bspline || this->spiro){
-                                    bspline_spiro_start_anchor(pc,(revent.state & GDK_SHIFT_MASK));
+                                    this->_bspline_spiro_start_anchor(revent.state & GDK_SHIFT_MASK);;
                                 }
                             }
                             this->_setInitialPoint(p);
@@ -986,7 +940,7 @@ void PenTool::_redrawAll() {
     //spanish: simplemente redibujamos la spiro.
     //como es un redibujo simplemente no llamamos a la función global sino al final de esta
     //Lanzamos solamente el redibujado
-     bspline_spiro_build(pc);
+     this->_bspline_spiro_build();
 }
 
 void PenTool::_lastpointMove(gdouble x, gdouble y) {
@@ -1060,7 +1014,7 @@ void PenTool::_lastpointToCurve() {
         }
         //spanish: si el último nodo es una union con otra curva
         if(this->green_curve->is_empty() && this->sa && !this->sa->curve->is_empty()){
-            bspline_spiro_start_anchor(pc, false); 
+            this->_bspline_spiro_start_anchor(false);
         }
     }
 
@@ -1107,7 +1061,7 @@ void PenTool::_lastpointToLine() {
         }
         //spanish: si el último nodo es una union con otra curva
         if(this->green_curve->is_empty() && this->sa && !this->sa->curve->is_empty()){
-            bspline_spiro_start_anchor(pc, true);
+            this->_bspline_spiro_start_anchor(true);
         }
     }
     
@@ -1332,7 +1286,7 @@ gint PenTool::_handleKeyPress(GdkEvent *event) {
                 this->_setSubsequentPoint(pt, true);
                 pen_last_paraxial_dir = !pen_last_paraxial_dir;
                 //spanish: redibujamos
-                bspline_spiro_build(pc);
+                this->_bspline_spiro_build();
                 ret = TRUE;
             }
             break;
@@ -1406,7 +1360,7 @@ void PenTool::_setAngleDistanceStatusMessage(Geom::Point const p, int pc_point_t
 
 
 //spanish: esta función cambia los colores rojo,verde y azul haciendolos transparentes o no en función de si se usa spiro
-static void bspline_spiro_color(PenTool *const pc)
+void PenTool::_bspline_spiro_color()
 {
     bool remake_green_bpaths = false;
     if(this->spiro){
@@ -1451,16 +1405,16 @@ static void bspline_spiro_color(PenTool *const pc)
 }
 
 
-static void bspline_spiro(PenTool *const pc, bool shift)
+void PenTool::_bspline_spiro(bool shift)
 {
     if(!this->spiro && !this->bspline)
         return;
 
-    shift?bspline_spiro_off(pc):bspline_spiro_on(pc);
-    bspline_spiro_build(pc);
+    shift?this->_bspline_spiro_off():this->_bspline_spiro_on();
+    this->_bspline_spiro_build();
 }
 
-static void bspline_spiro_on(PenTool *const pc)
+void PenTool::_bspline_spiro_on()
 {
     if(!this->red_curve->is_empty()){
         using Geom::X;
@@ -1473,7 +1427,7 @@ static void bspline_spiro_on(PenTool *const pc)
     }
 }
 
-static void bspline_spiro_off(PenTool *const pc)
+void PenTool::_bspline_spiro_off()
 {
     if(!this->red_curve->is_empty()){
         this->npoints = 5;
@@ -1483,7 +1437,7 @@ static void bspline_spiro_off(PenTool *const pc)
     }
 }
 
-static void bspline_spiro_start_anchor(PenTool *const pc, bool shift)
+void PenTool::_bspline_spiro_start_anchor(bool shift)
 {
     LivePathEffect::LPEBSpline *lpe_bsp = NULL;
 
@@ -1518,12 +1472,12 @@ static void bspline_spiro_start_anchor(PenTool *const pc, bool shift)
         return;
 
     if(shift)
-        bspline_spiro_start_anchor_off(pc);
+        this->_bspline_spiro_start_anchor_off();
     else
-        bspline_spiro_start_anchor_on(pc);
+        this->_bspline_spiro_start_anchor_on();
 }
 
-static void bspline_spiro_start_anchor_on(PenTool *const pc)
+void PenTool::_bspline_spiro_start_anchor_on()
 {
     using Geom::X;
     using Geom::Y;
@@ -1559,7 +1513,7 @@ static void bspline_spiro_start_anchor_on(PenTool *const pc)
     this->sa->curve = tmpCurve;
 }
 
-static void bspline_spiro_start_anchor_off(PenTool *const pc)
+void PenTool::_bspline_spiro_start_anchor_off()
 {
     SPCurve *tmpCurve = new SPCurve();
     tmpCurve = this->sa->curve->copy();
@@ -1587,7 +1541,7 @@ static void bspline_spiro_start_anchor_off(PenTool *const pc)
 
 }
 
-static void bspline_spiro_motion(PenTool *const pc, bool shift){
+void PenTool::_bspline_spiro_motion(bool shift){
     if(!this->spiro && !this->bspline)
         return;
 
@@ -1641,16 +1595,16 @@ static void bspline_spiro_motion(PenTool *const pc, bool shift){
 
     if(this->anchor_statusbar && !this->red_curve->is_empty()){
         if(shift){
-            bspline_spiro_end_anchor_off(pc);
+            this->_bspline_spiro_end_anchor_off();
         }else{
-            bspline_spiro_end_anchor_on(pc);
+            this->_bspline_spiro_end_anchor_on();
         }
     }
 
-    bspline_spiro_build(pc);
+    this->_bspline_spiro_build();
 }
 
-static void bspline_spiro_end_anchor_on(PenTool *const pc)
+void PenTool::_bspline_spiro_end_anchor_on()
 {
 
     using Geom::X;
@@ -1721,7 +1675,7 @@ static void bspline_spiro_end_anchor_on(PenTool *const pc)
     }
 }
 
-static void bspline_spiro_end_anchor_off(PenTool *const pc)
+void PenTool::_bspline_spiro_end_anchor_off()
 {
 
     SPCurve *tmpCurve = new SPCurve();
@@ -1773,7 +1727,7 @@ static void bspline_spiro_end_anchor_off(PenTool *const pc)
 
 
 //spanish: preparates the curves for its trasformation into BSline curves.
-static void bspline_spiro_build(PenTool *const pc)
+void PenTool::_bspline_spiro_build()
 {
     if(!this->spiro && !this->bspline)
         return;
@@ -1812,9 +1766,9 @@ static void bspline_spiro_build(PenTool *const pc)
         //Effect *spr = static_cast<Effect*> ( new LPEbspline(lpeobj) );
         //spr->doEffect(curve);
         if(this->bspline){
-            bspline_doEffect(curve);
+            this->_bspline_doEffect(curve);
         }else{
-            spiro_doEffect(curve);
+            this->_spiro_doEffect(curve);
         }
 
         sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(this->blue_bpath), curve);   
@@ -1838,7 +1792,7 @@ static void bspline_spiro_build(PenTool *const pc)
     }
 }
 
-static void bspline_doEffect(SPCurve * curve)
+void PenTool::_bspline_doEffect(SPCurve * curve)
 {
     //spanish: comentado en funcion "doEffect" de src/live_effects/lpe-bspline.cpp
     if(curve->get_segment_count() < 2)
@@ -1981,7 +1935,7 @@ static void bspline_doEffect(SPCurve * curve)
 
 //Spiro function cloned from lpe-spiro.cpp
 //spanish: comentado en funcion "doEffect" de src/live_effects/lpe-spiro.cpp
-static void spiro_doEffect(SPCurve * curve)
+void PenTool::_spiro_doEffect(SPCurve * curve)
 {
     using Geom::X;
     using Geom::Y;
@@ -2178,7 +2132,7 @@ void PenTool::_finishSegment(Geom::Point const p, guint const state) {
 
 
     if (!this->red_curve->is_empty()) {
-        bspline_spiro(pc,(state & GDK_SHIFT_MASK));
+        this->_bspline_spiro(state & GDK_SHIFT_MASK);
         this->green_curve->append_continuous(this->red_curve, 0.0625);
         SPCurve *curve = this->red_curve->copy();
 
diff --git a/src/ui/tools/pen-tool.h b/src/ui/tools/pen-tool.h
index 07fc037be..88e528b22 100644
--- a/src/ui/tools/pen-tool.h
+++ b/src/ui/tools/pen-tool.h
@@ -88,7 +88,34 @@ private:
 	gint _handleButtonRelease(GdkEventButton const &revent);
 	gint _handle2ButtonPress(GdkEventButton const &bevent);
 	gint _handleKeyPress(GdkEvent *event);
-
+    //spanish: añade los modos spiro y bspline
+    void _pen_context_set_mode(guint mode);
+    //spanish: esta función cambia los colores rojo,verde y azul haciendolos transparentes o no en función de si se usa spiro
+    void _bspline_spiro_color();
+    //spanish: crea un nodo en modo bspline o spiro
+    void _bspline_spiro(bool shift);
+    //spanish: crea un nodo de modo spiro o bspline
+    void _bspline_spiro_on();
+    //spanish: crea un nodo de tipo CUSP
+    void _bspline_spiro_off();
+    //spanish: continua una curva existente en modo bspline o spiro
+    void _bspline_spiro_start_anchor(bool shift);
+    //spanish: continua una curva exsitente con el nodo de union en modo bspline o spiro
+    void _bspline_spiro_start_anchor_on();
+    //spanish: continua una curva existente con el nodo de union en modo CUSP
+    void _bspline_spiro_start_anchor_off();
+    //spanish: modifica la "red_curve" cuando se detecta movimiento
+    void _bspline_spiro_motion(bool shift);
+    //spanish: cierra la curva con el último nodo en modo bspline o spiro
+    void _bspline_spiro_end_anchor_on();
+    //spanish: cierra la curva con el último nodo en modo CUSP
+    void _bspline_spiro_end_anchor_off();
+    //spanish: unimos todas las curvas en juego y llamamos a la función doEffect.
+    void _bspline_spiro_build();
+    //function bspline cloned from lpe-bspline.cpp
+    void _bspline_doEffect(SPCurve * curve);
+    //function spiro cloned from lpe-spiro.cpp
+    void _spiro_doEffect(SPCurve * curve);
 	void _setInitialPoint(Geom::Point const p);
 	void _setSubsequentPoint(Geom::Point const p, bool statusbar, guint status = 0);
 	void _setCtrl(Geom::Point const p, guint state);
-- 
cgit v1.2.3


From fef7175272bbed79c874496c71092d3ba6e38d98 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 2 Mar 2014 23:50:04 +0100
Subject: Add new curve structure to show temporay item while draw on bspline
 and spiro, maybe the previous usage of the blue_curve give the strange errors
 in mac noticed by suv

(bzr r11950.1.266)
---
 src/ui/tools/freehand-base.cpp | 22 ++++++++++++++++++++++
 src/ui/tools/freehand-base.h   |  4 ++++
 src/ui/tools/pen-tool.cpp      | 28 +++++++++++++++++++---------
 3 files changed, 45 insertions(+), 9 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 31d2f6191..cb6111bd5 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -82,6 +82,8 @@ FreehandBase::FreehandBase(gchar const *const *cursor_shape, gint hot_x, gint ho
     , red_curve(NULL)
     , blue_bpath(NULL)
     , blue_curve(NULL)
+    , blue2_bpath(NULL)
+    , blue2_curve(NULL)
     , green_bpaths(NULL)
     , green_curve(NULL)
     , green_anchor(NULL)
@@ -137,6 +139,13 @@ void FreehandBase::setup() {
     // Create blue curve
     this->blue_curve = new SPCurve();
 
+    // Create blue2 bpath
+    this->blue2_bpath = sp_canvas_bpath_new(sp_desktop_sketch(this->desktop), NULL);
+    sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(this->blue2_bpath), this->blue_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
+
+    // Create blue2 curve
+    this->blue2_curve = new SPCurve();
+
     // Create green curve
     this->green_curve = new SPCurve();
 
@@ -483,6 +492,10 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     dc->red_curve->reset();
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->red_bpath), NULL);
 
+    // Blue2
+    dc->blue2_curve->reset();
+    sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->blue2_bpath), NULL);
+
     //spanish: si c esta vacio, puede ser que se haya tratado de contnuar una curva existente
     //y se haya cancelado. Si es asi y el modo es bspline o spirolive la curva previa necesita volver a ser seleccionada
     //porque la modificamos al continuar por un anchor
@@ -718,6 +731,15 @@ static void spdc_free_colors(FreehandBase *dc)
         dc->blue_curve = dc->blue_curve->unref();
     }
 
+    // Blue2
+    if (dc->blue2_bpath) {
+        sp_canvas_item_destroy(SP_CANVAS_ITEM(dc->blue2_bpath));
+        dc->blue2_bpath = NULL;
+    }
+    if (dc->blue2_curve) {
+        dc->blue2_curve = dc->blue2_curve->unref();
+    }
+
     // Green
     while (dc->green_bpaths) {
         sp_canvas_item_destroy(SP_CANVAS_ITEM(dc->green_bpaths->data));
diff --git a/src/ui/tools/freehand-base.h b/src/ui/tools/freehand-base.h
index c8da9faed..d5c2fc9ba 100644
--- a/src/ui/tools/freehand-base.h
+++ b/src/ui/tools/freehand-base.h
@@ -57,6 +57,10 @@ public:
     SPCanvasItem *blue_bpath;
     SPCurve *blue_curve;
 
+    // Blue2
+    SPCanvasItem *blue2_bpath;
+    SPCurve *blue2_curve;
+
     // Green
     GSList *green_bpaths;
     SPCurve *green_curve;
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 65823b642..5846c3cec 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1303,6 +1303,9 @@ void PenTool::_resetColors() {
     // Blue
     this->blue_curve->reset();
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(this->blue_bpath), NULL);
+    // Blue2
+    this->blue2_curve->reset();
+    sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(this->blue2_bpath), NULL);
     // Green
     while (this->green_bpaths) {
         sp_canvas_item_destroy(SP_CANVAS_ITEM(this->green_bpaths->data));
@@ -1373,6 +1376,16 @@ void PenTool::_bspline_spiro_color()
             this->green_color = 0x00ff000;
             remake_green_bpaths = true;
         }
+    }else if(this->bspline){
+        //If we come from working with the spiro curve and change the mode the "green_curve" colour is transparent
+        if(this->green_color != 0xff00007f){
+            //since we are not im spiro mode, we assign the original colours
+            //to the red and the green curve, removing their transparency 
+            this->red_color = 0xff00007f;
+            //Damos color rojo a la linea verde
+            this->green_color = 0xff00007f;
+            remake_green_bpaths = true;
+        }
     }else{
         //If we come from working with the spiro curve and change the mode the "green_curve" colour is transparent
         if(this->green_color != 0x00ff007f){
@@ -1383,9 +1396,7 @@ void PenTool::_bspline_spiro_color()
             remake_green_bpaths = true;
         }
         //we hide the spiro/bspline rests
-        if(!this->bspline){
-            sp_canvas_item_hide(this->blue_bpath);
-        }
+        sp_canvas_item_hide(this->blue2_bpath);
     }
     //We erase all the "green_bpaths" to recreate them after with the colour
     //transparency recently modified
@@ -1771,11 +1782,11 @@ void PenTool::_bspline_spiro_build()
             this->_spiro_doEffect(curve);
         }
 
-        sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(this->blue_bpath), curve);   
-        sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(this->blue_bpath), this->blue_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
-        sp_canvas_item_show(this->blue_bpath);
+        sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(this->blue2_bpath), curve);   
+        sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(this->blue2_bpath), this->blue_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
+        sp_canvas_item_show(this->blue2_bpath);
         curve->unref();
-        this->blue_curve->reset();
+        this->blue2_curve->reset();
         //We hide the holders that doesn't contribute anything
         if(this->spiro){
             sp_canvas_item_show(this->c1);
@@ -1787,7 +1798,7 @@ void PenTool::_bspline_spiro_build()
         sp_canvas_item_hide(this->cl0);
     }else{
         //if the curve is empty
-        sp_canvas_item_hide(this->blue_bpath);
+        sp_canvas_item_hide(this->blue2_bpath);
 
     }
 }
@@ -2167,7 +2178,6 @@ void PenTool::_finish(gboolean const closed) {
 
     desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Drawing finished"));
 
-    if(this->spiro || this->bspline) this->blue_curve->reset();
     //spanish para cancelar linea sin un segmento creado
     this->red_curve->reset();
     spdc_concat_colors_and_flush(this, closed);
-- 
cgit v1.2.3


From 4eed716131afa00f3590b7d60600ef0c476c78e3 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebronyat-signgmaildotcom>
Date: Sun, 2 Mar 2014 20:24:50 -0500
Subject: Fixed path color when changed by Objects Dialog

(bzr r13090.1.11)
---
 src/ui/tools/node-tool.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index b1e11bd66..719b67108 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -473,7 +473,8 @@ bool NodeTool::root_handler(GdkEvent* event) {
             SPCanvasItem *flash = sp_canvas_bpath_new(sp_desktop_tempgroup(desktop), c);
 
             sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(flash),
-                prefs->getInt("/tools/nodes/highlight_color", 0xff0000ff), 1.0,
+                //prefs->getInt("/tools/nodes/highlight_color", 0xff0000ff), 1.0,
+                over_item->highlight_color(), 1.0,
                 SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
 
             sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(flash), 0, SP_WIND_RULE_NONZERO);
-- 
cgit v1.2.3


From 224de42669ff754155838d37c48a56fa70c9bc94 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 4 Mar 2014 12:38:20 +0100
Subject: Reduce a half the spiro distance to redraw

(bzr r11950.1.273)
---
 src/ui/tools/pen-tool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 5846c3cec..0c97bd445 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -710,7 +710,7 @@ gint PenTool::_handleMotionNotify(GdkEventMotion const &mevent) {
         this->_bspline_spiro_color();
         this->_bspline_spiro_motion(mevent.state & GDK_SHIFT_MASK);
     }else{
-        if ( Geom::LInfty( event_w - pen_drag_origin_w ) > tolerance || mevent.time == 0) {
+        if ( Geom::LInfty( event_w - pen_drag_origin_w ) > (tolerance/2) || mevent.time == 0) {
             this->_bspline_spiro_color();
             this->_bspline_spiro_motion(mevent.state & GDK_SHIFT_MASK);
             pen_drag_origin_w = event_w;
-- 
cgit v1.2.3


From 3d7f15d8b4adc83c04a2ba5c654529beeeec0c3b Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 4 Mar 2014 20:23:58 +0100
Subject: Change tooltip  to one more explicit to make cusp nodes

(bzr r11950.1.275)
---
 src/ui/tools/pen-tool.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 0c97bd445..ad77fcb53 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -642,7 +642,7 @@ gint PenTool::_handleMotionNotify(GdkEventMotion const &mevent) {
                             if(!this->spiro && !this->bspline){
                                 this->message_context->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> or <b>click and drag</b> to close and finish the path."));
                             }else{
-                                this->message_context->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> or <b>click and drag</b> to close and finish the path. Shift to cusp node"));
+                                this->message_context->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> or <b>click and drag</b> to close and finish the path. Shift+Click make a cusp node"));
                             }
                             this->anchor_statusbar = true;
                         } else if (!anchor && this->anchor_statusbar) {
@@ -656,7 +656,7 @@ gint PenTool::_handleMotionNotify(GdkEventMotion const &mevent) {
                             if(!this->spiro && !this->bspline){
                                 this->message_context->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> or <b>click and drag</b> to continue the path from this point."));
                             }else{
-                                this->message_context->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> or <b>click and drag</b> to continue the path from this point. Shift to cusp node"));      
+                                this->message_context->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> or <b>click and drag</b> to continue the path from this point. Shift+Click make a cusp node"));      
                             }
                             this->anchor_statusbar = true;
                         } else if (!anchor && this->anchor_statusbar) {
@@ -2084,8 +2084,8 @@ void PenTool::_setSubsequentPoint(Geom::Point const p, bool statusbar, guint sta
             _("<b>Line segment</b>: angle %3.2f&#176;, distance %s; with <b>Ctrl</b> to snap angle, <b>Enter</b> to finish the path");
         if(this->spiro || this->bspline){
             message = is_curve ?
-            _("<b>Curve segment</b>: angle %3.2f&#176;, distance %s; with <b>Shift</b> to cusp node, <b>Enter</b> to finish the path" ):
-            _("<b>Line segment</b>: angle %3.2f&#176;, distance %s; with <b>Shift</b> to cusp node, <b>Enter</b> to finish the path");        
+            _("<b>Curve segment</b>: angle %3.2f&#176;, distance %s; with <b>Shift+Click</b> make a cusp node, <b>Enter</b> to finish the path" ):
+            _("<b>Line segment</b>: angle %3.2f&#176;, distance %s; with <b>Shift+Click</b> make a cusp node, <b>Enter</b> to finish the path");        
         }
         this->_setAngleDistanceStatusMessage(p, 0, message);
     }
-- 
cgit v1.2.3


From 9ae7e81723f4ea4e2640ed01d55d94e73874804f Mon Sep 17 00:00:00 2001
From: Guiu Rocafort <neandertalspeople@gmail.com>
Date: Wed, 5 Mar 2014 12:37:27 +0100
Subject: translations from spanish to english done, it might need a little
 review, but everything seems ok

(bzr r11950.5.1)
---
 src/ui/tools/freehand-base.cpp | 23 ++++++++-------
 src/ui/tools/node-tool.h       |  3 +-
 src/ui/tools/pen-tool.cpp      | 67 +++++++++++++++++++-----------------------
 src/ui/tools/pen-tool.h        | 26 ++++++++--------
 src/ui/tools/pencil-tool.cpp   |  4 +--
 5 files changed, 60 insertions(+), 63 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index cb6111bd5..40a257de9 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -252,7 +252,7 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
         if (prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1) {
             Effect::createAndApply(SPIRO, dc->desktop->doc(), item);
         }
-        //spanish: añadimos el modo bspline a los efectos en espera
+        //add the bspline node in the waiting effects
         if (prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2) {
             Effect::createAndApply(BSPLINE, dc->desktop->doc(), item);
         }
@@ -496,9 +496,9 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     dc->blue2_curve->reset();
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->blue2_bpath), NULL);
 
-    //spanish: si c esta vacio, puede ser que se haya tratado de contnuar una curva existente
-    //y se haya cancelado. Si es asi y el modo es bspline o spirolive la curva previa necesita volver a ser seleccionada
-    //porque la modificamos al continuar por un anchor
+    /* if c is empty, it might be that the user was trying to continue an existing curve and cancelled.
+       if this is the case and we are in bspline or spirolive the previous curve needs to be selected again because
+       we modify it when continuing through an anchor.     */
     if (c->is_empty()) {
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
             SPDesktop *desktop = dc->desktop;
@@ -527,8 +527,10 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     {
         // We hit bot start and end of single curve, closing paths
         dc->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Closing path."));
-        //spanish: si estamos en modo bspline o spirolive, la curva de continuación y finalización es actualizada al continuar o finalizar la curva en un anchor
-        //esto proboca que la función original no detecte si es la misma curva en el caso de curvas con multiples partes -shift- y cierre de manera erronea una de las partes
+
+        /* if we are in bspline or spirolive mode, the continuation and ending curve are updated when continuing or ending the curve in an anchor.
+           this causes that the original function doesn't detect if it's the same curve in case the curves have multiples parts -shift- and
+           close incorrectly one of the parts */
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
            prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
             if (dc->sa->start && !(dc->sa->curve->is_closed()) ) {
@@ -547,8 +549,8 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
             c->unref();
             dc->sa->curve->closepath_current();
         }
-        //spanish: Si la curva tiene un LPE del tipo bspline o spiro ejecutamos spdc_flush_white
-        //pasándole la curva de inicio necesaria
+
+        //if the curve has an bspline or spiro LPE, we execute spdc_flush_white, passing the necessary starting curve.
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
            prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
             dc->white_curves = g_slist_remove(dc->white_curves, dc->sa->curve);
@@ -679,9 +681,8 @@ SPDrawAnchor *spdc_test_inside(FreehandBase *dc, Geom::Point p)
         }
     }
 
-    //spanish: modificamos la curva de anclaje para que sea igual que la curva de inicio.
-    //esta curva fue modificada al continuar la curva y necesitamos que sea igual que la curva en
-    //la que cerramos el trazado.
+    /* modify the anchoring curve so it is equal to the starting curve. 
+       this curve is modified when it's modified and we need them to be equal to the closing curve */
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if((prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
         prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2) && 
diff --git a/src/ui/tools/node-tool.h b/src/ui/tools/node-tool.h
index 168ec995a..42f89cd1c 100644
--- a/src/ui/tools/node-tool.h
+++ b/src/ui/tools/node-tool.h
@@ -14,7 +14,8 @@
 #include <boost/ptr_container/ptr_map.hpp>
 #include <glib.h>
 #include "ui/tools/tool-base.h"
-//spanish: lo necesitamos para llamarlo desde el Live Effect
+
+// we need it to call it from Live Effect
 #include "selection.h"
 
 namespace Inkscape {
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 5846c3cec..bb1a03b7c 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -42,7 +42,7 @@
 #include "context-fns.h"
 #include "tools-switch.h"
 #include "ui/control-manager.h"
-//spanish: incluimos los archivos necesarios para las BSpline y Spiro
+// we include the necessary files for BSpline & Spiro
 #include "live_effects/effect.h"
 #include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
@@ -166,7 +166,7 @@ PenTool::~PenTool() {
 void PenTool::setPolylineMode() {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     guint mode = prefs->getInt("/tools/freehand/pen/freehand-mode", 0);
-    //spanish: cambiamos los modos para dar cabida al modo bspline
+    // change the nodes to make space for bspline mode
     this->polylines_only = (mode == 3 || mode == 4);
     this->polylines_paraxial = (mode == 4);
     //we call the function which defines the Spiro modes and the BSpline
@@ -178,7 +178,7 @@ void PenTool::setPolylineMode() {
 *.Set the mode of draw spiro, and bsplines
 */
 void PenTool::_pen_context_set_mode(guint mode) {
-    //spanish: definimos los modos
+    // define the nodes
     this->spiro = (mode == 1);
     this->bspline = (mode == 2);
 }
@@ -386,7 +386,7 @@ gint PenTool::_handleButtonPress(GdkEventButton const &bevent) {
     if(bevent.button != 3 && (this->spiro || this->bspline) && this->npoints > 0 && this->p[0] == this->p[3]){
         this->state = PenTool::STOP;
         if( anchor && anchor == this->sa && this->green_curve->is_empty()){
-            //spanish Borrar siguiente linea para evitar un nodo encima de otro
+            //remove the following line to avoid having one node on top of another
             _finishSegment(event_dt, bevent.state);
             _finish( FALSE);
             return TRUE;
@@ -512,7 +512,7 @@ gint PenTool::_handleButtonPress(GdkEventButton const &bevent) {
                             }
                         }
 
-                        //spanish: evitamos la creación de un punto de control para que se cree el nodo en el evento de soltar
+                        // avoid the creation of a control point so a node is created in the release event
                         this->state = (this->spiro || this->bspline || this->polylines_only) ? PenTool::POINT : PenTool::CONTROL;
 
                         ret = TRUE;
@@ -705,7 +705,7 @@ gint PenTool::_handleMotionNotify(GdkEventMotion const &mevent) {
         default:
             break;
     }
-    //spanish: lanzamos la función "bspline_spiro_motion" al moverse el ratón o cuando se para.
+    // calls the function "bspline_spiro_motion" when the mouse starts or stops moving
     if(this->bspline){
         this->_bspline_spiro_color();
         this->_bspline_spiro_motion(mevent.state & GDK_SHIFT_MASK);
@@ -743,9 +743,7 @@ gint PenTool::_handleButtonRelease(GdkEventButton const &revent) {
         // Test whether we hit any anchor.
 
         SPDrawAnchor *anchor = spdc_test_inside(this, event_w);
-        //with this we avoid creating a new point over the existing one
-        //spanish: si intentamos crear un nodo en el mismo sitio que el origen, paramos.
-
+        // if we try to create a node in the same place as another node, we skip
         if((!anchor || anchor == this->sa) && (this->spiro || this->bspline) && this->npoints > 0 && this->p[0] == this->p[3]){
             return TRUE;
         }
@@ -760,7 +758,7 @@ gint PenTool::_handleButtonRelease(GdkEventButton const &revent) {
                                 p = anchor->dp;
                             }
                             this->sa = anchor;
-                            //spanish: continuamos una curva existente
+                            // continue the existing curve
                             if (anchor) {
                                 if(this->bspline || this->spiro){
                                     this->_bspline_spiro_start_anchor(revent.state & GDK_SHIFT_MASK);;
@@ -790,7 +788,7 @@ gint PenTool::_handleButtonRelease(GdkEventButton const &revent) {
                             this->_endpointSnap(p, revent.state);
                         }
                         this->_finishSegment(p, revent.state);
-                        //spanish: ocultamos la guia del penultimo nodo al cerrar la curva
+                        // hude the guide of the penultimate node when closing the curve
                         if(this->spiro){
                             sp_canvas_item_hide(this->c1);
                         }
@@ -817,7 +815,7 @@ gint PenTool::_handleButtonRelease(GdkEventButton const &revent) {
                     case PenTool::CLOSE:
                         this->_endpointSnap(p, revent.state);
                         this->_finishSegment(p, revent.state);
-                        //spanish: ocultamos la guia del penultimo nodo al cerrar la curva
+                        // hide the penultimate node guide when closing the curve
                         if(this->spiro){
                             sp_canvas_item_hide(this->c1);
                         }
@@ -908,7 +906,7 @@ void PenTool::_redrawAll() {
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(this->red_bpath), this->red_curve);
 
     // handles
-    //spanish: ocultamos los tiradores en modo bspline y spiro
+    // hide the handlers in bspline and spiro modes
     if (this->p[0] != this->p[1] && !this->spiro && !this->bspline) {
         SP_CTRL(this->c1)->moveto(this->p[1]);
         this->cl1->setCoords(this->p[0], this->p[1]);
@@ -922,7 +920,7 @@ void PenTool::_redrawAll() {
     Geom::Curve const * last_seg = this->green_curve->last_segment();
     if (last_seg) {
         Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const *>( last_seg );
-        //spanish: ocultamos los tiradores en modo bspline y spiro
+        // hide the handlers in bspline and spiro modes
         if ( cubic &&
              (*cubic)[2] != this->p[0] && !this->spiro && !this->bspline )
         {
@@ -937,9 +935,8 @@ void PenTool::_redrawAll() {
         }
     }
 
-    //spanish: simplemente redibujamos la spiro.
-    //como es un redibujo simplemente no llamamos a la función global sino al final de esta
-    //Lanzamos solamente el redibujado
+    // simply redraw the spiro. because its a redrawing, we don't call the global function, 
+    // but we call the redrawing at the ending.
      this->_bspline_spiro_build();
 }
 
@@ -969,12 +966,12 @@ void PenTool::_lastpointMoveScreen(gdouble x, gdouble y) {
 }
 
 void PenTool::_lastpointToCurve() {
-    //spanish: evitamos que si la "red_curve" tiene solo dos puntos -recta- no se pare aqui.
+    // avoid that if the "red_curve" contains only two points ( rect ), it doesn't stop here.
     if (this->npoints != 5 && !this->spiro && !this->bspline)
         return;
     Geom::CubicBezier const * cubic;
     this->p[1] = this->red_curve->last_segment()->initialPoint() + (1./3)* (Geom::Point)(this->red_curve->last_segment()->finalPoint() - this->red_curve->last_segment()->initialPoint());
-    //spanish: modificamos el último segmento de la curva verde para que forme el tipo de nodo que deseamos
+    //modificate the last segment of the green curve so it creates the type of node we need
     if(this->spiro||this->bspline){
         if(!this->green_curve->is_empty()){
             Geom::Point A(0,0);
@@ -1012,7 +1009,7 @@ void PenTool::_lastpointToCurve() {
                 this->green_curve->append_continuous(previous, 0.0625);
             }
         }
-        //spanish: si el último nodo es una union con otra curva
+        //if the last node is an union with another curve
         if(this->green_curve->is_empty() && this->sa && !this->sa->curve->is_empty()){
             this->_bspline_spiro_start_anchor(false);
         }
@@ -1023,11 +1020,11 @@ void PenTool::_lastpointToCurve() {
 
 
 void PenTool::_lastpointToLine() {
-    //spanish: evitamos que si la "red_curve" tiene solo dos puntos -recta- no se pare aqui.
+    // avoid that if the "red_curve" contains only two points ( rect) it doesn't stop here.
     if (this->npoints != 5 && !this->bspline)
         return;
 
-    //spanish: modificamos el último segmento de la curva verde para que forme el tipo de nodo que deseamos
+    // modify the last segment of the green curve so the type of node we want is created.
     if(this->spiro || this->bspline){
         if(!this->green_curve->is_empty()){
             Geom::Point A(0,0);
@@ -1059,7 +1056,7 @@ void PenTool::_lastpointToLine() {
                 this->green_curve->append_continuous(previous, 0.0625);
             }
         }
-        //spanish: si el último nodo es una union con otra curva
+        // if the last node is an union with another curve
         if(this->green_curve->is_empty() && this->sa && !this->sa->curve->is_empty()){
             this->_bspline_spiro_start_anchor(true);
         }
@@ -1248,7 +1245,7 @@ gint PenTool::_handleKeyPress(GdkEvent *event) {
                     this->p[1] = this->p[0];
                 }
 
-                //spanish: asignamos el valor a un tercio de distancia del último segmento.
+                // asign the value in a third of the distance of the last segment.
                 if(this->bspline){
                     this->p[1] = this->p[0] + (1./3)*(this->p[3] - this->p[0]);
                 }
@@ -1258,7 +1255,7 @@ gint PenTool::_handleKeyPress(GdkEvent *event) {
                                      : this->p[3]));
                 
                 this->npoints = 2;
-                //spanish: eliminamos el último segmento de la curva verde
+                // delete the last segment of the green curve
                 if( this->green_curve->get_segment_count() == 1){
                     this->npoints = 5;
                     if (this->green_bpaths) {
@@ -1270,7 +1267,7 @@ gint PenTool::_handleKeyPress(GdkEvent *event) {
                 }else{
                     this->green_curve->backspace();
                 }
-                //spanish: asignamos el valor de this->p[1] a el opuesto de el ultimo segmento de la línea verde
+                // assign the value of this->p[1] to the oposite of the green line last segment 
                 if(this->spiro){
                     cubic = dynamic_cast<Geom::CubicBezier const *>(this->green_curve->last_segment());
                     if ( cubic ) {
@@ -1285,7 +1282,8 @@ gint PenTool::_handleKeyPress(GdkEvent *event) {
                 this->state = PenTool::POINT;
                 this->_setSubsequentPoint(pt, true);
                 pen_last_paraxial_dir = !pen_last_paraxial_dir;
-                //spanish: redibujamos
+
+                //redraw
                 this->_bspline_spiro_build();
                 ret = TRUE;
             }
@@ -1360,9 +1358,7 @@ void PenTool::_setAngleDistanceStatusMessage(Geom::Point const p, int pc_point_t
     g_string_free(dist, FALSE);
 }
 
-
-
-//spanish: esta función cambia los colores rojo,verde y azul haciendolos transparentes o no en función de si se usa spiro
+// this function changes the colors red, green and blue making them transparent or not, depending on if spiro is being used.
 void PenTool::_bspline_spiro_color()
 {
     bool remake_green_bpaths = false;
@@ -1736,8 +1732,7 @@ void PenTool::_bspline_spiro_end_anchor_off()
     }
 }
 
-
-//spanish: preparates the curves for its trasformation into BSline curves.
+//prepares the curves for its transformation into BSpline curve.
 void PenTool::_bspline_spiro_build()
 {
     if(!this->spiro && !this->bspline)
@@ -1766,7 +1761,7 @@ void PenTool::_bspline_spiro_build()
     }
 
     if(!curve->is_empty()){
-        //spanish: cerramos la curva si estan cerca los puntos finales de la curva
+        // close the curve if the final points of the curve are close enough
         if(Geom::are_near(curve->first_path()->initialPoint(), curve->last_path()->finalPoint())){
             curve->closepath_current();
         }
@@ -1805,7 +1800,7 @@ void PenTool::_bspline_spiro_build()
 
 void PenTool::_bspline_doEffect(SPCurve * curve)
 {
-    //spanish: comentado en funcion "doEffect" de src/live_effects/lpe-bspline.cpp
+    // commenting the function doEffect in src/live_effects/lpe-bspline.cpp
     if(curve->get_segment_count() < 2)
         return;
     Geom::PathVector const original_pathv = curve->get_pathvector();
@@ -1945,7 +1940,7 @@ void PenTool::_bspline_doEffect(SPCurve * curve)
 }
 
 //Spiro function cloned from lpe-spiro.cpp
-//spanish: comentado en funcion "doEffect" de src/live_effects/lpe-spiro.cpp
+// commenting the function "doEffect" from src/live_effects/lpe-spiro.cpp
 void PenTool::_spiro_doEffect(SPCurve * curve)
 {
     using Geom::X;
@@ -2178,7 +2173,7 @@ void PenTool::_finish(gboolean const closed) {
 
     desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Drawing finished"));
 
-    //spanish para cancelar linea sin un segmento creado
+    // cancelate line without a created segment
     this->red_curve->reset();
     spdc_concat_colors_and_flush(this, closed);
     this->sa = NULL;
diff --git a/src/ui/tools/pen-tool.h b/src/ui/tools/pen-tool.h
index 88e528b22..95565abc9 100644
--- a/src/ui/tools/pen-tool.h
+++ b/src/ui/tools/pen-tool.h
@@ -49,7 +49,7 @@ public:
 
     bool polylines_only;
     bool polylines_paraxial;
-    //spanish: propiedad que guarda si el modo Spiro está activo o no
+    // propiety which saves if Spiro mode is active or not
     bool spiro;
     bool bspline;
     int num_clicks;
@@ -88,29 +88,29 @@ private:
 	gint _handleButtonRelease(GdkEventButton const &revent);
 	gint _handle2ButtonPress(GdkEventButton const &bevent);
 	gint _handleKeyPress(GdkEvent *event);
-    //spanish: añade los modos spiro y bspline
+    //adds spiro & bspline modes
     void _pen_context_set_mode(guint mode);
-    //spanish: esta función cambia los colores rojo,verde y azul haciendolos transparentes o no en función de si se usa spiro
+    //this function changes the colors red, green and blue making them transparent or not depending on if the function uses spiro
     void _bspline_spiro_color();
-    //spanish: crea un nodo en modo bspline o spiro
+    //creates a node in bspline or spiro modes
     void _bspline_spiro(bool shift);
-    //spanish: crea un nodo de modo spiro o bspline
+    //creates a node in bspline or spiro modes
     void _bspline_spiro_on();
-    //spanish: crea un nodo de tipo CUSP
+    //creates a CUSP node
     void _bspline_spiro_off();
-    //spanish: continua una curva existente en modo bspline o spiro
+    //continues the existing curve in bspline or spiro mode
     void _bspline_spiro_start_anchor(bool shift);
-    //spanish: continua una curva exsitente con el nodo de union en modo bspline o spiro
+    //continues the existing curve with the union node in bspline or spiro modes
     void _bspline_spiro_start_anchor_on();
-    //spanish: continua una curva existente con el nodo de union en modo CUSP
+    //continues an existing curve with the union node in CUSP mode
     void _bspline_spiro_start_anchor_off();
-    //spanish: modifica la "red_curve" cuando se detecta movimiento
+    //modifies the "red_curve" when it detects movement
     void _bspline_spiro_motion(bool shift);
-    //spanish: cierra la curva con el último nodo en modo bspline o spiro
+    //closes the curve with the last node in bspline or spiro mode
     void _bspline_spiro_end_anchor_on();
-    //spanish: cierra la curva con el último nodo en modo CUSP
+    //closes the curve with the last node in CUSP mode
     void _bspline_spiro_end_anchor_off();
-    //spanish: unimos todas las curvas en juego y llamamos a la función doEffect.
+    //CHECK: join all the curves "in game" and we call doEffect function
     void _bspline_spiro_build();
     //function bspline cloned from lpe-bspline.cpp
     void _bspline_doEffect(SPCurve * curve);
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index bd50672af..1ccdee637 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -685,7 +685,7 @@ void PencilTool::_interpolate() {
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         guint mode = prefs->getInt("/tools/freehand/pencil/freehand-mode", 0);
         for (int c = 0; c < n_segs; c++) {
-            //spanish: si el modo es BSpline modificamos para que el trazado cree los nodos adhoc
+            // if we are in BSpline we modify the trace to create adhoc nodes 
             if(mode == 2){
                 Geom::Point BP = b[4*c+0] + (1./3)*(b[4*c+3] - b[4*c+0]);
                 BP = Geom::Point(BP[X] + 0.0001,BP[Y] + 0.0001);
@@ -835,7 +835,7 @@ void PencilTool::_fitAndSplit() {
         this->red_curve->moveto(b[0]);
         using Geom::X;
         using Geom::Y;
-        //spanish: si el modo es BSpline modificamos para que el trazado cree los nodos adhoc
+            // if we are in BSpline we modify the trace to create adhoc nodes
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         guint mode = prefs->getInt("/tools/freehand/pencil/freehand-mode", 0);
         if(mode == 2){
-- 
cgit v1.2.3


From a9eea1cea2a13f129bcb30f175cea82ffcbcee29 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 5 Mar 2014 20:03:46 +0100
Subject: Translations

(bzr r11950.1.279)
---
 src/ui/tools/freehand-base.cpp | 23 +++++++--------
 src/ui/tools/node-tool.h       |  3 +-
 src/ui/tools/pen-tool.cpp      | 67 +++++++++++++++++++++++-------------------
 src/ui/tools/pen-tool.h        | 26 ++++++++--------
 src/ui/tools/pencil-tool.cpp   |  4 +--
 5 files changed, 63 insertions(+), 60 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 40a257de9..cb6111bd5 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -252,7 +252,7 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
         if (prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1) {
             Effect::createAndApply(SPIRO, dc->desktop->doc(), item);
         }
-        //add the bspline node in the waiting effects
+        //spanish: añadimos el modo bspline a los efectos en espera
         if (prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2) {
             Effect::createAndApply(BSPLINE, dc->desktop->doc(), item);
         }
@@ -496,9 +496,9 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     dc->blue2_curve->reset();
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->blue2_bpath), NULL);
 
-    /* if c is empty, it might be that the user was trying to continue an existing curve and cancelled.
-       if this is the case and we are in bspline or spirolive the previous curve needs to be selected again because
-       we modify it when continuing through an anchor.     */
+    //spanish: si c esta vacio, puede ser que se haya tratado de contnuar una curva existente
+    //y se haya cancelado. Si es asi y el modo es bspline o spirolive la curva previa necesita volver a ser seleccionada
+    //porque la modificamos al continuar por un anchor
     if (c->is_empty()) {
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
             SPDesktop *desktop = dc->desktop;
@@ -527,10 +527,8 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     {
         // We hit bot start and end of single curve, closing paths
         dc->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Closing path."));
-
-        /* if we are in bspline or spirolive mode, the continuation and ending curve are updated when continuing or ending the curve in an anchor.
-           this causes that the original function doesn't detect if it's the same curve in case the curves have multiples parts -shift- and
-           close incorrectly one of the parts */
+        //spanish: si estamos en modo bspline o spirolive, la curva de continuación y finalización es actualizada al continuar o finalizar la curva en un anchor
+        //esto proboca que la función original no detecte si es la misma curva en el caso de curvas con multiples partes -shift- y cierre de manera erronea una de las partes
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
            prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
             if (dc->sa->start && !(dc->sa->curve->is_closed()) ) {
@@ -549,8 +547,8 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
             c->unref();
             dc->sa->curve->closepath_current();
         }
-
-        //if the curve has an bspline or spiro LPE, we execute spdc_flush_white, passing the necessary starting curve.
+        //spanish: Si la curva tiene un LPE del tipo bspline o spiro ejecutamos spdc_flush_white
+        //pasándole la curva de inicio necesaria
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
            prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
             dc->white_curves = g_slist_remove(dc->white_curves, dc->sa->curve);
@@ -681,8 +679,9 @@ SPDrawAnchor *spdc_test_inside(FreehandBase *dc, Geom::Point p)
         }
     }
 
-    /* modify the anchoring curve so it is equal to the starting curve. 
-       this curve is modified when it's modified and we need them to be equal to the closing curve */
+    //spanish: modificamos la curva de anclaje para que sea igual que la curva de inicio.
+    //esta curva fue modificada al continuar la curva y necesitamos que sea igual que la curva en
+    //la que cerramos el trazado.
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if((prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
         prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2) && 
diff --git a/src/ui/tools/node-tool.h b/src/ui/tools/node-tool.h
index 42f89cd1c..168ec995a 100644
--- a/src/ui/tools/node-tool.h
+++ b/src/ui/tools/node-tool.h
@@ -14,8 +14,7 @@
 #include <boost/ptr_container/ptr_map.hpp>
 #include <glib.h>
 #include "ui/tools/tool-base.h"
-
-// we need it to call it from Live Effect
+//spanish: lo necesitamos para llamarlo desde el Live Effect
 #include "selection.h"
 
 namespace Inkscape {
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index e3bbc72b1..ad77fcb53 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -42,7 +42,7 @@
 #include "context-fns.h"
 #include "tools-switch.h"
 #include "ui/control-manager.h"
-// we include the necessary files for BSpline & Spiro
+//spanish: incluimos los archivos necesarios para las BSpline y Spiro
 #include "live_effects/effect.h"
 #include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
@@ -166,7 +166,7 @@ PenTool::~PenTool() {
 void PenTool::setPolylineMode() {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     guint mode = prefs->getInt("/tools/freehand/pen/freehand-mode", 0);
-    // change the nodes to make space for bspline mode
+    //spanish: cambiamos los modos para dar cabida al modo bspline
     this->polylines_only = (mode == 3 || mode == 4);
     this->polylines_paraxial = (mode == 4);
     //we call the function which defines the Spiro modes and the BSpline
@@ -178,7 +178,7 @@ void PenTool::setPolylineMode() {
 *.Set the mode of draw spiro, and bsplines
 */
 void PenTool::_pen_context_set_mode(guint mode) {
-    // define the nodes
+    //spanish: definimos los modos
     this->spiro = (mode == 1);
     this->bspline = (mode == 2);
 }
@@ -386,7 +386,7 @@ gint PenTool::_handleButtonPress(GdkEventButton const &bevent) {
     if(bevent.button != 3 && (this->spiro || this->bspline) && this->npoints > 0 && this->p[0] == this->p[3]){
         this->state = PenTool::STOP;
         if( anchor && anchor == this->sa && this->green_curve->is_empty()){
-            //remove the following line to avoid having one node on top of another
+            //spanish Borrar siguiente linea para evitar un nodo encima de otro
             _finishSegment(event_dt, bevent.state);
             _finish( FALSE);
             return TRUE;
@@ -512,7 +512,7 @@ gint PenTool::_handleButtonPress(GdkEventButton const &bevent) {
                             }
                         }
 
-                        // avoid the creation of a control point so a node is created in the release event
+                        //spanish: evitamos la creación de un punto de control para que se cree el nodo en el evento de soltar
                         this->state = (this->spiro || this->bspline || this->polylines_only) ? PenTool::POINT : PenTool::CONTROL;
 
                         ret = TRUE;
@@ -705,7 +705,7 @@ gint PenTool::_handleMotionNotify(GdkEventMotion const &mevent) {
         default:
             break;
     }
-    // calls the function "bspline_spiro_motion" when the mouse starts or stops moving
+    //spanish: lanzamos la función "bspline_spiro_motion" al moverse el ratón o cuando se para.
     if(this->bspline){
         this->_bspline_spiro_color();
         this->_bspline_spiro_motion(mevent.state & GDK_SHIFT_MASK);
@@ -743,7 +743,9 @@ gint PenTool::_handleButtonRelease(GdkEventButton const &revent) {
         // Test whether we hit any anchor.
 
         SPDrawAnchor *anchor = spdc_test_inside(this, event_w);
-        // if we try to create a node in the same place as another node, we skip
+        //with this we avoid creating a new point over the existing one
+        //spanish: si intentamos crear un nodo en el mismo sitio que el origen, paramos.
+
         if((!anchor || anchor == this->sa) && (this->spiro || this->bspline) && this->npoints > 0 && this->p[0] == this->p[3]){
             return TRUE;
         }
@@ -758,7 +760,7 @@ gint PenTool::_handleButtonRelease(GdkEventButton const &revent) {
                                 p = anchor->dp;
                             }
                             this->sa = anchor;
-                            // continue the existing curve
+                            //spanish: continuamos una curva existente
                             if (anchor) {
                                 if(this->bspline || this->spiro){
                                     this->_bspline_spiro_start_anchor(revent.state & GDK_SHIFT_MASK);;
@@ -788,7 +790,7 @@ gint PenTool::_handleButtonRelease(GdkEventButton const &revent) {
                             this->_endpointSnap(p, revent.state);
                         }
                         this->_finishSegment(p, revent.state);
-                        // hude the guide of the penultimate node when closing the curve
+                        //spanish: ocultamos la guia del penultimo nodo al cerrar la curva
                         if(this->spiro){
                             sp_canvas_item_hide(this->c1);
                         }
@@ -815,7 +817,7 @@ gint PenTool::_handleButtonRelease(GdkEventButton const &revent) {
                     case PenTool::CLOSE:
                         this->_endpointSnap(p, revent.state);
                         this->_finishSegment(p, revent.state);
-                        // hide the penultimate node guide when closing the curve
+                        //spanish: ocultamos la guia del penultimo nodo al cerrar la curva
                         if(this->spiro){
                             sp_canvas_item_hide(this->c1);
                         }
@@ -906,7 +908,7 @@ void PenTool::_redrawAll() {
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(this->red_bpath), this->red_curve);
 
     // handles
-    // hide the handlers in bspline and spiro modes
+    //spanish: ocultamos los tiradores en modo bspline y spiro
     if (this->p[0] != this->p[1] && !this->spiro && !this->bspline) {
         SP_CTRL(this->c1)->moveto(this->p[1]);
         this->cl1->setCoords(this->p[0], this->p[1]);
@@ -920,7 +922,7 @@ void PenTool::_redrawAll() {
     Geom::Curve const * last_seg = this->green_curve->last_segment();
     if (last_seg) {
         Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const *>( last_seg );
-        // hide the handlers in bspline and spiro modes
+        //spanish: ocultamos los tiradores en modo bspline y spiro
         if ( cubic &&
              (*cubic)[2] != this->p[0] && !this->spiro && !this->bspline )
         {
@@ -935,8 +937,9 @@ void PenTool::_redrawAll() {
         }
     }
 
-    // simply redraw the spiro. because its a redrawing, we don't call the global function, 
-    // but we call the redrawing at the ending.
+    //spanish: simplemente redibujamos la spiro.
+    //como es un redibujo simplemente no llamamos a la función global sino al final de esta
+    //Lanzamos solamente el redibujado
      this->_bspline_spiro_build();
 }
 
@@ -966,12 +969,12 @@ void PenTool::_lastpointMoveScreen(gdouble x, gdouble y) {
 }
 
 void PenTool::_lastpointToCurve() {
-    // avoid that if the "red_curve" contains only two points ( rect ), it doesn't stop here.
+    //spanish: evitamos que si la "red_curve" tiene solo dos puntos -recta- no se pare aqui.
     if (this->npoints != 5 && !this->spiro && !this->bspline)
         return;
     Geom::CubicBezier const * cubic;
     this->p[1] = this->red_curve->last_segment()->initialPoint() + (1./3)* (Geom::Point)(this->red_curve->last_segment()->finalPoint() - this->red_curve->last_segment()->initialPoint());
-    //modificate the last segment of the green curve so it creates the type of node we need
+    //spanish: modificamos el último segmento de la curva verde para que forme el tipo de nodo que deseamos
     if(this->spiro||this->bspline){
         if(!this->green_curve->is_empty()){
             Geom::Point A(0,0);
@@ -1009,7 +1012,7 @@ void PenTool::_lastpointToCurve() {
                 this->green_curve->append_continuous(previous, 0.0625);
             }
         }
-        //if the last node is an union with another curve
+        //spanish: si el último nodo es una union con otra curva
         if(this->green_curve->is_empty() && this->sa && !this->sa->curve->is_empty()){
             this->_bspline_spiro_start_anchor(false);
         }
@@ -1020,11 +1023,11 @@ void PenTool::_lastpointToCurve() {
 
 
 void PenTool::_lastpointToLine() {
-    // avoid that if the "red_curve" contains only two points ( rect) it doesn't stop here.
+    //spanish: evitamos que si la "red_curve" tiene solo dos puntos -recta- no se pare aqui.
     if (this->npoints != 5 && !this->bspline)
         return;
 
-    // modify the last segment of the green curve so the type of node we want is created.
+    //spanish: modificamos el último segmento de la curva verde para que forme el tipo de nodo que deseamos
     if(this->spiro || this->bspline){
         if(!this->green_curve->is_empty()){
             Geom::Point A(0,0);
@@ -1056,7 +1059,7 @@ void PenTool::_lastpointToLine() {
                 this->green_curve->append_continuous(previous, 0.0625);
             }
         }
-        // if the last node is an union with another curve
+        //spanish: si el último nodo es una union con otra curva
         if(this->green_curve->is_empty() && this->sa && !this->sa->curve->is_empty()){
             this->_bspline_spiro_start_anchor(true);
         }
@@ -1245,7 +1248,7 @@ gint PenTool::_handleKeyPress(GdkEvent *event) {
                     this->p[1] = this->p[0];
                 }
 
-                // asign the value in a third of the distance of the last segment.
+                //spanish: asignamos el valor a un tercio de distancia del último segmento.
                 if(this->bspline){
                     this->p[1] = this->p[0] + (1./3)*(this->p[3] - this->p[0]);
                 }
@@ -1255,7 +1258,7 @@ gint PenTool::_handleKeyPress(GdkEvent *event) {
                                      : this->p[3]));
                 
                 this->npoints = 2;
-                // delete the last segment of the green curve
+                //spanish: eliminamos el último segmento de la curva verde
                 if( this->green_curve->get_segment_count() == 1){
                     this->npoints = 5;
                     if (this->green_bpaths) {
@@ -1267,7 +1270,7 @@ gint PenTool::_handleKeyPress(GdkEvent *event) {
                 }else{
                     this->green_curve->backspace();
                 }
-                // assign the value of this->p[1] to the oposite of the green line last segment 
+                //spanish: asignamos el valor de this->p[1] a el opuesto de el ultimo segmento de la línea verde
                 if(this->spiro){
                     cubic = dynamic_cast<Geom::CubicBezier const *>(this->green_curve->last_segment());
                     if ( cubic ) {
@@ -1282,8 +1285,7 @@ gint PenTool::_handleKeyPress(GdkEvent *event) {
                 this->state = PenTool::POINT;
                 this->_setSubsequentPoint(pt, true);
                 pen_last_paraxial_dir = !pen_last_paraxial_dir;
-
-                //redraw
+                //spanish: redibujamos
                 this->_bspline_spiro_build();
                 ret = TRUE;
             }
@@ -1358,7 +1360,9 @@ void PenTool::_setAngleDistanceStatusMessage(Geom::Point const p, int pc_point_t
     g_string_free(dist, FALSE);
 }
 
-// this function changes the colors red, green and blue making them transparent or not, depending on if spiro is being used.
+
+
+//spanish: esta función cambia los colores rojo,verde y azul haciendolos transparentes o no en función de si se usa spiro
 void PenTool::_bspline_spiro_color()
 {
     bool remake_green_bpaths = false;
@@ -1732,7 +1736,8 @@ void PenTool::_bspline_spiro_end_anchor_off()
     }
 }
 
-//prepares the curves for its transformation into BSpline curve.
+
+//spanish: preparates the curves for its trasformation into BSline curves.
 void PenTool::_bspline_spiro_build()
 {
     if(!this->spiro && !this->bspline)
@@ -1761,7 +1766,7 @@ void PenTool::_bspline_spiro_build()
     }
 
     if(!curve->is_empty()){
-        // close the curve if the final points of the curve are close enough
+        //spanish: cerramos la curva si estan cerca los puntos finales de la curva
         if(Geom::are_near(curve->first_path()->initialPoint(), curve->last_path()->finalPoint())){
             curve->closepath_current();
         }
@@ -1800,7 +1805,7 @@ void PenTool::_bspline_spiro_build()
 
 void PenTool::_bspline_doEffect(SPCurve * curve)
 {
-    // commenting the function doEffect in src/live_effects/lpe-bspline.cpp
+    //spanish: comentado en funcion "doEffect" de src/live_effects/lpe-bspline.cpp
     if(curve->get_segment_count() < 2)
         return;
     Geom::PathVector const original_pathv = curve->get_pathvector();
@@ -1940,7 +1945,7 @@ void PenTool::_bspline_doEffect(SPCurve * curve)
 }
 
 //Spiro function cloned from lpe-spiro.cpp
-// commenting the function "doEffect" from src/live_effects/lpe-spiro.cpp
+//spanish: comentado en funcion "doEffect" de src/live_effects/lpe-spiro.cpp
 void PenTool::_spiro_doEffect(SPCurve * curve)
 {
     using Geom::X;
@@ -2173,7 +2178,7 @@ void PenTool::_finish(gboolean const closed) {
 
     desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Drawing finished"));
 
-    // cancelate line without a created segment
+    //spanish para cancelar linea sin un segmento creado
     this->red_curve->reset();
     spdc_concat_colors_and_flush(this, closed);
     this->sa = NULL;
diff --git a/src/ui/tools/pen-tool.h b/src/ui/tools/pen-tool.h
index 95565abc9..88e528b22 100644
--- a/src/ui/tools/pen-tool.h
+++ b/src/ui/tools/pen-tool.h
@@ -49,7 +49,7 @@ public:
 
     bool polylines_only;
     bool polylines_paraxial;
-    // propiety which saves if Spiro mode is active or not
+    //spanish: propiedad que guarda si el modo Spiro está activo o no
     bool spiro;
     bool bspline;
     int num_clicks;
@@ -88,29 +88,29 @@ private:
 	gint _handleButtonRelease(GdkEventButton const &revent);
 	gint _handle2ButtonPress(GdkEventButton const &bevent);
 	gint _handleKeyPress(GdkEvent *event);
-    //adds spiro & bspline modes
+    //spanish: añade los modos spiro y bspline
     void _pen_context_set_mode(guint mode);
-    //this function changes the colors red, green and blue making them transparent or not depending on if the function uses spiro
+    //spanish: esta función cambia los colores rojo,verde y azul haciendolos transparentes o no en función de si se usa spiro
     void _bspline_spiro_color();
-    //creates a node in bspline or spiro modes
+    //spanish: crea un nodo en modo bspline o spiro
     void _bspline_spiro(bool shift);
-    //creates a node in bspline or spiro modes
+    //spanish: crea un nodo de modo spiro o bspline
     void _bspline_spiro_on();
-    //creates a CUSP node
+    //spanish: crea un nodo de tipo CUSP
     void _bspline_spiro_off();
-    //continues the existing curve in bspline or spiro mode
+    //spanish: continua una curva existente en modo bspline o spiro
     void _bspline_spiro_start_anchor(bool shift);
-    //continues the existing curve with the union node in bspline or spiro modes
+    //spanish: continua una curva exsitente con el nodo de union en modo bspline o spiro
     void _bspline_spiro_start_anchor_on();
-    //continues an existing curve with the union node in CUSP mode
+    //spanish: continua una curva existente con el nodo de union en modo CUSP
     void _bspline_spiro_start_anchor_off();
-    //modifies the "red_curve" when it detects movement
+    //spanish: modifica la "red_curve" cuando se detecta movimiento
     void _bspline_spiro_motion(bool shift);
-    //closes the curve with the last node in bspline or spiro mode
+    //spanish: cierra la curva con el último nodo en modo bspline o spiro
     void _bspline_spiro_end_anchor_on();
-    //closes the curve with the last node in CUSP mode
+    //spanish: cierra la curva con el último nodo en modo CUSP
     void _bspline_spiro_end_anchor_off();
-    //CHECK: join all the curves "in game" and we call doEffect function
+    //spanish: unimos todas las curvas en juego y llamamos a la función doEffect.
     void _bspline_spiro_build();
     //function bspline cloned from lpe-bspline.cpp
     void _bspline_doEffect(SPCurve * curve);
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index 1ccdee637..bd50672af 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -685,7 +685,7 @@ void PencilTool::_interpolate() {
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         guint mode = prefs->getInt("/tools/freehand/pencil/freehand-mode", 0);
         for (int c = 0; c < n_segs; c++) {
-            // if we are in BSpline we modify the trace to create adhoc nodes 
+            //spanish: si el modo es BSpline modificamos para que el trazado cree los nodos adhoc
             if(mode == 2){
                 Geom::Point BP = b[4*c+0] + (1./3)*(b[4*c+3] - b[4*c+0]);
                 BP = Geom::Point(BP[X] + 0.0001,BP[Y] + 0.0001);
@@ -835,7 +835,7 @@ void PencilTool::_fitAndSplit() {
         this->red_curve->moveto(b[0]);
         using Geom::X;
         using Geom::Y;
-            // if we are in BSpline we modify the trace to create adhoc nodes
+        //spanish: si el modo es BSpline modificamos para que el trazado cree los nodos adhoc
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         guint mode = prefs->getInt("/tools/freehand/pencil/freehand-mode", 0);
         if(mode == 2){
-- 
cgit v1.2.3


From c15e77cc2670408ab725ba60c064743a9b61a375 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 5 Mar 2014 20:18:54 +0100
Subject: Fixing branch problems

(bzr r11950.1.281)
---
 src/ui/tools/freehand-base.cpp | 23 ++++++++-------
 src/ui/tools/node-tool.h       |  3 +-
 src/ui/tools/pen-tool.cpp      | 67 +++++++++++++++++++-----------------------
 src/ui/tools/pen-tool.h        | 26 ++++++++--------
 src/ui/tools/pencil-tool.cpp   |  4 +--
 5 files changed, 60 insertions(+), 63 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index cb6111bd5..40a257de9 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -252,7 +252,7 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
         if (prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1) {
             Effect::createAndApply(SPIRO, dc->desktop->doc(), item);
         }
-        //spanish: añadimos el modo bspline a los efectos en espera
+        //add the bspline node in the waiting effects
         if (prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2) {
             Effect::createAndApply(BSPLINE, dc->desktop->doc(), item);
         }
@@ -496,9 +496,9 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     dc->blue2_curve->reset();
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->blue2_bpath), NULL);
 
-    //spanish: si c esta vacio, puede ser que se haya tratado de contnuar una curva existente
-    //y se haya cancelado. Si es asi y el modo es bspline o spirolive la curva previa necesita volver a ser seleccionada
-    //porque la modificamos al continuar por un anchor
+    /* if c is empty, it might be that the user was trying to continue an existing curve and cancelled.
+       if this is the case and we are in bspline or spirolive the previous curve needs to be selected again because
+       we modify it when continuing through an anchor.     */
     if (c->is_empty()) {
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
             SPDesktop *desktop = dc->desktop;
@@ -527,8 +527,10 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     {
         // We hit bot start and end of single curve, closing paths
         dc->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Closing path."));
-        //spanish: si estamos en modo bspline o spirolive, la curva de continuación y finalización es actualizada al continuar o finalizar la curva en un anchor
-        //esto proboca que la función original no detecte si es la misma curva en el caso de curvas con multiples partes -shift- y cierre de manera erronea una de las partes
+
+        /* if we are in bspline or spirolive mode, the continuation and ending curve are updated when continuing or ending the curve in an anchor.
+           this causes that the original function doesn't detect if it's the same curve in case the curves have multiples parts -shift- and
+           close incorrectly one of the parts */
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
            prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
             if (dc->sa->start && !(dc->sa->curve->is_closed()) ) {
@@ -547,8 +549,8 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
             c->unref();
             dc->sa->curve->closepath_current();
         }
-        //spanish: Si la curva tiene un LPE del tipo bspline o spiro ejecutamos spdc_flush_white
-        //pasándole la curva de inicio necesaria
+
+        //if the curve has an bspline or spiro LPE, we execute spdc_flush_white, passing the necessary starting curve.
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
            prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
             dc->white_curves = g_slist_remove(dc->white_curves, dc->sa->curve);
@@ -679,9 +681,8 @@ SPDrawAnchor *spdc_test_inside(FreehandBase *dc, Geom::Point p)
         }
     }
 
-    //spanish: modificamos la curva de anclaje para que sea igual que la curva de inicio.
-    //esta curva fue modificada al continuar la curva y necesitamos que sea igual que la curva en
-    //la que cerramos el trazado.
+    /* modify the anchoring curve so it is equal to the starting curve. 
+       this curve is modified when it's modified and we need them to be equal to the closing curve */
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if((prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
         prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2) && 
diff --git a/src/ui/tools/node-tool.h b/src/ui/tools/node-tool.h
index 168ec995a..42f89cd1c 100644
--- a/src/ui/tools/node-tool.h
+++ b/src/ui/tools/node-tool.h
@@ -14,7 +14,8 @@
 #include <boost/ptr_container/ptr_map.hpp>
 #include <glib.h>
 #include "ui/tools/tool-base.h"
-//spanish: lo necesitamos para llamarlo desde el Live Effect
+
+// we need it to call it from Live Effect
 #include "selection.h"
 
 namespace Inkscape {
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index ad77fcb53..e3bbc72b1 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -42,7 +42,7 @@
 #include "context-fns.h"
 #include "tools-switch.h"
 #include "ui/control-manager.h"
-//spanish: incluimos los archivos necesarios para las BSpline y Spiro
+// we include the necessary files for BSpline & Spiro
 #include "live_effects/effect.h"
 #include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
@@ -166,7 +166,7 @@ PenTool::~PenTool() {
 void PenTool::setPolylineMode() {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     guint mode = prefs->getInt("/tools/freehand/pen/freehand-mode", 0);
-    //spanish: cambiamos los modos para dar cabida al modo bspline
+    // change the nodes to make space for bspline mode
     this->polylines_only = (mode == 3 || mode == 4);
     this->polylines_paraxial = (mode == 4);
     //we call the function which defines the Spiro modes and the BSpline
@@ -178,7 +178,7 @@ void PenTool::setPolylineMode() {
 *.Set the mode of draw spiro, and bsplines
 */
 void PenTool::_pen_context_set_mode(guint mode) {
-    //spanish: definimos los modos
+    // define the nodes
     this->spiro = (mode == 1);
     this->bspline = (mode == 2);
 }
@@ -386,7 +386,7 @@ gint PenTool::_handleButtonPress(GdkEventButton const &bevent) {
     if(bevent.button != 3 && (this->spiro || this->bspline) && this->npoints > 0 && this->p[0] == this->p[3]){
         this->state = PenTool::STOP;
         if( anchor && anchor == this->sa && this->green_curve->is_empty()){
-            //spanish Borrar siguiente linea para evitar un nodo encima de otro
+            //remove the following line to avoid having one node on top of another
             _finishSegment(event_dt, bevent.state);
             _finish( FALSE);
             return TRUE;
@@ -512,7 +512,7 @@ gint PenTool::_handleButtonPress(GdkEventButton const &bevent) {
                             }
                         }
 
-                        //spanish: evitamos la creación de un punto de control para que se cree el nodo en el evento de soltar
+                        // avoid the creation of a control point so a node is created in the release event
                         this->state = (this->spiro || this->bspline || this->polylines_only) ? PenTool::POINT : PenTool::CONTROL;
 
                         ret = TRUE;
@@ -705,7 +705,7 @@ gint PenTool::_handleMotionNotify(GdkEventMotion const &mevent) {
         default:
             break;
     }
-    //spanish: lanzamos la función "bspline_spiro_motion" al moverse el ratón o cuando se para.
+    // calls the function "bspline_spiro_motion" when the mouse starts or stops moving
     if(this->bspline){
         this->_bspline_spiro_color();
         this->_bspline_spiro_motion(mevent.state & GDK_SHIFT_MASK);
@@ -743,9 +743,7 @@ gint PenTool::_handleButtonRelease(GdkEventButton const &revent) {
         // Test whether we hit any anchor.
 
         SPDrawAnchor *anchor = spdc_test_inside(this, event_w);
-        //with this we avoid creating a new point over the existing one
-        //spanish: si intentamos crear un nodo en el mismo sitio que el origen, paramos.
-
+        // if we try to create a node in the same place as another node, we skip
         if((!anchor || anchor == this->sa) && (this->spiro || this->bspline) && this->npoints > 0 && this->p[0] == this->p[3]){
             return TRUE;
         }
@@ -760,7 +758,7 @@ gint PenTool::_handleButtonRelease(GdkEventButton const &revent) {
                                 p = anchor->dp;
                             }
                             this->sa = anchor;
-                            //spanish: continuamos una curva existente
+                            // continue the existing curve
                             if (anchor) {
                                 if(this->bspline || this->spiro){
                                     this->_bspline_spiro_start_anchor(revent.state & GDK_SHIFT_MASK);;
@@ -790,7 +788,7 @@ gint PenTool::_handleButtonRelease(GdkEventButton const &revent) {
                             this->_endpointSnap(p, revent.state);
                         }
                         this->_finishSegment(p, revent.state);
-                        //spanish: ocultamos la guia del penultimo nodo al cerrar la curva
+                        // hude the guide of the penultimate node when closing the curve
                         if(this->spiro){
                             sp_canvas_item_hide(this->c1);
                         }
@@ -817,7 +815,7 @@ gint PenTool::_handleButtonRelease(GdkEventButton const &revent) {
                     case PenTool::CLOSE:
                         this->_endpointSnap(p, revent.state);
                         this->_finishSegment(p, revent.state);
-                        //spanish: ocultamos la guia del penultimo nodo al cerrar la curva
+                        // hide the penultimate node guide when closing the curve
                         if(this->spiro){
                             sp_canvas_item_hide(this->c1);
                         }
@@ -908,7 +906,7 @@ void PenTool::_redrawAll() {
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(this->red_bpath), this->red_curve);
 
     // handles
-    //spanish: ocultamos los tiradores en modo bspline y spiro
+    // hide the handlers in bspline and spiro modes
     if (this->p[0] != this->p[1] && !this->spiro && !this->bspline) {
         SP_CTRL(this->c1)->moveto(this->p[1]);
         this->cl1->setCoords(this->p[0], this->p[1]);
@@ -922,7 +920,7 @@ void PenTool::_redrawAll() {
     Geom::Curve const * last_seg = this->green_curve->last_segment();
     if (last_seg) {
         Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const *>( last_seg );
-        //spanish: ocultamos los tiradores en modo bspline y spiro
+        // hide the handlers in bspline and spiro modes
         if ( cubic &&
              (*cubic)[2] != this->p[0] && !this->spiro && !this->bspline )
         {
@@ -937,9 +935,8 @@ void PenTool::_redrawAll() {
         }
     }
 
-    //spanish: simplemente redibujamos la spiro.
-    //como es un redibujo simplemente no llamamos a la función global sino al final de esta
-    //Lanzamos solamente el redibujado
+    // simply redraw the spiro. because its a redrawing, we don't call the global function, 
+    // but we call the redrawing at the ending.
      this->_bspline_spiro_build();
 }
 
@@ -969,12 +966,12 @@ void PenTool::_lastpointMoveScreen(gdouble x, gdouble y) {
 }
 
 void PenTool::_lastpointToCurve() {
-    //spanish: evitamos que si la "red_curve" tiene solo dos puntos -recta- no se pare aqui.
+    // avoid that if the "red_curve" contains only two points ( rect ), it doesn't stop here.
     if (this->npoints != 5 && !this->spiro && !this->bspline)
         return;
     Geom::CubicBezier const * cubic;
     this->p[1] = this->red_curve->last_segment()->initialPoint() + (1./3)* (Geom::Point)(this->red_curve->last_segment()->finalPoint() - this->red_curve->last_segment()->initialPoint());
-    //spanish: modificamos el último segmento de la curva verde para que forme el tipo de nodo que deseamos
+    //modificate the last segment of the green curve so it creates the type of node we need
     if(this->spiro||this->bspline){
         if(!this->green_curve->is_empty()){
             Geom::Point A(0,0);
@@ -1012,7 +1009,7 @@ void PenTool::_lastpointToCurve() {
                 this->green_curve->append_continuous(previous, 0.0625);
             }
         }
-        //spanish: si el último nodo es una union con otra curva
+        //if the last node is an union with another curve
         if(this->green_curve->is_empty() && this->sa && !this->sa->curve->is_empty()){
             this->_bspline_spiro_start_anchor(false);
         }
@@ -1023,11 +1020,11 @@ void PenTool::_lastpointToCurve() {
 
 
 void PenTool::_lastpointToLine() {
-    //spanish: evitamos que si la "red_curve" tiene solo dos puntos -recta- no se pare aqui.
+    // avoid that if the "red_curve" contains only two points ( rect) it doesn't stop here.
     if (this->npoints != 5 && !this->bspline)
         return;
 
-    //spanish: modificamos el último segmento de la curva verde para que forme el tipo de nodo que deseamos
+    // modify the last segment of the green curve so the type of node we want is created.
     if(this->spiro || this->bspline){
         if(!this->green_curve->is_empty()){
             Geom::Point A(0,0);
@@ -1059,7 +1056,7 @@ void PenTool::_lastpointToLine() {
                 this->green_curve->append_continuous(previous, 0.0625);
             }
         }
-        //spanish: si el último nodo es una union con otra curva
+        // if the last node is an union with another curve
         if(this->green_curve->is_empty() && this->sa && !this->sa->curve->is_empty()){
             this->_bspline_spiro_start_anchor(true);
         }
@@ -1248,7 +1245,7 @@ gint PenTool::_handleKeyPress(GdkEvent *event) {
                     this->p[1] = this->p[0];
                 }
 
-                //spanish: asignamos el valor a un tercio de distancia del último segmento.
+                // asign the value in a third of the distance of the last segment.
                 if(this->bspline){
                     this->p[1] = this->p[0] + (1./3)*(this->p[3] - this->p[0]);
                 }
@@ -1258,7 +1255,7 @@ gint PenTool::_handleKeyPress(GdkEvent *event) {
                                      : this->p[3]));
                 
                 this->npoints = 2;
-                //spanish: eliminamos el último segmento de la curva verde
+                // delete the last segment of the green curve
                 if( this->green_curve->get_segment_count() == 1){
                     this->npoints = 5;
                     if (this->green_bpaths) {
@@ -1270,7 +1267,7 @@ gint PenTool::_handleKeyPress(GdkEvent *event) {
                 }else{
                     this->green_curve->backspace();
                 }
-                //spanish: asignamos el valor de this->p[1] a el opuesto de el ultimo segmento de la línea verde
+                // assign the value of this->p[1] to the oposite of the green line last segment 
                 if(this->spiro){
                     cubic = dynamic_cast<Geom::CubicBezier const *>(this->green_curve->last_segment());
                     if ( cubic ) {
@@ -1285,7 +1282,8 @@ gint PenTool::_handleKeyPress(GdkEvent *event) {
                 this->state = PenTool::POINT;
                 this->_setSubsequentPoint(pt, true);
                 pen_last_paraxial_dir = !pen_last_paraxial_dir;
-                //spanish: redibujamos
+
+                //redraw
                 this->_bspline_spiro_build();
                 ret = TRUE;
             }
@@ -1360,9 +1358,7 @@ void PenTool::_setAngleDistanceStatusMessage(Geom::Point const p, int pc_point_t
     g_string_free(dist, FALSE);
 }
 
-
-
-//spanish: esta función cambia los colores rojo,verde y azul haciendolos transparentes o no en función de si se usa spiro
+// this function changes the colors red, green and blue making them transparent or not, depending on if spiro is being used.
 void PenTool::_bspline_spiro_color()
 {
     bool remake_green_bpaths = false;
@@ -1736,8 +1732,7 @@ void PenTool::_bspline_spiro_end_anchor_off()
     }
 }
 
-
-//spanish: preparates the curves for its trasformation into BSline curves.
+//prepares the curves for its transformation into BSpline curve.
 void PenTool::_bspline_spiro_build()
 {
     if(!this->spiro && !this->bspline)
@@ -1766,7 +1761,7 @@ void PenTool::_bspline_spiro_build()
     }
 
     if(!curve->is_empty()){
-        //spanish: cerramos la curva si estan cerca los puntos finales de la curva
+        // close the curve if the final points of the curve are close enough
         if(Geom::are_near(curve->first_path()->initialPoint(), curve->last_path()->finalPoint())){
             curve->closepath_current();
         }
@@ -1805,7 +1800,7 @@ void PenTool::_bspline_spiro_build()
 
 void PenTool::_bspline_doEffect(SPCurve * curve)
 {
-    //spanish: comentado en funcion "doEffect" de src/live_effects/lpe-bspline.cpp
+    // commenting the function doEffect in src/live_effects/lpe-bspline.cpp
     if(curve->get_segment_count() < 2)
         return;
     Geom::PathVector const original_pathv = curve->get_pathvector();
@@ -1945,7 +1940,7 @@ void PenTool::_bspline_doEffect(SPCurve * curve)
 }
 
 //Spiro function cloned from lpe-spiro.cpp
-//spanish: comentado en funcion "doEffect" de src/live_effects/lpe-spiro.cpp
+// commenting the function "doEffect" from src/live_effects/lpe-spiro.cpp
 void PenTool::_spiro_doEffect(SPCurve * curve)
 {
     using Geom::X;
@@ -2178,7 +2173,7 @@ void PenTool::_finish(gboolean const closed) {
 
     desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Drawing finished"));
 
-    //spanish para cancelar linea sin un segmento creado
+    // cancelate line without a created segment
     this->red_curve->reset();
     spdc_concat_colors_and_flush(this, closed);
     this->sa = NULL;
diff --git a/src/ui/tools/pen-tool.h b/src/ui/tools/pen-tool.h
index 88e528b22..95565abc9 100644
--- a/src/ui/tools/pen-tool.h
+++ b/src/ui/tools/pen-tool.h
@@ -49,7 +49,7 @@ public:
 
     bool polylines_only;
     bool polylines_paraxial;
-    //spanish: propiedad que guarda si el modo Spiro está activo o no
+    // propiety which saves if Spiro mode is active or not
     bool spiro;
     bool bspline;
     int num_clicks;
@@ -88,29 +88,29 @@ private:
 	gint _handleButtonRelease(GdkEventButton const &revent);
 	gint _handle2ButtonPress(GdkEventButton const &bevent);
 	gint _handleKeyPress(GdkEvent *event);
-    //spanish: añade los modos spiro y bspline
+    //adds spiro & bspline modes
     void _pen_context_set_mode(guint mode);
-    //spanish: esta función cambia los colores rojo,verde y azul haciendolos transparentes o no en función de si se usa spiro
+    //this function changes the colors red, green and blue making them transparent or not depending on if the function uses spiro
     void _bspline_spiro_color();
-    //spanish: crea un nodo en modo bspline o spiro
+    //creates a node in bspline or spiro modes
     void _bspline_spiro(bool shift);
-    //spanish: crea un nodo de modo spiro o bspline
+    //creates a node in bspline or spiro modes
     void _bspline_spiro_on();
-    //spanish: crea un nodo de tipo CUSP
+    //creates a CUSP node
     void _bspline_spiro_off();
-    //spanish: continua una curva existente en modo bspline o spiro
+    //continues the existing curve in bspline or spiro mode
     void _bspline_spiro_start_anchor(bool shift);
-    //spanish: continua una curva exsitente con el nodo de union en modo bspline o spiro
+    //continues the existing curve with the union node in bspline or spiro modes
     void _bspline_spiro_start_anchor_on();
-    //spanish: continua una curva existente con el nodo de union en modo CUSP
+    //continues an existing curve with the union node in CUSP mode
     void _bspline_spiro_start_anchor_off();
-    //spanish: modifica la "red_curve" cuando se detecta movimiento
+    //modifies the "red_curve" when it detects movement
     void _bspline_spiro_motion(bool shift);
-    //spanish: cierra la curva con el último nodo en modo bspline o spiro
+    //closes the curve with the last node in bspline or spiro mode
     void _bspline_spiro_end_anchor_on();
-    //spanish: cierra la curva con el último nodo en modo CUSP
+    //closes the curve with the last node in CUSP mode
     void _bspline_spiro_end_anchor_off();
-    //spanish: unimos todas las curvas en juego y llamamos a la función doEffect.
+    //CHECK: join all the curves "in game" and we call doEffect function
     void _bspline_spiro_build();
     //function bspline cloned from lpe-bspline.cpp
     void _bspline_doEffect(SPCurve * curve);
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index bd50672af..1ccdee637 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -685,7 +685,7 @@ void PencilTool::_interpolate() {
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         guint mode = prefs->getInt("/tools/freehand/pencil/freehand-mode", 0);
         for (int c = 0; c < n_segs; c++) {
-            //spanish: si el modo es BSpline modificamos para que el trazado cree los nodos adhoc
+            // if we are in BSpline we modify the trace to create adhoc nodes 
             if(mode == 2){
                 Geom::Point BP = b[4*c+0] + (1./3)*(b[4*c+3] - b[4*c+0]);
                 BP = Geom::Point(BP[X] + 0.0001,BP[Y] + 0.0001);
@@ -835,7 +835,7 @@ void PencilTool::_fitAndSplit() {
         this->red_curve->moveto(b[0]);
         using Geom::X;
         using Geom::Y;
-        //spanish: si el modo es BSpline modificamos para que el trazado cree los nodos adhoc
+            // if we are in BSpline we modify the trace to create adhoc nodes
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         guint mode = prefs->getInt("/tools/freehand/pencil/freehand-mode", 0);
         if(mode == 2){
-- 
cgit v1.2.3


From eb7c3f5dc2737bb22388b040f857117c3a25da6f Mon Sep 17 00:00:00 2001
From: root <root@jtx.marker.es>
Date: Thu, 6 Mar 2014 15:21:30 +0100
Subject: Fixed a bug when click over the previuos node in bspline/spiro mode

(bzr r11950.1.285)
---
 src/ui/tools/pen-tool.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index e3bbc72b1..d79803644 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -384,7 +384,6 @@ gint PenTool::_handleButtonPress(GdkEventButton const &bevent) {
 
     //with this we avoid creating a new point over the existing one
     if(bevent.button != 3 && (this->spiro || this->bspline) && this->npoints > 0 && this->p[0] == this->p[3]){
-        this->state = PenTool::STOP;
         if( anchor && anchor == this->sa && this->green_curve->is_empty()){
             //remove the following line to avoid having one node on top of another
             _finishSegment(event_dt, bevent.state);
-- 
cgit v1.2.3


From 9e33a22a12381e538c26580798934eb418f62bbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20dos=20Santos=20Oliveira?=
 <vini.ipsmaker@gmail.com>
Date: Sun, 9 Mar 2014 22:06:46 -0300
Subject: Shortening code through removal of variable declaration used only at
 one place.

(bzr r11950.6.1)
---
 src/ui/tools/freehand-base.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 40a257de9..4b7a310e3 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -501,8 +501,7 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
        we modify it when continuing through an anchor.     */
     if (c->is_empty()) {
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
-            SPDesktop *desktop = dc->desktop;
-            spdc_selection_modified(sp_desktop_selection(desktop), 0, dc);
+            spdc_selection_modified(sp_desktop_selection(dc->desktop), 0, dc);
         }
         c->unref();
         return;
-- 
cgit v1.2.3


From 4b8c6b64ba7ac54955cc68aa6ad18c67b57ef5fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20dos=20Santos=20Oliveira?=
 <vini.ipsmaker@gmail.com>
Date: Sun, 9 Mar 2014 23:20:18 -0300
Subject: Removing repeated condition logical test to make the code more
 readable and easier to follow.

(bzr r11950.6.2)
---
 src/ui/tools/freehand-base.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 4b7a310e3..3f74a5147 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -540,6 +540,11 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
             if(Geom::are_near(dc->sa->curve->first_path()->initialPoint(), dc->ea->dp)){
                 dc->sa->curve->closepath_current();
             }
+
+            // if the curve has an bspline or spiro LPE, we execute
+            // spdc_flush_white, passing the necessary starting curve.
+            dc->white_curves = g_slist_remove(dc->white_curves, dc->sa->curve);
+            spdc_flush_white(dc, dc->sa->curve);
         }else{
             if (dc->sa->start && !(dc->sa->curve->is_closed()) ) {
                 c = reverse_then_unref(c);
@@ -547,16 +552,9 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
             dc->sa->curve->append_continuous(c, 0.0625);
             c->unref();
             dc->sa->curve->closepath_current();
-        }
-
-        //if the curve has an bspline or spiro LPE, we execute spdc_flush_white, passing the necessary starting curve.
-        if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
-           prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
-            dc->white_curves = g_slist_remove(dc->white_curves, dc->sa->curve);
-            spdc_flush_white(dc, dc->sa->curve);
-        }else{
             spdc_flush_white(dc, NULL);
         }
+
         return;
     }
 
-- 
cgit v1.2.3


From c1c76126846e36fab78a51e5acec475b4de5ea44 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 19 Mar 2014 21:54:30 +0100
Subject: This think fix su_v related bug on continuous paths in BSpline or
 Spiro mode

(bzr r11950.1.301)
---
 src/ui/tools/freehand-base.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 3f74a5147..67b603ab0 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -495,7 +495,7 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     // Blue2
     dc->blue2_curve->reset();
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->blue2_bpath), NULL);
-
+  
     /* if c is empty, it might be that the user was trying to continue an existing curve and cancelled.
        if this is the case and we are in bspline or spirolive the previous curve needs to be selected again because
        we modify it when continuing through an anchor.     */
@@ -614,6 +614,18 @@ static void spdc_flush_white(FreehandBase *dc, SPCurve *gc)
 
         bool has_lpe = false;
         Inkscape::XML::Node *repr;
+
+        /* if we are in bspline or spirolive the anchors curves, if exist, needs to be selected again because
+        we modify it when continuing through an anchor.     */
+        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+        if ( ((dc->sa && !dc->sa->curve->is_empty()) ||
+             (dc->ea && !dc->ea->curve->is_empty())) &&
+             (prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 ||
+             prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2)
+            ) {
+                spdc_selection_modified(sp_desktop_selection(dc->desktop), 0, dc);
+        }
+
         if (dc->white_item) {
             repr = dc->white_item->getRepr();
             has_lpe = SP_LPE_ITEM(dc->white_item)->hasPathEffectRecursive();
-- 
cgit v1.2.3


From c6e50a519c55220ccd4efdd6a7a7dbe51cf9fa04 Mon Sep 17 00:00:00 2001
From: root <root@jtx.marker.es>
Date: Wed, 19 Mar 2014 22:49:07 +0100
Subject: Fixing suv mac bug continuing existing bsplines/spiro paths

(bzr r11950.1.303)
---
 src/ui/tools/freehand-base.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 67b603ab0..d34ca2142 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -566,7 +566,7 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
             s = reverse_then_unref(s);
         }
         s->append_continuous(c, 0.0625);
-        c->unref();
+        c->reset();
         c = s;
     } else /* Step D - test end */ if (dc->ea) {
         SPCurve *e = dc->ea->curve;
-- 
cgit v1.2.3


From 988c4a1639ca097634e336d49ad92eb1eb576f31 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 19 Mar 2014 23:05:50 +0100
Subject: Fix a bug when starting path with change from bspline to spiro and
 inverse

(bzr r11950.1.304)
---
 src/ui/tools/pen-tool.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index d79803644..75dd6a32b 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1445,6 +1445,10 @@ void PenTool::_bspline_spiro_off()
 
 void PenTool::_bspline_spiro_start_anchor(bool shift)
 {
+    if(this->sa->curve->is_empty()){
+        return;
+    }
+
     LivePathEffect::LPEBSpline *lpe_bsp = NULL;
 
     if (SP_IS_LPE_ITEM(this->white_item) && SP_LPE_ITEM(this->white_item)->hasPathEffect()){
@@ -1474,9 +1478,6 @@ void PenTool::_bspline_spiro_start_anchor(bool shift)
     if(!this->spiro && !this->bspline)
         return;
 
-    if(this->sa->curve->is_empty())
-        return;
-
     if(shift)
         this->_bspline_spiro_start_anchor_off();
     else
-- 
cgit v1.2.3


From 67a180fdd31fd8dd06be4df75356509001295458 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Thu, 20 Mar 2014 01:48:37 +0100
Subject: Refactor of anchors

(bzr r11950.1.306)
---
 src/ui/tools/freehand-base.cpp | 97 +++++++++++++++++-------------------------
 src/ui/tools/freehand-base.h   |  2 +
 src/ui/tools/pen-tool.cpp      | 18 ++++----
 3 files changed, 50 insertions(+), 67 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index d34ca2142..5897ce0ee 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -492,17 +492,7 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     dc->red_curve->reset();
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->red_bpath), NULL);
 
-    // Blue2
-    dc->blue2_curve->reset();
-    sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->blue2_bpath), NULL);
-  
-    /* if c is empty, it might be that the user was trying to continue an existing curve and cancelled.
-       if this is the case and we are in bspline or spirolive the previous curve needs to be selected again because
-       we modify it when continuing through an anchor.     */
     if (c->is_empty()) {
-        if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
-            spdc_selection_modified(sp_desktop_selection(dc->desktop), 0, dc);
-        }
         c->unref();
         return;
     }
@@ -526,50 +516,43 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     {
         // We hit bot start and end of single curve, closing paths
         dc->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Closing path."));
-
-        /* if we are in bspline or spirolive mode, the continuation and ending curve are updated when continuing or ending the curve in an anchor.
-           this causes that the original function doesn't detect if it's the same curve in case the curves have multiples parts -shift- and
-           close incorrectly one of the parts */
+        if (dc->sa->start && !(dc->sa->curve->is_closed()) ) {
+            c = reverse_then_unref(c);
+        }
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
-           prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
-            if (dc->sa->start && !(dc->sa->curve->is_closed()) ) {
-                dc->sa->curve = reverse_then_unref(dc->sa->curve);
-            }
-            dc->sa->curve->append_continuous(c, 0.0625);
+            prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
+            dc->sc->append_continuous(c, 0.0625);
             c->unref();
-            if(Geom::are_near(dc->sa->curve->first_path()->initialPoint(), dc->ea->dp)){
-                dc->sa->curve->closepath_current();
-            }
-
-            // if the curve has an bspline or spiro LPE, we execute
-            // spdc_flush_white, passing the necessary starting curve.
-            dc->white_curves = g_slist_remove(dc->white_curves, dc->sa->curve);
-            spdc_flush_white(dc, dc->sa->curve);
+            dc->sc->closepath_current();
         }else{
-            if (dc->sa->start && !(dc->sa->curve->is_closed()) ) {
-                c = reverse_then_unref(c);
-            }
             dc->sa->curve->append_continuous(c, 0.0625);
             c->unref();
             dc->sa->curve->closepath_current();
-            spdc_flush_white(dc, NULL);
         }
-
+        spdc_flush_white(dc, NULL);
         return;
     }
 
     // Step C - test start
     if (dc->sa) {
         SPCurve *s = dc->sa->curve;
+        if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
+            prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
+                s = dc->sc;
+        }
         dc->white_curves = g_slist_remove(dc->white_curves, s);
         if (dc->sa->start) {
             s = reverse_then_unref(s);
         }
         s->append_continuous(c, 0.0625);
-        c->reset();
+        c->unref();
         c = s;
     } else /* Step D - test end */ if (dc->ea) {
         SPCurve *e = dc->ea->curve;
+        if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
+            prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
+                e = dc->ec;
+        }
         dc->white_curves = g_slist_remove(dc->white_curves, e);
         if (!dc->ea->start) {
             e = reverse_then_unref(e);
@@ -577,16 +560,30 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
         c->append_continuous(e, 0.0625);
         e->unref();
     }
+
+
     spdc_flush_white(dc, c);
+
     c->unref();
 }
 
 static void spdc_flush_white(FreehandBase *dc, SPCurve *gc)
 {
     SPCurve *c;
-
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if (dc->white_curves) {
         g_assert(dc->white_item);
+        if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
+           prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
+                if(dc->sa){
+                    dc->white_curves = g_slist_remove(dc->white_curves, dc->sa->curve);
+                    dc->white_curves = g_slist_append(dc->white_curves, dc->sc);
+                }
+                if(dc->ea){
+                    dc->white_curves = g_slist_remove(dc->white_curves, dc->ea->curve);
+                    dc->white_curves = g_slist_append(dc->white_curves, dc->ec);
+                }
+        }
         c = SPCurve::concat(dc->white_curves);
         g_slist_free(dc->white_curves);
         dc->white_curves = NULL;
@@ -615,17 +612,6 @@ static void spdc_flush_white(FreehandBase *dc, SPCurve *gc)
         bool has_lpe = false;
         Inkscape::XML::Node *repr;
 
-        /* if we are in bspline or spirolive the anchors curves, if exist, needs to be selected again because
-        we modify it when continuing through an anchor.     */
-        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-        if ( ((dc->sa && !dc->sa->curve->is_empty()) ||
-             (dc->ea && !dc->ea->curve->is_empty())) &&
-             (prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 ||
-             prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2)
-            ) {
-                spdc_selection_modified(sp_desktop_selection(dc->desktop), 0, dc);
-        }
-
         if (dc->white_item) {
             repr = dc->white_item->getRepr();
             has_lpe = SP_LPE_ITEM(dc->white_item)->hasPathEffectRecursive();
@@ -689,19 +675,6 @@ SPDrawAnchor *spdc_test_inside(FreehandBase *dc, Geom::Point p)
             active = na;
         }
     }
-
-    /* modify the anchoring curve so it is equal to the starting curve. 
-       this curve is modified when it's modified and we need them to be equal to the closing curve */
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    if((prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
-        prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2) && 
-        dc->sa && !dc->red_curve->is_empty() && !dc->green_anchor){
-        if(active){
-            active->curve = dc->sa->curve;
-            active->curve->ref();
-        }
-    }
-
     return active;
 }
 
@@ -750,6 +723,14 @@ static void spdc_free_colors(FreehandBase *dc)
         dc->blue2_curve = dc->blue2_curve->unref();
     }
 
+    if (dc->sc) {
+        dc->sc = dc->sc->unref();
+    }
+
+    if (dc->ec) {
+        dc->ec = dc->ec->unref();
+    }
+
     // Green
     while (dc->green_bpaths) {
         sp_canvas_item_destroy(SP_CANVAS_ITEM(dc->green_bpaths->data));
diff --git a/src/ui/tools/freehand-base.h b/src/ui/tools/freehand-base.h
index d5c2fc9ba..266e22783 100644
--- a/src/ui/tools/freehand-base.h
+++ b/src/ui/tools/freehand-base.h
@@ -74,9 +74,11 @@ public:
 
     // Start anchor
     SPDrawAnchor *sa;
+    SPCurve * sc;
 
     // End anchor
     SPDrawAnchor *ea;
+    SPCurve * ec;
 
     /* type of the LPE that is to be applied automatically to a finished path (if any) */
     Inkscape::LivePathEffect::EffectType waiting_LPE_type;
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 75dd6a32b..1701cf5d9 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1516,8 +1516,8 @@ void PenTool::_bspline_spiro_start_anchor_on()
     if (this->sa->start) {
         tmpCurve = tmpCurve->create_reverse();
     }
-    this->sa->curve->reset();
-    this->sa->curve = tmpCurve;
+    this->sc->reset();
+    this->sc = tmpCurve;
 }
 
 void PenTool::_bspline_spiro_start_anchor_off()
@@ -1542,8 +1542,8 @@ void PenTool::_bspline_spiro_start_anchor_off()
         if (this->sa->start) {
             tmpCurve = tmpCurve->create_reverse();
         }
-        this->sa->curve->reset();
-        this->sa->curve = tmpCurve;
+        this->sc->reset();
+        this->sc = tmpCurve;
     }
 
 }
@@ -1677,8 +1677,8 @@ void PenTool::_bspline_spiro_end_anchor_on()
         if (!this->sa->start) {
             tmpCurve = tmpCurve->create_reverse();
         }
-        this->sa->curve->reset();
-        this->sa->curve = tmpCurve;
+        this->sc->reset();
+        this->sc = tmpCurve;
     }
 }
 
@@ -1726,8 +1726,8 @@ void PenTool::_bspline_spiro_end_anchor_off()
             if (!this->sa->start) {
                 tmpCurve = tmpCurve->create_reverse();
             }
-            this->sa->curve->reset();
-            this->sa->curve = tmpCurve;
+            this->sc->reset();
+            this->sc = tmpCurve;
         }
     }
 }
@@ -1742,7 +1742,7 @@ void PenTool::_bspline_spiro_build()
     SPCurve *curve = new SPCurve();
     //If we continuate the existing curve we add it at the start
     if(this->sa && !this->sa->curve->is_empty()){
-        curve = this->sa->curve->copy();
+        curve = this->sc->copy();
         if (this->sa->start) {
             curve = curve->create_reverse();
         }
-- 
cgit v1.2.3


From 9c0d852d84da8af9cbb07ee2ed0488390225f126 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Thu, 20 Mar 2014 03:27:13 +0100
Subject: Full refactor of path continuations in bspline-spirolive mode, I
 think no more suv mac crashes, but need to be full tested again because a lot
 of things changed.

(bzr r11950.1.308)
---
 src/ui/tools/freehand-base.cpp | 37 +++++++++++++++----------------------
 src/ui/tools/freehand-base.h   |  4 ++--
 src/ui/tools/pen-tool.cpp      |  5 ++---
 src/ui/tools/pencil-tool.cpp   |  3 +++
 4 files changed, 22 insertions(+), 27 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 5897ce0ee..cecf0c0ca 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -92,7 +92,9 @@ FreehandBase::FreehandBase(gchar const *const *cursor_shape, gint hot_x, gint ho
     , white_curves(NULL)
     , white_anchors(NULL)
     , sa(NULL)
+    , sc(NULL)
     , ea(NULL)
+    , ec(NULL)
     , waiting_LPE_type(Inkscape::LivePathEffect::INVALID_LPE)
     , red_curve_is_valid(false)
     , anchor_statusbar(false)
@@ -153,6 +155,12 @@ void FreehandBase::setup() {
     this->green_anchor = NULL;
     this->green_closed = FALSE;
 
+    // Create start anchor alternative curve
+    this->sc = new SPCurve();
+    
+    // Create end anchor alternative curve
+    this->ec = new SPCurve();
+
     this->attach = TRUE;
     spdc_attach_selection(this, this->selection);
 }
@@ -524,6 +532,10 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
             dc->sc->append_continuous(c, 0.0625);
             c->unref();
             dc->sc->closepath_current();
+            if(dc->sa){
+                dc->white_curves = g_slist_remove(dc->white_curves, dc->sa->curve);
+                dc->white_curves = g_slist_append(dc->white_curves, dc->sc);
+            }
         }else{
             dc->sa->curve->append_continuous(c, 0.0625);
             c->unref();
@@ -536,11 +548,11 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     // Step C - test start
     if (dc->sa) {
         SPCurve *s = dc->sa->curve;
+        dc->white_curves = g_slist_remove(dc->white_curves, s);
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
             prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
                 s = dc->sc;
         }
-        dc->white_curves = g_slist_remove(dc->white_curves, s);
         if (dc->sa->start) {
             s = reverse_then_unref(s);
         }
@@ -549,11 +561,11 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
         c = s;
     } else /* Step D - test end */ if (dc->ea) {
         SPCurve *e = dc->ea->curve;
+        dc->white_curves = g_slist_remove(dc->white_curves, e);
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
             prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
                 e = dc->ec;
         }
-        dc->white_curves = g_slist_remove(dc->white_curves, e);
         if (!dc->ea->start) {
             e = reverse_then_unref(e);
         }
@@ -570,20 +582,9 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
 static void spdc_flush_white(FreehandBase *dc, SPCurve *gc)
 {
     SPCurve *c;
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+
     if (dc->white_curves) {
         g_assert(dc->white_item);
-        if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
-           prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
-                if(dc->sa){
-                    dc->white_curves = g_slist_remove(dc->white_curves, dc->sa->curve);
-                    dc->white_curves = g_slist_append(dc->white_curves, dc->sc);
-                }
-                if(dc->ea){
-                    dc->white_curves = g_slist_remove(dc->white_curves, dc->ea->curve);
-                    dc->white_curves = g_slist_append(dc->white_curves, dc->ec);
-                }
-        }
         c = SPCurve::concat(dc->white_curves);
         g_slist_free(dc->white_curves);
         dc->white_curves = NULL;
@@ -723,14 +724,6 @@ static void spdc_free_colors(FreehandBase *dc)
         dc->blue2_curve = dc->blue2_curve->unref();
     }
 
-    if (dc->sc) {
-        dc->sc = dc->sc->unref();
-    }
-
-    if (dc->ec) {
-        dc->ec = dc->ec->unref();
-    }
-
     // Green
     while (dc->green_bpaths) {
         sp_canvas_item_destroy(SP_CANVAS_ITEM(dc->green_bpaths->data));
diff --git a/src/ui/tools/freehand-base.h b/src/ui/tools/freehand-base.h
index 266e22783..c134c5352 100644
--- a/src/ui/tools/freehand-base.h
+++ b/src/ui/tools/freehand-base.h
@@ -74,11 +74,11 @@ public:
 
     // Start anchor
     SPDrawAnchor *sa;
-    SPCurve * sc;
+    SPCurve *sc;
 
     // End anchor
     SPDrawAnchor *ea;
-    SPCurve * ec;
+    SPCurve *ec;
 
     /* type of the LPE that is to be applied automatically to a finished path (if any) */
     Inkscape::LivePathEffect::EffectType waiting_LPE_type;
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 1701cf5d9..3ef9b96af 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1516,7 +1516,6 @@ void PenTool::_bspline_spiro_start_anchor_on()
     if (this->sa->start) {
         tmpCurve = tmpCurve->create_reverse();
     }
-    this->sc->reset();
     this->sc = tmpCurve;
 }
 
@@ -1542,7 +1541,6 @@ void PenTool::_bspline_spiro_start_anchor_off()
         if (this->sa->start) {
             tmpCurve = tmpCurve->create_reverse();
         }
-        this->sc->reset();
         this->sc = tmpCurve;
     }
 
@@ -1677,7 +1675,6 @@ void PenTool::_bspline_spiro_end_anchor_on()
         if (!this->sa->start) {
             tmpCurve = tmpCurve->create_reverse();
         }
-        this->sc->reset();
         this->sc = tmpCurve;
     }
 }
@@ -2176,6 +2173,8 @@ void PenTool::_finish(gboolean const closed) {
     // cancelate line without a created segment
     this->red_curve->reset();
     spdc_concat_colors_and_flush(this, closed);
+    this->sc = NULL;
+    this->ec = NULL;
     this->sa = NULL;
     this->ea = NULL;
 
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index 1ccdee637..8fe01a852 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -203,6 +203,7 @@ gint PencilTool::_handleButtonPress(GdkEventButton const &bevent) {
                 }
                 if (anchor) {
                     p = anchor->dp;
+                    this->sc = anchor->curve;
                     desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Continuing selected path"));
                 } else {
                     m.setup(desktop);
@@ -380,6 +381,7 @@ gint PencilTool::_handleButtonRelease(GdkEventButton const &revent) {
                 /* Finish segment now */
                 if (anchor) {
                     p = anchor->dp;
+                    this->ec = anchor->curve;
                 } else {
                     this->_endpointSnap(p, revent.state);
                 }
@@ -406,6 +408,7 @@ gint PencilTool::_handleButtonRelease(GdkEventButton const &revent) {
                     /// \todo fixme: Clean up what follows (Lauris)
                     if (anchor) {
                         p = anchor->dp;
+                        this->ec = anchor->curve;
                     } else {
                         Geom::Point p_end = p;
                         this->_endpointSnap(p_end, revent.state);
-- 
cgit v1.2.3


From 8dee559ebb54fa7e1ef995b71713c0685b333d60 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Thu, 20 Mar 2014 03:35:35 +0100
Subject: Removed persistent blue line

(bzr r11950.1.309)
---
 src/ui/tools/freehand-base.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index cecf0c0ca..ac98be2cf 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -493,6 +493,10 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     dc->blue_curve->reset();
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->blue_bpath), NULL);
 
+    // Blue2
+    dc->blue2_curve->reset();
+    sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->blue2_bpath), NULL);
+
     // Red
     if (dc->red_curve_is_valid) {
         c->append_continuous(dc->red_curve, 0.0625);
-- 
cgit v1.2.3


From 1ee8c21b5cfe9efa827eed7ab5e31fe28a9b4ae1 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Thu, 20 Mar 2014 03:39:27 +0100
Subject: Fixed bug continuing cusp nodes

(bzr r11950.1.310)
---
 src/ui/tools/pen-tool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 3ef9b96af..cea8e67e6 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1563,7 +1563,7 @@ void PenTool::_bspline_spiro_motion(bool shift){
     }else if(!this->green_curve->is_empty()){
         tmpCurve = this->green_curve->copy();
     }else{
-        tmpCurve = this->sa->curve->copy();
+        tmpCurve = this->sc->copy();
         if(this->sa->start)
             tmpCurve = tmpCurve->create_reverse();
     }
-- 
cgit v1.2.3


From e65f0ccd07f3b1278ba389025af29df498a3b3ab Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 31 Mar 2014 16:38:26 +0200
Subject: =?UTF-8?q?clarify=20the=20'sc'=20and=20'ec'=20SPCurve,=20by=20poi?=
 =?UTF-8?q?nt=20of=20Vin=C3=ADcius,=20whith=20the=20result=20of=20one=20cu?=
 =?UTF-8?q?rve=20less=20in=20the=20header?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(bzr r11950.1.320)
---
 src/ui/tools/freehand-base.cpp | 20 ++++++--------------
 src/ui/tools/freehand-base.h   |  7 +++++--
 src/ui/tools/pen-tool.cpp      | 18 ++++++++----------
 src/ui/tools/pencil-tool.cpp   |  4 +---
 4 files changed, 20 insertions(+), 29 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index ac98be2cf..04796c2a6 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -91,10 +91,9 @@ FreehandBase::FreehandBase(gchar const *const *cursor_shape, gint hot_x, gint ho
     , white_item(NULL)
     , white_curves(NULL)
     , white_anchors(NULL)
+    , overwriteCurve(NULL)
     , sa(NULL)
-    , sc(NULL)
     , ea(NULL)
-    , ec(NULL)
     , waiting_LPE_type(Inkscape::LivePathEffect::INVALID_LPE)
     , red_curve_is_valid(false)
     , anchor_statusbar(false)
@@ -156,10 +155,7 @@ void FreehandBase::setup() {
     this->green_closed = FALSE;
 
     // Create start anchor alternative curve
-    this->sc = new SPCurve();
-    
-    // Create end anchor alternative curve
-    this->ec = new SPCurve();
+    this->overwriteCurve = new SPCurve();
 
     this->attach = TRUE;
     spdc_attach_selection(this, this->selection);
@@ -533,12 +529,12 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
         }
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
             prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
-            dc->sc->append_continuous(c, 0.0625);
+            dc->overwriteCurve->append_continuous(c, 0.0625);
             c->unref();
-            dc->sc->closepath_current();
+            dc->overwriteCurve->closepath_current();
             if(dc->sa){
                 dc->white_curves = g_slist_remove(dc->white_curves, dc->sa->curve);
-                dc->white_curves = g_slist_append(dc->white_curves, dc->sc);
+                dc->white_curves = g_slist_append(dc->white_curves, dc->overwriteCurve);
             }
         }else{
             dc->sa->curve->append_continuous(c, 0.0625);
@@ -555,7 +551,7 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
         dc->white_curves = g_slist_remove(dc->white_curves, s);
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
             prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
-                s = dc->sc;
+                s = dc->overwriteCurve;
         }
         if (dc->sa->start) {
             s = reverse_then_unref(s);
@@ -566,10 +562,6 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     } else /* Step D - test end */ if (dc->ea) {
         SPCurve *e = dc->ea->curve;
         dc->white_curves = g_slist_remove(dc->white_curves, e);
-        if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
-            prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
-                e = dc->ec;
-        }
         if (!dc->ea->start) {
             e = reverse_then_unref(e);
         }
diff --git a/src/ui/tools/freehand-base.h b/src/ui/tools/freehand-base.h
index 2422c3563..6e04e03b7 100644
--- a/src/ui/tools/freehand-base.h
+++ b/src/ui/tools/freehand-base.h
@@ -79,13 +79,16 @@ public:
     GSList *white_curves;
     GSList *white_anchors;
 
+    //ALternative curve to use on continuing exisiting curve in case of bspline or spirolive 
+    //because usigh anchor curves give memory and random bugs, - and obscure code- in some plataform reported by su_v in mac
+    SPCurve *overwriteCurve;
+
     // Start anchor
     SPDrawAnchor *sa;
-    SPCurve *sc;
 
     // End anchor
     SPDrawAnchor *ea;
-    SPCurve *ec;
+
 
     /* type of the LPE that is to be applied automatically to a finished path (if any) */
     Inkscape::LivePathEffect::EffectType waiting_LPE_type;
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 053f1ac3d..1c0394e15 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -378,7 +378,6 @@ bool PenTool::_handleButtonPress(GdkEventButton const &bevent) {
     Geom::Point event_dt(desktop->w2d(event_w));
     //Test whether we hit any anchor.
     SPDrawAnchor * const anchor = spdc_test_inside(this, event_w);
-    ToolBase *event_context = SP_EVENT_CONTEXT(this);
 
     //with this we avoid creating a new point over the existing one
     if(bevent.button != 3 && (this->spiro || this->bspline) && this->npoints > 0 && this->p[0] == this->p[3]){
@@ -1535,7 +1534,7 @@ void PenTool::_bspline_spiro_start_anchor_on()
     if (this->sa->start) {
         tmpCurve = tmpCurve->create_reverse();
     }
-    this->sc = tmpCurve;
+    this->overwriteCurve = tmpCurve;
 }
 
 void PenTool::_bspline_spiro_start_anchor_off()
@@ -1560,7 +1559,7 @@ void PenTool::_bspline_spiro_start_anchor_off()
         if (this->sa->start) {
             tmpCurve = tmpCurve->create_reverse();
         }
-        this->sc = tmpCurve;
+        this->overwriteCurve = tmpCurve;
     }
 
 }
@@ -1582,7 +1581,7 @@ void PenTool::_bspline_spiro_motion(bool shift){
     }else if(!this->green_curve->is_empty()){
         tmpCurve = this->green_curve->copy();
     }else{
-        tmpCurve = this->sc->copy();
+        tmpCurve = this->overwriteCurve->copy();
         if(this->sa->start)
             tmpCurve = tmpCurve->create_reverse();
     }
@@ -1694,7 +1693,7 @@ void PenTool::_bspline_spiro_end_anchor_on()
         if (!this->sa->start) {
             tmpCurve = tmpCurve->create_reverse();
         }
-        this->sc = tmpCurve;
+        this->overwriteCurve = tmpCurve;
     }
 }
 
@@ -1742,8 +1741,8 @@ void PenTool::_bspline_spiro_end_anchor_off()
             if (!this->sa->start) {
                 tmpCurve = tmpCurve->create_reverse();
             }
-            this->sc->reset();
-            this->sc = tmpCurve;
+            this->overwriteCurve->reset();
+            this->overwriteCurve = tmpCurve;
         }
     }
 }
@@ -1758,7 +1757,7 @@ void PenTool::_bspline_spiro_build()
     SPCurve *curve = new SPCurve();
     //If we continuate the existing curve we add it at the start
     if(this->sa && !this->sa->curve->is_empty()){
-        curve = this->sc->copy();
+        curve = this->overwriteCurve->copy();
         if (this->sa->start) {
             curve = curve->create_reverse();
         }
@@ -2191,8 +2190,7 @@ void PenTool::_finish(gboolean const closed) {
     // cancelate line without a created segment
     this->red_curve->reset();
     spdc_concat_colors_and_flush(this, closed);
-    this->sc = NULL;
-    this->ec = NULL;
+    this->overwriteCurve = NULL;
     this->sa = NULL;
     this->ea = NULL;
 
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index 6f55d361f..0e8660248 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -200,7 +200,7 @@ bool PencilTool::_handleButtonPress(GdkEventButton const &bevent) {
                 }
                 if (anchor) {
                     p = anchor->dp;
-                    this->sc = anchor->curve;
+                    this->overwriteCurve = anchor->curve;
                     desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Continuing selected path"));
                 } else {
                     m.setup(desktop);
@@ -372,7 +372,6 @@ bool PencilTool::_handleButtonRelease(GdkEventButton const &revent) {
                 /* Finish segment now */
                 if (anchor) {
                     p = anchor->dp;
-                    this->ec = anchor->curve;
                 } else {
                     this->_endpointSnap(p, revent.state);
                 }
@@ -398,7 +397,6 @@ bool PencilTool::_handleButtonRelease(GdkEventButton const &revent) {
                     /// \todo fixme: Clean up what follows (Lauris)
                     if (anchor) {
                         p = anchor->dp;
-                        this->ec = anchor->curve;
                     } else {
                         Geom::Point p_end = p;
                         this->_endpointSnap(p_end, revent.state);
-- 
cgit v1.2.3


From 064e0f756b7525d4af0b8a34b3ef6fe89c007064 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 2 Apr 2014 01:56:31 +0200
Subject: Refactor of end anchors.

(bzr r11950.1.325)
---
 src/ui/tools/freehand-base.cpp |  19 +++++
 src/ui/tools/pen-tool.cpp      | 169 ++++++++++++++++++++---------------------
 2 files changed, 101 insertions(+), 87 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 04796c2a6..1c5b7b8e3 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -565,6 +565,25 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
         if (!dc->ea->start) {
             e = reverse_then_unref(e);
         }
+        if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
+            prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
+                e = reverse_then_unref(e);
+                Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*e->last_segment());
+                SPCurve *lastSeg = new SPCurve();
+                if(cubic){
+                    lastSeg->moveto((*cubic)[0]);
+                    lastSeg->curveto((*cubic)[1],(*cubic)[3],(*cubic)[3]);
+                    if( e->get_segment_count() == 1){
+                        e = lastSeg;
+                    }else{
+                        //we eliminate the last segment
+                        e->backspace();
+                        //and we add it again with the recreation
+                        e->append_continuous(lastSeg, 0.0625);
+                    }
+                }
+                e = reverse_then_unref(e);
+        }
         c->append_continuous(e, 0.0625);
         e->unref();
     }
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 1c0394e15..9e4df5031 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1637,62 +1637,53 @@ void PenTool::_bspline_spiro_end_anchor_on()
     SPCurve *tmpCurve = new SPCurve();
     SPCurve *lastSeg = new SPCurve();
     Geom::Point C(0,0);
-    if(!this->sa || this->sa->curve->is_empty()){
+    bool reverse = false;
+    if( this->green_anchor && this->green_anchor->active ){
         tmpCurve = this->green_curve->create_reverse();
-        if(this->green_curve->get_segment_count()==0)return;
-        Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
-        if(this->bspline){
-            C = tmpCurve->last_segment()->finalPoint() + (1./3)*(tmpCurve->last_segment()->initialPoint() - tmpCurve->last_segment()->finalPoint());
-            C = Geom::Point(C[X] + 0.005,C[Y] + 0.005);
-        }else{
-            C =  this->p[3] + (Geom::Point)(this->p[3] - this->p[2] );
-        }
-        if(cubic){
-            lastSeg->moveto((*cubic)[0]);
-            lastSeg->curveto((*cubic)[1],C,(*cubic)[3]);
-        }else{
-            lastSeg->moveto(tmpCurve->last_segment()->initialPoint());
-            lastSeg->curveto(tmpCurve->last_segment()->initialPoint(),C,tmpCurve->last_segment()->finalPoint());
+        if(this->green_curve->get_segment_count()==0){
+            return;
         }
-        if( tmpCurve->get_segment_count() == 1){
-            tmpCurve = lastSeg;
-        }else{
-            //we eliminate the last segment
-            tmpCurve->backspace();
-            //and we add it again with the recreation
-            tmpCurve->append_continuous(lastSeg, 0.0625);
+        reverse = true;
+    } else if(this->sa){
+        tmpCurve = this->overwriteCurve;
+        if(!this->sa->start){
+            tmpCurve = tmpCurve->create_reverse();
+            reverse = true;
         }
+    }else{
+        return;
+    }
+    Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
+    if(this->bspline){
+        C = tmpCurve->last_segment()->finalPoint() + (1./3)*(tmpCurve->last_segment()->initialPoint() - tmpCurve->last_segment()->finalPoint());
+        C = Geom::Point(C[X] + 0.005,C[Y] + 0.005);
+    }else{
+        C =  this->p[3] + (Geom::Point)(this->p[3] - this->p[2] );
+    }
+    if(cubic){
+        lastSeg->moveto((*cubic)[0]);
+        lastSeg->curveto((*cubic)[1],C,(*cubic)[3]);
+    }else{
+        lastSeg->moveto(tmpCurve->last_segment()->initialPoint());
+        lastSeg->curveto(tmpCurve->last_segment()->initialPoint(),C,tmpCurve->last_segment()->finalPoint());
+    }
+    if( tmpCurve->get_segment_count() == 1){
+        tmpCurve = lastSeg;
+    }else{
+        //we eliminate the last segment
+        tmpCurve->backspace();
+        //and we add it again with the recreation
+        tmpCurve->append_continuous(lastSeg, 0.0625);
+    }
+    if (reverse) {
         tmpCurve = tmpCurve->create_reverse();
+    }
+    if( this->green_anchor && this->green_anchor->active )
+    {
         this->green_curve->reset();
         this->green_curve = tmpCurve;
-    }else {
-        tmpCurve = this->sa->curve->copy();
-        if(!this->sa->start) tmpCurve = tmpCurve->create_reverse();
-        Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
-        if(this->bspline){
-            C = tmpCurve->last_segment()->finalPoint() + (1./3)*(tmpCurve->last_segment()->initialPoint() - tmpCurve->last_segment()->finalPoint());
-            C = Geom::Point(C[X] + 0.005,C[Y] + 0.005);
-        }else{
-            C =  this->p[3] + (Geom::Point)(this->p[3] - this->p[2] );
-        }
-        if(cubic){
-            lastSeg->moveto((*cubic)[0]);
-            lastSeg->curveto((*cubic)[1],C,(*cubic)[3]);
-        }else{
-            lastSeg->moveto(tmpCurve->last_segment()->initialPoint());
-            lastSeg->curveto(tmpCurve->last_segment()->initialPoint(),C,tmpCurve->last_segment()->finalPoint());
-        }
-        if( tmpCurve->get_segment_count() == 1){
-            tmpCurve = lastSeg;
-        }else{
-            //we eliminate the last segment
-            tmpCurve->backspace();
-            //and we add it again with the recreation
-            tmpCurve->append_continuous(lastSeg, 0.0625);
-        }
-        if (!this->sa->start) {
-            tmpCurve = tmpCurve->create_reverse();
-        }
+    }else{
+        this->overwriteCurve->reset();
         this->overwriteCurve = tmpCurve;
     }
 }
@@ -1702,45 +1693,43 @@ void PenTool::_bspline_spiro_end_anchor_off()
 
     SPCurve *tmpCurve = new SPCurve();
     SPCurve *lastSeg = new SPCurve();
+    bool reverse = false;
     this->p[2] = this->p[3];
-    if(!this->sa || this->sa->curve->is_empty()){
-
+    if( this->green_anchor && this->green_anchor->active ){
         tmpCurve = this->green_curve->create_reverse();
-        if(this->green_curve->get_segment_count()==0)return;
-        Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
-        if(cubic){
-            lastSeg->moveto((*cubic)[0]);
-            lastSeg->curveto((*cubic)[1],(*cubic)[3],(*cubic)[3]);
-            if( tmpCurve->get_segment_count() == 1){
-                tmpCurve = lastSeg;
-            }else{
-                //we eliminate the last segment
-                tmpCurve->backspace();
-                //and we add it again with the recreation
-                tmpCurve->append_continuous(lastSeg, 0.0625);
-            }
+        if(this->green_curve->get_segment_count()==0){
+            return;
+        }
+        reverse = true;
+    } else if(this->sa){
+        tmpCurve = this->overwriteCurve;
+        if(!this->sa->start){
+            tmpCurve = tmpCurve->create_reverse();
+            reverse = true;
+        }
+    }else{
+        return;
+    }
+    Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
+    if(cubic){
+        lastSeg->moveto((*cubic)[0]);
+        lastSeg->curveto((*cubic)[1],(*cubic)[3],(*cubic)[3]);
+        if( tmpCurve->get_segment_count() == 1){
+            tmpCurve = lastSeg;
+        }else{
+            //we eliminate the last segment
+            tmpCurve->backspace();
+            //and we add it again with the recreation
+            tmpCurve->append_continuous(lastSeg, 0.0625);
+        }
+        if (reverse) {
             tmpCurve = tmpCurve->create_reverse();
+        }
+        if( this->green_anchor && this->green_anchor->active )
+        {
             this->green_curve->reset();
             this->green_curve = tmpCurve;
-        }
-    }else {
-        tmpCurve = this->sa->curve->copy();
-        if(!this->sa->start) tmpCurve = tmpCurve->create_reverse();
-        Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
-        if(cubic){
-            lastSeg->moveto((*cubic)[0]);
-            lastSeg->curveto((*cubic)[1],(*cubic)[3],(*cubic)[3]);
-            if( tmpCurve->get_segment_count() == 1){
-                tmpCurve = lastSeg;
-            }else{
-                //we eliminate the last segment
-                tmpCurve->backspace();
-                //and we add it again with the recreation
-                tmpCurve->append_continuous(lastSeg, 0.0625);
-            }
-            if (!this->sa->start) {
-                tmpCurve = tmpCurve->create_reverse();
-            }
+        }else{
             this->overwriteCurve->reset();
             this->overwriteCurve = tmpCurve;
         }
@@ -1750,8 +1739,9 @@ void PenTool::_bspline_spiro_end_anchor_off()
 //prepares the curves for its transformation into BSpline curve.
 void PenTool::_bspline_spiro_build()
 {
-    if(!this->spiro && !this->bspline)
+    if(!this->spiro && !this->bspline){
         return;
+    }
 
     //We create the base curve
     SPCurve *curve = new SPCurve();
@@ -1763,14 +1753,19 @@ void PenTool::_bspline_spiro_build()
         }
     }
 
-    if (!this->green_curve->is_empty())
+    if (!this->green_curve->is_empty()){
         curve->append_continuous(this->green_curve, 0.0625);
+    }
 
     //and the red one
     if (!this->red_curve->is_empty()){
         this->red_curve->reset();
         this->red_curve->moveto(this->p[0]);
-        this->red_curve->curveto(this->p[1],this->p[2],this->p[3]);
+        if(this->anchor_statusbar && !this->sa && !(this->green_anchor && this->green_anchor->active)){
+            this->red_curve->curveto(this->p[1],this->p[3],this->p[3]);
+        }else{
+            this->red_curve->curveto(this->p[1],this->p[2],this->p[3]);
+        }
         sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(this->red_bpath), this->red_curve);
         curve->append_continuous(this->red_curve, 0.0625);
     }
-- 
cgit v1.2.3


From 8dbf7bd73db6bb549b3e0be3fba91cddfcb589b8 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 13 May 2014 07:35:50 +0200
Subject: Fixed a bug in bspline with snaps and 1 sice segments. Pointed by
 LiamW

(bzr r13341.1.12)
---
 src/ui/tools/pen-tool.cpp | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 9e4df5031..386dc43e9 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1811,9 +1811,9 @@ void PenTool::_bspline_spiro_build()
 void PenTool::_bspline_doEffect(SPCurve * curve)
 {
     // commenting the function doEffect in src/live_effects/lpe-bspline.cpp
-    if(curve->get_segment_count() < 2)
-        return;
     Geom::PathVector const original_pathv = curve->get_pathvector();
+    if (curve->get_segment_count() < 1)
+        return;
     curve->reset();
 
     for(Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) {
@@ -1890,9 +1890,25 @@ void PenTool::_bspline_doEffect(SPCurve * curve)
             ++curve_it1;
             ++curve_it2;
         }
+        SPCurve *out = new SPCurve();
+        out->moveto(curve_it1->initialPoint());
+        out->lineto(curve_it1->finalPoint());
+        cubic = dynamic_cast<Geom::CubicBezier const *>(&*curve_it1);
+        if (cubic) {
+            SBasisOut = out->first_segment()->toSBasis();
+            nextPointAt1 = SBasisOut.valueAt(Geom::nearest_point((*cubic)[1], *out->first_segment()));
+            nextPointAt2 = SBasisOut.valueAt(Geom::nearest_point((*cubic)[2], *out->first_segment()));
+            nextPointAt3 = out->first_segment()->finalPoint();
+        } else {
+            nextPointAt1 = out->first_segment()->initialPoint();
+            nextPointAt2 = out->first_segment()->finalPoint();
+            nextPointAt3 = out->first_segment()->finalPoint();
+        }
+        out->reset();
+        delete out;
         SPCurve *curveHelper = new SPCurve();
         curveHelper->moveto(node);
-        Geom::Point startNode(0,0);
+        Geom::Point startNode = path_it->begin()->initialPoint();
         if (path_it->closed()) {
             SPCurve * start = new SPCurve();
             start->moveto(path_it->begin()->initialPoint());
-- 
cgit v1.2.3


From 9cd50c94d560a2372a755bdf58ccf7feb7afe083 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 13 May 2014 08:50:42 +0200
Subject: Add Simplify LPE

(bzr r13341.1.13)
---
 src/ui/tools/node-tool.cpp | 48 +++++++++++++++++++++++++++++++++++++++++++---
 src/ui/tools/node-tool.h   |  2 ++
 2 files changed, 47 insertions(+), 3 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index b1e11bd66..ce487831d 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -23,6 +23,8 @@
 #include "message-context.h"
 #include "selection.h"
 #include "shape-editor.h" // temporary!
+#include "live_effects/effect.h"
+#include "display/curve.h"
 #include "sp-clippath.h"
 #include "sp-item-group.h"
 #include "sp-mask.h"
@@ -167,6 +169,10 @@ NodeTool::~NodeTool() {
         this->desktop->remove_temporary_canvasitem(this->flash_tempitem);
     }
 
+    if (this->helperpath_tmpitem) {
+        this->desktop->remove_temporary_canvasitem(this->helperpath_tmpitem);
+    }
+
     this->_selection_changed_connection.disconnect();
     //this->_selection_modified_connection.disconnect();
     this->_mouseover_changed_connection.disconnect();
@@ -252,6 +258,7 @@ void NodeTool::setup() {
     this->flash_tempitem = NULL;
     this->flashed_item = NULL;
     this->_last_over = NULL;
+    this->helperpath_tmpitem = NULL;
 
     // read prefs before adding items to selection to prevent momentarily showing the outline
     sp_event_context_read(this, "show_handles");
@@ -278,6 +285,41 @@ void NodeTool::setup() {
     }
 
     this->desktop->emitToolSubselectionChanged(NULL); // sets the coord entry fields to inactive
+    this->update_helperpath();
+}
+
+void  NodeTool::update_helperpath(){
+    Inkscape::Selection *selection = sp_desktop_selection (this->desktop);
+    if (this->helperpath_tmpitem) {
+        this->desktop->remove_temporary_canvasitem(this->helperpath_tmpitem);
+        this->helperpath_tmpitem = NULL;
+    }
+    if (SP_IS_LPE_ITEM(selection->singleItem())) {
+        Inkscape::LivePathEffect::Effect *lpe = SP_LPE_ITEM(selection->singleItem())->getCurrentLPE();
+        if (lpe && lpe->isVisible()/* && lpe->showOrigPath()*/) {
+            if (lpe) {
+                SPCurve *c = new SPCurve();
+                SPCurve *cc = new SPCurve();
+                std::vector<Geom::PathVector> cs = lpe->getCanvasIndicators(SP_LPE_ITEM(selection->singleItem()));
+                for (std::vector<Geom::PathVector>::iterator p = cs.begin(); p != cs.end(); ++p) {
+                    cc->set_pathvector(*p);
+                    c->append(cc, false);
+                    cc->reset();
+                }
+                if (!c->is_empty()) {
+                    c->transform(selection->singleItem()->i2dt_affine());
+                    SPCanvasItem *helperpath = sp_canvas_bpath_new(sp_desktop_tempgroup(this->desktop), c);
+                    sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(helperpath),
+                       0x0000ff9A, 1.0,
+                        SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
+                    sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(helperpath), 0, SP_WIND_RULE_NONZERO);
+                    this->helperpath_tmpitem = this->desktop->add_temporary_canvasitem(helperpath,0);
+                }
+                c->unref();
+                cc->unref();
+           }
+        }
+    }
 }
 
 void NodeTool::set(const Inkscape::Preferences::Entry& value) {
@@ -392,7 +434,7 @@ void NodeTool::selection_changed(Inkscape::Selection *sel) {
     for (std::set<ShapeRecord>::iterator i = shapes.begin(); i != shapes.end(); ++i) {
         ShapeRecord const &r = *i;
 
-        if ((SP_IS_SHAPE(r.item) || SP_IS_TEXT(r.item)) &&
+        if ((SP_IS_SHAPE(r.item) || SP_IS_TEXT(r.item) || SP_IS_GROUP(r.item) || SP_IS_OBJECTGROUP(r.item)) &&
             this->_shape_editors.find(r.item) == this->_shape_editors.end())
         {
             ShapeEditor *si = new ShapeEditor(this->desktop);
@@ -416,7 +458,7 @@ bool NodeTool::root_handler(GdkEvent* event) {
     
     Inkscape::Selection *selection = desktop->selection;
     static Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    
+
     if (this->_multipath->event(this, event)) {
     	return true;
     }
@@ -433,6 +475,7 @@ bool NodeTool::root_handler(GdkEvent* event) {
     {
     case GDK_MOTION_NOTIFY: {
         combine_motion_events(desktop->canvas, event->motion, 0);
+        this->update_helperpath();
         SPItem *over_item = sp_event_context_find_item (desktop, event_point(event->button),
                 FALSE, TRUE);
 
@@ -441,7 +484,6 @@ bool NodeTool::root_handler(GdkEvent* event) {
             //ink_node_tool_update_tip(nt, event);
             this->update_tip(event);
         }
-
         // create pathflash outline
         if (prefs->getBool("/tools/nodes/pathflash_enabled")) {
             if (over_item == this->flashed_item) {
diff --git a/src/ui/tools/node-tool.h b/src/ui/tools/node-tool.h
index 42f89cd1c..9f0c40aa8 100644
--- a/src/ui/tools/node-tool.h
+++ b/src/ui/tools/node-tool.h
@@ -54,6 +54,7 @@ public:
 	static const std::string prefsPath;
 
 	virtual void setup();
+	virtual void update_helperpath();
 	virtual void set(const Inkscape::Preferences::Entry& val);
 	virtual bool root_handler(GdkEvent* event);
 
@@ -66,6 +67,7 @@ private:
 
     SPItem *flashed_item;
     Inkscape::Display::TemporaryItem *flash_tempitem;
+    Inkscape::Display::TemporaryItem *helperpath_tmpitem;
     Inkscape::UI::Selector* _selector;
     Inkscape::UI::PathSharedData* _path_data;
     SPCanvasGroup *_transform_handle_group;
-- 
cgit v1.2.3


From 67e3a25d12d9a273afb1b8f9f3258b232989c660 Mon Sep 17 00:00:00 2001
From: Diederik van Lierop <mail@diedenrezi.nl>
Date: Fri, 23 May 2014 22:52:32 +0200
Subject: Fix flakiness of measurement tool (due to issues with parallel lines,
 duplicate intersections, and faulty sorting of intersections)

Fixed bugs:
  - https://launchpad.net/bugs/1022733

(bzr r13397)
---
 src/ui/tools/measure-tool.cpp | 59 ++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 35 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 2c85874bc..feeb68288 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -277,21 +277,13 @@ void MeasureTool::finish() {
 //    return ret;
 //}
 
-static bool GeomPointSortPredicate(const Geom::Point& p1, const Geom::Point& p2)
+static void calculate_intersections(SPDesktop * /*desktop*/, SPItem* item, Geom::PathVector const &lineseg, SPCurve *curve, std::vector<double> &intersections)
 {
-    if (p1[Geom::Y] == p2[Geom::Y]) {
-        return p1[Geom::X] < p2[Geom::X];
-    } else {
-        return p1[Geom::Y] < p2[Geom::Y];
-    }
-}
 
-static void calculate_intersections(SPDesktop * /*desktop*/, SPItem* item, Geom::PathVector const &lineseg, SPCurve *curve, std::vector<Geom::Point> &intersections)
-{
     curve->transform(item->i2doc_affine());
-
     // Find all intersections of the control-line with this shape
     Geom::CrossingSet cs = Geom::crossings(lineseg, curve->get_pathvector());
+    Geom::delete_duplicates(cs[0]);
 
     // Reconstruct and store the points of intersection
     for (Geom::Crossings::const_iterator m = cs[0].begin(); m != cs[0].end(); ++m) {
@@ -304,10 +296,11 @@ static void calculate_intersections(SPDesktop * /*desktop*/, SPItem* item, Geom:
              item == doc->getItemAtPoint(desktop->dkey, lineseg[0].pointAt((*m).ta - eps), false, NULL)) ||
             ((*m).ta + eps < 1 &&
              item == doc->getItemAtPoint(desktop->dkey, lineseg[0].pointAt((*m).ta + eps), false, NULL)) ) {
-            intersections.push_back(intersection);
+            intersections.push_back((*m).ta);
         }
 #else
-        intersections.push_back(lineseg[0].pointAt((*m).ta));
+        intersections.push_back((*m).ta);
+
 #endif
     }
 }
@@ -441,28 +434,20 @@ bool MeasureTool::root_handler(GdkEvent* event) {
                     points.push_back(desktop->d2w(start_point + (i / NPOINTS) * (end_point - start_point)));
                 }
 
-// TODO: Felipe, why don't you simply iterate over all items, and test whether their bounding boxes intersect
-// with the measurement line, instead of interpolating? E.g. bbox_of_measurement_line.intersects(*bbox_of_item).
-// That's also how the object-snapper works, see _findCandidates() in object-snapper.cpp.
+                // TODO: Felipe, why don't you simply iterate over all items, and test whether their bounding boxes intersect
+                // with the measurement line, instead of interpolating over 800 points? E.g. bbox_of_measurement_line.intersects(*bbox_of_item).
+                // That's also how the object-snapper works, see _findCandidates() in object-snapper.cpp.
+
+                // TODO switch to a different variable name. The single letter 'l' is easy to misread.
 
                 //select elements crossed by line segment:
                 GSList *items = sp_desktop_document(desktop)->getItemsAtPoints(desktop->dkey, points);
-                std::vector<Geom::Point> intersections;
-                Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-                bool ignore_1st_and_last = prefs->getBool("/tools/measure/ignore_1st_and_last", true);
-
-                if (!ignore_1st_and_last) {
-                    intersections.push_back(desktop->dt2doc(start_point));
-                }
-
-                std::vector<LabelPlacement> placements;
-
-                // TODO switch to a different variable name. The single letter 'l' is easy to misread.
+                std::vector<double> intersection_times;
                 for (GSList *l = items; l != NULL; l = l->next) {
                     SPItem *item = static_cast<SPItem*>(l->data);
 
                     if (SP_IS_SHAPE(item)) {
-                       calculate_intersections(desktop, item, lineseg, SP_SHAPE(item)->getCurve(), intersections);
+                       calculate_intersections(desktop, item, lineseg, SP_SHAPE(item)->getCurve(), intersection_times);
                     } else {
                         if (SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item)) {
                             Inkscape::Text::Layout::iterator iter = te_get_layout(item)->begin();
@@ -486,7 +471,7 @@ bool MeasureTool::root_handler(GdkEvent* event) {
 
                                 curve->transform(item->i2doc_affine());
 
-                                calculate_intersections(desktop, item, lineseg, curve, intersections);
+                                calculate_intersections(desktop, item, lineseg, curve, intersection_times);
 
                                 if (iter == te_get_layout(item)->end()) {
                                     break;
@@ -496,13 +481,10 @@ bool MeasureTool::root_handler(GdkEvent* event) {
                     }
                 }
 
-                if (!ignore_1st_and_last) {
-                    intersections.push_back(desktop->dt2doc(end_point));
-                }
-
-                //sort intersections
-                if (intersections.size() > 2) {
-                    std::sort(intersections.begin(), intersections.end(), GeomPointSortPredicate);
+                Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+                if (!prefs->getBool("/tools/measure/ignore_1st_and_last", true)) {
+                    intersection_times.push_back(0);
+                    intersection_times.push_back(1);
                 }
 
                 Glib::ustring unit_name = prefs->getString("/tools/measure/unit");
@@ -516,6 +498,13 @@ bool MeasureTool::root_handler(GdkEvent* event) {
                 Geom::Point windowNormal = Geom::unit_vector(Geom::rot90(desktop->d2w(end_point - start_point)));
                 Geom::Point normal = desktop->w2d(windowNormal);
 
+                std::vector<Geom::Point> intersections;
+                std::sort(intersection_times.begin(), intersection_times.end());
+                for (std::vector<double>::iterator iter_t = intersection_times.begin(); iter_t != intersection_times.end(); iter_t++) {
+                    intersections.push_back(lineseg[0].pointAt(*iter_t));
+                }
+
+                std::vector<LabelPlacement> placements;
                 for (size_t idx = 1; idx < intersections.size(); ++idx) {
                     LabelPlacement placement;
                     placement.lengthVal = (intersections[idx] - intersections[idx - 1]).length();
-- 
cgit v1.2.3


From 1fd57a41383419cbeddbaef27e52d55c0d02400f Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebronyat-signgmaildotcom>
Date: Fri, 6 Jun 2014 17:01:38 -0400
Subject: Clean up some unnecessary pointer usage in livarot

(bzr r13341.1.50)
---
 src/ui/tools/flood-tool.cpp  | 2 +-
 src/ui/tools/pencil-tool.cpp | 5 ++---
 src/ui/tools/tweak-tool.cpp  | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp
index d74848dc6..15bc7164c 100644
--- a/src/ui/tools/flood-tool.cpp
+++ b/src/ui/tools/flood-tool.cpp
@@ -408,7 +408,7 @@ static void do_trace(bitmap_coords_info bci, guchar *trace_px, SPDesktop *deskto
             Shape *path_shape = new Shape();
         
             path->ConvertWithBackData(0.03);
-            path->Fill(path_shape, 0);
+            path->Fill(*path_shape, 0);
             delete path;
         
             Shape *expanded_path_shape = new Shape();
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index 0e8660248..48f8c3a28 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -760,9 +760,8 @@ void PencilTool::_sketchInterpolate() {
             path.LoadPathVector(Geom::path_from_piecewise(this->sketch_interpolation, 0.01));
             path.Simplify(0.5);
 
-            Geom::PathVector *pathv = path.MakePathVector();
-            this->sketch_interpolation = (*pathv)[0].toPwSb();
-            delete pathv;
+            Geom::PathVector pathv = path.MakePathVector();
+            this->sketch_interpolation = pathv[0].toPwSb();
         } else {
             this->sketch_interpolation = fit_pwd2;
         }
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index 75650d3af..bc1519773 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -551,7 +551,7 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
             Geom::Affine i2doc(item->i2doc_affine());
 
             orig->ConvertWithBackData((0.08 - (0.07 * fidelity)) / i2doc.descrim()); // default 0.059
-            orig->Fill(theShape, 0);
+            orig->Fill(*theShape, 0);
 
             SPCSSAttr *css = sp_repr_css_attr(item->getRepr(), "style");
             gchar const *val = sp_repr_css_property(css, "fill-rule", NULL);
-- 
cgit v1.2.3


From 48ddc5ea8c9ee44c7ae388d43f9be9552acf64ae Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebronyat-signgmaildotcom>
Date: Fri, 6 Jun 2014 21:19:18 -0400
Subject: Undo changes in r13391

(bzr r13341.1.51)
---
 src/ui/tools/flood-tool.cpp  | 2 +-
 src/ui/tools/pencil-tool.cpp | 5 +++--
 src/ui/tools/tweak-tool.cpp  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp
index 15bc7164c..d74848dc6 100644
--- a/src/ui/tools/flood-tool.cpp
+++ b/src/ui/tools/flood-tool.cpp
@@ -408,7 +408,7 @@ static void do_trace(bitmap_coords_info bci, guchar *trace_px, SPDesktop *deskto
             Shape *path_shape = new Shape();
         
             path->ConvertWithBackData(0.03);
-            path->Fill(*path_shape, 0);
+            path->Fill(path_shape, 0);
             delete path;
         
             Shape *expanded_path_shape = new Shape();
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index 48f8c3a28..0e8660248 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -760,8 +760,9 @@ void PencilTool::_sketchInterpolate() {
             path.LoadPathVector(Geom::path_from_piecewise(this->sketch_interpolation, 0.01));
             path.Simplify(0.5);
 
-            Geom::PathVector pathv = path.MakePathVector();
-            this->sketch_interpolation = pathv[0].toPwSb();
+            Geom::PathVector *pathv = path.MakePathVector();
+            this->sketch_interpolation = (*pathv)[0].toPwSb();
+            delete pathv;
         } else {
             this->sketch_interpolation = fit_pwd2;
         }
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index bc1519773..75650d3af 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -551,7 +551,7 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
             Geom::Affine i2doc(item->i2doc_affine());
 
             orig->ConvertWithBackData((0.08 - (0.07 * fidelity)) / i2doc.descrim()); // default 0.059
-            orig->Fill(*theShape, 0);
+            orig->Fill(theShape, 0);
 
             SPCSSAttr *css = sp_repr_css_attr(item->getRepr(), "style");
             gchar const *val = sp_repr_css_property(css, "fill-rule", NULL);
-- 
cgit v1.2.3


From 1fbcbe105b22951f565dd6ddecce3ceeb9e55a36 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 10 Jun 2014 00:12:02 +0200
Subject: fix a bug on spirolive close path

(bzr r13341.1.55)
---
 src/ui/tools/pen-tool.cpp | 56 ++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 386dc43e9..f8243fb7f 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1556,12 +1556,11 @@ void PenTool::_bspline_spiro_start_anchor_off()
             //and we add it again with the recreation
             tmpCurve->append_continuous(lastSeg, 0.0625);
         }
-        if (this->sa->start) {
-            tmpCurve = tmpCurve->create_reverse();
-        }
-        this->overwriteCurve = tmpCurve;
     }
-
+    if (this->sa->start) {
+        tmpCurve = tmpCurve->create_reverse();
+    }
+    this->overwriteCurve = tmpCurve;
 }
 
 void PenTool::_bspline_spiro_motion(bool shift){
@@ -1645,7 +1644,7 @@ void PenTool::_bspline_spiro_end_anchor_on()
         }
         reverse = true;
     } else if(this->sa){
-        tmpCurve = this->overwriteCurve;
+        tmpCurve = this->overwriteCurve->copy();
         if(!this->sa->start){
             tmpCurve = tmpCurve->create_reverse();
             reverse = true;
@@ -1665,7 +1664,7 @@ void PenTool::_bspline_spiro_end_anchor_on()
         lastSeg->curveto((*cubic)[1],C,(*cubic)[3]);
     }else{
         lastSeg->moveto(tmpCurve->last_segment()->initialPoint());
-        lastSeg->curveto(tmpCurve->last_segment()->initialPoint(),C,tmpCurve->last_segment()->finalPoint());
+        lastSeg->lineto(tmpCurve->last_segment()->finalPoint());
     }
     if( tmpCurve->get_segment_count() == 1){
         tmpCurve = lastSeg;
@@ -1702,7 +1701,7 @@ void PenTool::_bspline_spiro_end_anchor_off()
         }
         reverse = true;
     } else if(this->sa){
-        tmpCurve = this->overwriteCurve;
+        tmpCurve = this->overwriteCurve->copy();
         if(!this->sa->start){
             tmpCurve = tmpCurve->create_reverse();
             reverse = true;
@@ -1714,25 +1713,28 @@ void PenTool::_bspline_spiro_end_anchor_off()
     if(cubic){
         lastSeg->moveto((*cubic)[0]);
         lastSeg->curveto((*cubic)[1],(*cubic)[3],(*cubic)[3]);
-        if( tmpCurve->get_segment_count() == 1){
-            tmpCurve = lastSeg;
-        }else{
-            //we eliminate the last segment
-            tmpCurve->backspace();
-            //and we add it again with the recreation
-            tmpCurve->append_continuous(lastSeg, 0.0625);
-        }
-        if (reverse) {
-            tmpCurve = tmpCurve->create_reverse();
-        }
-        if( this->green_anchor && this->green_anchor->active )
-        {
-            this->green_curve->reset();
-            this->green_curve = tmpCurve;
-        }else{
-            this->overwriteCurve->reset();
-            this->overwriteCurve = tmpCurve;
-        }
+    }else{
+        lastSeg->moveto(tmpCurve->last_segment()->initialPoint());
+        lastSeg->lineto(tmpCurve->last_segment()->finalPoint());
+    }
+    if( tmpCurve->get_segment_count() == 1){
+        tmpCurve = lastSeg;
+    }else{
+        //we eliminate the last segment
+        tmpCurve->backspace();
+        //and we add it again with the recreation
+        tmpCurve->append_continuous(lastSeg, 0.0625);
+    }
+    if (reverse) {
+        tmpCurve = tmpCurve->create_reverse();
+    }
+    if( this->green_anchor && this->green_anchor->active )
+    {
+        this->green_curve->reset();
+        this->green_curve = tmpCurve;
+    }else{
+        this->overwriteCurve->reset();
+        this->overwriteCurve = tmpCurve;
     }
 }
 
-- 
cgit v1.2.3


From b2ae5212d7df04a0b973571748d402d5663312d6 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Wed, 11 Jun 2014 23:53:17 +0200
Subject: pen tool: fix crash when finishing path with right-click or enter
 while dragging from path's startnode (otherwise closing the path)

Fixed bugs:
  - https://launchpad.net/bugs/1326652

(bzr r13422)
---
 src/ui/tools/pen-tool.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 09c0a2a4f..b089065e8 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -481,6 +481,7 @@ bool PenTool::_handleButtonPress(GdkEventButton const &bevent) {
         ret = true;
     } else if (bevent.button == 3 && this->npoints != 0) {
         // right click - finish path
+        this->ea = NULL; // unset end anchor if set (otherwise crashes)
         this->_finish(false);
         ret = true;
     }
@@ -1018,6 +1019,7 @@ bool PenTool::_handleKeyPress(GdkEvent *event) {
         case GDK_KEY_Return:
         case GDK_KEY_KP_Enter:
             if (this->npoints != 0) {
+                this->ea = NULL; // unset end anchor if set (otherwise crashes)
                 this->_finish(false);
                 ret = true;
             }
-- 
cgit v1.2.3


From 6351d4ea2ea398e0096c14b3ba57ca28dfd2f8a3 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Tue, 1 Jul 2014 23:58:08 +0200
Subject: Fix pentool backspace bug. Thanks Jabier

Fixed bugs:
  - https://launchpad.net/bugs/1336561

(bzr r13445)
---
 src/ui/tools/pen-tool.cpp | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index b089065e8..70cbcaf0d 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -55,15 +55,15 @@ static bool pen_within_tolerance = false;
 static int pen_last_paraxial_dir = 0; // last used direction in horizontal/vertical mode; 0 = horizontal, 1 = vertical
 
 namespace {
-	ToolBase* createPenContext() {
-		return new PenTool();
-	}
+    ToolBase* createPenContext() {
+        return new PenTool();
+    }
 
-	bool penContextRegistered = ToolFactory::instance().registerObject("/tools/freehand/pen", createPenContext);
+    bool penContextRegistered = ToolFactory::instance().registerObject("/tools/freehand/pen", createPenContext);
 }
 
 const std::string& PenTool::getPrefsPath() {
-	return PenTool::prefsPath;
+    return PenTool::prefsPath;
 }
 
 const std::string PenTool::prefsPath = "/tools/freehand/pen";
@@ -277,7 +277,7 @@ bool PenTool::item_handler(SPItem* item, GdkEvent* event) {
     }
 
     if (!ret) {
-    	ret = FreehandBase::item_handler(item, event);
+        ret = FreehandBase::item_handler(item, event);
     }
 
     return ret;
@@ -315,7 +315,7 @@ bool PenTool::root_handler(GdkEvent* event) {
     }
 
     if (!ret) {
-    	ret = FreehandBase::root_handler(event);
+        ret = FreehandBase::root_handler(event);
     }
 
     return ret;
@@ -1061,8 +1061,9 @@ bool PenTool::_handleKeyPress(GdkEvent *event) {
                 this->red_curve->reset();
                 // Destroy topmost green bpath
                 if (this->green_bpaths) {
-                    if (this->green_bpaths->data)
+                    if (this->green_bpaths->data) {
                         sp_canvas_item_destroy(SP_CANVAS_ITEM(this->green_bpaths->data));
+                    }
                     this->green_bpaths = g_slist_remove(this->green_bpaths, this->green_bpaths->data);
                 }
                 // Get last segment
@@ -1078,11 +1079,21 @@ bool PenTool::_handleKeyPress(GdkEvent *event) {
                 } else {
                     this->p[1] = this->p[0];
                 }
-                Geom::Point const pt(( this->npoints < 4
-                                     ? (Geom::Point)(crv->finalPoint())
-                                     : this->p[3] ));
+                Geom::Point const pt( (this->npoints < 4) ? crv->finalPoint() : this->p[3] );
                 this->npoints = 2;
-                this->green_curve->backspace();
+                // delete the last segment of the green curve
+                if (this->green_curve->get_segment_count() == 1) {
+                    this->npoints = 5;
+                    if (this->green_bpaths) {
+                        if (this->green_bpaths->data) {
+                            sp_canvas_item_destroy(SP_CANVAS_ITEM(this->green_bpaths->data));
+                        }
+                        this->green_bpaths = g_slist_remove(this->green_bpaths, this->green_bpaths->data);
+                    }
+                    this->green_curve->reset();
+                } else {
+                    this->green_curve->backspace();
+                }
                 sp_canvas_item_hide(this->c0);
                 sp_canvas_item_hide(this->c1);
                 sp_canvas_item_hide(this->cl0);
-- 
cgit v1.2.3


From 77934815e32b73477fc5e7b19e61de702a303fd5 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Wed, 2 Jul 2014 00:13:46 +0200
Subject: pen tool: add back removal of curvature handle when
 backspace-deleting a node while drawing many code improvements: unnecessary
 casts, whitespace, { }, reduce variable scope. should all be noops.

(bzr r13341.1.73)
---
 src/ui/tools/pen-tool.cpp | 61 +++++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 29 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 0d8a2668b..aead3ebc0 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -958,40 +958,42 @@ void PenTool::_lastpointToCurve() {
     // avoid that if the "red_curve" contains only two points ( rect ), it doesn't stop here.
     if (this->npoints != 5 && !this->spiro && !this->bspline)
         return;
-    Geom::CubicBezier const * cubic;
-    this->p[1] = this->red_curve->last_segment()->initialPoint() + (1./3)* (Geom::Point)(this->red_curve->last_segment()->finalPoint() - this->red_curve->last_segment()->initialPoint());
+
+    this->p[1] = this->red_curve->last_segment()->initialPoint() + (1./3.)*(this->red_curve->last_segment()->finalPoint() - this->red_curve->last_segment()->initialPoint());
     //modificate the last segment of the green curve so it creates the type of node we need
-    if(this->spiro||this->bspline){
-        if(!this->green_curve->is_empty()){
+    if (this->spiro||this->bspline) {
+        if (!this->green_curve->is_empty()) {
             Geom::Point A(0,0);
             Geom::Point B(0,0);
             Geom::Point C(0,0);
             Geom::Point D(0,0);
-            SPCurve * previous = new SPCurve();
-            cubic = dynamic_cast<Geom::CubicBezier const *>( this->green_curve->last_segment() );
+            Geom::CubicBezier const *cubic = dynamic_cast<Geom::CubicBezier const *>( this->green_curve->last_segment() );
             //We obtain the last segment 4 points in the previous curve 
             if ( cubic ){
                 A = (*cubic)[0];
                 B = (*cubic)[1];
-                if(this->spiro){
-                    C = this->p[0] + (Geom::Point)(this->p[0] - this->p[1]);
-                }else
-                    C = this->green_curve->last_segment()->finalPoint() + (1./3)* (Geom::Point)(this->green_curve->last_segment()->initialPoint() - this->green_curve->last_segment()->finalPoint());
+                if (this->spiro) {
+                    C = this->p[0] + (this->p[0] - this->p[1]);
+                } else {
+                    C = this->green_curve->last_segment()->finalPoint() + (1./3.)*(this->green_curve->last_segment()->initialPoint() - this->green_curve->last_segment()->finalPoint());
+                }
                 D = (*cubic)[3];
-            }else{
+            } else {
                 A = this->green_curve->last_segment()->initialPoint();
                 B = this->green_curve->last_segment()->initialPoint();
-                if(this->spiro)
-                    C = this->p[0] + (Geom::Point)(this->p[0] - this->p[1]);
-                else
-                    C = this->green_curve->last_segment()->finalPoint() + (1./3)* (Geom::Point)(this->green_curve->last_segment()->initialPoint() - this->green_curve->last_segment()->finalPoint());
+                if (this->spiro) {
+                    C = this->p[0] + (this->p[0] - this->p[1]);
+                } else {
+                    C = this->green_curve->last_segment()->finalPoint() + (1./3.)*(this->green_curve->last_segment()->initialPoint() - this->green_curve->last_segment()->finalPoint());
+                }
                 D = this->green_curve->last_segment()->finalPoint();
             }
+            SPCurve *previous = new SPCurve();
             previous->moveto(A);
             previous->curveto(B, C, D);
-            if( this->green_curve->get_segment_count() == 1){
+            if ( this->green_curve->get_segment_count() == 1) {
                 this->green_curve = previous;
-            }else{
+            } else {
                 //we eliminate the last segment
                 this->green_curve->backspace();
                 //and we add it again with the recreation
@@ -999,7 +1001,7 @@ void PenTool::_lastpointToCurve() {
             }
         }
         //if the last node is an union with another curve
-        if(this->green_curve->is_empty() && this->sa && !this->sa->curve->is_empty()){
+        if (this->green_curve->is_empty() && this->sa && !this->sa->curve->is_empty()) {
             this->_bspline_spiro_start_anchor(false);
         }
     }
@@ -1242,12 +1244,12 @@ bool PenTool::_handleKeyPress(GdkEvent *event) {
                 }
             } else {
                 // Reset red curve
-                Geom::CubicBezier const * cubic = NULL;
                 this->red_curve->reset();
                 // Destroy topmost green bpath
                 if (this->green_bpaths) {
-                    if (this->green_bpaths->data)
+                    if (this->green_bpaths->data) {
                         sp_canvas_item_destroy(SP_CANVAS_ITEM(this->green_bpaths->data));
+                    }
                     this->green_bpaths = g_slist_remove(this->green_bpaths, this->green_bpaths->data);
                 }
                 // Get last segment
@@ -1270,17 +1272,16 @@ bool PenTool::_handleKeyPress(GdkEvent *event) {
                     this->p[1] = this->p[0] + (1./3)*(this->p[3] - this->p[0]);
                 }
 
-                Geom::Point const pt((this->npoints < 4
-                                     ? (Geom::Point)(crv->finalPoint())
-                                     : this->p[3]));
+                Geom::Point const pt( (this->npoints < 4) ? crv->finalPoint() : this->p[3] );
                 
                 this->npoints = 2;
                 // delete the last segment of the green curve
                 if( this->green_curve->get_segment_count() == 1){
                     this->npoints = 5;
                     if (this->green_bpaths) {
-                        if (this->green_bpaths->data)
+                        if (this->green_bpaths->data) {
                             sp_canvas_item_destroy(SP_CANVAS_ITEM(this->green_bpaths->data));
+                        }
                         this->green_bpaths = g_slist_remove(this->green_bpaths, this->green_bpaths->data);
                     }
                     this->green_curve->reset();
@@ -1289,14 +1290,16 @@ bool PenTool::_handleKeyPress(GdkEvent *event) {
                 }
                 // assign the value of this->p[1] to the oposite of the green line last segment 
                 if(this->spiro){
-                    cubic = dynamic_cast<Geom::CubicBezier const *>(this->green_curve->last_segment());
+                    Geom::CubicBezier const *cubic = dynamic_cast<Geom::CubicBezier const *>(this->green_curve->last_segment());
                     if ( cubic ) {
-                        this->p[1] = (*cubic)[3] + (Geom::Point)((*cubic)[3] - (*cubic)[2]);
+                        this->p[1] = (*cubic)[3] + (*cubic)[3] - (*cubic)[2];
                         SP_CTRL(this->c1)->moveto(this->p[0]);
                     } else {
                         this->p[1] = this->p[0];
                     }
                 }
+                sp_canvas_item_hide(this->c0);
+                sp_canvas_item_hide(this->c1);
                 sp_canvas_item_hide(this->cl0);
                 sp_canvas_item_hide(this->cl1);
                 this->state = PenTool::POINT;
@@ -1607,7 +1610,7 @@ void PenTool::_bspline_spiro_motion(bool shift){
                 if(shift)
                     this->p[2] = this->p[3];
             }else{
-                this->p[1] =  (*cubic)[3] + (Geom::Point)((*cubic)[3] - (*cubic)[2] );
+                this->p[1] =  (*cubic)[3] + ((*cubic)[3] - (*cubic)[2] );
                 this->p[1] = Geom::Point(this->p[1][X] + 0.005,this->p[1][Y] + 0.005);
             }
         }else{
@@ -1659,7 +1662,7 @@ void PenTool::_bspline_spiro_end_anchor_on()
         C = tmpCurve->last_segment()->finalPoint() + (1./3)*(tmpCurve->last_segment()->initialPoint() - tmpCurve->last_segment()->finalPoint());
         C = Geom::Point(C[X] + 0.005,C[Y] + 0.005);
     }else{
-        C =  this->p[3] + (Geom::Point)(this->p[3] - this->p[2] );
+        C = this->p[3] + this->p[3] - this->p[2];
     }
     if(cubic){
         lastSeg->moveto((*cubic)[0]);
@@ -2164,7 +2167,7 @@ void PenTool::_finishSegment(Geom::Point const p, guint const state) {
         pen_last_paraxial_dir = this->nextParaxialDirection(p, this->p[0], state);
     }
 
-    ++this->num_clicks;
+    ++num_clicks;
 
 
     if (!this->red_curve->is_empty()) {
-- 
cgit v1.2.3


From 7e68da8d1bc6a91031fa4a05cc5f8ca032bd960d Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebronyat-signgmaildotcom>
Date: Sat, 19 Jul 2014 18:06:37 -0400
Subject: Workarounds for crash bugs 1309050, 601336; will fix properly in
 experimental

Fixed bugs:
  - https://launchpad.net/bugs/601336
  - https://launchpad.net/bugs/1309050

(bzr r13455)
---
 src/ui/tools/tool-base.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 4195c9eb2..f1d90f6c6 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -1289,8 +1289,7 @@ void sp_event_context_snap_delay_handler(ToolBase *ec,
                 // now, just in case there's no future motion event that drops under the speed limit (when
                 // stopping abruptly)
                 delete ec->_delayed_snap_event;
-                ec->_delayed_snap_event = new DelayedSnapEvent(ec, dse_item, dse_item2,
-                        event, origin); // watchdog is reset, i.e. pushed forward in time
+                ec->_delayed_snap_event = new DelayedSnapEvent(ec, dse_item, dse_item2, event, origin); // watchdog is reset, i.e. pushed forward in time
                 // If the watchdog expires before a new motion event is received, we will snap (as explained
                 // above). This means however that when the timer is too short, we will always snap and that the
                 // speed threshold is ineffective. In the extreme case the delay is set to zero, and snapping will
@@ -1301,15 +1300,13 @@ void sp_event_context_snap_delay_handler(ToolBase *ec,
                 // snap, and set a new watchdog again.
                 if (ec->_delayed_snap_event == NULL) { // no watchdog has been set
                     // it might have already expired, so we'll set a new one; the snapping frequency will be limited this way
-                    ec->_delayed_snap_event = new DelayedSnapEvent(ec, dse_item,
-                            dse_item2, event, origin);
+                    ec->_delayed_snap_event = new DelayedSnapEvent(ec, dse_item, dse_item2, event, origin);
                 } // else: watchdog has been set before and we'll wait for it to expire
             }
         } else {
             // This is the first GDK_MOTION_NOTIFY event, so postpone snapping and set the watchdog
             g_assert(ec->_delayed_snap_event == NULL);
-            ec->_delayed_snap_event = new DelayedSnapEvent(ec, dse_item, dse_item2,
-                    event, origin);
+            ec->_delayed_snap_event = new DelayedSnapEvent(ec, dse_item, dse_item2, event, origin);
         }
 
         prev_pos = event_pos;
-- 
cgit v1.2.3


From 9b1d9867e9cfbf56b44e8a996a4ccf2e7f288b87 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 22 Jul 2014 02:29:52 +0200
Subject: fix bug pointed by LiamW in Spirolive

(bzr r13341.1.94)
---
 src/ui/tools/pen-tool.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index aead3ebc0..56bcbef0d 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1611,7 +1611,6 @@ void PenTool::_bspline_spiro_motion(bool shift){
                     this->p[2] = this->p[3];
             }else{
                 this->p[1] =  (*cubic)[3] + ((*cubic)[3] - (*cubic)[2] );
-                this->p[1] = Geom::Point(this->p[1][X] + 0.005,this->p[1][Y] + 0.005);
             }
         }else{
             this->p[1] = this->p[0];
-- 
cgit v1.2.3


From 38acb1deed8b48ab28cc28ba0dfc577a5e205da9 Mon Sep 17 00:00:00 2001
From: Markus Engel <markus.engel@tum.de>
Date: Tue, 22 Jul 2014 21:15:15 +0200
Subject: Fixed some unused variables warnings.

(bzr r13458)
---
 src/ui/tools/spray-tool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 08d3119a1..29f1b9a73 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -677,7 +677,7 @@ bool SprayTool::root_handler(GdkEvent* event) {
                 desktop->setToolboxAdjustmentValue("population", this->population * 100);
                 Geom::Point const scroll_w(event->button.x, event->button.y);
                 Geom::Point const scroll_dt = desktop->point();;
-                Geom::Point motion_doc(desktop->dt2doc(scroll_dt));
+                
                 switch (event->scroll.direction) {
                     case GDK_SCROLL_DOWN:
                     case GDK_SCROLL_UP: {
-- 
cgit v1.2.3


From b178124078314b78baca08fb65e12cc894242d3a Mon Sep 17 00:00:00 2001
From: Markus Engel <markus.engel@tum.de>
Date: Tue, 22 Jul 2014 21:16:13 +0200
Subject: Replaced some abs/fabs with std::abs.

(bzr r13459)
---
 src/ui/tools/pen-tool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 70cbcaf0d..649c64034 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1185,7 +1185,7 @@ void PenTool::_setSubsequentPoint(Geom::Point const p, bool statusbar, guint sta
         // we are drawing horizontal/vertical lines and hit an anchor;
         Geom::Point const origin = this->p[0];
         // if the previous point and the anchor are not aligned either horizontally or vertically...
-        if ((abs(p[Geom::X] - origin[Geom::X]) > 1e-9) && (abs(p[Geom::Y] - origin[Geom::Y]) > 1e-9)) {
+        if ((std::abs(p[Geom::X] - origin[Geom::X]) > 1e-9) && (std::abs(p[Geom::Y] - origin[Geom::Y]) > 1e-9)) {
             // ...then we should draw an L-shaped path, consisting of two paraxial segments
             Geom::Point intermed = p;
             this->_setToNearestHorizVert(intermed, status, false);
-- 
cgit v1.2.3


From cc73219a498e87298578996011b80680214f7a96 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sat, 26 Jul 2014 13:11:51 -0400
Subject: Clean up some ShapeHolder related things

(bzr r13341.1.100)
---
 src/ui/tools/arc-tool.cpp    | 6 +++---
 src/ui/tools/box3d-tool.cpp  | 6 +++---
 src/ui/tools/flood-tool.cpp  | 6 +++---
 src/ui/tools/lpe-tool.cpp    | 7 +++----
 src/ui/tools/node-tool.cpp   | 2 +-
 src/ui/tools/rect-tool.cpp   | 6 +++---
 src/ui/tools/spiral-tool.cpp | 6 +++---
 src/ui/tools/star-tool.cpp   | 6 +++---
 src/ui/tools/text-tool.cpp   | 6 +++---
 9 files changed, 25 insertions(+), 26 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp
index 43f8eb9e1..9fd68f1b9 100644
--- a/src/ui/tools/arc-tool.cpp
+++ b/src/ui/tools/arc-tool.cpp
@@ -102,8 +102,8 @@ ArcTool::~ArcTool() {
  * destroys old and creates new knotholder.
  */
 void ArcTool::selection_changed(Inkscape::Selection* selection) {
-    this->shape_editor->unset_item(SH_KNOTHOLDER);
-    this->shape_editor->set_item(selection->singleItem(), SH_KNOTHOLDER);
+    this->shape_editor->unset_item();
+    this->shape_editor->set_item(selection->singleItem());
 }
 
 void ArcTool::setup() {
@@ -115,7 +115,7 @@ void ArcTool::setup() {
 
     SPItem *item = sp_desktop_selection(this->desktop)->singleItem();
     if (item) {
-        this->shape_editor->set_item(item, SH_KNOTHOLDER);
+        this->shape_editor->set_item(item);
     }
 
     this->sel_changed_connection.disconnect();
diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp
index e00894d55..b998267c2 100644
--- a/src/ui/tools/box3d-tool.cpp
+++ b/src/ui/tools/box3d-tool.cpp
@@ -112,8 +112,8 @@ Box3dTool::~Box3dTool() {
  * destroys old and creates new knotholder.
  */
 void Box3dTool::selection_changed(Inkscape::Selection* selection) {
-    this->shape_editor->unset_item(SH_KNOTHOLDER);
-    this->shape_editor->set_item(selection->singleItem(), SH_KNOTHOLDER);
+    this->shape_editor->unset_item();
+    this->shape_editor->set_item(selection->singleItem());
 
     if (selection->perspList().size() == 1) {
         // selecting a single box changes the current perspective
@@ -147,7 +147,7 @@ void Box3dTool::setup() {
 
     SPItem *item = sp_desktop_selection(this->desktop)->singleItem();
     if (item) {
-        this->shape_editor->set_item(item, SH_KNOTHOLDER);
+        this->shape_editor->set_item(item);
     }
 
     this->sel_changed_connection.disconnect();
diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp
index d74848dc6..3fb56b2ad 100644
--- a/src/ui/tools/flood-tool.cpp
+++ b/src/ui/tools/flood-tool.cpp
@@ -119,8 +119,8 @@ FloodTool::~FloodTool() {
  * destroys old and creates new knotholder.
  */
 void FloodTool::selection_changed(Inkscape::Selection* selection) {
-    this->shape_editor->unset_item(SH_KNOTHOLDER);
-    this->shape_editor->set_item(selection->singleItem(), SH_KNOTHOLDER);
+    this->shape_editor->unset_item();
+    this->shape_editor->set_item(selection->singleItem());
 }
 
 void FloodTool::setup() {
@@ -130,7 +130,7 @@ void FloodTool::setup() {
 
     SPItem *item = sp_desktop_selection(this->desktop)->singleItem();
     if (item) {
-        this->shape_editor->set_item(item, SH_KNOTHOLDER);
+        this->shape_editor->set_item(item);
     }
 
     this->sel_changed_connection.disconnect();
diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp
index 9ab6d7814..e9b9421f1 100644
--- a/src/ui/tools/lpe-tool.cpp
+++ b/src/ui/tools/lpe-tool.cpp
@@ -129,8 +129,7 @@ void LpeTool::setup() {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
     if (item) {
-        this->shape_editor->set_item(item, SH_NODEPATH);
-        this->shape_editor->set_item(item, SH_KNOTHOLDER);
+        this->shape_editor->set_item(item);
     }
 
     if (prefs->getBool("/tools/lpetool/selcue")) {
@@ -146,9 +145,9 @@ void sp_lpetool_context_selection_changed(Inkscape::Selection *selection, gpoint
 {
     LpeTool *lc = SP_LPETOOL_CONTEXT(data);
 
-    lc->shape_editor->unset_item(SH_KNOTHOLDER);
+    lc->shape_editor->unset_item();
     SPItem *item = selection->singleItem();
-    lc->shape_editor->set_item(item, SH_KNOTHOLDER);
+    lc->shape_editor->set_item(item);
 }
 
 void LpeTool::set(const Inkscape::Preferences::Entry& val) {
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index ce487831d..36f33e478 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -438,7 +438,7 @@ void NodeTool::selection_changed(Inkscape::Selection *sel) {
             this->_shape_editors.find(r.item) == this->_shape_editors.end())
         {
             ShapeEditor *si = new ShapeEditor(this->desktop);
-            si->set_item(r.item, SH_KNOTHOLDER);
+            si->set_item(r.item);
             this->_shape_editors.insert(const_cast<SPItem*&>(r.item), si);
         }
     }
diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp
index 39f422c1a..819671dd6 100644
--- a/src/ui/tools/rect-tool.cpp
+++ b/src/ui/tools/rect-tool.cpp
@@ -102,8 +102,8 @@ RectTool::~RectTool() {
  * destroys old and creates new knotholder.
  */
 void RectTool::selection_changed(Inkscape::Selection* selection) {
-    this->shape_editor->unset_item(SH_KNOTHOLDER);
-    this->shape_editor->set_item(selection->singleItem(), SH_KNOTHOLDER);
+    this->shape_editor->unset_item();
+    this->shape_editor->set_item(selection->singleItem());
 }
 
 void RectTool::setup() {
@@ -113,7 +113,7 @@ void RectTool::setup() {
 
     SPItem *item = sp_desktop_selection(this->desktop)->singleItem();
     if (item) {
-        this->shape_editor->set_item(item, SH_KNOTHOLDER);
+        this->shape_editor->set_item(item);
     }
 
     this->sel_changed_connection.disconnect();
diff --git a/src/ui/tools/spiral-tool.cpp b/src/ui/tools/spiral-tool.cpp
index 5ae229df8..83712457a 100644
--- a/src/ui/tools/spiral-tool.cpp
+++ b/src/ui/tools/spiral-tool.cpp
@@ -104,8 +104,8 @@ SpiralTool::~SpiralTool() {
  * destroys old and creates new knotholder.
  */
 void SpiralTool::selection_changed(Inkscape::Selection *selection) {
-    this->shape_editor->unset_item(SH_KNOTHOLDER);
-    this->shape_editor->set_item(selection->singleItem(), SH_KNOTHOLDER);
+    this->shape_editor->unset_item();
+    this->shape_editor->set_item(selection->singleItem());
 }
 
 void SpiralTool::setup() {
@@ -119,7 +119,7 @@ void SpiralTool::setup() {
 
     SPItem *item = sp_desktop_selection(this->desktop)->singleItem();
     if (item) {
-        this->shape_editor->set_item(item, SH_KNOTHOLDER);
+        this->shape_editor->set_item(item);
     }
 
     Inkscape::Selection *selection = sp_desktop_selection(this->desktop);
diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index 68f998920..ed28c0a8d 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -112,8 +112,8 @@ StarTool::~StarTool() {
 void StarTool::selection_changed(Inkscape::Selection* selection) {
     g_assert (selection != NULL);
 
-    this->shape_editor->unset_item(SH_KNOTHOLDER);
-    this->shape_editor->set_item(selection->singleItem(), SH_KNOTHOLDER);
+    this->shape_editor->unset_item();
+    this->shape_editor->set_item(selection->singleItem());
 }
 
 void StarTool::setup() {
@@ -129,7 +129,7 @@ void StarTool::setup() {
 
 	SPItem *item = sp_desktop_selection(this->desktop)->singleItem();
 	if (item) {
-		this->shape_editor->set_item(item, SH_KNOTHOLDER);
+		this->shape_editor->set_item(item);
 	}
 
 	Inkscape::Selection *selection = sp_desktop_selection(this->desktop);
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index ac830fe6b..b60a39e5d 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -177,7 +177,7 @@ void TextTool::setup() {
 
     SPItem *item = sp_desktop_selection(this->desktop)->singleItem();
     if (item && SP_IS_FLOWTEXT(item) && SP_FLOWTEXT(item)->has_internal_frame()) {
-        this->shape_editor->set_item(item, SH_KNOTHOLDER);
+        this->shape_editor->set_item(item);
     }
 
     this->sel_changed_connection = sp_desktop_selection(desktop)->connectChangedFirst(
@@ -1411,10 +1411,10 @@ void TextTool::_selectionChanged(Inkscape::Selection *selection)
 
     ToolBase *ec = SP_EVENT_CONTEXT(this);
 
-    ec->shape_editor->unset_item(SH_KNOTHOLDER);
+    ec->shape_editor->unset_item();
     SPItem *item = selection->singleItem();
     if (item && SP_IS_FLOWTEXT(item) && SP_FLOWTEXT(item)->has_internal_frame()) {
-        ec->shape_editor->set_item(item, SH_KNOTHOLDER);
+        ec->shape_editor->set_item(item);
     }
 
     if (this->text && (item != this->text)) {
-- 
cgit v1.2.3


From 6934b8ce1b39c6d3533fa3da86aa32cac5282056 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Mon, 28 Jul 2014 21:47:11 -0400
Subject: Fix for 1346972 (freehand shape mode should pick stroke width from
 tool's active style)

Fixed bugs:
  - https://launchpad.net/bugs/1346972

(bzr r13482)
---
 src/ui/tools/freehand-base.cpp | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 288a200f4..a90a23a3e 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -225,6 +225,31 @@ static void spdc_apply_powerstroke_shape(const std::vector<Geom::Point> & points
     Effect* lpe = SP_LPE_ITEM(item)->getCurrentLPE();
     static_cast<LPEPowerStroke*>(lpe)->offset_points.param_set_and_write_new_value(points);
 
+    // find out stroke width (TODO: is there an easier way??)
+    SPDesktop *desktop = dc->desktop;
+    Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
+    Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
+    Inkscape::GC::release(repr);
+
+    char const* tool = SP_IS_PEN_CONTEXT(dc) ? "/tools/freehand/pen" : "/tools/freehand/pencil";
+
+    // apply the tool's current style
+    sp_desktop_apply_style_tool(desktop, repr, tool, false);
+
+    double stroke_width = 1.0;
+    char const *style_str = NULL;
+    style_str = repr->attribute("style");
+    if (style_str) {
+        SPStyle *style = sp_style_new(SP_ACTIVE_DOCUMENT);
+        sp_style_merge_from_style_string(style, style_str);
+        stroke_width = style->stroke_width.computed;
+        style->stroke_width.computed = 0;
+        sp_style_unref(style);
+    }
+
+    char * width_str = new char[50];
+    sprintf(width_str, "0,%f", stroke_width / 2.);
+
     // write powerstroke parameters:
     lpe->getRepr()->setAttribute("start_linecap_type", "zerowidth");
     lpe->getRepr()->setAttribute("end_linecap_type", "zerowidth");
@@ -232,6 +257,9 @@ static void spdc_apply_powerstroke_shape(const std::vector<Geom::Point> & points
     lpe->getRepr()->setAttribute("sort_points", "true");
     lpe->getRepr()->setAttribute("interpolator_type", "CubicBezierJohan");
     lpe->getRepr()->setAttribute("interpolator_beta", "0.2");
+    lpe->getRepr()->setAttribute("offset_points", width_str);
+
+    delete [] width_str;
 }
 
 static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item, SPCurve *curve)
-- 
cgit v1.2.3


From 702d7523e258cb18802dfedeef642589e99e89f0 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 30 Jul 2014 02:26:30 +0200
Subject: add last applied branch - mode to strokes on pen/pencil

(bzr r13341.1.108)
---
 src/ui/tools/freehand-base.cpp | 45 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 6 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 1c5b7b8e3..86b78c953 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -44,6 +44,8 @@
 #include "live_effects/lpe-powerstroke.h"
 #include "style.h"
 #include "ui/control-manager.h"
+// clipboard support
+#include "ui/clipboard.h"
 #include "ui/tools/freehand-base.h"
 
 #include <gdk/gdkkeysyms.h>
@@ -261,7 +263,13 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
             Effect::createAndApply(BSPLINE, dc->desktop->doc(), item);
         }
 
-        int shape = prefs->getInt(tool_name(dc) + "/shape", 0);
+        //Store the clipboard path to apply in the future without the use of clipboard
+        static Geom::PathVector previous_shape_pathv;
+        enum shapeType { NONE, TRIANGLE_IN, TRIANGLE_OUT, ELLIPSE, CLIPBOARD, LAST_APPLIED };
+        static shapeType previous_shape_type = NONE;
+
+
+        shapeType shape = (shapeType)prefs->getInt(tool_name(dc) + "/shape", 0);
         bool shape_applied = false;
         SPCSSAttr *css_item = sp_css_attr_from_object(item, SP_STYLE_FLAG_ALWAYS);
         const char *cstroke = sp_repr_css_property(css_item, "stroke", "none");
@@ -269,11 +277,18 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
 #define SHAPE_LENGTH 10
 #define SHAPE_HEIGHT 10
 
+        if(shape == LAST_APPLIED){
+            shape = previous_shape_type;
+            if(shape == CLIPBOARD){
+                shape = LAST_APPLIED;
+            }
+        }
+
         switch (shape) {
-            case 0:
+            case NONE:
                 // don't apply any shape
                 break;
-            case 1:
+            case TRIANGLE_IN:
             {
                 // "triangle in"
                 std::vector<Geom::Point> points(1);
@@ -283,7 +298,7 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
                 shape_applied = true;
                 break;
             }
-            case 2:
+            case TRIANGLE_OUT:
             {
                 // "triangle out"
                 guint curve_length = curve->get_segment_count();
@@ -294,7 +309,7 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
                 shape_applied = true;
                 break;
             }
-            case 3:
+            case ELLIPSE:
             {
                 // "ellipse"
                 SPCurve *c = new SPCurve();
@@ -307,22 +322,40 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
                 c->closepath();
                 spdc_paste_curve_as_freehand_shape(c, dc, item);
                 c->unref();
+
                 shape_applied = true;
                 break;
             }
-            case 4:
+            case CLIPBOARD:
             {
                 // take shape from clipboard; TODO: catch the case where clipboard is empty
                 Effect::createAndApply(PATTERN_ALONG_PATH, dc->desktop->doc(), item);
                 Effect* lpe = SP_LPE_ITEM(item)->getCurrentLPE();
                 static_cast<LPEPatternAlongPath*>(lpe)->pattern.on_paste_button_click();
+                Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+                Glib::ustring svgd = cm->getPathParameter(SP_ACTIVE_DESKTOP);
+                previous_shape_pathv = sp_svg_read_pathv(svgd.data());
 
                 shape_applied = true;
                 break;
             }
+            case LAST_APPLIED:
+            {
+                if(previous_shape_pathv.size() != 0){
+                    SPCurve * c = new SPCurve();
+                    c->set_pathvector(previous_shape_pathv);
+                    spdc_paste_curve_as_freehand_shape(c, dc, item);
+                    c->unref();
+
+                    shape_applied = true;
+                }
+                break;
+            }
             default:
                 break;
         }
+        previous_shape_type = shape;
+
         if (shape_applied) {
             // apply original stroke color as fill and unset stroke; then return
             SPCSSAttr *css = sp_repr_css_attr_new();
-- 
cgit v1.2.3


From a0acffb60236ee6d8c6f8ccc2f29d36b5aa02dda Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 1 Aug 2014 10:28:31 -0400
Subject: Fix for #906794, #1246550 (live effects not showing helper paths)

Fixed bugs:
  - https://launchpad.net/bugs/1246550
  - https://launchpad.net/bugs/906794

(bzr r13487)
---
 src/ui/tools/node-tool.cpp | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 src/ui/tools/node-tool.h   |  2 ++
 2 files changed, 47 insertions(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index b1e11bd66..0778e3f3f 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -19,6 +19,7 @@
 #include "display/curve.h"
 #include "display/sp-canvas.h"
 #include "document.h"
+#include "live_effects/effect.h"
 #include "live_effects/lpeobject.h"
 #include "message-context.h"
 #include "selection.h"
@@ -166,6 +167,9 @@ NodeTool::~NodeTool() {
     if (this->flash_tempitem) {
         this->desktop->remove_temporary_canvasitem(this->flash_tempitem);
     }
+    if (this->helperpath_tmpitem) {
+        this->desktop->remove_temporary_canvasitem(this->helperpath_tmpitem);
+    }
 
     this->_selection_changed_connection.disconnect();
     //this->_selection_modified_connection.disconnect();
@@ -246,6 +250,7 @@ void NodeTool::setup() {
 		)))
     );
 
+    this->helperpath_tmpitem = NULL;
     this->cursor_drag = false;
     this->show_transform_handles = true;
     this->single_node_transform_handles = false;
@@ -278,6 +283,44 @@ void NodeTool::setup() {
     }
 
     this->desktop->emitToolSubselectionChanged(NULL); // sets the coord entry fields to inactive
+    this->update_helperpath();
+}
+
+// show helper paths of the applied LPE, if any
+void  NodeTool::update_helperpath () {
+    Inkscape::Selection *selection = sp_desktop_selection (this->desktop);
+
+    if (this->helperpath_tmpitem) {
+        this->desktop->remove_temporary_canvasitem(this->helperpath_tmpitem);
+        this->helperpath_tmpitem = NULL;
+    }
+
+    if (SP_IS_LPE_ITEM(selection->singleItem())) {
+        Inkscape::LivePathEffect::Effect *lpe = SP_LPE_ITEM(selection->singleItem())->getCurrentLPE();
+        if (lpe && lpe->isVisible()/* && lpe->showOrigPath()*/) {
+            if (lpe) {
+                SPCurve *c = new SPCurve();
+                SPCurve *cc = new SPCurve();
+                std::vector<Geom::PathVector> cs = lpe->getCanvasIndicators(SP_LPE_ITEM(selection->singleItem()));
+                for (std::vector<Geom::PathVector>::iterator p = cs.begin(); p != cs.end(); ++p) {
+                    cc->set_pathvector(*p);
+                    c->append(cc, false);
+                    cc->reset();
+                }
+                if (!c->is_empty()) {
+                    c->transform(selection->singleItem()->i2dt_affine());
+                    SPCanvasItem *helperpath = sp_canvas_bpath_new(sp_desktop_tempgroup(this->desktop), c);
+                    sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(helperpath),
+                        0x0000ff9A, 1.0,
+                        SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
+                    sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(helperpath), 0, SP_WIND_RULE_NONZERO);
+                    this->helperpath_tmpitem = this->desktop->add_temporary_canvasitem(helperpath,0);
+                }
+                c->unref();
+                cc->unref();
+           }
+        }
+    }
 }
 
 void NodeTool::set(const Inkscape::Preferences::Entry& value) {
@@ -392,7 +435,7 @@ void NodeTool::selection_changed(Inkscape::Selection *sel) {
     for (std::set<ShapeRecord>::iterator i = shapes.begin(); i != shapes.end(); ++i) {
         ShapeRecord const &r = *i;
 
-        if ((SP_IS_SHAPE(r.item) || SP_IS_TEXT(r.item)) &&
+        if ((SP_IS_SHAPE(r.item) || SP_IS_TEXT(r.item) || SP_IS_GROUP(r.item) || SP_IS_OBJECTGROUP(r.item)) &&
             this->_shape_editors.find(r.item) == this->_shape_editors.end())
         {
             ShapeEditor *si = new ShapeEditor(this->desktop);
@@ -432,6 +475,7 @@ bool NodeTool::root_handler(GdkEvent* event) {
     switch (event->type)
     {
     case GDK_MOTION_NOTIFY: {
+	this->update_helperpath();
         combine_motion_events(desktop->canvas, event->motion, 0);
         SPItem *over_item = sp_event_context_find_item (desktop, event_point(event->button),
                 FALSE, TRUE);
diff --git a/src/ui/tools/node-tool.h b/src/ui/tools/node-tool.h
index 4d15ab70e..459ecd0a7 100644
--- a/src/ui/tools/node-tool.h
+++ b/src/ui/tools/node-tool.h
@@ -51,6 +51,7 @@ public:
 	static const std::string prefsPath;
 
 	virtual void setup();
+	virtual void update_helperpath();
 	virtual void set(const Inkscape::Preferences::Entry& val);
 	virtual bool root_handler(GdkEvent* event);
 
@@ -62,6 +63,7 @@ private:
     sigc::connection _sizeUpdatedConn;
 
     SPItem *flashed_item;
+    Inkscape::Display::TemporaryItem *helperpath_tmpitem;
     Inkscape::Display::TemporaryItem *flash_tempitem;
     Inkscape::UI::Selector* _selector;
     Inkscape::UI::PathSharedData* _path_data;
-- 
cgit v1.2.3


From b2842360758b2333a651ef9932c1e438e90628e3 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 4 Aug 2014 11:21:54 +0200
Subject: Fixed some redraw problems moving nodes in bspline mode

(bzr r13341.1.115)
---
 src/ui/tools/pen-tool.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index d826eaf48..9a73d497f 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -84,7 +84,7 @@ namespace Tools {
 static Geom::Point pen_drag_origin_w(0, 0);
 static bool pen_within_tolerance = false;
 static int pen_last_paraxial_dir = 0; // last used direction in horizontal/vertical mode; 0 = horizontal, 1 = vertical
-
+const double handleCubicGap = 0.01;
 namespace {
     ToolBase* createPenContext() {
         return new PenTool();
@@ -1454,7 +1454,7 @@ void PenTool::_bspline_spiro_on()
         this->p[0] = this->red_curve->first_segment()->initialPoint();
         this->p[3] = this->red_curve->first_segment()->finalPoint();
         this->p[2] = this->p[3] + (1./3)*(this->p[0] - this->p[3]);
-        this->p[2] = Geom::Point(this->p[2][X] + 0.005,this->p[2][Y] + 0.005);
+        this->p[2] = Geom::Point(this->p[2][X] + handleCubicGap,this->p[2][Y] + handleCubicGap);
     }
 }
 
@@ -1522,7 +1522,7 @@ void PenTool::_bspline_spiro_start_anchor_on()
     Geom::Point A = tmpCurve->last_segment()->initialPoint();
     Geom::Point D = tmpCurve->last_segment()->finalPoint();
     Geom::Point C = D + (1./3)*(A - D);
-    C = Geom::Point(C[X] + 0.005,C[Y] + 0.005);
+    C = Geom::Point(C[X] + handleCubicGap,C[Y] + handleCubicGap);
     if(cubic){
         lastSeg->moveto(A);
         lastSeg->curveto((*cubic)[1],C,D);
@@ -1580,10 +1580,10 @@ void PenTool::_bspline_spiro_motion(bool shift){
     this->npoints = 5;
     SPCurve *tmpCurve = new SPCurve();
     this->p[2] = this->p[3] + (1./3)*(this->p[0] - this->p[3]);
-    this->p[2] = Geom::Point(this->p[2][X] + 0.005,this->p[2][Y] + 0.005);
+    this->p[2] = Geom::Point(this->p[2][X] + handleCubicGap,this->p[2][Y] + handleCubicGap);
     if(this->green_curve->is_empty() && !this->sa){
         this->p[1] = this->p[0] + (1./3)*(this->p[3] - this->p[0]);
-        this->p[1] = Geom::Point(this->p[1][X] + 0.005,this->p[1][Y] + 0.005);
+        this->p[1] = Geom::Point(this->p[1][X] + handleCubicGap,this->p[1][Y] + handleCubicGap);
     }else if(!this->green_curve->is_empty()){
         tmpCurve = this->green_curve->copy();
     }else{
@@ -1608,7 +1608,7 @@ void PenTool::_bspline_spiro_motion(bool shift){
                 WPower->reset();
                 this->p[1] = SBasisWPower.valueAt(WP);
                 if(!Geom::are_near(this->p[1],this->p[0]))
-                    this->p[1] = Geom::Point(this->p[1][X] + 0.005,this->p[1][Y] + 0.005);
+                    this->p[1] = Geom::Point(this->p[1][X] + handleCubicGap,this->p[1][Y] + handleCubicGap);
                 if(shift)
                     this->p[2] = this->p[3];
             }else{
@@ -1638,7 +1638,7 @@ void PenTool::_bspline_spiro_end_anchor_on()
     using Geom::X;
     using Geom::Y;
     this->p[2] = this->p[3] + (1./3)*(this->p[0] - this->p[3]);
-    this->p[2] = Geom::Point(this->p[2][X] + 0.005,this->p[2][Y] + 0.005);
+    this->p[2] = Geom::Point(this->p[2][X] + handleCubicGap,this->p[2][Y] + handleCubicGap);
     SPCurve *tmpCurve = new SPCurve();
     SPCurve *lastSeg = new SPCurve();
     Geom::Point C(0,0);
@@ -1661,7 +1661,7 @@ void PenTool::_bspline_spiro_end_anchor_on()
     Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
     if(this->bspline){
         C = tmpCurve->last_segment()->finalPoint() + (1./3)*(tmpCurve->last_segment()->initialPoint() - tmpCurve->last_segment()->finalPoint());
-        C = Geom::Point(C[X] + 0.005,C[Y] + 0.005);
+        C = Geom::Point(C[X] + handleCubicGap,C[Y] + handleCubicGap);
     }else{
         C = this->p[3] + this->p[3] - this->p[2];
     }
-- 
cgit v1.2.3


From 2029349f5291ae10048202732a89f34c0a179130 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Wed, 6 Aug 2014 20:40:19 -0400
Subject: Add in some debugging code that will complain when deleted knots are
 accessed by snap handler

(bzr r13341.1.120)
---
 src/ui/tools/tool-base.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index f1d90f6c6..c23da87c0 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -58,6 +58,7 @@
 #include "sp-guide.h"
 #include "color.h"
 #include "knot.h"
+#include "knot-ptr.h"
 
 // globals for temporary switching to selector by space
 static bool selector_toggled = FALSE;
@@ -1359,6 +1360,7 @@ gboolean sp_event_context_snap_watchdog_callback(gpointer data) {
         break;
     case DelayedSnapEvent::KNOT_HANDLER: {
         gpointer knot = dse->getItem2();
+        check_if_knot_deleted(knot);
         if (knot && SP_IS_KNOT(knot)) {
             sp_knot_handler_request_position(dse->getEvent(), SP_KNOT(knot));
         }
-- 
cgit v1.2.3


From d59ab0cc036239f5e2f6040b2f439ba7b55af4c3 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Fri, 8 Aug 2014 09:47:46 -0400
Subject: Ponyscape feature: finish pen drawing on context switch

(bzr r13090.1.101)
---
 src/ui/tools/pen-tool.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 9a73d497f..318591df5 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -239,7 +239,9 @@ void PenTool::finish() {
     sp_event_context_discard_delayed_snap_event(this);
 
     if (this->npoints != 0) {
-        this->_cancel();
+        // switching context - finish path
+        this->ea = NULL; // unset end anchor if set (otherwise crashes)
+        this->_finish(false);
     }
 
     FreehandBase::finish();
-- 
cgit v1.2.3


From e9f9ba07739cdb52c649e8e10dca9de76c71114d Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Fri, 8 Aug 2014 16:20:44 -0400
Subject: Massive performance improvment for basic node operations with
 thousands of nodes

(bzr r13341.1.124)
---
 src/ui/tools/node-tool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index d2584ee74..d4d7b2c35 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -245,7 +245,7 @@ void NodeTool::setup() {
         )
     );
 
-    this->_selected_nodes->signal_point_changed.connect(
+    this->_selected_nodes->signal_selection_changed.connect(
 		// Hide both signal parameters and bind the function parameter to 0
 		// sigc::signal<void, SelectableControlPoint *, bool>
 		// <=>
-- 
cgit v1.2.3


From 764f8e7612bbf000a5fab4eeed165432f4ff779b Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sat, 9 Aug 2014 22:47:25 -0400
Subject: Further fixes related to bug #1327267, toolbars don't need to update
 when their context is not in use

(bzr r13341.1.126)
---
 src/ui/tools/arc-tool.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/arc-tool.h b/src/ui/tools/arc-tool.h
index c4c67660d..55cbaf78c 100644
--- a/src/ui/tools/arc-tool.h
+++ b/src/ui/tools/arc-tool.h
@@ -30,7 +30,7 @@ namespace Inkscape {
 }
 
 #define SP_ARC_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::ArcTool*>((Inkscape::UI::Tools::ToolBase*)obj))
-#define SP_IS_ARC_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::ArcTool*>(const Inkscape::UI::Tools::ToolBase*(obj)) != NULL)
+#define SP_IS_ARC_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::ArcTool*>(obj) != NULL)
 
 namespace Inkscape {
 namespace UI {
-- 
cgit v1.2.3


From 3511d63cc7b04e5fc5ae0ff8de616f0594c5dbcb Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sun, 10 Aug 2014 00:07:19 -0400
Subject: Get gradient tool to shut up about invalid casts with meshes

(bzr r13341.1.131)
---
 src/ui/tools/gradient-tool.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp
index a0bbfbaf1..4f9a7b59b 100644
--- a/src/ui/tools/gradient-tool.cpp
+++ b/src/ui/tools/gradient-tool.cpp
@@ -213,17 +213,20 @@ sp_gradient_context_is_over_line (GradientTool *rc, SPItem *item, Geom::Point ev
     //Translate mouse point into proper coord system
     rc->mousepoint_doc = desktop->w2d(event_p);
 
-    SPCtrlLine* line = SP_CTRLLINE(item);
+    if (SP_IS_CTRLLINE(item)) {
+        SPCtrlLine* line = SP_CTRLLINE(item);
 
-    Geom::LineSegment ls(line->s, line->e);
-    Geom::Point nearest = ls.pointAt(ls.nearestPoint(rc->mousepoint_doc));
-    double dist_screen = Geom::L2 (rc->mousepoint_doc - nearest) * desktop->current_zoom();
+        Geom::LineSegment ls(line->s, line->e);
+        Geom::Point nearest = ls.pointAt(ls.nearestPoint(rc->mousepoint_doc));
+        double dist_screen = Geom::L2 (rc->mousepoint_doc - nearest) * desktop->current_zoom();
 
-    double tolerance = (double) SP_EVENT_CONTEXT(rc)->tolerance;
+        double tolerance = (double) SP_EVENT_CONTEXT(rc)->tolerance;
 
-    bool close = (dist_screen < tolerance);
+        bool close = (dist_screen < tolerance);
 
-    return close;
+        return close;
+    }
+    return false;
 }
 
 static std::vector<Geom::Point>
-- 
cgit v1.2.3


From 8920e3ea655df6447e2ed6f8b0b5621442d20cb5 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Sun, 24 Aug 2014 12:31:46 +0100
Subject: Fix strict build with Gtk+ 2

(bzr r13341.1.172)
---
 src/ui/tools/tool-base.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index c23da87c0..c28b86416 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -18,6 +18,8 @@
 # include "config.h"
 #endif
 
+#include "widgets/desktop-widget.h"
+
 #if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
 #endif
@@ -40,7 +42,6 @@
 #include "desktop-handles.h"
 #include "desktop-events.h"
 #include "desktop-style.h"
-#include "widgets/desktop-widget.h"
 #include "sp-namedview.h"
 #include "selection.h"
 #include "interface.h"
-- 
cgit v1.2.3


From be6f51a507f0fddb403255adb8b25002ae10f154 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 25 Aug 2014 17:34:11 +0200
Subject: fix bug coninuing existing paths whith no LPE in bspline/spiro modes

(bzr r13341.1.176)
---
 src/ui/tools/freehand-base.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index aad924844..72250a550 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -610,13 +610,13 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     if (dc->sa) {
         SPCurve *s = dc->sa->curve;
         dc->white_curves = g_slist_remove(dc->white_curves, s);
-        if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
-            prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
-                s = dc->overwriteCurve;
-        }
         if (dc->sa->start) {
             s = reverse_then_unref(s);
         }
+        if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
+            prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
+                dc->overwriteCurve = s;
+        }
         s->append_continuous(c, 0.0625);
         c->unref();
         c = s;
-- 
cgit v1.2.3


From 977857ef75a45ed1ec79cfdcf0f25dd66d4a7e86 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Sat, 30 Aug 2014 14:00:28 +0100
Subject: Reduce header bloat

(bzr r13341.1.184)
---
 src/ui/tools/flood-tool.h  | 4 +---
 src/ui/tools/select-tool.h | 1 -
 src/ui/tools/spiral-tool.h | 8 +++-----
 src/ui/tools/text-tool.h   | 7 +++----
 4 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/flood-tool.h b/src/ui/tools/flood-tool.h
index 3ed670e8b..5104a42e9 100644
--- a/src/ui/tools/flood-tool.h
+++ b/src/ui/tools/flood-tool.h
@@ -11,9 +11,7 @@
  * Released under GNU GPL
  */
 
-#include <stddef.h>
-#include <sigc++/sigc++.h>
-#include <gtk/gtk.h>
+#include <sigc++/connection.h>
 #include "ui/tools/tool-base.h"
 
 #define SP_FLOOD_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::FloodTool*>((Inkscape::UI::Tools::ToolBase*)obj))
diff --git a/src/ui/tools/select-tool.h b/src/ui/tools/select-tool.h
index edc4069a2..5af99a56a 100644
--- a/src/ui/tools/select-tool.h
+++ b/src/ui/tools/select-tool.h
@@ -13,7 +13,6 @@
  */
 
 #include "ui/tools/tool-base.h"
-#include <gtk/gtk.h>
 
 #define SP_SELECT_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::SelectTool*>((Inkscape::UI::Tools::ToolBase*)obj))
 #define SP_IS_SELECT_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::SelectTool*>((const Inkscape::UI::Tools::ToolBase*)obj) != NULL)
diff --git a/src/ui/tools/spiral-tool.h b/src/ui/tools/spiral-tool.h
index 416aeb7e4..add92342d 100644
--- a/src/ui/tools/spiral-tool.h
+++ b/src/ui/tools/spiral-tool.h
@@ -15,17 +15,15 @@
  * Released under GNU GPL
  */
 
-#include <gtk/gtk.h>
-#include <stddef.h>
-#include <sigc++/sigc++.h>
+#include <sigc++/connection.h>
 #include <2geom/point.h>
 #include "ui/tools/tool-base.h"
 
-#include "sp-spiral.h"
-
 #define SP_SPIRAL_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::SpiralTool*>((Inkscape::UI::Tools::ToolBase*)obj))
 #define SP_IS_SPIRAL_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::SpiralTool*>((const Inkscape::UI::Tools::ToolBase*)obj) != NULL)
 
+class SPSpiral;
+
 namespace Inkscape {
 namespace UI {
 namespace Tools {
diff --git a/src/ui/tools/text-tool.h b/src/ui/tools/text-tool.h
index ca2b3d19a..289ee180d 100644
--- a/src/ui/tools/text-tool.h
+++ b/src/ui/tools/text-tool.h
@@ -14,10 +14,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-/*  #include <gdk/gdkic.h> */
-#include <stddef.h>
-#include <sigc++/sigc++.h>
-#include <gtk/gtk.h>
+#include <sigc++/connection.h>
 
 #include "ui/tools/tool-base.h"
 #include <2geom/point.h>
@@ -26,6 +23,8 @@
 #define SP_TEXT_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::TextTool*>((Inkscape::UI::Tools::ToolBase*)obj))
 #define SP_IS_TEXT_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::TextTool*>((const Inkscape::UI::Tools::ToolBase*)obj) != NULL)
 
+typedef struct _GtkIMContext GtkIMContext;
+
 struct SPCtrlLine;
 
 namespace Inkscape {
-- 
cgit v1.2.3


From 8dfc079b2537894d03f3b43a2e1d05b0d576dd7b Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sun, 31 Aug 2014 17:19:39 -0400
Subject: Fix for bug #1363497 (strange crash with knot path effect)

Fixed bugs:
  - https://launchpad.net/bugs/1363497

(bzr r13537)
---
 src/ui/tools/node-tool.cpp | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 0778e3f3f..4be547506 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -298,27 +298,23 @@ void  NodeTool::update_helperpath () {
     if (SP_IS_LPE_ITEM(selection->singleItem())) {
         Inkscape::LivePathEffect::Effect *lpe = SP_LPE_ITEM(selection->singleItem())->getCurrentLPE();
         if (lpe && lpe->isVisible()/* && lpe->showOrigPath()*/) {
-            if (lpe) {
-                SPCurve *c = new SPCurve();
-                SPCurve *cc = new SPCurve();
-                std::vector<Geom::PathVector> cs = lpe->getCanvasIndicators(SP_LPE_ITEM(selection->singleItem()));
-                for (std::vector<Geom::PathVector>::iterator p = cs.begin(); p != cs.end(); ++p) {
-                    cc->set_pathvector(*p);
-                    c->append(cc, false);
-                    cc->reset();
-                }
-                if (!c->is_empty()) {
-                    c->transform(selection->singleItem()->i2dt_affine());
-                    SPCanvasItem *helperpath = sp_canvas_bpath_new(sp_desktop_tempgroup(this->desktop), c);
-                    sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(helperpath),
-                        0x0000ff9A, 1.0,
-                        SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
-                    sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(helperpath), 0, SP_WIND_RULE_NONZERO);
-                    this->helperpath_tmpitem = this->desktop->add_temporary_canvasitem(helperpath,0);
-                }
-                c->unref();
-                cc->unref();
-           }
+            SPCurve *c = new SPCurve();
+            SPCurve *cc = new SPCurve();
+            std::vector<Geom::PathVector> cs = lpe->getCanvasIndicators(SP_LPE_ITEM(selection->singleItem()));
+            for (std::vector<Geom::PathVector>::iterator p = cs.begin(); p != cs.end(); ++p) {
+                cc->set_pathvector(*p);
+                c->append(cc, false);
+                cc->reset();
+            }
+            if (!c->is_empty()) {
+                SPCanvasItem *helperpath = sp_canvas_bpath_new(sp_desktop_tempgroup(this->desktop), c);
+                sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(helperpath), 0x0000ff9A, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
+                sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(helperpath), 0, SP_WIND_RULE_NONZERO);
+                sp_canvas_item_affine_absolute(helperpath, selection->singleItem()->i2dt_affine());
+                this->helperpath_tmpitem = this->desktop->add_temporary_canvasitem(helperpath, 0);
+            }
+            c->unref();
+            cc->unref();
         }
     }
 }
-- 
cgit v1.2.3


From f92e6ec4025b82d140a65a949741e10d2380c5d6 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Tue, 2 Sep 2014 16:37:58 -0400
Subject: Fix locale issue in powerstroke width selection

(bzr r13542)
---
 src/ui/tools/freehand-base.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index a90a23a3e..37a170bc9 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -247,8 +247,9 @@ static void spdc_apply_powerstroke_shape(const std::vector<Geom::Point> & points
         sp_style_unref(style);
     }
 
-    char * width_str = new char[50];
-    sprintf(width_str, "0,%f", stroke_width / 2.);
+    std::ostringstream s;
+    s.imbue(std::locale::classic());
+    s << "0," << stroke_width / 2.;
 
     // write powerstroke parameters:
     lpe->getRepr()->setAttribute("start_linecap_type", "zerowidth");
@@ -257,9 +258,7 @@ static void spdc_apply_powerstroke_shape(const std::vector<Geom::Point> & points
     lpe->getRepr()->setAttribute("sort_points", "true");
     lpe->getRepr()->setAttribute("interpolator_type", "CubicBezierJohan");
     lpe->getRepr()->setAttribute("interpolator_beta", "0.2");
-    lpe->getRepr()->setAttribute("offset_points", width_str);
-
-    delete [] width_str;
+    lpe->getRepr()->setAttribute("offset_points", s.str().c_str());
 }
 
 static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item, SPCurve *curve)
-- 
cgit v1.2.3


From 0d0958e3b2aff0ed5f3ad7a98b4035213475c7f1 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sun, 7 Sep 2014 13:02:01 -0400
Subject: Update to experimental r13543

(bzr r13090.1.108)
---
 src/ui/tools/freehand-base.cpp |  9 ++++-----
 src/ui/tools/node-tool.cpp     | 38 +++++++++++++++++---------------------
 2 files changed, 21 insertions(+), 26 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 72250a550..bab6bc7e3 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -262,8 +262,9 @@ static void spdc_apply_powerstroke_shape(const std::vector<Geom::Point> & points
         sp_style_unref(style);
     }
 
-    char * width_str = new char[50];
-    sprintf(width_str, "0,%f", stroke_width / 2.);
+    std::ostringstream s;
+    s.imbue(std::locale::classic());
+    s << "0," << stroke_width / 2.;
 
     // write powerstroke parameters:
     lpe->getRepr()->setAttribute("start_linecap_type", "zerowidth");
@@ -272,9 +273,7 @@ static void spdc_apply_powerstroke_shape(const std::vector<Geom::Point> & points
     lpe->getRepr()->setAttribute("sort_points", "true");
     lpe->getRepr()->setAttribute("interpolator_type", "CubicBezierJohan");
     lpe->getRepr()->setAttribute("interpolator_beta", "0.2");
-    lpe->getRepr()->setAttribute("offset_points", width_str);
-
-    delete [] width_str;
+    lpe->getRepr()->setAttribute("offset_points", s.str().c_str());
 }
 
 static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item, SPCurve *curve)
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 975894586..0b98bacc1 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -305,27 +305,23 @@ void  NodeTool::update_helperpath () {
     if (SP_IS_LPE_ITEM(selection->singleItem())) {
         Inkscape::LivePathEffect::Effect *lpe = SP_LPE_ITEM(selection->singleItem())->getCurrentLPE();
         if (lpe && lpe->isVisible()/* && lpe->showOrigPath()*/) {
-            if (lpe) {
-                SPCurve *c = new SPCurve();
-                SPCurve *cc = new SPCurve();
-                std::vector<Geom::PathVector> cs = lpe->getCanvasIndicators(SP_LPE_ITEM(selection->singleItem()));
-                for (std::vector<Geom::PathVector>::iterator p = cs.begin(); p != cs.end(); ++p) {
-                    cc->set_pathvector(*p);
-                    c->append(cc, false);
-                    cc->reset();
-                }
-                if (!c->is_empty()) {
-                    c->transform(selection->singleItem()->i2dt_affine());
-                    SPCanvasItem *helperpath = sp_canvas_bpath_new(sp_desktop_tempgroup(this->desktop), c);
-                    sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(helperpath),
-                        0x0000ff9A, 1.0,
-                        SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
-                    sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(helperpath), 0, SP_WIND_RULE_NONZERO);
-                    this->helperpath_tmpitem = this->desktop->add_temporary_canvasitem(helperpath,0);
-                }
-                c->unref();
-                cc->unref();
-           }
+            SPCurve *c = new SPCurve();
+            SPCurve *cc = new SPCurve();
+            std::vector<Geom::PathVector> cs = lpe->getCanvasIndicators(SP_LPE_ITEM(selection->singleItem()));
+            for (std::vector<Geom::PathVector>::iterator p = cs.begin(); p != cs.end(); ++p) {
+                cc->set_pathvector(*p);
+                c->append(cc, false);
+                cc->reset();
+            }
+            if (!c->is_empty()) {
+                SPCanvasItem *helperpath = sp_canvas_bpath_new(sp_desktop_tempgroup(this->desktop), c);
+                sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(helperpath), 0x0000ff9A, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
+                sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(helperpath), 0, SP_WIND_RULE_NONZERO);
+                sp_canvas_item_affine_absolute(helperpath, selection->singleItem()->i2dt_affine());
+                this->helperpath_tmpitem = this->desktop->add_temporary_canvasitem(helperpath, 0);
+            }
+            c->unref();
+            cc->unref();
         }
     }
 }
-- 
cgit v1.2.3


From 0403ae2f0f76e56b31e369160648968671324d13 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 16 Sep 2014 01:07:32 +0200
Subject: fixing cusp node bug on bspline -problems moving nodes because tiny
 handles

(bzr r13341.1.209)
---
 src/ui/tools/pen-tool.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 318591df5..b68231e10 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1586,6 +1586,9 @@ void PenTool::_bspline_spiro_motion(bool shift){
     if(this->green_curve->is_empty() && !this->sa){
         this->p[1] = this->p[0] + (1./3)*(this->p[3] - this->p[0]);
         this->p[1] = Geom::Point(this->p[1][X] + handleCubicGap,this->p[1][Y] + handleCubicGap);
+        if(shift){
+            this->p[2] = this->p[3];
+        }
     }else if(!this->green_curve->is_empty()){
         tmpCurve = this->green_curve->copy();
     }else{
@@ -1609,8 +1612,11 @@ void PenTool::_bspline_spiro_motion(bool shift){
                 SBasisWPower = WPower->first_segment()->toSBasis();
                 WPower->reset();
                 this->p[1] = SBasisWPower.valueAt(WP);
-                if(!Geom::are_near(this->p[1],this->p[0]))
+                if(!Geom::are_near(this->p[1],this->p[0])){
                     this->p[1] = Geom::Point(this->p[1][X] + handleCubicGap,this->p[1][Y] + handleCubicGap);
+                } else {
+                    this->p[1] = this->p[0];
+                }
                 if(shift)
                     this->p[2] = this->p[3];
             }else{
-- 
cgit v1.2.3


From fb4d4b30b50b7b4505d63772c0aeca4c05c2c5c6 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 22 Sep 2014 21:15:47 +0200
Subject: Fix for strange gap at shift to cusp in bspline Now curves with cusp
 noden in bspline mode looks better, more smooth. Remove some duplicate code
 from outside for loops Fix a bug continuing shapes in bspline-spiro mode.
 Style code formating

(bzr r13341.1.215)
---
 src/ui/tools/freehand-base.cpp |   8 +-
 src/ui/tools/pen-tool.cpp      | 232 ++++++++++++++++++++---------------------
 2 files changed, 115 insertions(+), 125 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index bab6bc7e3..17f173e47 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -609,12 +609,12 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     if (dc->sa) {
         SPCurve *s = dc->sa->curve;
         dc->white_curves = g_slist_remove(dc->white_curves, s);
-        if (dc->sa->start) {
-            s = reverse_then_unref(s);
-        }
         if(prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1 || 
             prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 2){
-                dc->overwriteCurve = s;
+                s = dc->overwriteCurve;
+        }
+        if (dc->sa->start) {
+            s = reverse_then_unref(s);
         }
         s->append_continuous(c, 0.0625);
         c->unref();
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index b68231e10..a72934ae3 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1827,155 +1827,145 @@ void PenTool::_bspline_spiro_build()
 void PenTool::_bspline_doEffect(SPCurve * curve)
 {
     // commenting the function doEffect in src/live_effects/lpe-bspline.cpp
-    Geom::PathVector const original_pathv = curve->get_pathvector();
-    if (curve->get_segment_count() < 1)
+    if (curve->get_segment_count() < 1){
         return;
+    }
+    // Make copy of old path as it is changed during processing
+    Geom::PathVector const original_pathv = curve->get_pathvector();
     curve->reset();
 
-    for(Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) {
+    //Recorremos todos los paths a los que queremos aplicar el efecto, hasta el
+    //penúltimo
+    for (Geom::PathVector::const_iterator path_it = original_pathv.begin();
+            path_it != original_pathv.end(); ++path_it) {
+        //Si está vacío...
         if (path_it->empty())
             continue;
+        //Itreadores
 
-        Geom::Path::const_iterator curve_it1 = path_it->begin();      // incoming curve
-        Geom::Path::const_iterator curve_it2 = ++(path_it->begin());         // outgoing curve
-        Geom::Path::const_iterator curve_endit = path_it->end_default(); // this determines when the loop has to stop
+        Geom::Path::const_iterator curve_it1 = path_it->begin();
+        Geom::Path::const_iterator curve_it2 = ++(path_it->begin());
+        Geom::Path::const_iterator curve_endit = path_it->end_default(); 
         SPCurve *nCurve = new SPCurve();
-        Geom::Point previousNode(0,0);
-        Geom::Point node(0,0);
-        Geom::Point pointAt1(0,0);
-        Geom::Point pointAt2(0,0);
-        Geom::Point nextPointAt1(0,0);
-        Geom::Point nextPointAt2(0,0);
-        Geom::Point nextPointAt3(0,0);
-        Geom::D2< Geom::SBasis > SBasisIn;
-        Geom::D2< Geom::SBasis > SBasisOut;
-        Geom::D2< Geom::SBasis > SBasisHelper;
+        Geom::Point previousNode(0, 0);
+        Geom::Point node(0, 0);
+        Geom::Point pointAt1(0, 0);
+        Geom::Point pointAt2(0, 0);
+        Geom::Point nextPointAt1(0, 0);
+        Geom::D2<Geom::SBasis> SBasisIn;
+        Geom::D2<Geom::SBasis> SBasisOut;
+        Geom::D2<Geom::SBasis> SBasisHelper;
         Geom::CubicBezier const *cubic = NULL;
         if (path_it->closed()) {
-            const Geom::Curve &closingline = path_it->back_closed(); // the closing line segment is always of type Geom::LineSegment.
+            const Geom::Curve &closingline =
+                path_it->back_closed(); // the closing line segment is always of type
             if (are_near(closingline.initialPoint(), closingline.finalPoint())) {
                 curve_endit = path_it->end_open();
             }
         }
-        while ( curve_it2 != curve_endit )
-        {
-            SPCurve * in = new SPCurve();
+        nCurve->moveto(curve_it1->initialPoint());
+        while (curve_it1 != curve_endit) {
+            SPCurve *in = new SPCurve();
             in->moveto(curve_it1->initialPoint());
             in->lineto(curve_it1->finalPoint());
-            cubic = dynamic_cast<Geom::CubicBezier const*>(&*curve_it1);
-            if(cubic){
+            cubic = dynamic_cast<Geom::CubicBezier const *>(&*curve_it1);
+            if (cubic) {
                 SBasisIn = in->first_segment()->toSBasis();
-                pointAt1 = SBasisIn.valueAt(Geom::nearest_point((*cubic)[1],*in->first_segment()));
-                pointAt2 = SBasisIn.valueAt(Geom::nearest_point((*cubic)[2],*in->first_segment()));
-            }else{
+                if(are_near((*cubic)[1],(*cubic)[0]) && !are_near((*cubic)[2],(*cubic)[3])) {
+                    pointAt1 = SBasisIn.valueAt(0.3334);
+                } else {
+                    pointAt1 = SBasisIn.valueAt(Geom::nearest_point((*cubic)[1], *in->first_segment()));
+                }
+                if(are_near((*cubic)[2],(*cubic)[3]) && !are_near((*cubic)[1],(*cubic)[0])) {
+                    pointAt2 = SBasisIn.valueAt(0.6667);
+                } else {
+                    pointAt2 = SBasisIn.valueAt(Geom::nearest_point((*cubic)[2], *in->first_segment()));
+                }
+            } else {
                 pointAt1 = in->first_segment()->initialPoint();
                 pointAt2 = in->first_segment()->finalPoint();
             }
             in->reset();
             delete in;
-            SPCurve * out = new SPCurve();
-            out->moveto(curve_it2->initialPoint());
-            out->lineto(curve_it2->finalPoint());
-            cubic = dynamic_cast<Geom::CubicBezier const*>(&*curve_it2);
-            if(cubic){
-                SBasisOut = out->first_segment()->toSBasis();
-                nextPointAt1 = SBasisOut.valueAt(Geom::nearest_point((*cubic)[1],*out->first_segment()));
-                nextPointAt2 = SBasisOut.valueAt(Geom::nearest_point((*cubic)[2],*out->first_segment()));;
-                nextPointAt3 = (*cubic)[3];
-            }else{
-                nextPointAt1 = out->first_segment()->initialPoint();
-                nextPointAt2 = out->first_segment()->finalPoint();
-                nextPointAt3 = out->first_segment()->finalPoint();
+            if ( curve_it2 != curve_endit ) {
+                SPCurve *out = new SPCurve();
+                out->moveto(curve_it2->initialPoint());
+                out->lineto(curve_it2->finalPoint());
+                cubic = dynamic_cast<Geom::CubicBezier const *>(&*curve_it2);
+                if (cubic) {
+                    SBasisOut = out->first_segment()->toSBasis();
+                    if(are_near((*cubic)[1],(*cubic)[0]) && !are_near((*cubic)[2],(*cubic)[3])) {
+                        nextPointAt1 = SBasisIn.valueAt(0.3334);
+                    } else {
+                        nextPointAt1 = SBasisOut.valueAt(Geom::nearest_point((*cubic)[1], *out->first_segment()));
+                    }
+                } else {
+                    nextPointAt1 = out->first_segment()->initialPoint();
+                }
+                out->reset();
+                delete out;
+            }
+            Geom::Point startNode = path_it->begin()->initialPoint();
+            if (path_it->closed() && curve_it2 == curve_endit) {
+                SPCurve *start = new SPCurve();
+                start->moveto(path_it->begin()->initialPoint());
+                start->lineto(path_it->begin()->finalPoint());
+                Geom::D2<Geom::SBasis> SBasisStart = start->first_segment()->toSBasis();
+                SPCurve *lineHelper = new SPCurve();
+                cubic = dynamic_cast<Geom::CubicBezier const *>(&*path_it->begin());
+                if (cubic) {
+                    lineHelper->moveto(SBasisStart.valueAt(
+                                           Geom::nearest_point((*cubic)[1], *start->first_segment())));
+                } else {
+                    lineHelper->moveto(start->first_segment()->initialPoint());
+                }
+                start->reset();
+                delete start;
+
+                SPCurve *end = new SPCurve();
+                end->moveto(curve_it1->initialPoint());
+                end->lineto(curve_it1->finalPoint());
+                Geom::D2<Geom::SBasis> SBasisEnd = end->first_segment()->toSBasis();
+                cubic = dynamic_cast<Geom::CubicBezier const *>(&*curve_it1);
+                if (cubic) {
+                    lineHelper->lineto(SBasisEnd.valueAt(
+                                           Geom::nearest_point((*cubic)[2], *end->first_segment())));
+                } else {
+                    lineHelper->lineto(end->first_segment()->finalPoint());
+                }
+                end->reset();
+                delete end;
+                SBasisHelper = lineHelper->first_segment()->toSBasis();
+                lineHelper->reset();
+                delete lineHelper;
+                startNode = SBasisHelper.valueAt(0.5);
+                nCurve->curveto(pointAt1, pointAt2, startNode);
+                nCurve->move_endpoints(startNode, startNode);
+            } else if ( curve_it2 == curve_endit) {
+                nCurve->curveto(pointAt1, pointAt2, curve_it1->finalPoint());
+                nCurve->move_endpoints(path_it->begin()->initialPoint(), curve_it1->finalPoint());
+            } else {
+                SPCurve *lineHelper = new SPCurve();
+                lineHelper->moveto(pointAt2);
+                lineHelper->lineto(nextPointAt1);
+                SBasisHelper = lineHelper->first_segment()->toSBasis();
+                lineHelper->reset();
+                delete lineHelper;
+                previousNode = node;
+                node = SBasisHelper.valueAt(0.5);
+                Geom::CubicBezier const *cubic2 = dynamic_cast<Geom::CubicBezier const *>(&*curve_it1);
+                if((cubic && are_near((*cubic)[0],(*cubic)[1])) || (cubic2 && are_near((*cubic2)[2],(*cubic2)[3]))) {
+                    node = curve_it1->finalPoint();
+                }
+                nCurve->curveto(pointAt1, pointAt2, node);
             }
-            out->reset();
-            delete out;
-            SPCurve *lineHelper = new SPCurve();
-            lineHelper->moveto(pointAt2);
-            lineHelper->lineto(nextPointAt1);
-            SBasisHelper  = lineHelper->first_segment()->toSBasis();
-            lineHelper->reset();
-            delete lineHelper;
-            previousNode = node;
-            node = SBasisHelper.valueAt(0.5);
-            SPCurve *curveHelper = new SPCurve();
-            curveHelper->moveto(previousNode);
-            curveHelper->curveto(pointAt1, pointAt2, node);
-            nCurve->append_continuous(curveHelper, 0.0625);
-            curveHelper->reset();
-            delete curveHelper;
             ++curve_it1;
             ++curve_it2;
         }
-        SPCurve *out = new SPCurve();
-        out->moveto(curve_it1->initialPoint());
-        out->lineto(curve_it1->finalPoint());
-        cubic = dynamic_cast<Geom::CubicBezier const *>(&*curve_it1);
-        if (cubic) {
-            SBasisOut = out->first_segment()->toSBasis();
-            nextPointAt1 = SBasisOut.valueAt(Geom::nearest_point((*cubic)[1], *out->first_segment()));
-            nextPointAt2 = SBasisOut.valueAt(Geom::nearest_point((*cubic)[2], *out->first_segment()));
-            nextPointAt3 = out->first_segment()->finalPoint();
-        } else {
-            nextPointAt1 = out->first_segment()->initialPoint();
-            nextPointAt2 = out->first_segment()->finalPoint();
-            nextPointAt3 = out->first_segment()->finalPoint();
-        }
-        out->reset();
-        delete out;
-        SPCurve *curveHelper = new SPCurve();
-        curveHelper->moveto(node);
-        Geom::Point startNode = path_it->begin()->initialPoint();
-        if (path_it->closed()) {
-            SPCurve * start = new SPCurve();
-            start->moveto(path_it->begin()->initialPoint());
-            start->lineto(path_it->begin()->finalPoint());
-            Geom::D2< Geom::SBasis > SBasisStart = start->first_segment()->toSBasis();
-            SPCurve *lineHelper = new SPCurve();
-            cubic = dynamic_cast<Geom::CubicBezier const*>(&*path_it->begin());
-            if(cubic){
-                lineHelper->moveto(SBasisStart.valueAt(Geom::nearest_point((*cubic)[1],*start->first_segment())));
-            }else{
-                lineHelper->moveto(start->first_segment()->initialPoint());
-            }
-            start->reset();
-            delete start;
-
-            SPCurve * end = new SPCurve();
-            end->moveto(curve_it1->initialPoint());
-            end->lineto(curve_it1->finalPoint());
-            Geom::D2< Geom::SBasis > SBasisEnd = end->first_segment()->toSBasis();
-            cubic = dynamic_cast<Geom::CubicBezier const*>(&*curve_it1);
-            if(cubic){
-                lineHelper->lineto(SBasisEnd.valueAt(Geom::nearest_point((*cubic)[2],*end->first_segment())));
-            }else{
-                lineHelper->lineto(end->first_segment()->finalPoint());
-            }
-            end->reset();
-            delete end;
-            SBasisHelper = lineHelper->first_segment()->toSBasis();
-            lineHelper->reset();
-            delete lineHelper;
-            startNode = SBasisHelper.valueAt(0.5);
-            curveHelper->curveto(nextPointAt1, nextPointAt2, startNode);
-            nCurve->append_continuous(curveHelper, 0.0625);
-            nCurve->move_endpoints(startNode,startNode);
-        }else{
-            SPCurve * start = new SPCurve();
-            start->moveto(path_it->begin()->initialPoint());
-            start->lineto(path_it->begin()->finalPoint());
-            startNode = start->first_segment()->initialPoint();
-            start->reset();
-            delete start;
-            curveHelper->curveto(nextPointAt1, nextPointAt2, nextPointAt3);
-            nCurve->append_continuous(curveHelper, 0.0625);
-            nCurve->move_endpoints(startNode,nextPointAt3);
-        }
-        curveHelper->reset();
-        delete curveHelper;
         if (path_it->closed()) {
             nCurve->closepath_current();
         }
-        curve->append(nCurve,false);
+        curve->append(nCurve, false);
         nCurve->reset();
         delete nCurve;
     }
-- 
cgit v1.2.3


From f692482d773d75799712e8bd3c48d1da3d752a03 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 24 Sep 2014 03:27:47 +0200
Subject: Show the helper curves in pen tool with the color of the current
 layer defined in objects dialog

(bzr r13341.1.220)
---
 src/ui/tools/freehand-base.cpp |  1 +
 src/ui/tools/freehand-base.h   |  1 +
 src/ui/tools/pen-tool.cpp      | 46 ++++++++++++++++--------------------------
 3 files changed, 19 insertions(+), 29 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 17f173e47..bc979821a 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -80,6 +80,7 @@ FreehandBase::FreehandBase(gchar const *const *cursor_shape, gint hot_x, gint ho
     , red_color(0xff00007f)
     , blue_color(0x0000ff7f)
     , green_color(0x00ff007f)
+    , highlight_color(0x0000007f)
     , red_bpath(NULL)
     , red_curve(NULL)
     , blue_bpath(NULL)
diff --git a/src/ui/tools/freehand-base.h b/src/ui/tools/freehand-base.h
index 6e04e03b7..fb2db86f6 100644
--- a/src/ui/tools/freehand-base.h
+++ b/src/ui/tools/freehand-base.h
@@ -55,6 +55,7 @@ public:
     guint32 red_color;
     guint32 blue_color;
     guint32 green_color;
+    guint32 highlight_color;
 
     // Red
     SPCanvasItem *red_bpath;
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index a72934ae3..9a86dfe2c 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -188,7 +188,6 @@ void PenTool::_pen_context_set_mode(guint mode) {
  */
 void PenTool::setup() {
     FreehandBase::setup();
-
     ControlManager &mgr = ControlManager::getManager();
 
     // Pen indicators
@@ -435,7 +434,7 @@ bool PenTool::_handleButtonPress(GdkEventButton const &bevent) {
                         // This is allowed, if we just canceled curve
                     case PenTool::POINT:
                         if (this->npoints == 0) {
-
+                            this->_bspline_spiro_color();
                             Geom::Point p;
                             if ((bevent.state & GDK_CONTROL_MASK) && (this->polylines_only || this->polylines_paraxial)) {
                                 p = event_dt;
@@ -702,11 +701,9 @@ bool PenTool::_handleMotionNotify(GdkEventMotion const &mevent) {
     }
     // calls the function "bspline_spiro_motion" when the mouse starts or stops moving
     if(this->bspline){
-        this->_bspline_spiro_color();
         this->_bspline_spiro_motion(mevent.state & GDK_SHIFT_MASK);
     }else{
         if ( Geom::LInfty( event_w - pen_drag_origin_w ) > (tolerance/2) || mevent.time == 0) {
-            this->_bspline_spiro_color();
             this->_bspline_spiro_motion(mevent.state & GDK_SHIFT_MASK);
             pen_drag_origin_w = event_w;
         }
@@ -746,6 +743,7 @@ bool PenTool::_handleButtonRelease(GdkEventButton const &revent) {
                     case PenTool::POINT:
                         if ( this->npoints == 0 ) {
                             // Start new thread only with button release
+                            this->_bspline_spiro_color();
                             if (anchor) {
                                 p = anchor->dp;
                             }
@@ -1387,42 +1385,32 @@ void PenTool::_setAngleDistanceStatusMessage(Geom::Point const p, int pc_point_t
 // this function changes the colors red, green and blue making them transparent or not, depending on if spiro is being used.
 void PenTool::_bspline_spiro_color()
 {
-    bool remake_green_bpaths = false;
+    static Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if(this->spiro){
-        //If the colour is not defined as trasparent, por example when changing
-        //from drawing to spiro mode or when selecting the pen tool
-        if(this->green_color != 0x00ff000){
-            //We change the green and red colours to transparent, so this lines are not necessary
-            //to the drawing with spiro
-            this->red_color = 0xff00000;
-            this->green_color = 0x00ff000;
-            remake_green_bpaths = true;
-        }
+        this->red_color = 0xff00000;
+        this->green_color = 0x00ff000;
     }else if(this->bspline){
-        //If we come from working with the spiro curve and change the mode the "green_curve" colour is transparent
-        if(this->green_color != 0xff00007f){
-            //since we are not im spiro mode, we assign the original colours
-            //to the red and the green curve, removing their transparency 
-            this->red_color = 0xff00007f;
-            //Damos color rojo a la linea verde
+        this->highlight_color = SP_ITEM(this->desktop->currentLayer())->highlight_color();
+        if((unsigned int)prefs->getInt("/tools/nodes/highlight_color", 0xff0000ff) == this->highlight_color){
             this->green_color = 0xff00007f;
-            remake_green_bpaths = true;
+            this->red_color = 0xff00007f;
+        } else {
+            this->green_color = this->highlight_color;
+            this->red_color = this->highlight_color;
         }
     }else{
-        //If we come from working with the spiro curve and change the mode the "green_curve" colour is transparent
-        if(this->green_color != 0x00ff007f){
-            //since we are not im spiro mode, we assign the original colours
-            //to the red and the green curve, removing their transparency 
-            this->red_color = 0xff00007f;
+        this->highlight_color = SP_ITEM(this->desktop->currentLayer())->highlight_color();
+        this->red_color = 0xff00007f;
+        if((unsigned int)prefs->getInt("/tools/nodes/highlight_color", 0xff0000ff) == this->highlight_color){
             this->green_color = 0x00ff007f;
-            remake_green_bpaths = true;
+        } else {
+            this->green_color = this->highlight_color;
         }
-        //we hide the spiro/bspline rests
         sp_canvas_item_hide(this->blue2_bpath);
     }
     //We erase all the "green_bpaths" to recreate them after with the colour
     //transparency recently modified
-    if (this->green_bpaths && remake_green_bpaths) {
+    if (this->green_bpaths) {
         // remove old piecewise green canvasitems
         while (this->green_bpaths) {
             sp_canvas_item_destroy(SP_CANVAS_ITEM(this->green_bpaths->data));
-- 
cgit v1.2.3


From 8a766e96c9317858d547ccf571bbca206c8f8e1b Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 24 Sep 2014 03:43:01 +0200
Subject: Now add the helper colors also to pencil helper

(bzr r13341.1.221)
---
 src/ui/tools/pencil-tool.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index 0e8660248..ca6dffc12 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -803,6 +803,7 @@ void PencilTool::_fitAndSplit() {
     g_assert(is_zero(this->req_tangent)
              || is_unit_vector(this->req_tangent));
     Geom::Point const tHatEnd(0, 0);
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     int const n_segs = Geom::bezier_fit_cubic_full(b, NULL, this->p, this->npoints,
                                                 this->req_tangent, tHatEnd,
                                                 tolerance_sq, 1);
@@ -816,7 +817,6 @@ void PencilTool::_fitAndSplit() {
         using Geom::X;
         using Geom::Y;
             // if we are in BSpline we modify the trace to create adhoc nodes
-        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         guint mode = prefs->getInt("/tools/freehand/pencil/freehand-mode", 0);
         if(mode == 2){
             Geom::Point B = b[0] + (1./3)*(b[3] - b[0]);
@@ -855,6 +855,13 @@ void PencilTool::_fitAndSplit() {
         /// \todo fixme:
         SPCanvasItem *cshape = sp_canvas_bpath_new(sp_desktop_sketch(this->desktop), curve);
         curve->unref();
+
+        this->highlight_color = SP_ITEM(this->desktop->currentLayer())->highlight_color();
+        if((unsigned int)prefs->getInt("/tools/nodes/highlight_color", 0xff0000ff) == this->highlight_color){
+            this->green_color = 0x00ff007f;
+        } else {
+            this->green_color = this->highlight_color;
+        }
         sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cshape), this->green_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
 
         this->green_bpaths = g_slist_prepend(this->green_bpaths, cshape);
-- 
cgit v1.2.3


From 128c104aa13184648dbe91de0a2d1d4a71062938 Mon Sep 17 00:00:00 2001
From: root <root@jtx.marker.es>
Date: Wed, 24 Sep 2014 04:01:09 +0200
Subject: Change colors of helper paths also in middle draw when change the
 mode -spiro, bspline...-

(bzr r13341.1.222)
---
 src/ui/tools/pen-tool.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 9a86dfe2c..ecd10b068 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -181,6 +181,7 @@ void PenTool::_pen_context_set_mode(guint mode) {
     // define the nodes
     this->spiro = (mode == 1);
     this->bspline = (mode == 2);
+    this->_bspline_spiro_color();
 }
 
 /**
-- 
cgit v1.2.3


From 9cf38f99fc246131a2f2d9c3c55617488003b3b4 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 24 Sep 2014 04:56:55 +0200
Subject: A bit refactor, remove some old vars

(bzr r13341.1.223)
---
 src/ui/tools/freehand-base.cpp | 22 ----------------------
 src/ui/tools/freehand-base.h   |  4 ----
 src/ui/tools/pen-tool.cpp      | 15 ++++++---------
 3 files changed, 6 insertions(+), 35 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index bc979821a..46ab53eef 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -85,8 +85,6 @@ FreehandBase::FreehandBase(gchar const *const *cursor_shape, gint hot_x, gint ho
     , red_curve(NULL)
     , blue_bpath(NULL)
     , blue_curve(NULL)
-    , blue2_bpath(NULL)
-    , blue2_curve(NULL)
     , green_bpaths(NULL)
     , green_curve(NULL)
     , green_anchor(NULL)
@@ -143,13 +141,6 @@ void FreehandBase::setup() {
     // Create blue curve
     this->blue_curve = new SPCurve();
 
-    // Create blue2 bpath
-    this->blue2_bpath = sp_canvas_bpath_new(sp_desktop_sketch(this->desktop), NULL);
-    sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(this->blue2_bpath), this->blue_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
-
-    // Create blue2 curve
-    this->blue2_curve = new SPCurve();
-
     // Create green curve
     this->green_curve = new SPCurve();
 
@@ -550,10 +541,6 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
     dc->blue_curve->reset();
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->blue_bpath), NULL);
 
-    // Blue2
-    dc->blue2_curve->reset();
-    sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->blue2_bpath), NULL);
-
     // Red
     if (dc->red_curve_is_valid) {
         c->append_continuous(dc->red_curve, 0.0625);
@@ -791,15 +778,6 @@ static void spdc_free_colors(FreehandBase *dc)
         dc->blue_curve = dc->blue_curve->unref();
     }
 
-    // Blue2
-    if (dc->blue2_bpath) {
-        sp_canvas_item_destroy(SP_CANVAS_ITEM(dc->blue2_bpath));
-        dc->blue2_bpath = NULL;
-    }
-    if (dc->blue2_curve) {
-        dc->blue2_curve = dc->blue2_curve->unref();
-    }
-
     // Green
     while (dc->green_bpaths) {
         sp_canvas_item_destroy(SP_CANVAS_ITEM(dc->green_bpaths->data));
diff --git a/src/ui/tools/freehand-base.h b/src/ui/tools/freehand-base.h
index fb2db86f6..6b4265215 100644
--- a/src/ui/tools/freehand-base.h
+++ b/src/ui/tools/freehand-base.h
@@ -65,10 +65,6 @@ public:
     SPCanvasItem *blue_bpath;
     SPCurve *blue_curve;
 
-    // Blue2
-    SPCanvasItem *blue2_bpath;
-    SPCurve *blue2_curve;
-
     // Green
     GSList *green_bpaths;
     SPCurve *green_curve;
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index ecd10b068..2c5ffc182 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1327,9 +1327,6 @@ void PenTool::_resetColors() {
     // Blue
     this->blue_curve->reset();
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(this->blue_bpath), NULL);
-    // Blue2
-    this->blue2_curve->reset();
-    sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(this->blue2_bpath), NULL);
     // Green
     while (this->green_bpaths) {
         sp_canvas_item_destroy(SP_CANVAS_ITEM(this->green_bpaths->data));
@@ -1407,7 +1404,7 @@ void PenTool::_bspline_spiro_color()
         } else {
             this->green_color = this->highlight_color;
         }
-        sp_canvas_item_hide(this->blue2_bpath);
+        sp_canvas_item_hide(this->blue_bpath);
     }
     //We erase all the "green_bpaths" to recreate them after with the colour
     //transparency recently modified
@@ -1792,11 +1789,11 @@ void PenTool::_bspline_spiro_build()
             this->_spiro_doEffect(curve);
         }
 
-        sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(this->blue2_bpath), curve);   
-        sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(this->blue2_bpath), this->blue_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
-        sp_canvas_item_show(this->blue2_bpath);
+        sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(this->blue_bpath), curve);   
+        sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(this->blue_bpath), this->blue_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
+        sp_canvas_item_show(this->blue_bpath);
         curve->unref();
-        this->blue2_curve->reset();
+        this->blue_curve->reset();
         //We hide the holders that doesn't contribute anything
         if(this->spiro){
             sp_canvas_item_show(this->c1);
@@ -1808,7 +1805,7 @@ void PenTool::_bspline_spiro_build()
         sp_canvas_item_hide(this->cl0);
     }else{
         //if the curve is empty
-        sp_canvas_item_hide(this->blue2_bpath);
+        sp_canvas_item_hide(this->blue_bpath);
 
     }
 }
-- 
cgit v1.2.3


From efd39893a4f5e629a9df2d0674222aea1be14199 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sun, 5 Oct 2014 12:38:15 -0400
Subject: Move obvious ui component to ui/

(bzr r13341.1.247)
---
 src/ui/tools/tool-base.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index c28b86416..150e899ce 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -44,7 +44,7 @@
 #include "desktop-style.h"
 #include "sp-namedview.h"
 #include "selection.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "macros.h"
 #include "tools-switch.h"
 #include "preferences.h"
-- 
cgit v1.2.3


From 156cf3323a936c7dfccd9e09458cd8b5d174b7fe Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sun, 5 Oct 2014 19:24:27 -0400
Subject: Move more UI code into ui/

(bzr r13341.1.253)
---
 src/ui/tools/arc-tool.cpp          | 4 ++--
 src/ui/tools/box3d-tool.cpp        | 4 ++--
 src/ui/tools/calligraphic-tool.cpp | 2 +-
 src/ui/tools/connector-tool.cpp    | 2 +-
 src/ui/tools/dropper-tool.cpp      | 2 +-
 src/ui/tools/eraser-tool.cpp       | 2 +-
 src/ui/tools/flood-tool.cpp        | 4 ++--
 src/ui/tools/freehand-base.cpp     | 2 +-
 src/ui/tools/gradient-tool.cpp     | 2 +-
 src/ui/tools/lpe-tool.cpp          | 4 ++--
 src/ui/tools/measure-tool.cpp      | 2 +-
 src/ui/tools/mesh-tool.cpp         | 2 +-
 src/ui/tools/node-tool.cpp         | 4 ++--
 src/ui/tools/pen-tool.cpp          | 6 +++---
 src/ui/tools/pencil-tool.cpp       | 4 ++--
 src/ui/tools/rect-tool.cpp         | 4 ++--
 src/ui/tools/select-tool.cpp       | 4 ++--
 src/ui/tools/spiral-tool.cpp       | 4 ++--
 src/ui/tools/spray-tool.cpp        | 2 +-
 src/ui/tools/star-tool.cpp         | 4 ++--
 src/ui/tools/text-tool.cpp         | 4 ++--
 src/ui/tools/tool-base.cpp         | 4 ++--
 src/ui/tools/tool-base.h           | 4 +++-
 src/ui/tools/tweak-tool.cpp        | 2 +-
 src/ui/tools/zoom-tool.cpp         | 2 +-
 25 files changed, 41 insertions(+), 39 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp
index 9fd68f1b9..4f64ade25 100644
--- a/src/ui/tools/arc-tool.cpp
+++ b/src/ui/tools/arc-tool.cpp
@@ -40,7 +40,7 @@
 #include "desktop-style.h"
 #include "context-fns.h"
 #include "verbs.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "ui/tools/tool-base.h"
 
 #include "ui/tools/arc-tool.h"
@@ -48,7 +48,7 @@
 
 using Inkscape::DocumentUndo;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp
index b998267c2..0a20a0842 100644
--- a/src/ui/tools/box3d-tool.cpp
+++ b/src/ui/tools/box3d-tool.cpp
@@ -47,12 +47,12 @@
 #include "box3d-side.h"
 #include "document-private.h"
 #include "line-geometry.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp
index 64097e834..d297fe5e1 100644
--- a/src/ui/tools/calligraphic-tool.cpp
+++ b/src/ui/tools/calligraphic-tool.cpp
@@ -82,7 +82,7 @@ using Inkscape::DocumentUndo;
 
 #define DYNA_MIN_WIDTH 1.0e-6
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index d1355e807..7b5c84c16 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -109,7 +109,7 @@
 
 using Inkscape::DocumentUndo;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp
index 99d42a211..6c55f7484 100644
--- a/src/ui/tools/dropper-tool.cpp
+++ b/src/ui/tools/dropper-tool.cpp
@@ -52,7 +52,7 @@ using Inkscape::DocumentUndo;
 static GdkCursor *cursor_dropper_fill = NULL;
 static GdkCursor *cursor_dropper_stroke = NULL;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp
index 4106785e7..bf4015b4c 100644
--- a/src/ui/tools/eraser-tool.cpp
+++ b/src/ui/tools/eraser-tool.cpp
@@ -84,7 +84,7 @@ using Inkscape::DocumentUndo;
 #define DRAG_DEFAULT 1.0
 #define DRAG_MAX 1.0
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp
index 3fb56b2ad..5745fc9cc 100644
--- a/src/ui/tools/flood-tool.cpp
+++ b/src/ui/tools/flood-tool.cpp
@@ -50,7 +50,7 @@
 #include "preferences.h"
 #include "rubberband.h"
 #include "selection.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "sp-defs.h"
 #include "sp-item.h"
 #include "splivarot.h"
@@ -74,7 +74,7 @@ using Inkscape::Display::ExtractARGB32;
 using Inkscape::Display::ExtractRGB32;
 using Inkscape::Display::AssembleARGB32;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 46ab53eef..6434c30d2 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -30,7 +30,7 @@
 #include "desktop-handles.h"
 #include "desktop-style.h"
 #include "document.h"
-#include "draw-anchor.h"
+#include "ui/draw-anchor.h"
 #include "macros.h"
 #include "message-stack.h"
 #include "ui/tools/pen-tool.h"
diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp
index 4f9a7b59b..9c853917e 100644
--- a/src/ui/tools/gradient-tool.cpp
+++ b/src/ui/tools/gradient-tool.cpp
@@ -51,7 +51,7 @@
 
 using Inkscape::DocumentUndo;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp
index e9b9421f1..1fd1ebf8c 100644
--- a/src/ui/tools/lpe-tool.cpp
+++ b/src/ui/tools/lpe-tool.cpp
@@ -28,7 +28,7 @@
 #include "desktop.h"
 #include "message-context.h"
 #include "preferences.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "selection.h"
 #include "desktop-handles.h"
 #include "document.h"
@@ -59,7 +59,7 @@ SubtoolEntry lpesubtools[] = {
 };
 
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index feeb68288..6b5cbeccd 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -49,7 +49,7 @@ using Inkscape::ControlManager;
 using Inkscape::CTLINE_SECONDARY;
 using Inkscape::Util::unit_table;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp
index 7d6d3bc23..8a1fb7c72 100644
--- a/src/ui/tools/mesh-tool.cpp
+++ b/src/ui/tools/mesh-tool.cpp
@@ -53,7 +53,7 @@
 
 using Inkscape::DocumentUndo;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 0b98bacc1..e2bb85d11 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -23,7 +23,7 @@
 #include "live_effects/lpeobject.h"
 #include "message-context.h"
 #include "selection.h"
-#include "shape-editor.h" // temporary!
+#include "ui/shape-editor.h" // temporary!
 #include "live_effects/effect.h"
 #include "display/curve.h"
 #include "sp-clippath.h"
@@ -107,7 +107,7 @@
 
 using Inkscape::ControlManager;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 2c5ffc182..92937a135 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -26,7 +26,7 @@
 #include "desktop-handles.h"
 #include "selection.h"
 #include "selection-chemistry.h"
-#include "draw-anchor.h"
+#include "ui/draw-anchor.h"
 #include "message-stack.h"
 #include "message-context.h"
 #include "preferences.h"
@@ -40,7 +40,7 @@
 #include <glibmm/i18n.h>
 #include "macros.h"
 #include "context-fns.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "ui/control-manager.h"
 // we include the necessary files for BSpline & Spiro
 #include "live_effects/effect.h"
@@ -70,7 +70,7 @@
 #include "live_effects/lpe-bspline.h"
 #include <2geom/nearest-point.h>
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 #include "live_effects/effect.h"
 
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index ca6dffc12..3ea2ae843 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -23,7 +23,7 @@
 #include "desktop-handles.h"
 #include "selection.h"
 #include "selection-chemistry.h"
-#include "draw-anchor.h"
+#include "ui/draw-anchor.h"
 #include "message-stack.h"
 #include "message-context.h"
 #include "sp-path.h"
@@ -43,7 +43,7 @@
 #include "display/sp-canvas.h"
 #include "display/curve.h"
 #include "livarot/Path.h"
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 #include "ui/tool/event-utils.h"
 
 namespace Inkscape {
diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp
index 819671dd6..de91dcff4 100644
--- a/src/ui/tools/rect-tool.cpp
+++ b/src/ui/tools/rect-tool.cpp
@@ -40,13 +40,13 @@
 #include "xml/node-event-vector.h"
 #include "preferences.h"
 #include "context-fns.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "verbs.h"
 #include "display/sp-canvas-item.h"
 
 using Inkscape::DocumentUndo;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp
index 83bef17c9..394b0b369 100644
--- a/src/ui/tools/select-tool.cpp
+++ b/src/ui/tools/select-tool.cpp
@@ -41,7 +41,7 @@
 #include "desktop-handles.h"
 #include "sp-root.h"
 #include "preferences.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "message-stack.h"
 #include "selection-describer.h"
 #include "seltrans.h"
@@ -49,7 +49,7 @@
 #include "display/sp-canvas.h"
 #include "display/sp-canvas-item.h"
 #include "display/drawing-item.h"
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/tools/spiral-tool.cpp b/src/ui/tools/spiral-tool.cpp
index 83712457a..18c3e4e2d 100644
--- a/src/ui/tools/spiral-tool.cpp
+++ b/src/ui/tools/spiral-tool.cpp
@@ -39,13 +39,13 @@
 #include "xml/node-event-vector.h"
 #include "preferences.h"
 #include "context-fns.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "verbs.h"
 #include "display/sp-canvas-item.h"
 
 using Inkscape::DocumentUndo;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 29f1b9a73..933da6fb1 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -84,7 +84,7 @@ using namespace std;
 // Please enable again when working on 1.0
 #define ENABLE_SPRAY_MODE_SINGLE_PATH
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index ed28c0a8d..7604ba04e 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -41,7 +41,7 @@
 #include "xml/repr.h"
 #include "xml/node-event-vector.h"
 #include "context-fns.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "verbs.h"
 #include "display/sp-canvas-item.h"
 
@@ -49,7 +49,7 @@
 
 using Inkscape::DocumentUndo;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index b60a39e5d..a72748733 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -40,7 +40,7 @@
 #include "rubberband.h"
 #include "selection-chemistry.h"
 #include "selection.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "sp-flowtext.h"
 #include "sp-namedview.h"
 #include "sp-text.h"
@@ -52,7 +52,7 @@
 #include "xml/node-event-vector.h"
 #include "xml/repr.h"
 #include <gtk/gtk.h>
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 using Inkscape::ControlManager;
 using Inkscape::DocumentUndo;
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 150e899ce..37ca5eeea 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -46,7 +46,7 @@
 #include "selection.h"
 #include "ui/interface.h"
 #include "macros.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "preferences.h"
 #include "message-context.h"
 #include "gradient-drag.h"
@@ -55,7 +55,7 @@
 #include "selcue.h"
 #include "ui/tools/lpe-tool.h"
 #include "ui/tool/control-point.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "sp-guide.h"
 #include "color.h"
 #include "knot.h"
diff --git a/src/ui/tools/tool-base.h b/src/ui/tools/tool-base.h
index b27de9030..7a6ab83e7 100644
--- a/src/ui/tools/tool-base.h
+++ b/src/ui/tools/tool-base.h
@@ -30,7 +30,6 @@ namespace Glib {
 class GrDrag;
 class SPDesktop;
 class SPItem;
-class ShapeEditor;
 
 namespace Inkscape {
     class MessageContext;
@@ -42,6 +41,9 @@ namespace Inkscape {
 
 namespace Inkscape {
 namespace UI {
+
+class ShapeEditor;
+
 namespace Tools {
 
 class ToolBase;
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index 75650d3af..340f64a0b 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -91,7 +91,7 @@ using Inkscape::DocumentUndo;
 
 #define DYNA_MIN_WIDTH 1.0e-6
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/zoom-tool.cpp b/src/ui/tools/zoom-tool.cpp
index 9f99cfe2e..b3fb78c8f 100644
--- a/src/ui/tools/zoom-tool.cpp
+++ b/src/ui/tools/zoom-tool.cpp
@@ -25,7 +25,7 @@
 #include "selection-chemistry.h"
 
 #include "ui/tools/zoom-tool.h"
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
-- 
cgit v1.2.3


From a7384aa7c43a5fe4b56e5d5d610ece0cafcaa748 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 15 Oct 2014 20:03:43 +0200
Subject: Fix strict build with Gtk+ 2 (experimental commit r13513)

(bzr r13616.1.2)
---
 src/ui/tools/tool-base.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index f1d90f6c6..1c1e8a17a 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -18,6 +18,8 @@
 # include "config.h"
 #endif
 
+#include "widgets/desktop-widget.h"
+
 #if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
 #endif
@@ -40,7 +42,6 @@
 #include "desktop-handles.h"
 #include "desktop-events.h"
 #include "desktop-style.h"
-#include "widgets/desktop-widget.h"
 #include "sp-namedview.h"
 #include "selection.h"
 #include "interface.h"
-- 
cgit v1.2.3


From e2ae473da92a1f96e307e3f1f3e206cad7bd1c38 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Thu, 23 Oct 2014 19:33:47 -0700
Subject: Initial removal of box3d outdated GTKish macros.

(bzr r13634)
---
 src/ui/tools/select-tool.cpp | 78 ++++++++++++++++++++++++----------------
 src/ui/tools/spray-tool.cpp  | 32 ++++++++++-------
 src/ui/tools/tweak-tool.cpp  | 86 +++++++++++++++++++++++++-------------------
 3 files changed, 117 insertions(+), 79 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp
index 83bef17c9..21f37e83d 100644
--- a/src/ui/tools/select-tool.cpp
+++ b/src/ui/tools/select-tool.cpp
@@ -264,15 +264,16 @@ sp_select_context_up_one_layer(SPDesktop *desktop)
     SPObject *const current_layer = desktop->currentLayer();
     if (current_layer) {
         SPObject *const parent = current_layer->parent;
+        SPGroup *current_group = dynamic_cast<SPGroup *>(current_layer);
         if ( parent
              && ( parent->parent
-                  || !( SP_IS_GROUP(current_layer)
-                        && ( SPGroup::LAYER
-                             == SP_GROUP(current_layer)->layerMode() ) ) ) )
+                  || !( current_group
+                        && ( SPGroup::LAYER == current_group->layerMode() ) ) ) )
         {
             desktop->setCurrentLayer(parent);
-            if (SP_IS_GROUP(current_layer) && SPGroup::LAYER != SP_GROUP(current_layer)->layerMode())
+            if (current_group && (SPGroup::LAYER != current_group->layerMode())) {
                 sp_desktop_selection(desktop)->set(current_layer);
+            }
         }
     }
 }
@@ -403,7 +404,8 @@ void SelectTool::sp_select_context_cycle_through_items(Inkscape::Selection *sele
     }
 
     Inkscape::DrawingItem *arenaitem;
-    SPItem *item = SP_ITEM(this->cycling_cur_item->data);
+    SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(cycling_cur_item->data));
+    g_assert(item != NULL);
 
     // Deactivate current item
     if (!g_list_find(this->cycling_items_selected_before, item) && selection->includes(item)) {
@@ -427,7 +429,8 @@ void SelectTool::sp_select_context_cycle_through_items(Inkscape::Selection *sele
 
     if (next) {
         this->cycling_cur_item = next;
-        item = SP_ITEM(this->cycling_cur_item->data);
+        item = dynamic_cast<SPItem *>(static_cast<SPObject *>(this->cycling_cur_item->data));
+        g_assert(item != NULL);
     }
 
     arenaitem = item->get_arenaitem(desktop->dkey);
@@ -442,8 +445,13 @@ void SelectTool::sp_select_context_cycle_through_items(Inkscape::Selection *sele
 
 void SelectTool::sp_select_context_reset_opacities() {
     for (GList *l = this->cycling_items; l != NULL; l = g_list_next(l)) {
-        Inkscape::DrawingItem *arenaitem = SP_ITEM(l->data)->get_arenaitem(this->desktop->dkey);
-        arenaitem->setOpacity(SP_SCALE24_TO_FLOAT(SP_ITEM(l->data)->style->opacity.value));
+        SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(l->data));
+        if (item) {
+            Inkscape::DrawingItem *arenaitem = item->get_arenaitem(desktop->dkey);
+            arenaitem->setOpacity(SP_SCALE24_TO_FLOAT(item->style->opacity.value));
+        } else {
+            g_assert_not_reached();
+        }
     }
 
     g_list_free(this->cycling_items);
@@ -475,8 +483,8 @@ bool SelectTool::root_handler(GdkEvent* event) {
                 if (!selection->isEmpty()) {
                     SPItem *clicked_item = static_cast<SPItem *>(selection->itemList()->data);
 
-                    if (SP_IS_GROUP(clicked_item) && !SP_IS_BOX3D(clicked_item)) { // enter group if it's not a 3D box
-                        desktop->setCurrentLayer(reinterpret_cast<SPObject *>(clicked_item));
+                    if (dynamic_cast<SPGroup *>(clicked_item) && !dynamic_cast<SPBox3D *>(clicked_item)) { // enter group if it's not a 3D box
+                        desktop->setCurrentLayer(clicked_item);
                         sp_desktop_selection(desktop)->clear();
                         this->dragging = false;
                         sp_event_context_discard_delayed_snap_event(this);
@@ -591,8 +599,11 @@ bool SelectTool::root_handler(GdkEvent* event) {
                             item_in_group = desktop->getItemAtPoint(Geom::Point(event->button.x, event->button.y), TRUE);
                             group_at_point = desktop->getGroupAtPoint(Geom::Point(event->button.x, event->button.y));
 
-                            if (SP_IS_LAYER(selection->single())) {
-                                group_at_point = SP_GROUP(selection->single());
+                            {
+                                SPGroup *selGroup = dynamic_cast<SPGroup *>(selection->single());
+                                if (selGroup && (selGroup->layerMode() == SPGroup::LAYER)) {
+                                    group_at_point = selGroup;
+                                }
                             }
 
                             // group-at-point is meant to be topmost item if it's a group,
@@ -673,10 +684,11 @@ bool SelectTool::root_handler(GdkEvent* event) {
                                 selection->toggle(this->item);
                             } else {
                                 SPObject* single = selection->single();
+                                SPGroup *singleGroup = dynamic_cast<SPGroup *>(single);
                                 // without shift, increase state (i.e. toggle scale/rotation handles)
                                 if (selection->includes(this->item)) {
                                     _seltrans->increaseState();
-                                } else if (SP_IS_LAYER(single) && single->isAncestorOf(this->item)) {
+                                } else if (singleGroup && (singleGroup->layerMode() == SPGroup::LAYER) && single->isAncestorOf(this->item)) {
                                     _seltrans->increaseState();
                                 } else {
                                     _seltrans->resetState();
@@ -818,7 +830,7 @@ bool SelectTool::root_handler(GdkEvent* event) {
                 SPItem *item = desktop->getItemAtPoint(p, true, NULL);
 
                 // Save pointer to current cycle-item so that we can find it again later, in the freshly built list
-                SPItem *tmp_cur_item = this->cycling_cur_item ? SP_ITEM(this->cycling_cur_item->data) : NULL;
+                SPItem *tmp_cur_item = this->cycling_cur_item ? dynamic_cast<SPItem *>(static_cast<SPObject *>(this->cycling_cur_item->data)) : NULL;
                 g_list_free(this->cycling_items);
                 this->cycling_items = NULL;
                 this->cycling_cur_item = NULL;
@@ -851,11 +863,14 @@ bool SelectTool::root_handler(GdkEvent* event) {
                     Inkscape::DrawingItem *arenaitem;
 
                     for(GList *l = this->cycling_items_cmp; l != NULL; l = l->next) {
-                        arenaitem = SP_ITEM(l->data)->get_arenaitem(desktop->dkey);
-                        arenaitem->setOpacity(1.0);
-                        //if (!shift_pressed && !g_list_find(this->cycling_items_selected_before, SP_ITEM(l->data)) && selection->includes(SP_ITEM(l->data)))
-                        if (!g_list_find(this->cycling_items_selected_before, SP_ITEM(l->data)) && selection->includes(SP_ITEM(l->data))) {
-                            selection->remove(SP_ITEM(l->data));
+                        SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(l->data));
+                        if (item) {
+                            arenaitem = item->get_arenaitem(desktop->dkey);
+                            arenaitem->setOpacity(1.0);
+                            //if (!shift_pressed && !g_list_find(this->cycling_items_selected_before, item) && selection->includes(item))
+                            if (!g_list_find(this->cycling_items_selected_before, item) && selection->includes(item)) {
+                                selection->remove(item);
+                            }
                         }
                     }
 
@@ -869,16 +884,19 @@ bool SelectTool::root_handler(GdkEvent* event) {
 
                     // ... and rebuild them with the new items.
                     this->cycling_items_cmp = g_list_copy(this->cycling_items);
-                    SPItem *item;
 
                     for(GList *l = this->cycling_items; l != NULL; l = l->next) {
-                        item = SP_ITEM(l->data);
-                        arenaitem = item->get_arenaitem(desktop->dkey);
-                        arenaitem->setOpacity(0.3);
-
-                        if (selection->includes(item)) {
-                            // already selected items are stored separately, too
-                            this->cycling_items_selected_before = g_list_append(this->cycling_items_selected_before, item);
+                        SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(l->data));
+                        if (item) {
+                            arenaitem = item->get_arenaitem(desktop->dkey);
+                            arenaitem->setOpacity(0.3);
+
+                            if (selection->includes(item)) {
+                                // already selected items are stored separately, too
+                                this->cycling_items_selected_before = g_list_append(this->cycling_items_selected_before, item);
+                            }
+                        } else {
+                            g_assert_not_reached();
                         }
                     }
 
@@ -1134,9 +1152,9 @@ bool SelectTool::root_handler(GdkEvent* event) {
                     if (MOD__CTRL_ONLY(event)) {
                         if (selection->singleItem()) {
                             SPItem *clicked_item = selection->singleItem();
-                            
-                            if ( SP_IS_GROUP(clicked_item) || SP_IS_BOX3D(clicked_item)) { // enter group or a 3D box
-                                desktop->setCurrentLayer(reinterpret_cast<SPObject *>(clicked_item));
+                            SPGroup *clickedGroup = dynamic_cast<SPGroup *>(clicked_item);
+                            if ( (clickedGroup && (clickedGroup->layerMode() == SPGroup::LAYER)) || dynamic_cast<SPBox3D *>(clicked_item)) { // enter group or a 3D box
+                                desktop->setCurrentLayer(clicked_item);
                                 sp_desktop_selection(desktop)->clear();
                             } else {
                                 this->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Selected object is not a group. Cannot enter."));
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 29f1b9a73..e15dbb59f 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -384,11 +384,14 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                gint _distrib)
 {
     bool did = false;
-    
-    if (SP_IS_BOX3D(item) ) {
-        // convert 3D boxes to ordinary groups before spraying their shapes
-        item = box3d_convert_to_group(SP_BOX3D(item));
-        selection->add(item);
+
+    {
+        SPBox3D *box = dynamic_cast<SPBox3D *>(item);
+        if (box) {
+            // convert 3D boxes to ordinary groups before spraying their shapes
+            item = box3d_convert_to_group(box);
+            selection->add(item);
+        }
     }
 
     double _fid = g_random_double_range(0, 1);
@@ -413,7 +416,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 parent->appendChild(copy);
 
                 SPObject *new_obj = doc->getObjectByRepr(copy);
-                item_copied = SP_ITEM(new_obj);   // Convertion object->item
+                item_copied = dynamic_cast<SPItem *>(new_obj);   // Convertion object->item
                 Geom::Point center=item->getCenter();
                 sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(_scale,_scale));
                 sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale,scale));
@@ -437,7 +440,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 items != NULL;
                 items = items->next) {
 
-            SPItem *item1 = SP_ITEM(items->data);
+            SPItem *item1 = dynamic_cast<SPItem *>(static_cast<SPObject *>(items->data));
             if (i == 1) {
                 parent_item = item1;
             }
@@ -458,7 +461,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Inkscape::XML::Node *copy = old_repr->duplicate(xml_doc);
                 parent->appendChild(copy);
                 SPObject *new_obj = doc->getObjectByRepr(copy);
-                item_copied = SP_ITEM(new_obj);
+                item_copied = dynamic_cast<SPItem *>(new_obj);
 
                 // Move around the cursor
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint()); 
@@ -503,7 +506,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
 
                 SPObject *clone_object = doc->getObjectByRepr(clone);
                 // Conversion object->item
-                item_copied = SP_ITEM(clone_object);
+                item_copied = dynamic_cast<SPItem *>(clone_object);
                 Geom::Point center = item->getCenter();
                 sp_spray_scale_rel(center, desktop, item_copied, Geom::Scale(_scale, _scale));
                 sp_spray_scale_rel(center, desktop, item_copied, Geom::Scale(scale, scale));
@@ -554,13 +557,16 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         for (GSList *items = original_selection;
                 items != NULL;
                 items = items->next) {
-            sp_object_ref(SP_ITEM(items->data));
+            SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(items->data));
+            g_assert(item != NULL);
+            sp_object_ref(item);
         }
 
         for (GSList *items = original_selection;
                 items != NULL;
                 items = items->next) {
-            SPItem *item = SP_ITEM(items->data);
+            SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(items->data));
+            g_assert(item != NULL);
 
             if (is_transform_modes(tc->mode)) {
                 if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, move_force, tc->population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib)) {
@@ -576,7 +582,9 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         for (GSList *items = original_selection;
                 items != NULL;
                 items = items->next) {
-            sp_object_unref(SP_ITEM(items->data));
+            SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(items->data));
+            g_assert(item != NULL);
+            sp_object_unref(item);
         }
     }
 
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index 75650d3af..571a17b70 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -372,13 +372,16 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
 {
     bool did = false;
 
-    if (SP_IS_BOX3D(item) && !is_transform_mode(mode) && !is_color_mode(mode)) {
-        // convert 3D boxes to ordinary groups before tweaking their shapes
-        item = box3d_convert_to_group(SP_BOX3D(item));
-        selection->add(item);
+    {
+        SPBox3D *box = dynamic_cast<SPBox3D *>(item);
+        if (box && !is_transform_mode(mode) && !is_color_mode(mode)) {
+            // convert 3D boxes to ordinary groups before tweaking their shapes
+            item = box3d_convert_to_group(box);
+            selection->add(item);
+        }
     }
 
-    if (SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item)) {
+    if (dynamic_cast<SPText *>(item) || dynamic_cast<SPFlowtext *>(item)) {
         GSList *items = g_slist_prepend (NULL, item);
         GSList *selected = NULL;
         GSList *to_select = NULL;
@@ -387,22 +390,25 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
         g_slist_free (items);
         SPObject* newObj = doc->getObjectByRepr(static_cast<Inkscape::XML::Node *>(to_select->data));
         g_slist_free (to_select);
-        item = SP_ITEM(newObj);
+        item = dynamic_cast<SPItem *>(newObj);
+        g_assert(item != NULL);
         selection->add(item);
     }
 
-    if (SP_IS_GROUP(item) && !SP_IS_BOX3D(item)) {
+    if (dynamic_cast<SPGroup *>(item) && !dynamic_cast<SPBox3D *>(item)) {
         GSList *children = NULL;
         for (SPObject *child = item->firstChild() ; child; child = child->getNext() ) {
-            if (SP_IS_ITEM(child)) {
+            if (dynamic_cast<SPItem *>(static_cast<SPObject *>(child))) {
                 children = g_slist_prepend(children, child);
             }
         }
 
         for (GSList *i = children; i; i = i->next) {
-            SPItem *child = SP_ITEM(i->data);
-            if (sp_tweak_dilate_recursive (selection, SP_ITEM(child), p, vector, mode, radius, force, fidelity, reverse))
+            SPItem *child = dynamic_cast<SPItem *>(static_cast<SPObject *>(i->data));
+            g_assert(child != NULL);
+            if (sp_tweak_dilate_recursive (selection, child, p, vector, mode, radius, force, fidelity, reverse)) {
                 did = true;
+            }
         }
 
         g_slist_free(children);
@@ -509,13 +515,13 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
                 }
             }
 
-        } else if (SP_IS_PATH(item) || SP_IS_SHAPE(item)) {
+        } else if (dynamic_cast<SPPath *>(item) || dynamic_cast<SPShape *>(item)) {
 
             Inkscape::XML::Node *newrepr = NULL;
             gint pos = 0;
             Inkscape::XML::Node *parent = NULL;
             char const *id = NULL;
-            if (!SP_IS_PATH(item)) {
+            if (!dynamic_cast<SPPath *>(item)) {
                 newrepr = sp_selected_item_to_curved_repr(item, 0);
                 if (!newrepr) {
                     return false;
@@ -631,7 +637,8 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
                     if (newrepr) {
                         newrepr->setAttribute("d", str);
                     } else {
-                        if (SP_IS_LPE_ITEM(item) && SP_LPE_ITEM(item)->hasPathEffectRecursive()) {
+                        SPLPEItem *lpeitem = dynamic_cast<SPLPEItem *>(item);
+                        if (lpeitem && lpeitem->hasPathEffectRecursive()) {
                             item->getRepr()->setAttribute("inkscape:original-d", str);
                         } else {
                             item->getRepr()->setAttribute("d", str);
@@ -769,7 +776,7 @@ static void tweak_colors_in_gradient(SPItem *item, Inkscape::PaintTarget fill_or
 {
     SPGradient *gradient = getGradient(item, fill_or_stroke);
 
-    if (!gradient || !SP_IS_GRADIENT(gradient)) {
+    if (!gradient || !dynamic_cast<SPGradient *>(gradient)) {
         return;
     }
 
@@ -780,9 +787,9 @@ static void tweak_colors_in_gradient(SPItem *item, Inkscape::PaintTarget fill_or
 
     double pos = 0;
     double r = 0;
-    if (SP_IS_LINEARGRADIENT(gradient)) {
-        SPLinearGradient *lg = SP_LINEARGRADIENT(gradient);
 
+    SPLinearGradient *lg = dynamic_cast<SPLinearGradient *>(gradient);
+    if (lg) {
         Geom::Point p1(lg->x1.computed, lg->y1.computed);
         Geom::Point p2(lg->x2.computed, lg->y2.computed);
         Geom::Point pdiff(p2 - p1);
@@ -800,11 +807,13 @@ static void tweak_colors_in_gradient(SPItem *item, Inkscape::PaintTarget fill_or
         // Calculate radius in lenfth-of-gradient-line units
         r = radius / vl;
 
-    } else if (SP_IS_RADIALGRADIENT(gradient)) {
-        SPRadialGradient *rg = SP_RADIALGRADIENT(gradient);
-        Geom::Point c (rg->cx.computed, rg->cy.computed);
-        pos = Geom::L2(p - c) / rg->r.computed;
-        r = radius / rg->r.computed;
+    } else {
+        SPRadialGradient *rg = dynamic_cast<SPRadialGradient *>(gradient);
+        if (rg) {
+            Geom::Point c (rg->cx.computed, rg->cy.computed);
+            pos = Geom::L2(p - c) / rg->r.computed;
+            r = radius / rg->r.computed;
+        }
     }
 
     // Normalize pos to 0..1, taking into accound gradient spread:
@@ -836,14 +845,16 @@ static void tweak_colors_in_gradient(SPItem *item, Inkscape::PaintTarget fill_or
     double offset_h = 0;
     SPObject *child_prev = NULL;
     for (SPObject *child = vector->firstChild(); child; child = child->getNext()) {
-        if (!SP_IS_STOP(child)) {
+        SPStop *stop = dynamic_cast<SPStop *>(child);
+        if (!stop) {
             continue;
         }
-        SPStop *stop = SP_STOP (child);
 
         offset_h = stop->offset;
 
         if (child_prev) {
+            SPStop *prevStop = dynamic_cast<SPStop *>(child_prev);
+            g_assert(prevStop != NULL);
 
             if (offset_h - offset_l > r && pos_e >= offset_l && pos_e <= offset_h) {
                 // the summit falls in this interstop, and the radius is small,
@@ -853,9 +864,9 @@ static void tweak_colors_in_gradient(SPItem *item, Inkscape::PaintTarget fill_or
                 tweak_color (mode, stop->specified_color.v.c, rgb_goal,
                                   force * (pos_e - offset_l) / (offset_h - offset_l),
                                   do_h, do_s, do_l);
-                tweak_color (mode, SP_STOP(child_prev)->specified_color.v.c, rgb_goal,
-                                  force * (offset_h - pos_e) / (offset_h - offset_l),
-                                  do_h, do_s, do_l);
+                tweak_color(mode, prevStop->specified_color.v.c, rgb_goal,
+                            force * (offset_h - pos_e) / (offset_h - offset_l),
+                            do_h, do_s, do_l);
                 stop->updateRepr();
                 child_prev->updateRepr();
                 break;
@@ -863,9 +874,9 @@ static void tweak_colors_in_gradient(SPItem *item, Inkscape::PaintTarget fill_or
                 // wide brush, may affect more than 2 stops,
                 // paint each stop by the force from the profile curve
                 if (offset_l <= pos_e && offset_l > pos_e - r) {
-                    tweak_color (mode, SP_STOP(child_prev)->specified_color.v.c, rgb_goal,
-                                 force * tweak_profile (fabs (pos_e - offset_l), r),
-                                 do_h, do_s, do_l);
+                    tweak_color(mode, prevStop->specified_color.v.c, rgb_goal,
+                                force * tweak_profile (fabs (pos_e - offset_l), r),
+                                do_h, do_s, do_l);
                     child_prev->updateRepr();
                 }
 
@@ -894,10 +905,11 @@ sp_tweak_color_recursive (guint mode, SPItem *item, SPItem *item_at_point,
 {
     bool did = false;
 
-    if (SP_IS_GROUP(item)) {
+    if (dynamic_cast<SPGroup *>(item)) {
         for (SPObject *child = item->firstChild() ; child; child = child->getNext() ) {
-            if (SP_IS_ITEM(child)) {
-                if (sp_tweak_color_recursive (mode, SP_ITEM(child), item_at_point,
+            SPItem *childItem = dynamic_cast<SPItem *>(child);
+            if (childItem) {
+                if (sp_tweak_color_recursive (mode, childItem, item_at_point,
                                           fill_goal, do_fill,
                                           stroke_goal, do_stroke,
                                           opacity_goal, do_opacity,
@@ -953,11 +965,11 @@ sp_tweak_color_recursive (guint mode, SPItem *item, SPItem *item_at_point,
                     //cycle through filter primitives
                     SPObject *primitive_obj = style->getFilter()->children;
                     while (primitive_obj) {
-                        if (SP_IS_FILTER_PRIMITIVE(primitive_obj)) {
-                            SPFilterPrimitive *primitive = SP_FILTER_PRIMITIVE(primitive_obj);
+                        SPFilterPrimitive *primitive = dynamic_cast<SPFilterPrimitive *>(primitive_obj);
+                        if (primitive) {
                             //if primitive is gaussianblur
-                            if(SP_IS_GAUSSIANBLUR(primitive)) {
-                                SPGaussianBlur * spblur = SP_GAUSSIANBLUR(primitive);
+                            SPGaussianBlur * spblur = dynamic_cast<SPGaussianBlur *>(primitive);
+                            if (spblur) {
                                 float num = spblur->stdDeviation.getNumber();
                                 blur_now += num * i2dt.descrim(); // sum all blurs in the filter
                             }
@@ -1080,7 +1092,7 @@ sp_tweak_dilate (TweakTool *tc, Geom::Point event_p, Geom::Point p, Geom::Point
          items != NULL;
          items = items->next) {
 
-        SPItem *item = SP_ITEM(items->data);
+        SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(items->data));
 
         if (is_color_mode (tc->mode)) {
             if (do_fill || do_stroke || do_opacity) {
-- 
cgit v1.2.3


From dd6537989eab9f89d15163dd96d7c87256b3e9ce Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Sun, 2 Nov 2014 06:14:30 -0800
Subject: Correct check-for-layer that should have been check-for-group. Fixes
 bug #1388297.

Fixed bugs:
  - https://launchpad.net/bugs/1388297

(bzr r13658)
---
 src/ui/tools/select-tool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp
index 21459e5d0..a8267ea1d 100644
--- a/src/ui/tools/select-tool.cpp
+++ b/src/ui/tools/select-tool.cpp
@@ -1153,7 +1153,7 @@ bool SelectTool::root_handler(GdkEvent* event) {
                         if (selection->singleItem()) {
                             SPItem *clicked_item = selection->singleItem();
                             SPGroup *clickedGroup = dynamic_cast<SPGroup *>(clicked_item);
-                            if ( (clickedGroup && (clickedGroup->layerMode() == SPGroup::LAYER)) || dynamic_cast<SPBox3D *>(clicked_item)) { // enter group or a 3D box
+                            if ( (clickedGroup && (clickedGroup->layerMode() != SPGroup::LAYER)) || dynamic_cast<SPBox3D *>(clicked_item)) { // enter group or a 3D box
                                 desktop->setCurrentLayer(clicked_item);
                                 sp_desktop_selection(desktop)->clear();
                             } else {
-- 
cgit v1.2.3


From f51e8d7c6b4e2caa9e470af674949f3cd1695bf5 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 5 Nov 2014 19:30:49 +0100
Subject: Refactor to remove references to Desktop/Ui in Effect, bspline and
 fillet-chamfer. Also fixed the selected node problem in units not px. Also
 fixed two var to not allow NULL pointed by Johan Engelen.

(bzr r13672)
---
 src/ui/tools/node-tool.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index e2bb85d11..99d60e2b7 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -305,6 +305,16 @@ void  NodeTool::update_helperpath () {
     if (SP_IS_LPE_ITEM(selection->singleItem())) {
         Inkscape::LivePathEffect::Effect *lpe = SP_LPE_ITEM(selection->singleItem())->getCurrentLPE();
         if (lpe && lpe->isVisible()/* && lpe->showOrigPath()*/) {
+            Inkscape::UI::ControlPointSelection::Set &selectionNodes = _selected_nodes->allPoints();
+            std::vector<Geom::Point> selectedNodesPositions;
+            for (Inkscape::UI::ControlPointSelection::Set::iterator i = selectionNodes.begin(); i != selectionNodes.end(); ++i) {
+                if ((*i)->selected()) {
+                    Inkscape::UI::Node *n = dynamic_cast<Inkscape::UI::Node *>(*i);
+                    selectedNodesPositions.push_back(desktop->doc2dt(n->position()));
+                }
+            }
+            lpe->setSelectedNodePoints(selectedNodesPositions);
+            lpe->setCurrentZoom(this->desktop->current_zoom());
             SPCurve *c = new SPCurve();
             SPCurve *cc = new SPCurve();
             std::vector<Geom::PathVector> cs = lpe->getCanvasIndicators(SP_LPE_ITEM(selection->singleItem()));
-- 
cgit v1.2.3


From 7ff4799d9ecde4286c94e76f4005e18db5a60055 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 12 Nov 2014 01:12:35 +0100
Subject: Fixed bug in node point selection to LPE.

(bzr r13704)
---
 src/ui/tools/node-tool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 99d60e2b7..838c2a884 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -310,7 +310,7 @@ void  NodeTool::update_helperpath () {
             for (Inkscape::UI::ControlPointSelection::Set::iterator i = selectionNodes.begin(); i != selectionNodes.end(); ++i) {
                 if ((*i)->selected()) {
                     Inkscape::UI::Node *n = dynamic_cast<Inkscape::UI::Node *>(*i);
-                    selectedNodesPositions.push_back(desktop->doc2dt(n->position()));
+                    selectedNodesPositions.push_back(n->position());
                 }
             }
             lpe->setSelectedNodePoints(selectedNodesPositions);
-- 
cgit v1.2.3


From f6740d03736aa790dbd2b0441337ce97cef843fb Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Sat, 15 Nov 2014 10:52:22 -0800
Subject: Purged GTKish SP_IS_RECT_CONTEXT/SP_RECT_CONTEXT macros.

(bzr r13713)
---
 src/ui/tools/rect-tool.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/rect-tool.h b/src/ui/tools/rect-tool.h
index a50fd7b24..a22f1caa8 100644
--- a/src/ui/tools/rect-tool.h
+++ b/src/ui/tools/rect-tool.h
@@ -6,6 +6,7 @@
  *
  * Author:
  *   Lauris Kaplinski <lauris@kaplinski.com>
+ *   Jon A. Cruz <jon@joncruz.org>
  *
  * Copyright (C) 2000 Lauris Kaplinski
  * Copyright (C) 2000-2001 Ximian, Inc.
@@ -21,9 +22,6 @@
 
 #include "sp-rect.h"
 
-#define SP_RECT_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::RectTool*>((Inkscape::UI::Tools::ToolBase*)obj))
-#define SP_IS_RECT_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::RectTool*>((const Inkscape::UI::Tools::ToolBase*)obj) != NULL)
-
 namespace Inkscape {
 namespace UI {
 namespace Tools {
-- 
cgit v1.2.3


From 39eb601008ddcd01b4e05ec2d6efb49a7732d5e3 Mon Sep 17 00:00:00 2001
From: Alvin Penner <penner@vaxxine.com>
Date: Wed, 19 Nov 2014 14:31:03 -0500
Subject: modify sequence of events. (Bug 1247801)

Fixed bugs:
  - https://launchpad.net/bugs/1247801

(bzr r13735)
---
 src/ui/tools/freehand-base.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/tools')

diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 6434c30d2..bd84e0efb 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -703,8 +703,8 @@ static void spdc_flush_white(FreehandBase *dc, SPCurve *gc)
             dc->selection->set(repr);
             Inkscape::GC::release(repr);
             item->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
-            item->doWriteTransform(item->getRepr(), item->transform, NULL, true);
             item->updateRepr();
+            item->doWriteTransform(item->getRepr(), item->transform, NULL, true);
         }
 
         DocumentUndo::done(doc, SP_IS_PEN_CONTEXT(dc)? SP_VERB_CONTEXT_PEN : SP_VERB_CONTEXT_PENCIL,
-- 
cgit v1.2.3