From 45d32acc437f1ea60269d51bbbb97845cee2dfc9 Mon Sep 17 00:00:00 2001 From: dooglus Date: Fri, 11 Apr 2008 14:01:00 +0000 Subject: [PATCH] Rename all 'offset' parameters to 'origin'. git-svn-id: http://svn.voria.com/code@2014 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/modules/lyr_std/shade.cpp | 54 +++++------ synfig-core/trunk/src/modules/lyr_std/shade.h | 2 +- .../trunk/src/modules/mod_filter/halftone.cpp | 2 +- .../trunk/src/modules/mod_filter/halftone.h | 2 +- .../trunk/src/modules/mod_filter/halftone2.cpp | 16 ++-- .../trunk/src/modules/mod_filter/halftone3.cpp | 24 ++--- .../trunk/src/modules/mod_geometry/outline.cpp | 2 +- .../trunk/src/modules/mod_geometry/region.cpp | 2 +- .../trunk/src/modules/mod_geometry/star.cpp | 6 +- .../src/modules/mod_gradient/curvegradient.cpp | 23 ++--- .../trunk/src/modules/mod_gradient/curvegradient.h | 2 +- .../trunk/src/modules/mod_particle/plant.cpp | 18 ++-- synfig-core/trunk/src/modules/mod_particle/plant.h | 2 +- synfig-core/trunk/src/synfig/layer_polygon.cpp | 2 +- synfig-core/trunk/src/synfig/layer_shape.cpp | 100 +++++++++++---------- synfig-core/trunk/src/synfig/layer_shape.h | 2 +- synfig-studio/trunk/src/gtkmm/state_bline.cpp | 54 +++++------ synfig-studio/trunk/src/gtkmm/state_circle.cpp | 56 ++++++------ synfig-studio/trunk/src/gtkmm/state_draw.cpp | 32 +++---- synfig-studio/trunk/src/gtkmm/state_rectangle.cpp | 56 ++++++------ synfig-studio/trunk/src/gtkmm/state_star.cpp | 60 ++++++------- 21 files changed, 266 insertions(+), 251 deletions(-) diff --git a/synfig-core/trunk/src/modules/lyr_std/shade.cpp b/synfig-core/trunk/src/modules/lyr_std/shade.cpp index 651432d..4ab3917 100644 --- a/synfig-core/trunk/src/modules/lyr_std/shade.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/shade.cpp @@ -81,7 +81,7 @@ Layer_Shade::Layer_Shade(): size(0.1,0.1), type(Blur::FASTGAUSSIAN), color(Color::black()), - offset(0.2,-0.2), + origin(0.2,-0.2), invert(false) { } @@ -94,9 +94,11 @@ Layer_Shade::set_param(const String ¶m, const ValueBase &value) IMPORT_PLUS(color, { if (color.get_a() == 0) { if (converted_blend_) { set_blend_method(Color::BLEND_ALPHA_OVER); color.set_a(1); } else transparent_color_ = true; } }); - IMPORT(offset); + IMPORT(origin); IMPORT(invert); + IMPORT_AS(origin,"offset"); + return Layer_Composite::set_param(param,value); } @@ -106,7 +108,7 @@ Layer_Shade::get_param(const String ¶m)const EXPORT(size); EXPORT(type); EXPORT(color); - EXPORT(offset); + EXPORT(origin); EXPORT(invert); EXPORT_NAME(); @@ -126,9 +128,9 @@ Layer_Shade::get_color(Context context, const Point &pos)const Color shade(color); if(!invert) - shade.set_a(context.get_color(blurpos-offset).get_a()); + shade.set_a(context.get_color(blurpos-origin).get_a()); else - shade.set_a(1.0f-context.get_color(blurpos-offset).get_a()); + shade.set_a(1.0f-context.get_color(blurpos-origin).get_a()); return Color::blend(shade,context.get_color(pos),get_amount(),get_blend_method()); } @@ -153,15 +155,15 @@ Layer_Shade::accelerated_render(Context context,Surface *surface,int quality, co int halfsizex = (int) (abs(size[0]*.5/pw) + 3), halfsizey = (int) (abs(size[1]*.5/ph) + 3); - int offset_u(-round_to_int(offset[0]/pw)),offset_v(-round_to_int(offset[1]/ph)); + int origin_u(-round_to_int(origin[0]/pw)),origin_v(-round_to_int(origin[1]/ph)); - int offset_w(w+abs(offset_u)),offset_h(h+abs(offset_v)); + int origin_w(w+abs(origin_u)),origin_h(h+abs(origin_v)); workdesc.set_subwindow( - offset_u<0?offset_u:0, - offset_v<0?offset_v:0, - (offset_u>0?offset_u:0)+w, - (offset_v>0?offset_v:0)+h + origin_u<0?origin_u:0, + origin_v<0?origin_v:0, + (origin_u>0?origin_u:0)+w, + (origin_v>0?origin_v:0)+h ); if(quality >= 10) @@ -182,7 +184,7 @@ Layer_Shade::accelerated_render(Context context,Surface *surface,int quality, co case Blur::BOX: case Blur::CROSS: { - workdesc.set_subwindow(-max(1,halfsizex),-max(1,halfsizey),offset_w+2*max(1,halfsizex),offset_h+2*max(1,halfsizey)); + workdesc.set_subwindow(-max(1,halfsizex),-max(1,halfsizey),origin_w+2*max(1,halfsizex),origin_h+2*max(1,halfsizey)); break; } case Blur::FASTGAUSSIAN: @@ -192,7 +194,7 @@ Layer_Shade::accelerated_render(Context context,Surface *surface,int quality, co halfsizex*=2; halfsizey*=2; } - workdesc.set_subwindow(-max(1,halfsizex),-max(1,halfsizey),offset_w+2*max(1,halfsizex),offset_h+2*max(1,halfsizey)); + workdesc.set_subwindow(-max(1,halfsizex),-max(1,halfsizey),origin_w+2*max(1,halfsizex),origin_h+2*max(1,halfsizey)); break; } case Blur::GAUSSIAN: @@ -209,7 +211,7 @@ Layer_Shade::accelerated_render(Context context,Surface *surface,int quality, co halfsizex = (halfsizex + 1)/2; halfsizey = (halfsizey + 1)/2; - workdesc.set_subwindow( -halfsizex, -halfsizey, offset_w+2*halfsizex, offset_h+2*halfsizey ); + workdesc.set_subwindow( -halfsizex, -halfsizey, origin_w+2*halfsizex, origin_h+2*halfsizey ); break; } @@ -260,18 +262,18 @@ Layer_Shade::accelerated_render(Context context,Surface *surface,int quality, co //be sure the surface is of the correct size surface->set_wh(renddesc.get_w(),renddesc.get_h()); - int u = halfsizex-(offset_u<0?offset_u:0), v = halfsizey-(offset_v<0?offset_v:0); + int u = halfsizex-(origin_u<0?origin_u:0), v = halfsizey-(origin_v<0?origin_v:0); for(y=0;y::const_iterator iter,next; @@ -362,14 +362,14 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co const Real mag(diff.inv_mag()); supersample=supersample*mag; diff*=mag*mag; - dist=((point_-offset)*diff-p1*diff); + dist=((point_-origin)*diff-p1*diff); } } else // not perpendicular { if (edge_case) { - diff=(p1-(point_-offset)); + diff=(p1-(point_-origin)); if(diff*tangent.perp()<0) diff=-diff; diff=diff.norm()*thickness*width; } @@ -380,7 +380,7 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co const Real mag(diff.inv_mag()); supersample=supersample*mag; diff*=mag*mag; - dist=((point_-offset)*diff-p1*diff); + dist=((point_-origin)*diff-p1*diff); } if(loop) @@ -440,7 +440,7 @@ CurveGradient::set_param(const String & param, const ValueBase &value) { - IMPORT(offset); + IMPORT(origin); IMPORT(perpendicular); IMPORT(fast); @@ -457,13 +457,16 @@ CurveGradient::set_param(const String & param, const ValueBase &value) IMPORT(gradient); IMPORT(loop); IMPORT(zigzag); + + IMPORT_AS(origin,"offset"); + return Layer_Composite::set_param(param,value); } ValueBase CurveGradient::get_param(const String & param)const { - EXPORT(offset); + EXPORT(origin); EXPORT(bline); EXPORT(gradient); EXPORT(loop); @@ -483,8 +486,8 @@ CurveGradient::get_param_vocab()const { Layer::Vocab ret(Layer_Composite::get_param_vocab()); - ret.push_back(ParamDesc("offset") - .set_local_name(_("Offset"))); + ret.push_back(ParamDesc("origin") + .set_local_name(_("Origin"))); ret.push_back(ParamDesc("width") .set_is_distance() @@ -492,7 +495,7 @@ CurveGradient::get_param_vocab()const ret.push_back(ParamDesc("bline") .set_local_name(_("Vertices")) - .set_origin("offset") + .set_origin("origin") .set_hint("width") .set_description(_("A list of BLine Points"))); diff --git a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.h b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.h index d9608e6..a6b419c 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.h +++ b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.h @@ -52,7 +52,7 @@ class CurveGradient : public Layer_Composite, public Layer_NoDeform private: std::vector bline; - Point offset; + Point origin; Real width; Gradient gradient; Real curve_length_; diff --git a/synfig-core/trunk/src/modules/mod_particle/plant.cpp b/synfig-core/trunk/src/modules/mod_particle/plant.cpp index 60652a4..a7df926 100644 --- a/synfig-core/trunk/src/modules/mod_particle/plant.cpp +++ b/synfig-core/trunk/src/modules/mod_particle/plant.cpp @@ -76,7 +76,7 @@ SYNFIG_LAYER_SET_CVS_ID(Plant,"$Id$"); Plant::Plant(): - offset(0,0), + origin(0,0), split_angle(Angle::deg(10)), gravity(0,-0.1), velocity(0.3), @@ -287,7 +287,7 @@ Plant::set_param(const String & param, const ValueBase &value) needs_sync_=true; return true; } - IMPORT(offset); + IMPORT(origin); IMPORT_PLUS(split_angle,needs_sync_=true); IMPORT_PLUS(gravity,needs_sync_=true); IMPORT_PLUS(gradient,needs_sync_=true); @@ -314,6 +314,8 @@ Plant::set_param(const String & param, const ValueBase &value) IMPORT(size_as_alpha); IMPORT(reverse); + IMPORT_AS(origin,"offset"); + return Layer_Composite::set_param(param,value); } /* @@ -347,7 +349,7 @@ Plant::get_param(const String& param)const if(param=="seed") return random.get_seed(); EXPORT(bline); - EXPORT(offset); + EXPORT(origin); EXPORT(split_angle); EXPORT(gravity); EXPORT(velocity); @@ -379,12 +381,12 @@ Plant::get_param_vocab()const ret.push_back(ParamDesc("bline") .set_local_name(_("Vertices")) .set_description(_("A list of BLine Points")) - .set_origin("offset") + .set_origin("origin") .set_hint("width") ); - ret.push_back(ParamDesc("offset") - .set_local_name(_("Offset")) + ret.push_back(ParamDesc("origin") + .set_local_name(_("Origin")) ); ret.push_back(ParamDesc("gradient") @@ -484,8 +486,8 @@ Plant::accelerated_render(Context context,Surface *surface,int quality, const Re dest_surface.set_wh(surface->get_w(),surface->get_h()); dest_surface.clear(); - const Point tl(renddesc.get_tl()-offset); - const Point br(renddesc.get_br()-offset); + const Point tl(renddesc.get_tl()-origin); + const Point br(renddesc.get_br()-origin); const int w(renddesc.get_w()); const int h(renddesc.get_h()); diff --git a/synfig-core/trunk/src/modules/mod_particle/plant.h b/synfig-core/trunk/src/modules/mod_particle/plant.h index 3304d55..b399a8a 100644 --- a/synfig-core/trunk/src/modules/mod_particle/plant.h +++ b/synfig-core/trunk/src/modules/mod_particle/plant.h @@ -57,7 +57,7 @@ private: std::vector bline; bool bline_loop; - Point offset; + Point origin; synfig::Gradient gradient; diff --git a/synfig-core/trunk/src/synfig/layer_polygon.cpp b/synfig-core/trunk/src/synfig/layer_polygon.cpp index a6b4ccb..afec259 100644 --- a/synfig-core/trunk/src/synfig/layer_polygon.cpp +++ b/synfig-core/trunk/src/synfig/layer_polygon.cpp @@ -169,7 +169,7 @@ Layer_Polygon::get_param_vocab()const ret.push_back(ParamDesc("vector_list") .set_local_name(_("Vector List")) - .set_origin("offset") + .set_origin("origin") ); return ret; diff --git a/synfig-core/trunk/src/synfig/layer_shape.cpp b/synfig-core/trunk/src/synfig/layer_shape.cpp index c24efb3..8c4a818 100644 --- a/synfig-core/trunk/src/synfig/layer_shape.cpp +++ b/synfig-core/trunk/src/synfig/layer_shape.cpp @@ -1124,7 +1124,7 @@ Layer_Shape::Layer_Shape(const Real &a, const Color::BlendMethod m): Layer_Composite (a,m), edge_table (new Intersector), color (Color::black()), - offset (0,0), + origin (0,0), invert (false), antialias (true), blurtype (Blur::FASTGAUSSIAN), @@ -1154,13 +1154,15 @@ Layer_Shape::set_param(const String & param, const ValueBase &value) IMPORT_PLUS(color, { if (color.get_a() == 0) { if (converted_blend_) { set_blend_method(Color::BLEND_ALPHA_OVER); color.set_a(1); } else transparent_color_ = true; } }); - IMPORT(offset); + IMPORT(origin); IMPORT(invert); IMPORT(antialias); IMPORT_PLUS(feather, if(feather<0)feather=0;); IMPORT(blurtype); IMPORT(winding_style); + IMPORT_AS(origin,"offset"); + return Layer_Composite::set_param(param,value); } @@ -1168,7 +1170,7 @@ ValueBase Layer_Shape::get_param(const String ¶m)const { EXPORT(color); - EXPORT(offset); + EXPORT(origin); EXPORT(invert); EXPORT(antialias); EXPORT(feather); @@ -1190,8 +1192,8 @@ Layer_Shape::get_param_vocab()const .set_local_name(_("Color")) .set_description(_("Layer_Shape Color")) ); - ret.push_back(ParamDesc("offset") - .set_local_name(_("Offset")) + ret.push_back(ParamDesc("origin") + .set_local_name(_("Origin")) ); ret.push_back(ParamDesc("invert") .set_local_name(_("Invert")) @@ -1227,7 +1229,7 @@ Layer_Shape::get_param_vocab()const synfig::Layer::Handle Layer_Shape::hit_check(synfig::Context context, const synfig::Point &p)const { - Point pos(p-offset); + Point pos(p-origin); int intercepts = edge_table->intersect(pos[0],pos[1]); @@ -1274,7 +1276,7 @@ Layer_Shape::get_color(Context context, const Point &p)const if(feather) pp = Blur(feather,feather,blurtype)(p); - Point pos(pp-offset); + Point pos(pp-origin); int intercepts = edge_table->intersect(pos[0],pos[1]); @@ -2474,7 +2476,7 @@ Layer_Shape::accelerated_render(Context context,Surface *surface,int quality, co if(is_solid_color() && invert) { Rect aabb = edge_table->aabb; - Point tl = renddesc.get_tl() - offset; + Point tl = renddesc.get_tl() - origin; Real pw = renddesc.get_pw(), ph = renddesc.get_ph(); @@ -2723,9 +2725,9 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/, case Primitive::MOVE_TO: { x = data[curnum][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; if(curnum == 0) { @@ -2750,9 +2752,9 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/, case Primitive::LINE_TO: { x = data[curnum][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; tangent[0] = x - span.cur_x; tangent[1] = y - span.cur_y; @@ -2765,14 +2767,14 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/, case Primitive::CONIC_TO: { x = data[curnum+1][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum+1][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; x1 = data[curnum][0]; - x1 = (x1 - tl[0] + offset[0])*pw; + x1 = (x1 - tl[0] + origin[0])*pw; y1 = data[curnum][1]; - y1 = (y1 - tl[1] + offset[1])*ph; + y1 = (y1 - tl[1] + origin[1])*ph; tangent[0] = 2*(x - x1); tangent[1] = 2*(y - y1); @@ -2785,9 +2787,9 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/, case Primitive::CONIC_TO_SMOOTH: { x = data[curnum][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; x1 = span.cur_x + tangent[0]/2; y1 = span.cur_y + tangent[1]/2; @@ -2804,19 +2806,19 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/, case Primitive::CUBIC_TO: { x = data[curnum+2][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum+2][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; x2 = data[curnum+1][0]; - x2 = (x2 - tl[0] + offset[0])*pw; + x2 = (x2 - tl[0] + origin[0])*pw; y2 = data[curnum+1][1]; - y2 = (y2 - tl[1] + offset[1])*ph; + y2 = (y2 - tl[1] + origin[1])*ph; x1 = data[curnum][0]; - x1 = (x1 - tl[0] + offset[0])*pw; + x1 = (x1 - tl[0] + origin[0])*pw; y1 = data[curnum][1]; - y1 = (y1 - tl[1] + offset[1])*ph; + y1 = (y1 - tl[1] + origin[1])*ph; tangent[0] = 2*(x - x2); tangent[1] = 2*(y - y2); @@ -2830,14 +2832,14 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/, case Primitive::CUBIC_TO_SMOOTH: { x = data[curnum+1][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum+1][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; x2 = data[curnum][0]; - x2 = (x2 - tl[0] + offset[0])*pw; + x2 = (x2 - tl[0] + origin[0])*pw; y2 = data[curnum][1]; - y2 = (y2 - tl[1] + offset[1])*ph; + y2 = (y2 - tl[1] + origin[1])*ph; x1 = span.cur_x + tangent[0]/3.0; y1 = span.cur_y + tangent[1]/3.0; @@ -2952,9 +2954,9 @@ Layer_Shape::render_shape(etl::surface *surface,int /*quality*/, case Primitive::MOVE_TO: { x = data[curnum][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; if(curnum == 0) { @@ -2979,9 +2981,9 @@ Layer_Shape::render_shape(etl::surface *surface,int /*quality*/, case Primitive::LINE_TO: { x = data[curnum][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; tangent[0] = x - span.cur_x; tangent[1] = y - span.cur_y; @@ -2994,14 +2996,14 @@ Layer_Shape::render_shape(etl::surface *surface,int /*quality*/, case Primitive::CONIC_TO: { x = data[curnum+1][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum+1][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; x1 = data[curnum][0]; - x1 = (x1 - tl[0] + offset[0])*pw; + x1 = (x1 - tl[0] + origin[0])*pw; y1 = data[curnum][1]; - y1 = (y1 - tl[1] + offset[1])*ph; + y1 = (y1 - tl[1] + origin[1])*ph; tangent[0] = 2*(x - x1); tangent[1] = 2*(y - y1); @@ -3014,9 +3016,9 @@ Layer_Shape::render_shape(etl::surface *surface,int /*quality*/, case Primitive::CONIC_TO_SMOOTH: { x = data[curnum][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; x1 = span.cur_x + tangent[0]/2; y1 = span.cur_y + tangent[1]/2; @@ -3033,19 +3035,19 @@ Layer_Shape::render_shape(etl::surface *surface,int /*quality*/, case Primitive::CUBIC_TO: { x = data[curnum+2][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum+2][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; x2 = data[curnum+1][0]; - x2 = (x2 - tl[0] + offset[0])*pw; + x2 = (x2 - tl[0] + origin[0])*pw; y2 = data[curnum+1][1]; - y2 = (y2 - tl[1] + offset[1])*ph; + y2 = (y2 - tl[1] + origin[1])*ph; x1 = data[curnum][0]; - x1 = (x1 - tl[0] + offset[0])*pw; + x1 = (x1 - tl[0] + origin[0])*pw; y1 = data[curnum][1]; - y1 = (y1 - tl[1] + offset[1])*ph; + y1 = (y1 - tl[1] + origin[1])*ph; tangent[0] = 2*(x - x2); tangent[1] = 2*(y - y2); @@ -3059,14 +3061,14 @@ Layer_Shape::render_shape(etl::surface *surface,int /*quality*/, case Primitive::CUBIC_TO_SMOOTH: { x = data[curnum+1][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum+1][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; x2 = data[curnum][0]; - x2 = (x2 - tl[0] + offset[0])*pw; + x2 = (x2 - tl[0] + origin[0])*pw; y2 = data[curnum][1]; - y2 = (y2 - tl[1] + offset[1])*ph; + y2 = (y2 - tl[1] + origin[1])*ph; x1 = span.cur_x + tangent[0]/3.0; y1 = span.cur_y + tangent[1]/3.0; @@ -3098,7 +3100,7 @@ Layer_Shape::get_bounding_rect()const if (edge_table->initaabb) return Rect::zero(); - Rect bounds(edge_table->aabb+offset); + Rect bounds(edge_table->aabb+origin); bounds.expand(max((bounds.get_min() - bounds.get_max()).mag()*0.01, feather)); diff --git a/synfig-core/trunk/src/synfig/layer_shape.h b/synfig-core/trunk/src/synfig/layer_shape.h index d8fe006..745d98d 100644 --- a/synfig-core/trunk/src/synfig/layer_shape.h +++ b/synfig-core/trunk/src/synfig/layer_shape.h @@ -66,7 +66,7 @@ private: //exported data Color color; - Point offset; + Point origin; bool invert; bool antialias; diff --git a/synfig-studio/trunk/src/gtkmm/state_bline.cpp b/synfig-studio/trunk/src/gtkmm/state_bline.cpp index de96a95..bead76f 100644 --- a/synfig-studio/trunk/src/gtkmm/state_bline.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_bline.cpp @@ -120,7 +120,7 @@ class studio::StateBLine_Context : public sigc::trackable Gtk::CheckButton checkbutton_layer_outline; Gtk::CheckButton checkbutton_layer_curve_gradient; Gtk::CheckButton checkbutton_layer_plant; - Gtk::CheckButton checkbutton_layer_link_offsets; + Gtk::CheckButton checkbutton_layer_link_origins; Gtk::CheckButton checkbutton_auto_export; Gtk::Button button_make; Gtk::Button button_clear; @@ -161,8 +161,8 @@ public: bool get_layer_plant_flag()const { return checkbutton_layer_plant.get_active(); } void set_layer_plant_flag(bool x) { return checkbutton_layer_plant.set_active(x); } - bool get_layer_link_offsets_flag()const { return checkbutton_layer_link_offsets.get_active(); } - void set_layer_link_offsets_flag(bool x) { return checkbutton_layer_link_offsets.set_active(x); } + bool get_layer_link_origins_flag()const { return checkbutton_layer_link_origins.get_active(); } + void set_layer_link_origins_flag(bool x) { return checkbutton_layer_link_origins.set_active(x); } Real get_feather() const { return adj_feather.get_value(); } void set_feather(Real x) { return adj_feather.set_value(x); } @@ -257,10 +257,10 @@ StateBLine_Context::load_settings() else set_layer_plant_flag(false); - if(settings.get_value("bline.layer_link_offsets",value) && value=="0") - set_layer_link_offsets_flag(false); + if(settings.get_value("bline.layer_link_origins",value) && value=="0") + set_layer_link_origins_flag(false); else - set_layer_link_offsets_flag(true); + set_layer_link_origins_flag(true); if(settings.get_value("bline.auto_export",value) && value=="1") set_auto_export_flag(true); @@ -289,7 +289,7 @@ StateBLine_Context::save_settings() settings.set_value("bline.layer_region",get_layer_region_flag()?"1":"0"); settings.set_value("bline.layer_curve_gradient",get_layer_curve_gradient_flag()?"1":"0"); settings.set_value("bline.layer_plant",get_layer_plant_flag()?"1":"0"); - settings.set_value("bline.layer_link_offsets",get_layer_link_offsets_flag()?"1":"0"); + settings.set_value("bline.layer_link_origins",get_layer_link_origins_flag()?"1":"0"); settings.set_value("bline.auto_export",get_auto_export_flag()?"1":"0"); settings.set_value("bline.id",get_id().c_str()); settings.set_value("bline.feather",strprintf("%f",get_feather())); @@ -362,7 +362,7 @@ StateBLine_Context::StateBLine_Context(CanvasView* canvas_view): checkbutton_layer_outline(_("Create Outline BLine")), checkbutton_layer_curve_gradient(_("Create Curve Gradient BLine")), checkbutton_layer_plant(_("Create Plant BLine")), - checkbutton_layer_link_offsets(_("Link Offsets")), + checkbutton_layer_link_origins(_("Link Origins")), checkbutton_auto_export(_("Auto Export")), button_make(_("Make")), button_clear(_("Clear")), @@ -380,7 +380,7 @@ StateBLine_Context::StateBLine_Context(CanvasView* canvas_view): options_table.attach(checkbutton_layer_region, 0, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(checkbutton_layer_plant, 0, 2, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(checkbutton_layer_curve_gradient, 0, 2, 5, 6, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - options_table.attach(checkbutton_layer_link_offsets, 0, 2, 6, 7, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + options_table.attach(checkbutton_layer_link_origins, 0, 2, 6, 7, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(checkbutton_auto_export, 0, 2, 7, 8, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(*manage(new Gtk::Label(_("Feather"))), 0, 1, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(spin_feather, 1, 2, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); @@ -569,8 +569,8 @@ StateBLine_Context::run_() ValueNode_BLine::Handle value_node_bline(ValueNode_BLine::create(new_list)); assert(value_node_bline); - ValueNode_Const::Handle value_node_offset(ValueNode_Const::create(Vector())); - assert(value_node_offset); + ValueNode_Const::Handle value_node_origin(ValueNode_Const::create(Vector())); + assert(value_node_origin); // Set the looping flag value_node_bline->set_loop(loop_); @@ -647,8 +647,8 @@ StateBLine_Context::run_() } } - // only link the curve gradient's offset parameter if the option is selected and we're creating more than one layer - if (get_layer_link_offsets_flag() && layers_to_create > 1) + // only link the curve gradient's origin parameter if the option is selected and we're creating more than one layer + if (get_layer_link_origins_flag() && layers_to_create > 1) { synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); assert(action); @@ -656,9 +656,9 @@ StateBLine_Context::run_() action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("layer",layer); - if(!action->set_param("param",String("offset"))) + if(!action->set_param("param",String("origin"))) synfig::error("LayerParamConnect didn't like \"param\""); - if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + if(!action->set_param("value_node",ValueNode::Handle(value_node_origin))) synfig::error("LayerParamConnect didn't like \"value_node\""); if(!get_canvas_interface()->get_instance()->perform_action(action)) @@ -706,8 +706,8 @@ StateBLine_Context::run_() } } - // only link the plant's offset parameter if the option is selected and we're creating more than one layer - if (get_layer_link_offsets_flag() && layers_to_create > 1) + // only link the plant's origin parameter if the option is selected and we're creating more than one layer + if (get_layer_link_origins_flag() && layers_to_create > 1) { synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); assert(action); @@ -715,9 +715,9 @@ StateBLine_Context::run_() action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("layer",layer); - if(!action->set_param("param",String("offset"))) + if(!action->set_param("param",String("origin"))) synfig::error("LayerParamConnect didn't like \"param\""); - if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + if(!action->set_param("value_node",ValueNode::Handle(value_node_origin))) synfig::error("LayerParamConnect didn't like \"value_node\""); if(!get_canvas_interface()->get_instance()->perform_action(action)) @@ -776,8 +776,8 @@ StateBLine_Context::run_() } } - // only link the region's offset parameter if the option is selected and we're creating more than one layer - if (get_layer_link_offsets_flag() && layers_to_create > 1) + // only link the region's origin parameter if the option is selected and we're creating more than one layer + if (get_layer_link_origins_flag() && layers_to_create > 1) { synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); assert(action); @@ -785,9 +785,9 @@ StateBLine_Context::run_() action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("layer",layer); - if(!action->set_param("param",String("offset"))) + if(!action->set_param("param",String("origin"))) synfig::error("LayerParamConnect didn't like \"param\""); - if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + if(!action->set_param("value_node",ValueNode::Handle(value_node_origin))) synfig::error("LayerParamConnect didn't like \"value_node\""); if(!get_canvas_interface()->get_instance()->perform_action(action)) @@ -840,8 +840,8 @@ StateBLine_Context::run_() } } - // only link the outline's offset parameter if the option is selected and we're creating more than one layer - if (get_layer_link_offsets_flag() && layers_to_create > 1) + // only link the outline's origin parameter if the option is selected and we're creating more than one layer + if (get_layer_link_origins_flag() && layers_to_create > 1) { synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); assert(action); @@ -849,9 +849,9 @@ StateBLine_Context::run_() action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("layer",layer); - if(!action->set_param("param",String("offset"))) + if(!action->set_param("param",String("origin"))) synfig::error("LayerParamConnect didn't like \"param\""); - if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + if(!action->set_param("value_node",ValueNode::Handle(value_node_origin))) synfig::error("LayerParamConnect didn't like \"value_node\""); if(!get_canvas_interface()->get_instance()->perform_action(action)) diff --git a/synfig-studio/trunk/src/gtkmm/state_circle.cpp b/synfig-studio/trunk/src/gtkmm/state_circle.cpp index b83431b..f23632c 100644 --- a/synfig-studio/trunk/src/gtkmm/state_circle.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_circle.cpp @@ -121,12 +121,12 @@ class studio::StateCircle_Context : public sigc::trackable Gtk::CheckButton checkbutton_layer_outline; Gtk::CheckButton checkbutton_layer_curve_gradient; Gtk::CheckButton checkbutton_layer_plant; - Gtk::CheckButton checkbutton_layer_link_offsets; + Gtk::CheckButton checkbutton_layer_link_origins; public: // this only counts the layers which use blines - they're the only - // ones we link the offsets for + // ones we link the origins for int layers_to_create()const { return @@ -174,8 +174,8 @@ public: bool get_layer_plant_flag()const { return checkbutton_layer_plant.get_active(); } void set_layer_plant_flag(bool x) { return checkbutton_layer_plant.set_active(x); } - bool get_layer_link_offsets_flag()const { return checkbutton_layer_link_offsets.get_active(); } - void set_layer_link_offsets_flag(bool x) { return checkbutton_layer_link_offsets.set_active(x); } + bool get_layer_link_origins_flag()const { return checkbutton_layer_link_origins.get_active(); } + void set_layer_link_origins_flag(bool x) { return checkbutton_layer_link_origins.set_active(x); } void refresh_tool_options(); //to refresh the toolbox @@ -299,10 +299,10 @@ StateCircle_Context::load_settings() else set_layer_plant_flag(false); - if(settings.get_value("circle.layer_link_offsets",value) && value=="0") - set_layer_link_offsets_flag(false); + if(settings.get_value("circle.layer_link_origins",value) && value=="0") + set_layer_link_origins_flag(false); else - set_layer_link_offsets_flag(true); + set_layer_link_origins_flag(true); } void @@ -322,7 +322,7 @@ StateCircle_Context::save_settings() settings.set_value("circle.layer_region",get_layer_region_flag()?"1":"0"); settings.set_value("circle.layer_curve_gradient",get_layer_curve_gradient_flag()?"1":"0"); settings.set_value("circle.layer_plant",get_layer_plant_flag()?"1":"0"); - settings.set_value("circle.layer_link_offsets",get_layer_link_offsets_flag()?"1":"0"); + settings.set_value("circle.layer_link_origins",get_layer_link_origins_flag()?"1":"0"); } void @@ -395,7 +395,7 @@ StateCircle_Context::StateCircle_Context(CanvasView* canvas_view): checkbutton_layer_outline(_("Create Outline BLine")), checkbutton_layer_curve_gradient(_("Create Curve Gradient BLine")), checkbutton_layer_plant(_("Create Plant BLine")), - checkbutton_layer_link_offsets(_("Link BLine Offsets")) + checkbutton_layer_link_origins(_("Link BLine Origins")) { egress_on_selection_change=true; // Set up the tool options dialog @@ -433,7 +433,7 @@ StateCircle_Context::StateCircle_Context(CanvasView* canvas_view): options_table.attach(checkbutton_layer_region, 0, 2, 9, 10, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(checkbutton_layer_plant, 0, 2, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(checkbutton_layer_curve_gradient, 0, 2, 11, 12, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - options_table.attach(checkbutton_layer_link_offsets, 0, 2, 12, 13, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + options_table.attach(checkbutton_layer_link_origins, 0, 2, 12, 13, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(*manage(new Gtk::Label(_("BLine Points:"))), 0, 1, 13, 14, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(spin_number_of_bline_points, 1, 2, 13, 14, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(*manage(new Gtk::Label(_("Point Angle Offset:"))), 0, 1, 14, 15, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); @@ -570,8 +570,8 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) ValueNode_BLine::Handle value_node_bline(ValueNode_BLine::create(new_list)); assert(value_node_bline); - ValueNode_Const::Handle value_node_offset(ValueNode_Const::create(Vector())); - assert(value_node_offset); + ValueNode_Const::Handle value_node_origin(ValueNode_Const::create(Vector())); + assert(value_node_origin); // Set the looping flag value_node_bline->set_loop(true); @@ -664,8 +664,8 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) } } - // only link the curve gradient's offset parameter if the option is selected and we're creating more than one layer - if (get_layer_link_offsets_flag() && layers_to_create > 1) + // only link the curve gradient's origin parameter if the option is selected and we're creating more than one layer + if (get_layer_link_origins_flag() && layers_to_create > 1) { synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); assert(action); @@ -673,9 +673,9 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("layer",layer); - if(!action->set_param("param",String("offset"))) + if(!action->set_param("param",String("origin"))) synfig::error("LayerParamConnect didn't like \"param\""); - if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + if(!action->set_param("value_node",ValueNode::Handle(value_node_origin))) synfig::error("LayerParamConnect didn't like \"value_node\""); if(!get_canvas_interface()->get_instance()->perform_action(action)) @@ -728,8 +728,8 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) } } - // only link the plant's offset parameter if the option is selected and we're creating more than one layer - if (get_layer_link_offsets_flag() && layers_to_create > 1) + // only link the plant's origin parameter if the option is selected and we're creating more than one layer + if (get_layer_link_origins_flag() && layers_to_create > 1) { synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); assert(action); @@ -737,9 +737,9 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("layer",layer); - if(!action->set_param("param",String("offset"))) + if(!action->set_param("param",String("origin"))) synfig::error("LayerParamConnect didn't like \"param\""); - if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + if(!action->set_param("value_node",ValueNode::Handle(value_node_origin))) synfig::error("LayerParamConnect didn't like \"value_node\""); if(!get_canvas_interface()->get_instance()->perform_action(action)) @@ -803,8 +803,8 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) } } - // only link the region's offset parameter if the option is selected and we're creating more than one layer - if (get_layer_link_offsets_flag() && layers_to_create > 1) + // only link the region's origin parameter if the option is selected and we're creating more than one layer + if (get_layer_link_origins_flag() && layers_to_create > 1) { synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); assert(action); @@ -812,9 +812,9 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("layer",layer); - if(!action->set_param("param",String("offset"))) + if(!action->set_param("param",String("origin"))) synfig::error("LayerParamConnect didn't like \"param\""); - if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + if(!action->set_param("value_node",ValueNode::Handle(value_node_origin))) synfig::error("LayerParamConnect didn't like \"value_node\""); if(!get_canvas_interface()->get_instance()->perform_action(action)) @@ -871,8 +871,8 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) } } - // only link the outline's offset parameter if the option is selected and we're creating more than one layer - if (get_layer_link_offsets_flag() && layers_to_create > 1) + // only link the outline's origin parameter if the option is selected and we're creating more than one layer + if (get_layer_link_origins_flag() && layers_to_create > 1) { synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); assert(action); @@ -880,9 +880,9 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("layer",layer); - if(!action->set_param("param",String("offset"))) + if(!action->set_param("param",String("origin"))) synfig::error("LayerParamConnect didn't like \"param\""); - if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + if(!action->set_param("value_node",ValueNode::Handle(value_node_origin))) synfig::error("LayerParamConnect didn't like \"value_node\""); if(!get_canvas_interface()->get_instance()->perform_action(action)) diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp index 3f65660..79c4788 100644 --- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp @@ -777,8 +777,8 @@ StateDraw_Context::new_bline(std::list bline,bool loop_bline // Create the action group synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("Sketch BLine")); - bool shift_offset = false; - Vector shift_offset_vector; + bool shift_origin = false; + Vector shift_origin_vector; bool join_start_no_extend=false,join_finish_no_extend=false; synfigapp::ValueDesc start_duck_value_desc,finish_duck_value_desc; bool extend_start=false,extend_finish=false,complete_loop=false; @@ -814,8 +814,8 @@ StateDraw_Context::new_bline(std::list bline,bool loop_bline (start_duck_index==0||start_duck_index==start_duck_value_node_bline->link_count()-1)) { extend_start=true; - shift_offset=true; - shift_offset_vector=start_duck->get_origin(); + shift_origin=true; + shift_origin_vector=start_duck->get_origin(); } }while(0); @@ -845,8 +845,8 @@ StateDraw_Context::new_bline(std::list bline,bool loop_bline complete_loop=extend_finish=true; }else{ extend_finish=true; - shift_offset=true; - shift_offset_vector=finish_duck->get_origin(); + shift_origin=true; + shift_origin_vector=finish_duck->get_origin(); } } }while(0); @@ -860,10 +860,10 @@ StateDraw_Context::new_bline(std::list bline,bool loop_bline start_duck_value_desc=synfigapp::ValueDesc(LinkableValueNode::Handle::cast_dynamic(start_duck_value_desc.get_value_node()),0); // fall through case synfig::ValueBase::TYPE_VECTOR: - if (shift_offset && shift_offset_vector != start_duck->get_origin()) + if (shift_origin && shift_origin_vector != start_duck->get_origin()) break; - shift_offset = true; - shift_offset_vector = start_duck->get_origin(); + shift_origin = true; + shift_origin_vector = start_duck->get_origin(); get_canvas_interface()->auto_export(start_duck_value_desc); if (extend_finish) if(start_duck_value_node_bline&&start_duck_value_node_bline==finish_duck_value_node_bline) @@ -885,10 +885,10 @@ StateDraw_Context::new_bline(std::list bline,bool loop_bline finish_duck_value_desc=synfigapp::ValueDesc(LinkableValueNode::Handle::cast_dynamic(finish_duck_value_desc.get_value_node()),0); // fall through case synfig::ValueBase::TYPE_VECTOR: - if (shift_offset && shift_offset_vector != finish_duck->get_origin()) + if (shift_origin && shift_origin_vector != finish_duck->get_origin()) break; - shift_offset = true; - shift_offset_vector = finish_duck->get_origin(); + shift_origin = true; + shift_origin_vector = finish_duck->get_origin(); get_canvas_interface()->auto_export(finish_duck_value_desc); if(extend_start) if(finish_duck_value_node_bline&&start_duck_value_node_bline==finish_duck_value_node_bline) @@ -926,8 +926,8 @@ StateDraw_Context::new_bline(std::list bline,bool loop_bline ) -new_vertex ); - if (shift_offset) - new_vertex=new_vertex-shift_offset_vector; + if (shift_origin) + new_vertex=new_vertex-shift_origin_vector; bline_point.set_vertex(new_vertex); @@ -1067,9 +1067,9 @@ StateDraw_Context::new_bline(std::list bline,bool loop_bline //layer->set_description(strprintf("Stroke %d",number)); //get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description()); - if (shift_offset) + if (shift_origin) get_canvas_interface()-> - change_value(synfigapp::ValueDesc(layer,"offset"),shift_offset_vector); + change_value(synfigapp::ValueDesc(layer,"origin"),shift_origin_vector); synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); diff --git a/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp b/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp index d20bf15..c1fcc59 100644 --- a/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp @@ -103,12 +103,12 @@ class studio::StateRectangle_Context : public sigc::trackable Gtk::CheckButton checkbutton_layer_outline; Gtk::CheckButton checkbutton_layer_curve_gradient; Gtk::CheckButton checkbutton_layer_plant; - Gtk::CheckButton checkbutton_layer_link_offsets; + Gtk::CheckButton checkbutton_layer_link_origins; public: // this only counts the layers which use blines - they're the only - // ones we link the offsets for + // ones we link the origins for int layers_to_create()const { return @@ -145,8 +145,8 @@ public: bool get_layer_plant_flag()const { return checkbutton_layer_plant.get_active(); } void set_layer_plant_flag(bool x) { return checkbutton_layer_plant.set_active(x); } - bool get_layer_link_offsets_flag()const { return checkbutton_layer_link_offsets.get_active(); } - void set_layer_link_offsets_flag(bool x) { return checkbutton_layer_link_offsets.set_active(x); } + bool get_layer_link_origins_flag()const { return checkbutton_layer_link_origins.get_active(); } + void set_layer_link_origins_flag(bool x) { return checkbutton_layer_link_origins.set_active(x); } void refresh_tool_options(); //to refresh the toolbox @@ -253,10 +253,10 @@ StateRectangle_Context::load_settings() else set_layer_plant_flag(false); - if(settings.get_value("rectangle.layer_link_offsets",value) && value=="0") - set_layer_link_offsets_flag(false); + if(settings.get_value("rectangle.layer_link_origins",value) && value=="0") + set_layer_link_origins_flag(false); else - set_layer_link_offsets_flag(true); + set_layer_link_origins_flag(true); } void @@ -271,7 +271,7 @@ StateRectangle_Context::save_settings() settings.set_value("rectangle.layer_region",get_layer_region_flag()?"1":"0"); settings.set_value("rectangle.layer_curve_gradient",get_layer_curve_gradient_flag()?"1":"0"); settings.set_value("rectangle.layer_plant",get_layer_plant_flag()?"1":"0"); - settings.set_value("rectangle.layer_link_offsets",get_layer_link_offsets_flag()?"1":"0"); + settings.set_value("rectangle.layer_link_origins",get_layer_link_origins_flag()?"1":"0"); } void @@ -342,7 +342,7 @@ StateRectangle_Context::StateRectangle_Context(CanvasView* canvas_view): checkbutton_layer_outline(_("Create Outline BLine")), checkbutton_layer_curve_gradient(_("Create Curve Gradient BLine")), checkbutton_layer_plant(_("Create Plant BLine")), - checkbutton_layer_link_offsets(_("Link BLine Offsets")) + checkbutton_layer_link_origins(_("Link BLine Origins")) { egress_on_selection_change=true; load_settings(); @@ -367,7 +367,7 @@ StateRectangle_Context::StateRectangle_Context(CanvasView* canvas_view): options_table.attach(checkbutton_layer_region, 0, 2, 9, 10, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(checkbutton_layer_plant, 0, 2, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(checkbutton_layer_curve_gradient, 0, 2, 11, 12, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - options_table.attach(checkbutton_layer_link_offsets, 0, 2, 12, 13, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + options_table.attach(checkbutton_layer_link_origins, 0, 2, 12, 13, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.show_all(); @@ -497,8 +497,8 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) ValueNode_BLine::Handle value_node_bline(ValueNode_BLine::create(new_list)); assert(value_node_bline); - ValueNode_Const::Handle value_node_offset(ValueNode_Const::create(Vector())); - assert(value_node_offset); + ValueNode_Const::Handle value_node_origin(ValueNode_Const::create(Vector())); + assert(value_node_origin); // Set the looping flag value_node_bline->set_loop(true); @@ -577,8 +577,8 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) } } - // only link the curve gradient's offset parameter if the option is selected and we're creating more than one layer - if (get_layer_link_offsets_flag() && layers_to_create > 1) + // only link the curve gradient's origin parameter if the option is selected and we're creating more than one layer + if (get_layer_link_origins_flag() && layers_to_create > 1) { synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); assert(action); @@ -586,9 +586,9 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("layer",layer); - if(!action->set_param("param",String("offset"))) + if(!action->set_param("param",String("origin"))) synfig::error("LayerParamConnect didn't like \"param\""); - if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + if(!action->set_param("value_node",ValueNode::Handle(value_node_origin))) synfig::error("LayerParamConnect didn't like \"value_node\""); if(!get_canvas_interface()->get_instance()->perform_action(action)) @@ -636,8 +636,8 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) } } - // only link the plant's offset parameter if the option is selected and we're creating more than one layer - if (get_layer_link_offsets_flag() && layers_to_create > 1) + // only link the plant's origin parameter if the option is selected and we're creating more than one layer + if (get_layer_link_origins_flag() && layers_to_create > 1) { synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); assert(action); @@ -645,9 +645,9 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("layer",layer); - if(!action->set_param("param",String("offset"))) + if(!action->set_param("param",String("origin"))) synfig::error("LayerParamConnect didn't like \"param\""); - if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + if(!action->set_param("value_node",ValueNode::Handle(value_node_origin))) synfig::error("LayerParamConnect didn't like \"value_node\""); if(!get_canvas_interface()->get_instance()->perform_action(action)) @@ -706,8 +706,8 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) } } - // only link the region's offset parameter if the option is selected and we're creating more than one layer - if (get_layer_link_offsets_flag() && layers_to_create > 1) + // only link the region's origin parameter if the option is selected and we're creating more than one layer + if (get_layer_link_origins_flag() && layers_to_create > 1) { synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); assert(action); @@ -715,9 +715,9 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("layer",layer); - if(!action->set_param("param",String("offset"))) + if(!action->set_param("param",String("origin"))) synfig::error("LayerParamConnect didn't like \"param\""); - if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + if(!action->set_param("value_node",ValueNode::Handle(value_node_origin))) synfig::error("LayerParamConnect didn't like \"value_node\""); if(!get_canvas_interface()->get_instance()->perform_action(action)) @@ -769,8 +769,8 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) } } - // only link the outline's offset parameter if the option is selected and we're creating more than one layer - if (get_layer_link_offsets_flag() && layers_to_create > 1) + // only link the outline's origin parameter if the option is selected and we're creating more than one layer + if (get_layer_link_origins_flag() && layers_to_create > 1) { synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); assert(action); @@ -778,9 +778,9 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("layer",layer); - if(!action->set_param("param",String("offset"))) + if(!action->set_param("param",String("origin"))) synfig::error("LayerParamConnect didn't like \"param\""); - if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + if(!action->set_param("value_node",ValueNode::Handle(value_node_origin))) synfig::error("LayerParamConnect didn't like \"value_node\""); if(!get_canvas_interface()->get_instance()->perform_action(action)) diff --git a/synfig-studio/trunk/src/gtkmm/state_star.cpp b/synfig-studio/trunk/src/gtkmm/state_star.cpp index 3ebb6fe..5fe9440 100644 --- a/synfig-studio/trunk/src/gtkmm/state_star.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_star.cpp @@ -118,12 +118,12 @@ class studio::StateStar_Context : public sigc::trackable Gtk::CheckButton checkbutton_layer_outline; Gtk::CheckButton checkbutton_layer_curve_gradient; Gtk::CheckButton checkbutton_layer_plant; - Gtk::CheckButton checkbutton_layer_link_offsets; + Gtk::CheckButton checkbutton_layer_link_origins; public: // this only counts the layers which use blines - they're the only - // ones we link the offsets for + // ones we link the origins for int layers_to_create()const { return @@ -181,8 +181,8 @@ public: bool get_layer_plant_flag()const { return checkbutton_layer_plant.get_active(); } void set_layer_plant_flag(bool x) { return checkbutton_layer_plant.set_active(x); } - bool get_layer_link_offsets_flag()const { return checkbutton_layer_link_offsets.get_active(); } - void set_layer_link_offsets_flag(bool x) { return checkbutton_layer_link_offsets.set_active(x); } + bool get_layer_link_origins_flag()const { return checkbutton_layer_link_origins.get_active(); } + void set_layer_link_origins_flag(bool x) { return checkbutton_layer_link_origins.set_active(x); } void refresh_tool_options(); //to refresh the toolbox @@ -324,10 +324,10 @@ StateStar_Context::load_settings() else set_layer_plant_flag(false); - if(settings.get_value("star.layer_link_offsets",value) && value=="0") - set_layer_link_offsets_flag(false); + if(settings.get_value("star.layer_link_origins",value) && value=="0") + set_layer_link_origins_flag(false); else - set_layer_link_offsets_flag(true); + set_layer_link_origins_flag(true); } void @@ -349,7 +349,7 @@ StateStar_Context::save_settings() settings.set_value("star.layer_region",get_layer_region_flag()?"1":"0"); settings.set_value("star.layer_curve_gradient",get_layer_curve_gradient_flag()?"1":"0"); settings.set_value("star.layer_plant",get_layer_plant_flag()?"1":"0"); - settings.set_value("star.layer_link_offsets",get_layer_link_offsets_flag()?"1":"0"); + settings.set_value("star.layer_link_origins",get_layer_link_origins_flag()?"1":"0"); } void @@ -433,7 +433,7 @@ StateStar_Context::StateStar_Context(CanvasView* canvas_view): checkbutton_layer_outline(_("Create Outline BLine")), checkbutton_layer_curve_gradient(_("Create Curve Gradient BLine")), checkbutton_layer_plant(_("Create Plant BLine")), - checkbutton_layer_link_offsets(_("Link BLine Offsets")) + checkbutton_layer_link_origins(_("Link BLine Origins")) { egress_on_selection_change=true; @@ -451,7 +451,7 @@ StateStar_Context::StateStar_Context(CanvasView* canvas_view): options_table.attach(checkbutton_layer_region, 0, 2, 9, 10, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(checkbutton_layer_plant, 0, 2, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(checkbutton_layer_curve_gradient, 0, 2, 11, 12, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - options_table.attach(checkbutton_layer_link_offsets, 0, 2, 12, 13, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + options_table.attach(checkbutton_layer_link_origins, 0, 2, 12, 13, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(*manage(new Gtk::Label(_("Number of Points:"))), 0, 1, 13, 14, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(spin_number_of_points, 1, 2, 13, 14, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(*manage(new Gtk::Label(_("Inner Tangent:"))), 0, 1, 14, 15, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); @@ -613,8 +613,8 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) ValueNode_BLine::Handle value_node_bline(ValueNode_BLine::create(new_list)); assert(value_node_bline); - ValueNode_Const::Handle value_node_offset(ValueNode_Const::create(Vector())); - assert(value_node_offset); + ValueNode_Const::Handle value_node_origin(ValueNode_Const::create(Vector())); + assert(value_node_origin); // Set the looping flag value_node_bline->set_loop(true); @@ -636,8 +636,8 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) layer=get_canvas_interface()->add_layer_to("star",canvas,depth); layer_selection.push_back(layer); - layer->set_param("offset",p1); - get_canvas_interface()->signal_layer_param_changed()(layer,"offset"); + layer->set_param("origin",p1); + get_canvas_interface()->signal_layer_param_changed()(layer,"origin"); layer->set_param("radius1",(p2-p1).mag()); get_canvas_interface()->signal_layer_param_changed()(layer,"radius1"); @@ -705,8 +705,8 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) } } - // only link the curve gradient's offset parameter if the option is selected and we're creating more than one layer - if (get_layer_link_offsets_flag() && layers_to_create > 1) + // only link the curve gradient's origin parameter if the option is selected and we're creating more than one layer + if (get_layer_link_origins_flag() && layers_to_create > 1) { synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); assert(action); @@ -714,9 +714,9 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("layer",layer); - if(!action->set_param("param",String("offset"))) + if(!action->set_param("param",String("origin"))) synfig::error("LayerParamConnect didn't like \"param\""); - if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + if(!action->set_param("value_node",ValueNode::Handle(value_node_origin))) synfig::error("LayerParamConnect didn't like \"value_node\""); if(!get_canvas_interface()->get_instance()->perform_action(action)) @@ -764,8 +764,8 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) } } - // only link the plant's offset parameter if the option is selected and we're creating more than one layer - if (get_layer_link_offsets_flag() && layers_to_create > 1) + // only link the plant's origin parameter if the option is selected and we're creating more than one layer + if (get_layer_link_origins_flag() && layers_to_create > 1) { synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); assert(action); @@ -773,9 +773,9 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("layer",layer); - if(!action->set_param("param",String("offset"))) + if(!action->set_param("param",String("origin"))) synfig::error("LayerParamConnect didn't like \"param\""); - if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + if(!action->set_param("value_node",ValueNode::Handle(value_node_origin))) synfig::error("LayerParamConnect didn't like \"value_node\""); if(!get_canvas_interface()->get_instance()->perform_action(action)) @@ -834,8 +834,8 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) } } - // only link the region's offset parameter if the option is selected and we're creating more than one layer - if (get_layer_link_offsets_flag() && layers_to_create > 1) + // only link the region's origin parameter if the option is selected and we're creating more than one layer + if (get_layer_link_origins_flag() && layers_to_create > 1) { synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); assert(action); @@ -843,9 +843,9 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("layer",layer); - if(!action->set_param("param",String("offset"))) + if(!action->set_param("param",String("origin"))) synfig::error("LayerParamConnect didn't like \"param\""); - if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + if(!action->set_param("value_node",ValueNode::Handle(value_node_origin))) synfig::error("LayerParamConnect didn't like \"value_node\""); if(!get_canvas_interface()->get_instance()->perform_action(action)) @@ -897,8 +897,8 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) } } - // only link the outline's offset parameter if the option is selected and we're creating more than one layer - if (get_layer_link_offsets_flag() && layers_to_create > 1) + // only link the outline's origin parameter if the option is selected and we're creating more than one layer + if (get_layer_link_origins_flag() && layers_to_create > 1) { synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); assert(action); @@ -906,9 +906,9 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("layer",layer); - if(!action->set_param("param",String("offset"))) + if(!action->set_param("param",String("origin"))) synfig::error("LayerParamConnect didn't like \"param\""); - if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + if(!action->set_param("value_node",ValueNode::Handle(value_node_origin))) synfig::error("LayerParamConnect didn't like \"value_node\""); if(!get_canvas_interface()->get_instance()->perform_action(action)) -- 2.7.4