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 --------
 1 file changed, 8 deletions(-)

(limited to 'src/ui/tools/freehand-base.cpp')

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 :
-
-- 
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/freehand-base.cpp')

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 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/freehand-base.cpp')

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/freehand-base.cpp')

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 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

(limited to 'src/ui/tools/freehand-base.cpp')

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();
 }
 
-- 
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/freehand-base.cpp')

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 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 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'src/ui/tools/freehand-base.cpp')

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));
-- 
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 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'src/ui/tools/freehand-base.cpp')

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) && 
-- 
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 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'src/ui/tools/freehand-base.cpp')

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) && 
-- 
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 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'src/ui/tools/freehand-base.cpp')

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) && 
-- 
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/freehand-base.cpp')

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/freehand-base.cpp')

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/freehand-base.cpp')

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/freehand-base.cpp')

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 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 +++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 58 deletions(-)

(limited to 'src/ui/tools/freehand-base.cpp')

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));
-- 
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 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

(limited to 'src/ui/tools/freehand-base.cpp')

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));
-- 
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/freehand-base.cpp')

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 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 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'src/ui/tools/freehand-base.cpp')

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);
         }
-- 
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 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'src/ui/tools/freehand-base.cpp')

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();
     }
-- 
cgit v1.2.3