From 0905e866b43bc83405adc3b03a8db47956779c19 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Thu, 14 Feb 2013 03:18:29 +0100 Subject: Pen Context working in mode BSpline,Cusp mode to fix (bzr r11950.1.30) --- src/pen-context.cpp | 67 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 13 deletions(-) (limited to 'src/pen-context.cpp') diff --git a/src/pen-context.cpp b/src/pen-context.cpp index 3c8e46a54..8d5887223 100644 --- a/src/pen-context.cpp +++ b/src/pen-context.cpp @@ -583,7 +583,7 @@ static gint pen_handle_button_press(SPPenContext *const pc, GdkEventButton const //BSpline //Esto evita arrastrar los manejadores ya que el punto se crea //al soltar el botón del ratón. - if((pc->spiro || pc->bspline) && pc->state != SP_PEN_CONTEXT_CLOSE ) pc->state = SP_PEN_CONTEXT_POINT; + if(((pc->spiro || pc->bspline) && pc->state != SP_PEN_CONTEXT_CLOSE)&&!(pc->bspline && bevent.state & GDK_SHIFT_MASK) ) pc->state = SP_PEN_CONTEXT_POINT; //BSpline End ret = TRUE; break; @@ -984,8 +984,20 @@ static void pen_redraw_all (SPPenContext *const pc) // handles //BSpline - if (pc->p[0] != pc->p[1] && !pc->spiro && !pc->bspline) { + SPCurve * WPower = new SPCurve(); + Geom::D2< Geom::SBasis > SBasisWPower; + float WP = 0; + if (pc->p[0] != pc->p[1] && !pc->spiro /*&& !pc->bspline*/) { //BSpline End + if(pc->bspline){ + WPower->moveto(pc->red_curve->first_segment()->initialPoint()); + WPower->lineto(pc->red_curve->first_segment()->finalPoint()); + SBasisWPower = WPower->first_segment()->toSBasis(); + + WPower->reset(); + pc->p[1] = SBasisWPower.valueAt(WP); + } + SP_CTRL(pc->c1)->moveto(pc->p[1]); pc->cl1->setCoords(pc->p[0], pc->p[1]); sp_canvas_item_show(pc->c1); @@ -994,16 +1006,23 @@ static void pen_redraw_all (SPPenContext *const pc) sp_canvas_item_hide(pc->c1); sp_canvas_item_hide(pc->cl1); } - + Geom::Point p2; Geom::Curve const * last_seg = pc->green_curve->last_segment(); if (last_seg) { Geom::CubicBezier const * cubic = dynamic_cast( last_seg ); //BSpline if ( cubic && - (*cubic)[2] != pc->p[0]&& !pc->spiro && !pc->bspline ) + (*cubic)[2] != pc->p[0]&& !pc->spiro /*&& !pc->bspline*/ ) { //BSpline End - Geom::Point p2 = (*cubic)[2]; + if(pc->bspline){ + WPower->moveto(last_seg->finalPoint()); + WPower->lineto(last_seg->initialPoint()); + SBasisWPower = WPower->first_segment()->toSBasis(); + p2 = SBasisWPower.valueAt(WP); + }else{ + p2 = (*cubic)[2]; + } SP_CTRL(pc->c0)->moveto(p2); pc->cl0->setCoords(p2, pc->p[0]); sp_canvas_item_show(pc->c0); @@ -1784,15 +1803,35 @@ static void bspline(SPPenContext *const pc, bool Shift) pc->npoints = 5; pc->p[0] = pc->red_curve->first_segment()->initialPoint(); pc->p[3] = pc->red_curve->first_segment()->finalPoint(); - if(pc->green_curve->is_empty()) + if(pc->green_curve->is_empty()){ pc->p[1] = pc->p[0] + (1./3)*(pc->p[0] - pc->p[3]); - else + pc->p[1] = Geom::Point(pc->p[1][X]+1,pc->p[1][Y]+1); + }else{ cubic = dynamic_cast(&*pc->green_curve->last_segment()); - if(cubic && ((*cubic)[2] == (*cubic)[3])) + if(!cubic || ((*cubic)[2] == (*cubic)[3])) pc->p[1] = pc->p[0]; - else - pc->p[1] = pc->p[0] + (1./3)*(pc->p[0] - pc->p[3]); + else{ + if(cubic){ + SPCurve * WPower = new SPCurve(); + Geom::D2< Geom::SBasis > SBasisWPower; + WPower->moveto(pc->green_curve->last_segment()->finalPoint()); + WPower->lineto(pc->green_curve->last_segment()->initialPoint()); + float WP = Geom::nearest_point((*cubic)[2],*WPower->first_segment()); + WPower->reset(); + WPower->moveto(pc->red_curve->last_segment()->initialPoint()); + WPower->lineto(pc->red_curve->last_segment()->finalPoint()); + SBasisWPower = WPower->first_segment()->toSBasis(); + WPower->reset(); + pc->p[1] = SBasisWPower.valueAt(WP); + pc->p[1] = Geom::Point(pc->p[1][X]+1,pc->p[1][Y]+1); + }else{ + pc->p[1] = pc->p[0] + (1./3)*(pc->p[0] - pc->p[3]); + pc->p[1] = Geom::Point(pc->p[1][X]+1,pc->p[1][Y]+1); + } + } + } pc->p[2] = pc->p[3] + (1./3)*(pc->p[0] - pc->p[3]); + pc->p[2] = Geom::Point(pc->p[2][X]+1,pc->p[2][Y]+1); } }else{ if(pc->anchor_statusbar && pc->red_curve->is_empty()){ @@ -1803,9 +1842,11 @@ static void bspline(SPPenContext *const pc, bool Shift) saShift = false; } - if (pc->npoints == 5 || !pc->red_curve->is_empty()){ - pc->npoints = 2; - pc->p[1]= pc->p[3]; + if (!pc->red_curve->is_empty()){ + pc->npoints = 5; + pc->p[0] = pc->red_curve->first_segment()->finalPoint(); + pc->p[3] = pc->red_curve->first_segment()->initialPoint(); + pc->p[2] = pc->p[3]; } if(pc->green_curve->is_empty() && saShift){ pc->npoints = 5; -- cgit v1.2.3 From 28b44133e0d9df8054e17ed9724ea645220e1530 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Thu, 14 Feb 2013 06:01:26 +0100 Subject: All done except cusp continuous and close bspline (bzr r11950.1.32) --- src/pen-context.cpp | 78 ++++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 37 deletions(-) (limited to 'src/pen-context.cpp') diff --git a/src/pen-context.cpp b/src/pen-context.cpp index 8d5887223..5c3c49250 100644 --- a/src/pen-context.cpp +++ b/src/pen-context.cpp @@ -583,7 +583,7 @@ static gint pen_handle_button_press(SPPenContext *const pc, GdkEventButton const //BSpline //Esto evita arrastrar los manejadores ya que el punto se crea //al soltar el botón del ratón. - if(((pc->spiro || pc->bspline) && pc->state != SP_PEN_CONTEXT_CLOSE)&&!(pc->bspline && bevent.state & GDK_SHIFT_MASK) ) pc->state = SP_PEN_CONTEXT_POINT; + if((pc->spiro || pc->bspline) && pc->state != SP_PEN_CONTEXT_CLOSE) pc->state = SP_PEN_CONTEXT_POINT; //BSpline End ret = TRUE; break; @@ -1785,15 +1785,12 @@ static void spiro_doEffect(SPCurve * curve) //Unimos todas las curvas en juego y llamamos a la función doEffect. static void bspline(SPPenContext *const pc, bool Shift) { + using Geom::X; + using Geom::Y; + Geom::CubicBezier const *cubic; if(!Shift){ - - using Geom::X; - using Geom::Y; - Geom::CubicBezier const *cubic; - //Continuamos la curva en modo CUSP - //Guardamos el valor de inicio en cusp para que no se redibuje como SYMM if(pc->anchor_statusbar && pc->red_curve->is_empty()){ - saShift = true; + saShift = false; } //NODO CUSP formado por nodo SMOOTH //solo mobemos el manejador del nodo final de cada segmento @@ -1804,39 +1801,39 @@ static void bspline(SPPenContext *const pc, bool Shift) pc->p[0] = pc->red_curve->first_segment()->initialPoint(); pc->p[3] = pc->red_curve->first_segment()->finalPoint(); if(pc->green_curve->is_empty()){ - pc->p[1] = pc->p[0] + (1./3)*(pc->p[0] - pc->p[3]); + pc->p[1] = pc->p[0] + (1./3)*(pc->p[3] - pc->p[0]); pc->p[1] = Geom::Point(pc->p[1][X]+1,pc->p[1][Y]+1); }else{ cubic = dynamic_cast(&*pc->green_curve->last_segment()); if(!cubic || ((*cubic)[2] == (*cubic)[3])) pc->p[1] = pc->p[0]; else{ - if(cubic){ - SPCurve * WPower = new SPCurve(); - Geom::D2< Geom::SBasis > SBasisWPower; - WPower->moveto(pc->green_curve->last_segment()->finalPoint()); - WPower->lineto(pc->green_curve->last_segment()->initialPoint()); - float WP = Geom::nearest_point((*cubic)[2],*WPower->first_segment()); - WPower->reset(); - WPower->moveto(pc->red_curve->last_segment()->initialPoint()); - WPower->lineto(pc->red_curve->last_segment()->finalPoint()); - SBasisWPower = WPower->first_segment()->toSBasis(); - WPower->reset(); - pc->p[1] = SBasisWPower.valueAt(WP); - pc->p[1] = Geom::Point(pc->p[1][X]+1,pc->p[1][Y]+1); - }else{ - pc->p[1] = pc->p[0] + (1./3)*(pc->p[0] - pc->p[3]); - pc->p[1] = Geom::Point(pc->p[1][X]+1,pc->p[1][Y]+1); - } + SPCurve * WPower = new SPCurve(); + Geom::D2< Geom::SBasis > SBasisWPower; + WPower->moveto(pc->green_curve->last_segment()->finalPoint()); + WPower->lineto(pc->green_curve->last_segment()->initialPoint()); + float WP = Geom::nearest_point((*cubic)[2],*WPower->first_segment()); + WPower->reset(); + WPower->moveto(pc->red_curve->last_segment()->initialPoint()); + WPower->lineto(pc->red_curve->last_segment()->finalPoint()); + SBasisWPower = WPower->first_segment()->toSBasis(); + WPower->reset(); + pc->p[1] = SBasisWPower.valueAt(WP); + pc->p[1] = Geom::Point(pc->p[1][X]+1,pc->p[1][Y]+1); } } pc->p[2] = pc->p[3] + (1./3)*(pc->p[0] - pc->p[3]); pc->p[2] = Geom::Point(pc->p[2][X]+1,pc->p[2][Y]+1); } + if(pc->green_curve->is_empty() && saShift) + pc->p[1] = pc->p[0]; }else{ + //Continuamos la curva en modo CUSP + //Guardamos el valor de inicio en cusp para que no se redibuje como SYMM if(pc->anchor_statusbar && pc->red_curve->is_empty()){ - saShift = false; + saShift = true; } + if(!pc->green_curve->is_empty()){ //Damos valor original a la variable por si se necesita de nuevo saShift = false; @@ -1844,15 +1841,22 @@ static void bspline(SPPenContext *const pc, bool Shift) if (!pc->red_curve->is_empty()){ pc->npoints = 5; - pc->p[0] = pc->red_curve->first_segment()->finalPoint(); - pc->p[3] = pc->red_curve->first_segment()->initialPoint(); - pc->p[2] = pc->p[3]; - } - if(pc->green_curve->is_empty() && saShift){ - pc->npoints = 5; - pc->p[3] = pc->p[1]; - pc->p[2] = pc->p[3]; - pc->p[1] = pc->p[0] + (1./3)*(pc->p[0] - pc->p[3]); + pc->p[0] = pc->red_curve->first_segment()->initialPoint(); + pc->p[3] = pc->red_curve->first_segment()->finalPoint(); + if(pc->green_curve->is_empty()){ + pc->p[1] = pc->p[0]; + }else{ + cubic = dynamic_cast(&*pc->green_curve->last_segment()); + if(!cubic || ((*cubic)[2] == (*cubic)[3])){ + pc->p[1] = pc->p[0]; + pc->p[2] = pc->p[3]; + }else{ + pc->p[1] = pc->p[0] + (1./3)*(pc->p[3] - pc->p[0]); + pc->p[1] = Geom::Point(pc->p[1][X]+1,pc->p[1][Y]+1); + pc->p[2] = pc->p[3]; + } + + } } } bspline_build(pc); @@ -1985,7 +1989,7 @@ static void bspline_doEffect(SPCurve * curve) cubicIn = dynamic_cast(&*curve_it1); cubicOut = dynamic_cast(&*curve_it2); cubicEnd = dynamic_cast(&*curve_end); - if (path_it->closed() && cubicIn && cubicEnd && (*cubicIn)[1] != (*cubicEnd)[2]){ + if (path_it->closed() && cubicEnd && (*cubicEnd)[3] != (*cubicEnd)[2]){ //Calculamos el nodo de inicio BSpline SBasisIn = in->first_segment()->toSBasis(); SBasisEnd = end->first_segment()->toSBasis(); -- cgit v1.2.3