From 471c968c4698589188dccbb9cdafd4d0bae2c8b1 Mon Sep 17 00:00:00 2001 From: ankit-kumar-dwivedi Date: Nov 29 2019 17:41:40 +0000 Subject: added debug::log() and updated gitignore for synfig-studio/tmpwrk3127/* --- diff --git a/.gitignore b/.gitignore index dc439eb..3cfe176 100644 --- a/.gitignore +++ b/.gitignore @@ -181,6 +181,7 @@ synfig-studio/po/synfigstudio.pot synfig-studio/po/stamp-it synfig-studio/src/gui/synfigstudio synfig-studio/synfigstudio-thumbnailer.schemas +synfig-studio/tmpwrk3127/* synfig-studio/org.synfig.SynfigStudio.desktop # ------------------------------------------------------------------------ diff --git a/synfig-studio/src/gui/canvasview.cpp b/synfig-studio/src/gui/canvasview.cpp index 14afac6..a909dbc 100644 --- a/synfig-studio/src/gui/canvasview.cpp +++ b/synfig-studio/src/gui/canvasview.cpp @@ -189,13 +189,16 @@ using namespace studio; class studio::CanvasViewUIInterface : public UIInterface { CanvasView *view; - +private: + float cur_progress; public: CanvasViewUIInterface(CanvasView *view): view(view) - { view->statusbar->push(_("Idle")); - view->progressbar->hide();} + { + view->statusbar->push(_("Idle")); + view->progressbar->hide(); + } ~CanvasViewUIInterface() { } virtual Response confirmation( @@ -299,7 +302,7 @@ public: virtual bool amount_complete(int current, int total) { - float cur_progress=(float)current/(float)total; + cur_progress = (float)current/(float)total; if(cur_progress>0.0 && cur_progress<1.0) { @@ -1051,7 +1054,7 @@ CanvasView::create_time_bar() controls->pack_start(*separator, false, true); controls->pack_start(*jackdial, false, true); controls->pack_start(*statusbar, true, true); - controls->pack_start(*progressbar, true, true); + controls->pack_start(*progressbar, true, true); controls->pack_start(*widget_interpolation, false, true); controls->pack_start(*keyframedial, false, true); controls->pack_start(*space, false, true); diff --git a/synfig-studio/src/gui/dialogs/vectorizersettings.cpp b/synfig-studio/src/gui/dialogs/vectorizersettings.cpp index 5ad0d82..8be58c2 100644 --- a/synfig-studio/src/gui/dialogs/vectorizersettings.cpp +++ b/synfig-studio/src/gui/dialogs/vectorizersettings.cpp @@ -35,7 +35,7 @@ #include #include #include -#include "onemoment.h" +#include /* === U S I N G =========================================================== */ @@ -283,12 +283,12 @@ VectorizerSettings::on_convert_pressed() { hide(); synfigapp::Action::Handle action(synfigapp::Action::create("Vectorization")); - std::cout<<"Action Created \n"; + synfig::debug::Log::info("","Action Created "); assert(action); if(!action) return; savecurrconfig(); - std::cout<<"Action Asserted \n"; + synfig::debug::Log::info("","Action Asserted "); // Add an if else to pass param according to outline /centerline action->set_param("image",synfig::Layer::Handle::cast_dynamic(layer_bitmap_)); action->set_param("mode","centerline"); @@ -305,13 +305,11 @@ VectorizerSettings::on_convert_pressed() if(etl::handle paste = etl::handle::cast_dynamic(reference_layer_)) { - std::cout<<"image inside group layer clicked\n"; canvas = layer_bitmap_->get_canvas()->parent(); action->set_param("reference_layer",reference_layer_); } else { - std::cout<<"image switch layer clicked\n"; canvas = layer_bitmap_->get_canvas(); } @@ -319,17 +317,17 @@ VectorizerSettings::on_convert_pressed() action->set_param("canvas", canvas); action->set_param("canvas_interface", canvas_interface); - std::cout<<"Action param passed \n"; + synfig::debug::Log::info("","Action param passed "); if(!action->is_ready()) { return; } - std::cout<<"Action is ready \n"; + synfig::debug::Log::info("","Action is ready "); if(!instance->perform_action(action)) { return; } - std::cout<<"Convert Pressed...."; + synfig::debug::Log::info("","Convert Pressed...."); } void diff --git a/synfig-studio/src/synfigapp/actions/vectorization.cpp b/synfig-studio/src/synfigapp/actions/vectorization.cpp index 536d5f6..4c83d90 100644 --- a/synfig-studio/src/synfigapp/actions/vectorization.cpp +++ b/synfig-studio/src/synfigapp/actions/vectorization.cpp @@ -197,7 +197,6 @@ Action::Vectorization::set_param(const synfig::String& name, const Action::Param if(name=="maxthickness" && param.get_type() == Param::TYPE_INTEGER) { maxthickness = param.get_integer(); - std::cout<<"vectorization action maxthickness :"< &ras, Contours &polygons, VectorizerCoreGlobals &g) { - std::cout<<"Welcome to polygonize\n"; BorderList *borders; diff --git a/synfig-studio/src/synfigapp/vectorizer/centerlinevectorizer.cpp b/synfig-studio/src/synfigapp/vectorizer/centerlinevectorizer.cpp index c492df8..a3d5d35 100644 --- a/synfig-studio/src/synfigapp/vectorizer/centerlinevectorizer.cpp +++ b/synfig-studio/src/synfigapp/vectorizer/centerlinevectorizer.cpp @@ -32,6 +32,7 @@ #include "centerlinevectorizer.h" #include "polygonizerclasses.h" #include +#include #endif /* === U S I N G =========================================================== */ @@ -69,7 +70,7 @@ std::vector< etl::handle > VectorizerCore::centerlineVectorize(etl::handle &image,const etl::handle &ui_interface, const CenterlineConfiguration &configuration,const Gamma &gamma) { - std::cout<<"Inside CenterlineVectorize\n"; + synfig::debug::Log::info("","Inside CenterlineVectorize"); VectorizerCoreGlobals globals; globals.currConfig = &configuration;