From 63e709f66d50c124cc0ece2325f4773ac4ae7b20 Mon Sep 17 00:00:00 2001 From: dooglus Date: Sat, 12 Jan 2008 17:49:10 +0000 Subject: [PATCH] Removed a bunch more DEBUGPOINT()s. git-svn-id: http://svn.voria.com/code@1338 1f10aa63-cdf2-0310-b900-c93c546f37ac --- ETL/trunk/test/pen.cpp | 2 -- synfig-core/trunk/src/modules/mod_gif/trgt_gif.cpp | 5 --- .../modules/mod_imagemagick/mptr_imagemagick.cpp | 6 ---- synfig-core/trunk/src/modules/mod_png/mptr_png.cpp | 5 --- synfig-core/trunk/src/synfig/canvas.cpp | 8 ----- synfig-core/trunk/src/synfig/keyframe.cpp | 2 -- synfig-core/trunk/src/synfig/layer_pastecanvas.cpp | 1 - synfig-core/trunk/src/synfig/listimporter.cpp | 17 ---------- synfig-core/trunk/src/synfig/loadcanvas.cpp | 1 - synfig-core/trunk/src/synfig/valuenode.cpp | 2 -- synfig-studio/trunk/src/gtkmm/app.cpp | 6 ---- synfig-studio/trunk/src/gtkmm/canvasview.cpp | 15 +++------ .../trunk/src/gtkmm/cellrenderer_timetrack.cpp | 3 -- .../trunk/src/gtkmm/cellrenderer_value.cpp | 1 - .../trunk/src/gtkmm/childrentreestore.cpp | 2 -- synfig-studio/trunk/src/gtkmm/dock_navigator.cpp | 1 - synfig-studio/trunk/src/gtkmm/dock_params.cpp | 1 - synfig-studio/trunk/src/gtkmm/iconcontroller.cpp | 7 ---- synfig-studio/trunk/src/gtkmm/instance.cpp | 2 -- .../trunk/src/gtkmm/keyframetreestore.cpp | 3 -- .../trunk/src/gtkmm/layergrouptreestore.cpp | 9 ----- synfig-studio/trunk/src/gtkmm/layertree.cpp | 5 --- synfig-studio/trunk/src/gtkmm/layertreestore.cpp | 5 --- synfig-studio/trunk/src/gtkmm/state_draw.cpp | 10 ------ synfig-studio/trunk/src/gtkmm/state_normal.cpp | 2 -- .../trunk/src/gtkmm/widget_compselect.cpp | 1 - synfig-studio/trunk/src/gtkmm/widget_value.cpp | 1 - synfig-studio/trunk/src/gtkmm/workarea.cpp | 4 --- .../trunk/src/synfigapp/action_system.cpp | 15 +-------- .../src/synfigapp/actions/keyframesetdelta.cpp | 1 - .../trunk/src/synfigapp/actions/valuedescset.cpp | 4 --- .../src/synfigapp/actions/waypointsetsmart.cpp | 38 ++++------------------ 32 files changed, 11 insertions(+), 174 deletions(-) diff --git a/ETL/trunk/test/pen.cpp b/ETL/trunk/test/pen.cpp index 92b004f..f29319f 100644 --- a/ETL/trunk/test/pen.cpp +++ b/ETL/trunk/test/pen.cpp @@ -38,8 +38,6 @@ using namespace std; using namespace etl; -#define DEBUGPOINT() fprintf(stderr,__FILE__":%d: Debugpoint\n",__LINE__) - /* === C L A S S E S ======================================================= */ int generic_pen_test(int w, int h) diff --git a/synfig-core/trunk/src/modules/mod_gif/trgt_gif.cpp b/synfig-core/trunk/src/modules/mod_gif/trgt_gif.cpp index 6b939af..2239e30 100644 --- a/synfig-core/trunk/src/modules/mod_gif/trgt_gif.cpp +++ b/synfig-core/trunk/src/modules/mod_gif/trgt_gif.cpp @@ -135,18 +135,14 @@ gif::init() fputc(0,file.get()); // background color fputc(0,file.get()); // Pixel Aspect Ratio - DEBUGPOINT(); - if(!local_palette) { - DEBUGPOINT(); curr_palette=Palette::grayscale(256/(1<<(8-rootsize))-1); output_curr_palette(); } if(loop_count && multi_image) { - DEBUGPOINT(); fputc(33,file.get()); // 33 (hex 0x21) GIF Extension code fputc(255,file.get()); // 255 (hex 0xFF) Application Extension Label fputc(11,file.get()); // 11 (hex (0x0B) Length of Application Block @@ -157,7 +153,6 @@ gif::init() fputc((loop_count&0x0000ff00)>>8,file.get()); fputc(0,file.get()); // 0 (hex 0x00) a Data Sub-block Terminator. } - DEBUGPOINT(); return true; } diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp b/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp index c945ee5..4bcf1f8 100644 --- a/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp +++ b/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp @@ -142,8 +142,6 @@ imagemagick_mptr::get_frame(synfig::Surface &surface,Time /*time*/, synfig::Prog Importer::Handle importer(Importer::open(temp_file)); - DEBUGPOINT(); - if(!importer) { if(cb)cb->error(_("Unable to open ")+temp_file); @@ -151,8 +149,6 @@ imagemagick_mptr::get_frame(synfig::Surface &surface,Time /*time*/, synfig::Prog return false; } - DEBUGPOINT(); - if(!importer->get_frame(surface,0,cb)) { if(cb)cb->error(_("Unable to get frame from ")+temp_file); @@ -193,9 +189,7 @@ imagemagick_mptr::get_frame(synfig::Surface &surface,Time /*time*/, synfig::Prog Surface bleh(surface); surface=bleh; - //remove(temp_file.c_str()); - DEBUGPOINT(); return true; #else diff --git a/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp b/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp index 7c07d38..2a928a8 100644 --- a/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp +++ b/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp @@ -223,7 +223,6 @@ png_mptr::png_mptr(const char *file_name) switch(color_type) { case PNG_COLOR_TYPE_RGB: - DEBUGPOINT(); for(y=0;yadd_value_node(x,id); // throw runtime_error("You cannot add a ValueNode to an inline Canvas"); - //DEBUGPOINT(); if(x->is_exported()) throw runtime_error("ValueNode is already exported"); @@ -425,16 +423,13 @@ Canvas::add_value_node(ValueNode::Handle x, const String &id) try { - //DEBUGPOINT(); if(PlaceholderValueNode::Handle::cast_dynamic(value_node_list_.find(id))) throw Exception::IDNotFound("add_value_node()"); - //DEBUGPOINT(); throw Exception::IDAlreadyExists(id); } catch(Exception::IDNotFound) { - //DEBUGPOINT(); x->set_id(id); x->set_parent_canvas(this); @@ -444,7 +439,6 @@ Canvas::add_value_node(ValueNode::Handle x, const String &id) synfig::error("Unable to add ValueNode"); throw std::runtime_error("Unable to add ValueNode"); } - //DEBUGPOINT(); return; } @@ -664,7 +658,6 @@ Canvas::create() void Canvas::push_back(etl::handle x) { -// DEBUGPOINT(); // int i(x->count()); insert(end(),x); //if(x->count()!=i+1)synfig::info("push_back before %d, after %d",i,x->count()); @@ -673,7 +666,6 @@ Canvas::push_back(etl::handle x) void Canvas::push_front(etl::handle x) { -// DEBUGPOINT(); // int i(x->count()); insert(begin(),x); //if(x->count()!=i+1)synfig::error("push_front before %d, after %d",i,x->count()); diff --git a/synfig-core/trunk/src/synfig/keyframe.cpp b/synfig-core/trunk/src/synfig/keyframe.cpp index 0a9d2fd..baade29 100644 --- a/synfig-core/trunk/src/synfig/keyframe.cpp +++ b/synfig-core/trunk/src/synfig/keyframe.cpp @@ -84,13 +84,11 @@ KeyframeList::dump()const void KeyframeList::sync() { - //DEBUGPOINT(); //synfig::info("PRE-SORT:"); //dump(); sort(begin(),end()); //synfig::info("POST-SORT:"); //dump(); - //DEBUGPOINT(); } KeyframeList::iterator diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp index cf2ae81..7d8fbea 100644 --- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp +++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp @@ -297,7 +297,6 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali if(depth==MAX_DEPTH) { - DEBUGPOINT(); // if we are at the extent of our depth, // then we should just return whatever is under us. return context.accelerated_render(surface,quality,renddesc,cb); diff --git a/synfig-core/trunk/src/synfig/listimporter.cpp b/synfig-core/trunk/src/synfig/listimporter.cpp index 01ef02f..6245b99 100644 --- a/synfig-core/trunk/src/synfig/listimporter.cpp +++ b/synfig-core/trunk/src/synfig/listimporter.cpp @@ -95,9 +95,7 @@ ListImporter::~ListImporter() bool ListImporter::get_frame(Surface &surface,Time time, ProgressCallback *cb) { -// DEBUGPOINT(); int frame=round_to_int(time*fps); -// DEBUGPOINT(); if(!filename_list.size()) { @@ -106,18 +104,15 @@ ListImporter::get_frame(Surface &surface,Time time, ProgressCallback *cb) return false; } -// DEBUGPOINT(); if(frame<0)frame=0; if(frame>=(signed)filename_list.size())frame=filename_list.size()-1; -// DEBUGPOINT(); // See if that frame is cached std::list >::iterator iter; for(iter=frame_cache.begin();iter!=frame_cache.end();++iter) { if(iter->first==filename_list[frame]) { -// DEBUGPOINT(); surface.mirror(iter->second); return static_cast(surface); } @@ -125,8 +120,6 @@ ListImporter::get_frame(Surface &surface,Time time, ProgressCallback *cb) Importer::Handle importer(Importer::open(filename_list[frame])); -// DEBUGPOINT(); - if(!importer) { if(cb)cb->error(_("Unable to open ")+filename_list[frame]); @@ -134,8 +127,6 @@ ListImporter::get_frame(Surface &surface,Time time, ProgressCallback *cb) return false; } -// DEBUGPOINT(); - if(!importer->get_frame(surface,0,cb)) { if(cb)cb->error(_("Unable to get frame from ")+filename_list[frame]); @@ -143,21 +134,13 @@ ListImporter::get_frame(Surface &surface,Time time, ProgressCallback *cb) return false; } -// DEBUGPOINT(); - if(frame_cache.size()>=LIST_IMPORTER_CACHE_SIZE) frame_cache.pop_front(); -// DEBUGPOINT(); - frame_cache.push_back(std::pair(filename_list[frame],surface)); -// DEBUGPOINT(); - surface.mirror(frame_cache.back().second); -// DEBUGPOINT(); - return static_cast(surface); } diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp index 1b4a68c..199a609 100644 --- a/synfig-core/trunk/src/synfig/loadcanvas.cpp +++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp @@ -856,7 +856,6 @@ CanvasParser::parse_value(xmlpp::Element *element,Canvas::Handle canvas) return ValueBase(parse_canvas(element,canvas,true)); else { - DEBUGPOINT(); error_unexpected_element(element,element->get_name()); } diff --git a/synfig-core/trunk/src/synfig/valuenode.cpp b/synfig-core/trunk/src/synfig/valuenode.cpp index dce62ab..81a9fa2 100644 --- a/synfig-core/trunk/src/synfig/valuenode.cpp +++ b/synfig-core/trunk/src/synfig/valuenode.cpp @@ -255,8 +255,6 @@ ValueNode::~ValueNode() value_node_count--; begin_delete(); - - //DEBUGPOINT(); } void diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp index d94d3fd..504d0a0 100644 --- a/synfig-studio/trunk/src/gtkmm/app.cpp +++ b/synfig-studio/trunk/src/gtkmm/app.cpp @@ -411,30 +411,24 @@ studio::add_action_group_to_top(Glib::RefPtr ui_manager, Glib { ui_manager->insert_action_group(group,0); return; - DEBUGPOINT(); std::list > prev_groups(ui_manager->get_action_groups()); std::list >::reverse_iterator iter; - DEBUGPOINT(); for(iter=prev_groups.rbegin();iter!=prev_groups.rend();++iter) { - DEBUGPOINT(); if(*iter && (*iter)->get_name()!="menus") { synfig::info("Removing action group "+(*iter)->get_name()); ui_manager->remove_action_group(*iter); } } - DEBUGPOINT(); ui_manager->insert_action_group(group,0); - DEBUGPOINT(); for(;!prev_groups.empty();prev_groups.pop_front()) { if(prev_groups.front() && prev_groups.front()!=group && prev_groups.front()->get_name()!="menus") ui_manager->insert_action_group(prev_groups.front(),1); } - DEBUGPOINT(); } */ class Preferences : public synfigapp::Settings diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp index 3f7f24a..dcc436b 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp @@ -123,13 +123,6 @@ using namespace sigc; #define DEFAULT_TIME_WINDOW_SIZE (10.0) -/* -#ifdef DEBUGPOINT -#undef DEBUGPOINT -#endif -#define DEBUGPOINT() -*/ - #ifndef SMALL_BUTTON #define SMALL_BUTTON(button,stockid,tooltip) \ button = manage(new class Gtk::Button()); \ @@ -449,7 +442,7 @@ public: { // assert(view->layer_tree); - if(!view->layer_tree) { DEBUGPOINT(); synfig::error("%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__); return LayerList(); } + if(!view->layer_tree) { synfig::error("%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__); return LayerList(); } return view->layer_tree->get_selected_layers(); } @@ -458,7 +451,7 @@ public: { // assert(view->layer_tree); - if(!view->layer_tree) { DEBUGPOINT(); synfig::error("%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__); return 0; } + if(!view->layer_tree) { synfig::error("%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__); return 0; } return view->layer_tree->get_selected_layer(); } @@ -467,7 +460,7 @@ public: { // assert(view->layer_tree); - if(!view->layer_tree) { DEBUGPOINT(); synfig::error("%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__); return; } + if(!view->layer_tree) { synfig::error("%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__); return; } view->layer_tree->select_layers(layer_list); //view->get_smach().process_event(EVENT_REFRESH_DUCKS); @@ -479,7 +472,7 @@ public: { // assert(view->layer_tree); - if(!view->layer_tree) { DEBUGPOINT(); synfig::error("canvas_view.layer_tree not defined!?"); return; } + if(!view->layer_tree) { synfig::error("canvas_view.layer_tree not defined!?"); return; } view->layer_tree->select_layer(layer); //view->queue_rebuild_ducks(); } diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp index c1e6c87..c1759d9 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp @@ -770,7 +770,6 @@ CellRenderer_TimeTrack::activate_vfunc( break; case GDK_MOTION_NOTIFY: - //DEBUGPOINT(); //if(selection && dragging) // selected_time=((float)event->motion.x-(float)cell_area.get_x())/(float)cell_area.get_width()*(adjustment->get_upper()-adjustment->get_lower())+adjustment->get_lower(); return true; @@ -778,8 +777,6 @@ CellRenderer_TimeTrack::activate_vfunc( break; case GDK_BUTTON_RELEASE: { - DEBUGPOINT(); - //selected_time=((float)event->button.x-(float)cell_area.get_x())/(float)cell_area.get_width()*(adjustment->get_upper()-adjustment->get_lower())+adjustment->get_lower(); dragging=false; diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp index 3f4a8fb..98487b6 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp @@ -126,7 +126,6 @@ public: } ~ValueBase_Entry() { - DEBUGPOINT(); } void on_editing_done() diff --git a/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp b/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp index 7814161..7c2bab4 100644 --- a/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp @@ -148,7 +148,6 @@ ChildrenTreeStore::refresh_value_nodes() for(iter = children.begin(); iter != children.end(); ++iter) { Gtk::TreeRow row=*iter; - //DEBUGPOINT(); refresh_row(row); } } @@ -241,7 +240,6 @@ bool ChildrenTreeStore::execute_changed_value_nodes() { Profiler profiler("ChildrenTreeStore::execute_changed_value_nodes()"); - DEBUGPOINT(); if(!replaced_set_.empty()) rebuild_value_nodes(); diff --git a/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp b/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp index 6f88bbf..7141fa9 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp @@ -182,7 +182,6 @@ void studio::Widget_NavView::on_finish_render() //synfig::warning("Nav: It hath succeeded!!!"); //assert(renderer && renderer->has_success()); - DEBUGPOINT(); //synfig::warning("Nav: now we know it really succeeded"); if(!*surface) { diff --git a/synfig-studio/trunk/src/gtkmm/dock_params.cpp b/synfig-studio/trunk/src/gtkmm/dock_params.cpp index 1e4a621..a3b478c 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_params.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_params.cpp @@ -89,7 +89,6 @@ Dock_Params::~Dock_Params() void Dock_Params::init_canvas_view_vfunc(etl::loose_handle canvas_view) { - DEBUGPOINT(); Gtk::TreeView* tree_view( static_cast(canvas_view->get_ext_widget(get_name())) ); diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp index 4d90c55..3573810 100644 --- a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp +++ b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp @@ -227,16 +227,11 @@ Gdk::Cursor IconController::get_tool_cursor(const Glib::ustring& name,const Glib::RefPtr& window) { Glib::RefPtr pixmap; - DEBUGPOINT(); pixmap=Gdk::Pixmap::create(window, 64, 64, 8); - DEBUGPOINT(); pixmap->set_colormap(window->get_colormap()); //pixmap->set_colormap(Gdk::Colormap::create(pixmap->get_visual(),false)); - DEBUGPOINT(); Glib::RefPtr pixbuf; - DEBUGPOINT(); pixbuf=Gtk::Button().render_icon(Gtk::StockID("synfig-"+name),Gtk::ICON_SIZE_SMALL_TOOLBAR); - DEBUGPOINT(); pixbuf->render_to_drawable_alpha( pixmap, @@ -259,12 +254,10 @@ IconController::get_tool_cursor(const Glib::ustring& name,const Glib::RefPtr canvas_view, std::listget_instance().get(),_("Set Waypoints")); std::list::iterator iter; diff --git a/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp b/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp index 0075930..9452734 100644 --- a/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp @@ -837,7 +837,6 @@ KeyframeTreeStore::remove_keyframe(synfig::Keyframe keyframe) } catch(std::exception x) { - DEBUGPOINT(); g_warning(x.what()); } } @@ -856,7 +855,6 @@ KeyframeTreeStore::change_keyframe(synfig::Keyframe keyframe) if(iter!=old_keyframe_list.end() && new_index!=old_index) { - DEBUGPOINT(); std::vector new_order; for(unsigned int i=0;iset_param("dest_canvas",dest_canvas); if(canvas_interface()->get_instance()->perform_action(action)) { - DEBUGPOINT(); ret=true; } else { - DEBUGPOINT(); passive_grouper.cancel(); return false; } @@ -827,8 +825,6 @@ LayerGroupTreeStore::on_group_added(synfig::String group) bool LayerGroupTreeStore::on_group_removed(synfig::String group) { - //DEBUGPOINT(); - Gtk::TreeModel::Children::iterator iter; if(find_group_row(group,iter) && iter->children().size()==0) erase(iter); @@ -841,7 +837,6 @@ LayerGroupTreeStore::on_group_removed(synfig::String group) bool LayerGroupTreeStore::on_group_changed(synfig::String /*group*/) { - //DEBUGPOINT(); return true; } @@ -850,7 +845,6 @@ LayerGroupTreeStore::on_group_pair_added(synfig::String group, etl::handleget_canvas()) return; - //DEBUGPOINT(); Gtk::TreeModel::Children::iterator iter; if(!find_group_row(group, iter)) iter=on_group_added(group); @@ -865,7 +859,6 @@ LayerGroupTreeStore::on_group_pair_removed(synfig::String group, etl::handleget_canvas()) return; - //DEBUGPOINT(); Gtk::TreeModel::Children::iterator iter; if(!find_group_row(group, iter)) return; @@ -948,7 +941,6 @@ LayerGroupTreeStore::find_layer_row_(const synfig::Layer::Handle &layer, synfig: } iter=children().end(); - //DEBUGPOINT(); //return false; } @@ -1002,7 +994,6 @@ LayerGroupTreeStore::find_group_row_(const synfig::String &group, Gtk::TreeModel } iter=children().end(); - //DEBUGPOINT(); //return false; } diff --git a/synfig-studio/trunk/src/gtkmm/layertree.cpp b/synfig-studio/trunk/src/gtkmm/layertree.cpp index f65fbc7..81460f5 100644 --- a/synfig-studio/trunk/src/gtkmm/layertree.cpp +++ b/synfig-studio/trunk/src/gtkmm/layertree.cpp @@ -1046,24 +1046,19 @@ LayerTree::on_drag_data_get(const Glib::RefPtr&context, Gtk::S synfig::info("Dragged data of target \"%s\"",gdk_atom_name(selection_data->target)); synfig::info("Dragged selection=\"%s\"",gdk_atom_name(selection_data->selection)); - DEBUGPOINT(); - Gtk::TreeModel::Path path; Gtk::TreeViewColumn *column; int cell_x, cell_y; if(get_selection() Gtk::TreeRow row = *(get_selection()->get_selected()); - DEBUGPOINT(); if(synfig::String(gdk_atom_name(selection_data->target))=="LAYER" && (bool)row[model.is_layer]) { - DEBUGPOINT(); Layer* layer(((Layer::Handle)row[model.layer]).get()); assert(layer); selection_data.set(8, reinterpret_cast(&layer), sizeof(layer)); return; } - DEBUGPOINT(); } void diff --git a/synfig-studio/trunk/src/gtkmm/layertreestore.cpp b/synfig-studio/trunk/src/gtkmm/layertreestore.cpp index 1e12538..cb8440d 100644 --- a/synfig-studio/trunk/src/gtkmm/layertreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/layertreestore.cpp @@ -893,25 +893,21 @@ LayerTreeStore::on_layer_param_changed(synfig::Layer::Handle handle,synfig::Stri } /* - //DEBUGPOINT(); Gtk::TreeModel::Children::iterator iter; if(find_layer_row(handle,iter)) { - //DEBUGPOINT(); Gtk::TreeModel::Children children(iter->children()); for(iter = children.begin(); iter && iter != children.end(); ++iter) { if((Glib::ustring)(*iter)[model.param_name]==param_name) { - //DEBUGPOINT(); Gtk::TreeRow row=*iter; refresh_row(row); return; } } } - //DEBUGPOINT(); rebuild(); */ } @@ -1004,7 +1000,6 @@ LayerTreeStore::find_layer_row_(const synfig::Layer::Handle &layer, synfig::Canv } iter=children().end(); - //DEBUGPOINT(); //return false; } diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp index a3d8855..8bda933 100644 --- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp @@ -1522,7 +1522,6 @@ StateDraw_Context::new_region(std::list bline, synfig::Real if(value_prev.get_parent_value_node()==value_next.get_parent_value_node() && value_prev.get_parent_value_node()!=value_desc.get_parent_value_node()) { - DEBUGPOINT(); vertex_list.erase(iter); done=false; break; @@ -1537,7 +1536,6 @@ StateDraw_Context::new_region(std::list bline, synfig::Real // if(value_prev.get_value_node()==value_desc.get_value_node() || // value_desc.get_value_node()==value_next.get_value_node()) // { - // // DEBUGPOINT(); // vertex_list.erase(iter); // done=false; // printf("erased node - i = %d\n", i); @@ -1547,7 +1545,6 @@ StateDraw_Context::new_region(std::list bline, synfig::Real // // if previous is the same as next, remove previous? or next? // if(value_prev.get_value_node()==value_next.get_value_node()) // { - // // DEBUGPOINT(); // vertex_list.erase(next); // // vertex_list.erase(prev); // done=false; @@ -1576,7 +1573,6 @@ StateDraw_Context::new_region(std::list bline, synfig::Real // strprintf("same parent, different points this %d < next-1 %d", // value_desc.get_index(), ((value_next.get_index()-1))), // current); - // // DEBUGPOINT(); // for (int index = value_desc.get_index()+1; index < value_next.get_index(); index++) // { // printf("inserting up %d\n", index); @@ -1592,7 +1588,6 @@ StateDraw_Context::new_region(std::list bline, synfig::Real // strprintf("same parent, different points next %d < this-1 %d", // value_next.get_index(), ((value_desc.get_index()-1))), // current); - // // DEBUGPOINT(); // for (int index = value_desc.get_index()-1; index > value_next.get_index(); index--) // { // printf("inserting down %d\n", index); @@ -1632,7 +1627,6 @@ StateDraw_Context::new_region(std::list bline, synfig::Real if((vertex.get_vertex()-vertex_next.get_vertex()).mag_squared() bline, synfig::Real synfig::info(__FILE__":%d: Unable to properly connect blines.",__LINE__); continue; } - // DEBUGPOINT(); // \todo if next isn't split, don't we want to copy its 'Tangent 1' instead? value_node->set_link(5,value_node_next->get_link(5)); // Tangent 2 value_node->set_link(3,ValueNode_Const::create(true)); // Split Tangents @@ -1663,7 +1656,6 @@ StateDraw_Context::new_region(std::list bline, synfig::Real else if (value_prev.parent_is_value_node()) { printf("in two - it's far\n"); - // DEBUGPOINT(); // \todo this only makes sense if prev is on the same bline printf("this is index %d\n", value_desc.get_index()); printf("prev is index %d\n", value_prev.get_index()); @@ -1679,7 +1671,6 @@ StateDraw_Context::new_region(std::list bline, synfig::Real if (value_desc.get_index()link_count()-1) { printf("in two - b\n"); - // DEBUGPOINT(); printf("inserting node with index %d\n", value_desc.get_index()+1); vertex_list.insert(next, synfigapp::ValueDesc(value_desc.get_parent_value_node(), @@ -1694,7 +1685,6 @@ StateDraw_Context::new_region(std::list bline, synfig::Real if(value_desc.get_index()>0) { printf("in two - a\n"); - // DEBUGPOINT(); printf("inserting node on this line with index %d\n", value_desc.get_index()-1); vertex_list.insert(next, diff --git a/synfig-studio/trunk/src/gtkmm/state_normal.cpp b/synfig-studio/trunk/src/gtkmm/state_normal.cpp index 3378c6a..26dc853 100644 --- a/synfig-studio/trunk/src/gtkmm/state_normal.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_normal.cpp @@ -265,10 +265,8 @@ StateNormal_Context::edit_several_waypoints(std::list valu dialog.add_button(Gtk::StockID("gtk-cancel"),0); dialog.show(); - DEBUGPOINT(); if(dialog.run()==0) return; - DEBUGPOINT(); synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("Set Waypoints")); std::list::iterator iter; diff --git a/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp b/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp index f4ce475..5877486 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp @@ -140,7 +140,6 @@ Widget_CompSelect::new_instance(etl::handle instance) void Widget_CompSelect::delete_instance(etl::handle instance) { - DEBUGPOINT(); refresh(); if(selected_instance==instance) diff --git a/synfig-studio/trunk/src/gtkmm/widget_value.cpp b/synfig-studio/trunk/src/gtkmm/widget_value.cpp index 82bbdda..5a8257a 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_value.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_value.cpp @@ -149,7 +149,6 @@ Widget_ValueBase::~Widget_ValueBase() void Widget_ValueBase::activate() { - //DEBUGPOINT(); signal_activate()(); } diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp index 228c087..8f73604 100644 --- a/synfig-studio/trunk/src/gtkmm/workarea.cpp +++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp @@ -1869,10 +1869,8 @@ WorkArea::on_vruler_event(GdkEvent */*event*/) switch(event->type) { case GDK_BUTTON_PRESS: - DEBUGPOINT(); if(dragging==DRAG_NONE) { - DEBUGPOINT(); dragging=DRAG_GUIDE; curr_guide=get_guide_list_x().insert(get_guide_list_x().begin()); curr_guide_is_x=true; @@ -1880,10 +1878,8 @@ WorkArea::on_vruler_event(GdkEvent */*event*/) return true; break; case GDK_BUTTON_RELEASE: - DEBUGPOINT(); if(dragging==DRAG_GUIDE && curr_guide_is_x==true) { - DEBUGPOINT(); dragging=DRAG_NONE; get_guide_list_x().erase(curr_guide); } diff --git a/synfig-studio/trunk/src/synfigapp/action_system.cpp b/synfig-studio/trunk/src/synfigapp/action_system.cpp index 33f71f9..cc20a2b 100644 --- a/synfig-studio/trunk/src/synfigapp/action_system.cpp +++ b/synfig-studio/trunk/src/synfigapp/action_system.cpp @@ -198,7 +198,6 @@ Action::System::perform_action(etl::handle action) { handle canvas_interface=static_cast(this)->find_canvas_interface(canvas); assert(canvas_interface); - DEBUGPOINT(); //canvas_interface->signal_dirty_preview()(); } } @@ -299,7 +298,6 @@ synfigapp::Action::System::undo() { handle canvas_interface=static_cast(this)->find_canvas_interface(canvas); assert(canvas_interface); - //DEBUGPOINT(); //canvas_interface->signal_dirty_preview()(); } } @@ -398,7 +396,6 @@ Action::System::redo() { handle canvas_interface=static_cast(this)->find_canvas_interface(canvas); assert(canvas_interface); - //DEBUGPOINT(); //canvas_interface->signal_dirty_preview()(); } } @@ -511,7 +508,6 @@ Action::System::set_action_status(etl::handle action, bool x) Canvas::Handle canvas=canvas_specific->get_canvas(); handle canvas_interface=static_cast(this)->find_canvas_interface(canvas); assert(canvas_interface); - //DEBUGPOINT(); //canvas_interface->signal_dirty_preview()(); } @@ -532,7 +528,6 @@ Action::System::set_action_status(etl::handle action, bool x) Canvas::Handle canvas=canvas_specific->get_canvas(); handle canvas_interface=static_cast(this)->find_canvas_interface(canvas); assert(canvas_interface); - DEBUGPOINT(); //canvas_interface->signal_dirty_preview()(); } @@ -555,12 +550,10 @@ Action::PassiveGrouper::PassiveGrouper(etl::loose_handle instance_,synfi void Action::PassiveGrouper::request_redraw(etl::handle x) { -/* DEBUGPOINT(); - if(instance_->group_stack_.empty()) +/* if(instance_->group_stack_.empty()) { if(x!=canvas_interface_) { - DEBUGPOINT(); x->signal_dirty_preview()(); } @@ -568,21 +561,16 @@ Action::PassiveGrouper::request_redraw(etl::handle x) } else { - DEBUGPOINT(); if(instance_->group_stack_.back()==this) { - DEBUGPOINT(); redraw_requested_=true; } else { - DEBUGPOINT(); instance_->group_stack_.back()->request_redraw(x); redraw_requested_=false; } - DEBUGPOINT(); } - DEBUGPOINT(); */ if(x) { @@ -678,7 +666,6 @@ Action::PassiveGrouper::~PassiveGrouper() if(instance_->group_stack_.empty()) { assert(canvas_interface_); - DEBUGPOINT(); canvas_interface_->signal_dirty_preview()(); } else diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp index 666fc80..0af76d4 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp @@ -127,7 +127,6 @@ Action::KeyframeSetDelta::prepare() Time time(get_canvas()->keyframe_list().find(keyframe)->get_time()); std::vector::iterator iter; - DEBUGPOINT(); for(iter=value_desc_list.begin();iter!=value_desc_list.end();++iter) { ValueDesc& value_desc(*iter); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp index e5edf2a..a7ca4cf 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp @@ -193,7 +193,6 @@ Action::ValueDescSet::prepare() if (value_desc.get_index()==4) { printf("copying change to tangent 2\n"); - DEBUGPOINT(); ValueNode_Composite::Handle parent_value_node; parent_value_node=parent_value_node.cast_dynamic(value_desc.get_parent_value_node()); @@ -511,7 +510,6 @@ Action::ValueDescSet::prepare() if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - DEBUGPOINT(); add_action_front(action); } else @@ -519,7 +517,6 @@ Action::ValueDescSet::prepare() value_node=value_node.cast_dynamic(value_desc.get_value_node()); } - DEBUGPOINT(); if(!value_node) throw Error(_("Direct manipulation of this ValueNode type is not yet supported")); @@ -541,7 +538,6 @@ Action::ValueDescSet::prepare() if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - DEBUGPOINT(); add_action(action); return; diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp index 97bbb28..21d39be 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp @@ -63,12 +63,6 @@ ACTION_SET_PRIORITY(Action::WaypointSetSmart,0); ACTION_SET_VERSION(Action::WaypointSetSmart,"0.0"); ACTION_SET_CVS_ID(Action::WaypointSetSmart,"$Id$"); - -/*#ifdef DEBUGPOINT -#undef DEBUGPOINT -#endif -#define DEBUGPOINT() -*/ /* === G L O B A L S ======================================================= */ /* === P R O C E D U R E S ================================================= */ @@ -132,7 +126,6 @@ Action::WaypointSetSmart::set_param(const synfig::String& name, const Action::Pa if(name=="value_node" && param.get_type()==Param::TYPE_VALUENODE) { value_node=ValueNode_Animated::Handle::cast_dynamic(param.get_value_node()); - DEBUGPOINT(); if(time_set) calc_waypoint(); @@ -141,7 +134,6 @@ Action::WaypointSetSmart::set_param(const synfig::String& name, const Action::Pa if(name=="waypoint" && param.get_type()==Param::TYPE_WAYPOINT && !time_set) { waypoint=param.get_waypoint(); - DEBUGPOINT(); return true; } @@ -153,7 +145,6 @@ Action::WaypointSetSmart::set_param(const synfig::String& name, const Action::Pa if(value_node) calc_waypoint(); - DEBUGPOINT(); return true; } @@ -191,7 +182,6 @@ Action::WaypointSetSmart::is_ready()const void Action::WaypointSetSmart::calc_waypoint() { - DEBUGPOINT(); Time time=waypoint.get_time(); try { @@ -238,10 +228,8 @@ Action::WaypointSetSmart::enclose_waypoint(const synfig::Waypoint& waypoint) try { times.insert(value_node->find(waypoint)->get_time()); // synfig::info(__FILE__":%d: value_node->find(waypoint)->get_time()=%s",__LINE__,value_node->find(waypoint)->get_time().get_string().c_str()); -// DEBUGPOINT(); }catch (...) { } -// DEBUGPOINT(); // First we need to to add any waypoints necessary to // maintain the integrity of the keyframes. if(get_edit_mode()&MODE_ANIMATE_PAST) try @@ -257,20 +245,16 @@ Action::WaypointSetSmart::enclose_waypoint(const synfig::Waypoint& waypoint) // synfig::info(__FILE__":%d: prev_keyframe->time=%s",__LINE__,keyframe.get_time().get_string().c_str()); // synfig::info(__FILE__":%d: waypoint->time=%s",__LINE__,waypoint.get_time().get_string().c_str()); -// DEBUGPOINT(); if(times.count(keyframe.get_time())) { -// DEBUGPOINT(); throw int(); } if(waypoint.get_time().is_equal(keyframe.get_time())) { -// DEBUGPOINT(); throw int(); } times.insert(keyframe.get_time()); -// DEBUGPOINT(); try { value_node->find(keyframe.get_time()); @@ -306,12 +290,10 @@ Action::WaypointSetSmart::enclose_waypoint(const synfig::Waypoint& waypoint) } } catch(Error x) { throw x; } - catch(synfig::Exception::NotFound) { DEBUGPOINT(); } - catch(int) { DEBUGPOINT(); } - catch(...) { DEBUGPOINT(); } - //DEBUGPOINT(); + catch(synfig::Exception::NotFound) { } + catch(int) { } + catch(...) { } - //DEBUGPOINT(); if(get_edit_mode()&MODE_ANIMATE_FUTURE)try { Time curr_time(waypoint.get_time()); @@ -319,19 +301,16 @@ Action::WaypointSetSmart::enclose_waypoint(const synfig::Waypoint& waypoint) //while(value_node->waypoint_list().back().get_time()>=curr_time) { - //DEBUGPOINT(); // Try to find next keyframe //synfig::info("FUTURE waypoint.get_time()=%s",waypoint.get_time().get_string().c_str()); Keyframe keyframe(*get_canvas()->keyframe_list().find_next(curr_time)); //synfig::info("FUTURE keyframe.get_time()=%s",keyframe.get_time().get_string().c_str()); curr_time=keyframe.get_time(); - //DEBUGPOINT(); if(times.count(keyframe.get_time())|| waypoint.get_time().is_equal(keyframe.get_time())) throw int(); else times.insert(keyframe.get_time()); - //DEBUGPOINT(); try { @@ -368,19 +347,16 @@ Action::WaypointSetSmart::enclose_waypoint(const synfig::Waypoint& waypoint) add_action(action); } } - //DEBUGPOINT(); } catch(Error x) { throw x; } - catch(synfig::Exception::NotFound) { DEBUGPOINT(); } - catch(int) { DEBUGPOINT(); } - catch(...) { DEBUGPOINT(); } - //DEBUGPOINT(); + catch(synfig::Exception::NotFound) { } + catch(int) { } + catch(...) { } } void Action::WaypointSetSmart::prepare() { - //DEBUGPOINT(); clear(); times.clear(); @@ -419,7 +395,6 @@ Action::WaypointSetSmart::prepare() try { //synfig::info("WaypointSetSmart: Replace?"); - //DEBUGPOINT(); // Check to see if a waypoint exists at this point in time WaypointList::iterator iter=value_node->find(waypoint.get_time()); @@ -447,7 +422,6 @@ Action::WaypointSetSmart::prepare() try { //synfig::info("WaypointSetSmart: Add?"); - //DEBUGPOINT(); // At this point we know that the old waypoint doesn't exist, // so we need to create it. Action::Handle action(WaypointAdd::create()); -- 2.7.4