X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fduckmatic.cpp;h=2db91b8a370518d5bf0e41edf0a4981ceac1867a;hb=3163c8bde2f1c7599b71eb22373217edefaac07f;hp=62e70fc16c8df0c6146a673cfdb2e0744345567c;hpb=aa759125fb923ee26c866453aada53db7e053e6a;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp index 62e70fc..2db91b8 100644 --- a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp +++ b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp @@ -6,7 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley -** Copyright (c) 2007 Chris Moore +** Copyright (c) 2007, 2008 Chris Moore ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -56,6 +56,8 @@ #include "onemoment.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -97,7 +99,24 @@ Duckmatic::Duckmatic(): Duckmatic::~Duckmatic() { clear_ducks(); - //synfig::info("Duckmatic::~Duckmatic(): Deleted. Duck Count=%d",Duck::duck_count); + + if (Duck::duck_count) + synfig::error("%d ducks not yet deleted!", Duck::duck_count); + + if (getenv("SYNFIG_DEBUG_DESTRUCTORS")) + synfig::info("Duckmatic::~Duckmatic(): Deleted"); +} + +void +Duckmatic::set_flip_x(bool flip_x) +{ + flip_x_ = flip_x; +} + +void +Duckmatic::set_flip_y(bool flip_y) +{ + flip_y_ = flip_y; } void @@ -151,8 +170,6 @@ Duckmatic::set_guide_snap(bool x) } } - - Duckmatic::GuideList::iterator Duckmatic::find_guide_x(synfig::Point pos, float radius) { @@ -242,21 +259,18 @@ Duckmatic::is_duck_group_selectable(const etl::handle& x)const { const Type type(get_type_mask()); - if(( x->get_type() && (!(type & x->get_type())) ) ) - { + if(( x->get_type() && (!(type & x->get_type())) || !x->get_editable() ) ) return false; - } + if(x->get_value_desc().parent_is_layer_param() && type & Duck::TYPE_POSITION) { Layer::Handle layer(x->get_value_desc().get_layer()); String layer_name(layer->get_name()); - if( - layer_name=="outline" || - layer_name=="region" || - layer_name=="polygon" || - layer_name=="curve_gradient" - ) + + if (layer_name == "outline" || layer_name == "region" || layer_name == "plant" || + layer_name == "polygon" || layer_name == "curve_gradient") return false; + if((layer_name=="PasteCanvas"|| layer_name=="paste_canvas") && !layer->get_param("children_lock").get(bool())) return false; @@ -382,7 +396,6 @@ Duckmatic::toggle_select_duck(const etl::handle &duck) select_duck(duck); } - void Duckmatic::translate_selected_ducks(const synfig::Vector& vector) { @@ -409,7 +422,7 @@ Duckmatic::end_duck_drag() } Point -Duckmatic::snap_point_to_grid(const Point& x, float radius)const +Duckmatic::snap_point_to_grid(const synfig::Point& x, float radius)const { Point ret(x); @@ -505,26 +518,21 @@ DuckDrag_Translate::duck_drag(Duckmatic* duckmatic, const synfig::Vector& vector for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++) { - if((*iter)->get_type()!=Duck::TYPE_VERTEX&&(*iter)->get_type()!=Duck::TYPE_POSITION)continue; + if((*iter)->get_type()!=Duck::TYPE_VERTEX && + (*iter)->get_type()!=Duck::TYPE_POSITION) + continue; (*iter)->set_trans_point(positions[i]+vect); } for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++) { - if((*iter)->get_type()==Duck::TYPE_VERTEX||(*iter)->get_type()==Duck::TYPE_POSITION)continue; + if((*iter)->get_type()==Duck::TYPE_VERTEX || + (*iter)->get_type()==Duck::TYPE_POSITION) + continue; (*iter)->set_trans_point(positions[i]+vect); } last_translate_=vect; } - - - - - - - - - void Duckmatic::signal_edited_selected_ducks() { @@ -540,10 +548,46 @@ Duckmatic::signal_edited_selected_ducks() // Go ahead and call everyone's signals for(iter=ducks.begin();iter!=ducks.end();++iter) { - if(!(*iter)->signal_edited()((*iter)->get_point())) + if ((*iter)->get_type() == Duck::TYPE_ANGLE) { - selected_ducks=old_set; - throw String("Bad edit"); + if(!(*iter)->signal_edited_angle()((*iter)->get_rotations())) + { + selected_ducks=old_set; + throw String("Bad edit"); + } + } + else if (App::restrict_radius_ducks && + (*iter)->is_radius()) + { + Point point((*iter)->get_point()); + bool changed = false; + + if (point[0] * (flip_x_ ? -1 : 1) < 0) + { + point[0] = 0; + changed = true; + } + if (point[1] * (flip_y_ ? -1 : 1) < 0) + { + point[1] = 0; + changed = true; + } + + if (changed) (*iter)->set_point(point); + + if(!(*iter)->signal_edited()(point)) + { + selected_ducks=old_set; + throw String("Bad edit"); + } + } + else + { + if(!(*iter)->signal_edited()((*iter)->get_point())) + { + selected_ducks=old_set; + throw String("Bad edit"); + } } } selected_ducks=old_set; @@ -561,10 +605,6 @@ Duckmatic::signal_user_click_selected_ducks(int button) } } - - - - void Duckmatic::add_duck(const etl::handle &duck) { @@ -711,7 +751,6 @@ Duckmatic::last_bezier()const return bezier_list_.back(); } - etl::handle Duckmatic::find_duck(synfig::Point point, synfig::Real radius, Duck::Type type) { @@ -729,12 +768,12 @@ Duckmatic::find_duck(synfig::Point point, synfig::Real radius, Duck::Type type) { const Duck::Handle& duck(iter->second); - if(!duck->get_editable()) - continue; Real dist((duck->get_trans_point()-point).mag_squared()); if(duck->get_type()&Duck::TYPE_VERTEX) dist*=1.0001; + else if(duck->get_type()&Duck::TYPE_RADIUS) + dist*=0.9999; if(dist<=closest && !( duck->get_type() && (!(type & duck->get_type())) ) ) { @@ -814,11 +853,10 @@ Duckmatic::find_bezier(synfig::Point pos, synfig::Real scale, synfig::Real radiu return 0; } - - bool Duckmatic::save_sketch(const synfig::String& filename)const { + ChangeLocale change_locale(LC_NUMERIC, "C"); std::ofstream file(filename.c_str()); if(!file)return false; @@ -852,6 +890,7 @@ Duckmatic::save_sketch(const synfig::String& filename)const bool Duckmatic::load_sketch(const synfig::String& filename) { + ChangeLocale change_locale(LC_NUMERIC, "C"); std::ifstream file(filename.c_str()); if(!file) @@ -866,7 +905,6 @@ Duckmatic::load_sketch(const synfig::String& filename) return false; } - etl::smart_ptr > stroke_data; while(file) @@ -914,13 +952,6 @@ Duckmatic::load_sketch(const synfig::String& filename) return true; } - - - - - - - Duckmatic::Push::Push(Duckmatic *duckmatic_): duckmatic_(duckmatic_) { @@ -949,14 +980,6 @@ Duckmatic::Push::restore() needs_restore=false; } - - - - - - - - inline String guid_string(const synfigapp::ValueDesc& x) { if(x.parent_is_layer_param()) @@ -1009,7 +1032,8 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_radius(true); duck->set_type(Duck::TYPE_RADIUS); - duck->set_point(Point(value_desc.get_value(get_time()).get(Real()),0)); + // put the duck on the right hand side of the center, whether the display is flipped or not + duck->set_point(Point(value_desc.get_value(get_time()).get(Real()) * (flip_x_ ? -1 : 1), 0)); duck->set_name(guid_string(value_desc)); if(value_desc.is_value_node()) { @@ -1036,7 +1060,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_scalar(param_desc->get_scalar()); } - duck->signal_edited().clear(); + duck->signal_edited().clear(); // value_desc.get_value_type() == ValueBase::TYPE_REAL: duck->signal_edited().connect( sigc::bind( sigc::mem_fun( @@ -1112,12 +1136,13 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_scalar(param_desc->get_scalar()); } - duck->signal_edited().clear(); - duck->signal_edited().connect( + duck->signal_edited().clear(); // value_desc.get_value_type() == ValueBase::TYPE_ANGLE: + duck->signal_edited_angle().clear(); + duck->signal_edited_angle().connect( sigc::bind( sigc::mem_fun( *canvas_view, - &studio::CanvasView::on_duck_changed + &studio::CanvasView::on_duck_angle_changed ), value_desc ) @@ -1210,8 +1235,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_type(Duck::TYPE_POSITION); - - duck->signal_edited().clear(); + duck->signal_edited().clear(); // value_desc.get_value_type() == ValueBase::TYPE_VECTOR: duck->signal_edited().connect( sigc::bind( sigc::mem_fun( @@ -1262,7 +1286,6 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handlec1->set_scalar(TANGENT_BEZIER_SCALE); bezier->c1->set_tangent(true); - if(!add_to_ducks(synfigapp::ValueDesc(value_node,2),canvas_view,transform_stack)) return false; bezier->p2=last_duck(); @@ -1349,7 +1372,6 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle vertex_duck(last_duck()); @@ -1817,7 +1839,6 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle